OP-1122 OP-1125 cleaned up GCS side uavtalk includes

2025-01-29 14:52:12 +01:00 · 2013-12-11 22:22:28 +01:00 · 2013-12-11 22:22:28 +01:00 · e0115a25b0
commit e0115a25b0
parent 617924e64d
24 changed files with 66 additions and 63 deletions
--- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h
@ -33,7 +33,6 @@
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
-#include "uavtalk/telemetrymanager.h"

 #include <QWidget>
 #include <QList>
--- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h
@ -33,7 +33,7 @@
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
-#include "uavtalk/telemetrymanager.h"
+
 #include <QWidget>
 #include <QList>
 #include <QItemDelegate>
--- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h
+++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h
@ -33,7 +33,7 @@
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
-#include "uavtalk/telemetrymanager.h"
+
 #include <QWidget>
 #include <QList>
 #include <QItemDelegate>
--- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h
@ -33,7 +33,6 @@
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
-#include "uavtalk/telemetrymanager.h"

 #include <QtCore/QList>
 #include <QWidget>
--- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
@ -42,6 +42,8 @@
 #include "defaulthwsettingswidget.h"
 #include "uavobjectutilmanager.h"

+#include <uavtalk/telemetrymanager.h>
+
 #include <QDebug>
 #include <QStringList>
 #include <QWidget>
--- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
@ -27,18 +27,18 @@
 #ifndef CONFIGGADGETWIDGET_H
 #define CONFIGGADGETWIDGET_H

-#include "uavtalk/telemetrymanager.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
 #include "objectpersistence.h"
+#include "utils/pathutils.h"
+#include "utils/mytabbedstackwidget.h"
+#include "../uavobjectwidgetutils/configtaskwidget.h"
+
 #include <QWidget>
 #include <QList>
 #include <QTextBrowser>
-#include "utils/pathutils.h"
 #include <QMessageBox>
