From e0115a25b0ab54068fecc764605c5235e1273473 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 11 Dec 2013 22:22:28 +0100 Subject: [PATCH] OP-1122 OP-1125 cleaned up GCS side uavtalk includes --- .../cfg_vehicletypes/configcustomwidget.h | 1 - .../cfg_vehicletypes/configfixedwingwidget.h | 2 +- .../configgroundvehiclewidget.h | 2 +- .../cfg_vehicletypes/configmultirotorwidget.h | 1 - .../src/plugins/config/configgadgetwidget.cpp | 2 ++ .../src/plugins/config/configgadgetwidget.h | 8 ++++---- .../src/plugins/config/configinputwidget.cpp | 6 ++---- .../src/plugins/config/configoutputwidget.cpp | 17 ++++++++--------- .../src/plugins/config/configplugin.h | 1 - .../openpilotgcs/src/plugins/hitl/isimulator.h | 11 +++++------ .../openpilotgcs/src/plugins/hitl/simulator.cpp | 8 +++++--- .../openpilotgcs/src/plugins/hitl/simulator.h | 14 +++++++------- .../src/plugins/notify/notifyplugin.cpp | 12 +++++++----- .../src/plugins/notify/notifyplugin.h | 2 -- .../src/plugins/scope/scopegadgetwidget.cpp | 1 - .../plugins/setupwizard/pages/autoupdatepage.h | 1 - .../systemhealth/systemhealthgadgetwidget.cpp | 4 +++- .../systemhealth/systemhealthgadgetwidget.h | 2 +- .../plugins/telemetry/monitorgadgetfactory.cpp | 5 +++-- .../uavobjectwidgetutils/configtaskwidget.cpp | 10 +++++++--- .../uavobjectwidgetutils/smartsavebutton.h | 1 - .../src/plugins/uploader/runningdevicewidget.h | 10 +++++----- .../plugins/uploader/uploadergadgetwidget.cpp | 7 +++++-- .../src/plugins/uploader/uploadergadgetwidget.h | 1 - 24 files changed, 66 insertions(+), 63 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h index faa89cc9c..fbef8939e 100644 --- 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 #include diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h index 65c03c86e..f0b786379 100644 --- 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 #include #include diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h index 94ef93e0c..72d7d0fff 100644 --- 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 #include #include diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h index 181c06875..dde2ced06 100644 --- 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 #include diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index b71333c4f..6e932e870 100644 --- 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 + #include #include #include diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h index a2d04e793..45eadd8b5 100644 --- 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 #include #include -#include "utils/pathutils.h" #include -#include "utils/mytabbedstackwidget.h" -#include "../uavobjectwidgetutils/configtaskwidget.h" class ConfigGadgetWidget : public QWidget { Q_OBJECT diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index d1040724f..c2d119ac8 100644 --- 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 +#include #include #include @@ -41,9 +42,6 @@ #include #include -#include -#include - #define ACCESS_MIN_MOVE -3 #define ACCESS_MAX_MOVE 3 #define STICK_MIN_MOVE -8 diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp index ee15cf188..9ca2ed943 100644 --- 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 +#include #include #include @@ -40,14 +47,6 @@ #include #include #include -#include "mixersettings.h" -#include "actuatorcommand.h" -#include "actuatorsettings.h" -#include "systemalarms.h" -#include "systemsettings.h" -#include "uavsettingsimportexport/uavsettingsimportexportfactory.h" -#include -#include ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(parent), wasItMe(false) { diff --git a/ground/openpilotgcs/src/plugins/config/configplugin.h b/ground/openpilotgcs/src/plugins/config/configplugin.h index c47cfd791..2f8ead7e2 100644 --- a/ground/openpilotgcs/src/plugins/config/configplugin.h +++ b/ground/openpilotgcs/src/plugins/config/configplugin.h @@ -31,7 +31,6 @@ #include #include #include -#include "uavtalk/telemetrymanager.h" #include "objectpersistence.h" #include diff --git a/ground/openpilotgcs/src/plugins/hitl/isimulator.h b/ground/openpilotgcs/src/plugins/hitl/isimulator.h index 12124a5bf..f9b064d9b 100644 --- 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 -#include -#include -#include -#include "uavtalk/telemetrymanager.h" #include "uavobjectmanager.h" #include "actuatordesired.h" #include "altitudestate.h" @@ -15,6 +9,11 @@ #include "positionstate.h" #include "gcstelemetrystats.h" +#include +#include +#include +#include + class Simulator : public QObject { Q_OBJECT public: diff --git a/ground/openpilotgcs/src/plugins/hitl/simulator.cpp b/ground/openpilotgcs/src/plugins/hitl/simulator.cpp index c77b26f91..355e76448 100644 --- 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 +#include +#include +#include + volatile bool Simulator::isStarted = false; const float Simulator::GEE = 9.81; diff --git a/ground/openpilotgcs/src/plugins/hitl/simulator.h b/ground/openpilotgcs/src/plugins/hitl/simulator.h index 7d9ac4ad9..8eb24ff5f 100644 --- 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 -#include -#include -#include -#include - #include "qscopedpointer.h" -#include "uavtalk/telemetrymanager.h" #include "uavobjectmanager.h" #include "accelstate.h" @@ -61,6 +54,13 @@ #include "utils/coordinateconversions.h" +#include +#include +#include +#include +#include +#include + /** * just imagine this was a class without methods and all public properties */ diff --git a/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp b/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp index bd2a08ade..898e22802 100644 --- 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 #include +#include + +#include + #include #include #include -#include - -#include - 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(obj); + TelemetryManager *telMngr = qobject_cast(obj); if (telMngr) { connect(telMngr, SIGNAL(disconnected()), this, SLOT(onAutopilotDisconnect())); } diff --git a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h index 39912a94b..8c912fddd 100644 --- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h +++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h @@ -29,7 +29,6 @@ #include #include -#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; }; diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp index 46f0d6213..8418a1c42 100644 --- 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" diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.h b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.h index a8c4a402d..09351c810 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.h @@ -31,7 +31,6 @@ #include #include #include "setupwizard.h" -#include "uavtalk/telemetrymanager.h" #include "abstractwizardpage.h" #include "uploader/enums.h" diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp index 52d6d1f80..fc7232590 100644 --- 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 #include #include diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.h b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.h index c48526382..42a316ae5 100644 --- 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 #include #include diff --git a/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetfactory.cpp b/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetfactory.cpp index 94faf597a..bdd675458 100644 --- 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 #include #include +#include MonitorGadgetFactory::MonitorGadgetFactory(QObject *parent) : IUAVGadgetFactory(QString("TelemetryMonitorGadget"), tr("Telemetry Monitor"), parent) diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp index ac6951d3a..b9317114c 100644 --- 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 +#include "uavsettingsimportexport/uavsettingsimportexportfactory.h" + #include #include -#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(); - Q_ASSERT(telMngr); + enableControls(telMngr->isConnected()); } diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h index 42d9b06e8..68e84cf67 100644 --- 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" diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h index 44fcdc944..42e694414 100644 --- 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 -#include -#include -#include -#include "uavtalk/telemetrymanager.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" #include "uavobjectutilmanager.h" #include "uploader_global.h" +#include +#include +#include +#include + class UPLOADER_EXPORT RunningDeviceWidget : public QWidget { Q_OBJECT public: diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp index 2063fea3a..d6f12e464 100644 --- 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 -#include #include "flightstatus.h" +#include +#include + +#include + #define DFU_DEBUG true const int UploaderGadgetWidget::AUTOUPDATE_CLOSE_TIMEOUT = 7000; diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h index 3a59de352..14d9ac098 100644 --- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h +++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h @@ -36,7 +36,6 @@ #include #include -#include "uavtalk/telemetrymanager.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h"