-#include "utils/mytabbedstackwidget.h"
-#include "../uavobjectwidgetutils/configtaskwidget.h"

 class ConfigGadgetWidget : public QWidget {
    Q_OBJECT
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@ -27,7 +27,8 @@

 #include "configinputwidget.h"

-#include "uavtalk/telemetrymanager.h"
+#include <extensionsystem/pluginmanager.h>
+#include <coreplugin/generalsettings.h>

 #include <QDebug>
 #include <QStringList>
@ -41,9 +42,6 @@
 #include <utils/stylehelper.h>
 #include <QMessageBox>

-#include <extensionsystem/pluginmanager.h>
-#include <coreplugin/generalsettings.h>
-
 #define ACCESS_MIN_MOVE -3
 #define ACCESS_MAX_MOVE 3
 #define STICK_MIN_MOVE  -8
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
@ -29,7 +29,14 @@
 #include "outputchannelform.h"
 #include "configvehicletypewidget.h"

-#include "uavtalk/telemetrymanager.h"
+#include "mixersettings.h"
+#include "actuatorcommand.h"
+#include "actuatorsettings.h"
+#include "systemalarms.h"
+#include "systemsettings.h"
+#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
+#include <extensionsystem/pluginmanager.h>
+#include <coreplugin/generalsettings.h>

 #include <QDebug>
 #include <QStringList>
@ -40,14 +47,6 @@
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QUrl>
-#include "mixersettings.h"
-#include "actuatorcommand.h"
-#include "actuatorsettings.h"
-#include "systemalarms.h"
-#include "systemsettings.h"
-#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
-#include <extensionsystem/pluginmanager.h>
-#include <coreplugin/generalsettings.h>

 ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(parent), wasItMe(false)
 {
--- a/ground/openpilotgcs/src/plugins/config/configplugin.h
+++ b/ground/openpilotgcs/src/plugins/config/configplugin.h
@ -31,7 +31,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include "uavtalk/telemetrymanager.h"
 #include "objectpersistence.h"

 #include <QMessageBox>
--- a/ground/openpilotgcs/src/plugins/hitl/isimulator.h
+++ b/ground/openpilotgcs/src/plugins/hitl/isimulator.h
@ -1,12 +1,6 @@
 #ifndef ISIMULATOR_H
 #define ISIMULATOR_H

-
-#include <QObject>
-#include <QUdpSocket>
-#include <QTimer>
-#include <math.h>
-#include "uavtalk/telemetrymanager.h"
 #include "uavobjectmanager.h"
 #include "actuatordesired.h"
 #include "altitudestate.h"
@ -15,6 +9,11 @@
 #include "positionstate.h"
 #include "gcstelemetrystats.h"

+#include <QObject>
+#include <QUdpSocket>
+#include <QTimer>
+#include <math.h>
+
 class Simulator : public QObject {
    Q_OBJECT
 public:
--- a/ground/openpilotgcs/src/plugins/hitl/simulator.cpp
+++ b/ground/openpilotgcs/src/plugins/hitl/simulator.cpp
@ -27,11 +27,13 @@


 #include "simulator.h"
-#include "extensionsystem/pluginmanager.h"
-#include "coreplugin/icore.h"
-#include "coreplugin/threadmanager.h"
 #include "hitlnoisegeneration.h"

+#include <extensionsystem/pluginmanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/threadmanager.h>
+#include <uavtalk/telemetrymanager.h>
+
 volatile bool Simulator::isStarted = false;

 const float Simulator::GEE      = 9.81;
--- a/ground/openpilotgcs/src/plugins/hitl/simulator.h
+++ b/ground/openpilotgcs/src/plugins/hitl/simulator.h
@ -28,14 +28,7 @@
 #ifndef ISIMULATOR_H
 #define ISIMULATOR_H

-#include <QObject>
-#include <QUdpSocket>
-#include <QTimer>
-#include <QProcess>
-#include <qmath.h>
-
 #include "qscopedpointer.h"
-#include "uavtalk/telemetrymanager.h"
 #include "uavobjectmanager.h"

 #include "accelstate.h"
@ -61,6 +54,13 @@

 #include "utils/coordinateconversions.h"

+#include <QObject>
+#include <QUdpSocket>
+#include <QTime>
+#include <QTimer>
+#include <QProcess>
+#include <qmath.h>
+
 /**
 * just imagine this was a class without methods and all public properties
 */
--- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp
@ -29,15 +29,17 @@
 #include "notificationitem.h"
 #include "notifypluginoptionspage.h"
 #include "notifylogging.h"
+
+#include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
+#include <uavtalk/telemetrymanager.h>
+
+#include <iostream>
+
 #include <QDebug>
 #include <QtPlugin>
 #include <QStringList>

-#include <extensionsystem/pluginmanager.h>
-
-#include <iostream>
-
 static const QString VERSION = "1.0.0";

 // #define DEBUG_NOTIFIES
@ -125,7 +127,7 @@ void SoundNotifyPlugin::readConfig(QSettings *settings, UAVConfigInfo * /* confi

 void SoundNotifyPlugin::onTelemetryManagerAdded(QObject *obj)
 {
-    telMngr = qobject_cast<TelemetryManager *>(obj);
+    TelemetryManager *telMngr = qobject_cast<TelemetryManager *>(obj);
    if (telMngr) {
        connect(telMngr, SIGNAL(disconnected()), this, SLOT(onAutopilotDisconnect()));
    }
--- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h
+++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h
@ -29,7 +29,6 @@

 #include <extensionsystem/iplugin.h>
 #include <coreplugin/iconfigurableplugin.h>
-#include "uavtalk/telemetrymanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
 #include "notificationitem.h"
@ -111,7 +110,6 @@ private:

    PhononObject phonon;
    NotifyPluginOptionsPage *mop;
-    TelemetryManager *telMngr;
    QMediaPlaylist *playlist;
 };

--- a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
@ -30,7 +30,6 @@
 #include "scopegadgetwidget.h"
 #include "utils/stylehelper.h"

-#include "uavtalk/telemetrymanager.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.h
@ -31,7 +31,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/connectionmanager.h>
 #include "setupwizard.h"
-#include "uavtalk/telemetrymanager.h"
 #include "abstractwizardpage.h"
 #include "uploader/enums.h"

--- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp
@ -25,11 +25,13 @@
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

+#include "systemalarms.h"
 #include "systemhealthgadgetwidget.h"
+
 #include "utils/stylehelper.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
-#include "systemalarms.h"
+#include <uavtalk/telemetrymanager.h>

 #include <QDebug>
 #include <QWhatsThis>
--- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.h
@ -30,7 +30,7 @@

 #include "systemhealthgadgetconfiguration.h"
 #include "uavobject.h"
-#include "uavtalk/telemetrymanager.h"
+
 #include <QGraphicsView>
 #include <QtSvg/QSvgRenderer>
 #include <QtSvg/QGraphicsSvgItem>
--- a/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetfactory.cpp
+++ b/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetfactory.cpp
@ -25,14 +25,15 @@
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include "monitorgadgetfactory.h"
-#include "uavtalk/telemetrymanager.h"
-#include "extensionsystem/pluginmanager.h"
+
 #include "monitorgadgetconfiguration.h"
 #include "monitorgadget.h"
 #include "monitorgadgetoptionspage.h"

+#include <extensionsystem/pluginmanager.h>
 #include <coreplugin/connectionmanager.h>
 #include <coreplugin/icore.h>
+#include <uavtalk/telemetrymanager.h>

 MonitorGadgetFactory::MonitorGadgetFactory(QObject *parent) :
    IUAVGadgetFactory(QString("TelemetryMonitorGadget"), tr("Telemetry Monitor"), parent)
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
@ -25,9 +25,12 @@
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include "configtaskwidget.h"
+
+#include <uavtalk/telemetrymanager.h>
+#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
+
 #include <QWidget>
 #include <QLineEdit>
-#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"

 /**
 * Constructor
@ -324,7 +327,8 @@ void ConfigTaskWidget::forceConnectedState() // dynamic widgets don't recieve th
 void ConfigTaskWidget::onAutopilotConnect()
 {
    if (utilMngr) {
-        currentBoard = utilMngr->getBoardModel(); // TODO REMEMBER TO ADD THIS TO FORCE CONNECTED FUNC ON CC3D_RELEASE
+        // TODO REMEMBER TO ADD THIS TO FORCE CONNECTED FUNC ON CC3D_RELEASE
+        currentBoard = utilMngr->getBoardModel();
    }
    invalidateObjects();
    isConnected = true;
@ -1226,8 +1230,8 @@ void ConfigTaskWidget::loadWidgetLimits(QWidget *widget, UAVObjectField *field,
 void ConfigTaskWidget::updateEnableControls()
 {
    TelemetryManager *telMngr = pm->getObject<TelemetryManager>();
-
    Q_ASSERT(telMngr);
+
    enableControls(telMngr->isConnected());
 }

--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
@ -27,7 +27,6 @@
 #ifndef SMARTSAVEBUTTON_H
 #define SMARTSAVEBUTTON_H

-#include "uavtalk/telemetrymanager.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
--- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h
+++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h
@ -30,17 +30,17 @@

 #include "ui_runningdevicewidget.h"

-#include <QWidget>
-#include <QErrorMessage>
-#include <QtSvg/QGraphicsSvgItem>
-#include <QtSvg/QSvgRenderer>
-#include "uavtalk/telemetrymanager.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"
 #include "uavobjectutilmanager.h"
 #include "uploader_global.h"

+#include <QWidget>
+#include <QErrorMessage>
+#include <QtSvg/QGraphicsSvgItem>
+#include <QtSvg/QSvgRenderer>
+
 class UPLOADER_EXPORT RunningDeviceWidget : public QWidget {
    Q_OBJECT
 public:
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@ -26,10 +26,13 @@
 */
 #include "uploadergadgetwidget.h"
 #include "version_info/version_info.h"
-#include <coreplugin/coreconstants.h>
-#include <QDebug>
 #include "flightstatus.h"

+#include <coreplugin/coreconstants.h>
+#include <uavtalk/telemetrymanager.h>
+
+#include <QDebug>
+
 #define DFU_DEBUG true

 const int UploaderGadgetWidget::AUTOUPDATE_CLOSE_TIMEOUT = 7000;
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
@ -36,7 +36,6 @@
 #include <QtSerialPort/QSerialPort>
 #include <QtSerialPort/QSerialPortInfo>

-#include "uavtalk/telemetrymanager.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjectmanager.h"
 #include "uavobject.h"