From ce64ea17a014cf49066dacbb3e039b69017293eb Mon Sep 17 00:00:00 2001 From: stac Date: Sat, 22 Jan 2011 17:38:22 +0000 Subject: [PATCH] UAVObjects-gcs: Move generated files into build dir Also fixes the include paths in the plugins tree. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2521 ebee16cc-31ac-478f-84a7-5cbb03baadba --- .gitignore | 94 --------- Makefile | 1 + .../generators/gcs/uavobjectgeneratorgcs.cpp | 9 +- .../generators/gcs/uavobjectgeneratorgcs.h | 3 +- ground/src/libs/uavobjgenerator/main.cpp | 2 +- .../antennatrack/antennatrackwidget.cpp | 2 +- .../plugins/antennatrack/antennatrackwidget.h | 2 +- .../plugins/antennatrack/telemetryparser.h | 4 +- ground/src/plugins/config/configahrswidget.h | 4 +- .../src/plugins/config/configairframewidget.h | 4 +- ground/src/plugins/config/configccpmwidget.h | 4 +- .../src/plugins/config/configgadgetwidget.h | 6 +- ground/src/plugins/config/configservowidget.h | 4 +- ground/src/plugins/config/configtaskwidget.h | 6 +- .../plugins/config/configtelemetrywidget.h | 4 +- .../plugins/dial/dialgadgetoptionspage.cpp | 4 +- ground/src/plugins/dial/dialgadgetwidget.h | 4 +- .../plugins/gcscontrol/gcscontrolgadget.cpp | 4 +- .../src/plugins/gcscontrol/gcscontrolgadget.h | 2 +- .../gcscontrol/gcscontrolgadgetwidget.cpp | 6 +- .../gcscontrol/gcscontrolgadgetwidget.h | 2 +- .../src/plugins/gcscontrol/joystickcontrol.h | 2 +- .../plugins/gpsdisplay/gpsdisplaywidget.cpp | 2 +- .../src/plugins/gpsdisplay/gpsdisplaywidget.h | 2 +- .../src/plugins/gpsdisplay/telemetryparser.h | 4 +- ground/src/plugins/hitlnew/hitlwidget.cpp | 2 +- ground/src/plugins/hitlnew/isimulator.h | 14 +- ground/src/plugins/hitlnew/simulator.h | 24 +-- .../lineardialgadgetoptionspage.cpp | 4 +- .../lineardial/lineardialgadgetwidget.h | 4 +- ground/src/plugins/logging/logfile.h | 2 +- ground/src/plugins/logging/logginggadget.cpp | 4 +- ground/src/plugins/logging/loggingplugin.cpp | 3 +- ground/src/plugins/logging/loggingplugin.h | 4 +- .../magicwaypoint/magicwaypointgadget.cpp | 4 +- .../magicwaypointgadgetwidget.cpp | 6 +- .../magicwaypoint/magicwaypointgadgetwidget.h | 4 +- .../plugins/modelview/modelviewgadgetwidget.h | 4 +- ground/src/plugins/notify/notifyplugin.h | 4 +- .../plugins/notify/notifypluginoptionspage.h | 4 +- .../opmap/opmap_waypointeditor_dialog.h | 4 +- .../src/plugins/opmap/opmapgadgetwidget.cpp | 8 +- .../src/plugins/pfd/pfdgadgetoptionspage.cpp | 4 +- ground/src/plugins/pfd/pfdgadgetwidget.h | 4 +- ground/src/plugins/scope/plotdata.h | 10 +- .../plugins/scope/scopegadgetoptionspage.cpp | 4 +- .../src/plugins/scope/scopegadgetwidget.cpp | 4 +- .../systemhealth/systemhealthgadgetwidget.cpp | 4 +- .../systemhealth/systemhealthgadgetwidget.h | 2 +- .../src/plugins/uavobjectbrowser/treeitem.h | 6 +- .../uavobjectbrowserwidget.cpp | 2 +- .../uavobjectbrowser/uavobjectbrowserwidget.h | 2 +- .../uavobjectbrowser/uavobjecttreemodel.cpp | 8 +- ground/src/plugins/uavobjects/uavobjects.pri | 3 + ground/src/plugins/uavobjects/uavobjects.pro | 179 +++++++++--------- .../uavobjects/uavobjects_dependencies.pri | 7 + ground/src/plugins/uavtalk/telemetry.h | 4 +- ground/src/plugins/uavtalk/telemetrymanager.h | 2 +- ground/src/plugins/uavtalk/telemetrymonitor.h | 8 +- ground/src/plugins/uavtalk/uavtalk.h | 2 +- ground/src/plugins/uavtalk/uavtalkplugin.h | 2 +- .../plugins/uploader/uploadergadgetwidget.h | 4 +- 62 files changed, 232 insertions(+), 309 deletions(-) diff --git a/.gitignore b/.gitignore index d865cfdca..9df004d33 100644 --- a/.gitignore +++ b/.gitignore @@ -67,52 +67,6 @@ #ignore autogenerated files - they should really go into special dirs to be ignored more easy -ground/src/plugins/uavobjects/actuatorcommand.cpp -ground/src/plugins/uavobjects/actuatordesired.cpp -ground/src/plugins/uavobjects/actuatorsettings.cpp -ground/src/plugins/uavobjects/ahrscalibration.cpp -ground/src/plugins/uavobjects/ahrssettings.cpp -ground/src/plugins/uavobjects/ahrsstatus.cpp -ground/src/plugins/uavobjects/attitudeactual.cpp -ground/src/plugins/uavobjects/attitudedesired.cpp -ground/src/plugins/uavobjects/attituderaw.cpp -ground/src/plugins/uavobjects/baroaltitude.cpp -ground/src/plugins/uavobjects/batterysettings.cpp -ground/src/plugins/uavobjects/firmwareiapobj.cpp -ground/src/plugins/uavobjects/flightbatterystate.cpp -ground/src/plugins/uavobjects/flightplancontrol.cpp -ground/src/plugins/uavobjects/flightplansettings.cpp -ground/src/plugins/uavobjects/flightplanstatus.cpp -ground/src/plugins/uavobjects/flighttelemetrystats.cpp -ground/src/plugins/uavobjects/gcstelemetrystats.cpp -ground/src/plugins/uavobjects/gpsposition.cpp -ground/src/plugins/uavobjects/gpssatellites.cpp -ground/src/plugins/uavobjects/gpstime.cpp -ground/src/plugins/uavobjects/guidancesettings.cpp -ground/src/plugins/uavobjects/homelocation.cpp -ground/src/plugins/uavobjects/i2cstats.cpp -ground/src/plugins/uavobjects/manualcontrolcommand.cpp -ground/src/plugins/uavobjects/manualcontrolsettings.cpp -ground/src/plugins/uavobjects/mixersettings.cpp -ground/src/plugins/uavobjects/mixerstatus.cpp -ground/src/plugins/uavobjects/objectpersistence.cpp -ground/src/plugins/uavobjects/pipxtrememodemsettings.cpp -ground/src/plugins/uavobjects/pipxtrememodemstatus.cpp -ground/src/plugins/uavobjects/positionactual.cpp -ground/src/plugins/uavobjects/positiondesired.cpp -ground/src/plugins/uavobjects/ratedesired.cpp -ground/src/plugins/uavobjects/stabilizationsettings.cpp -ground/src/plugins/uavobjects/systemalarms.cpp -ground/src/plugins/uavobjects/systemsettings.cpp -ground/src/plugins/uavobjects/systemstats.cpp -ground/src/plugins/uavobjects/taskinfo.cpp -ground/src/plugins/uavobjects/telemetrysettings.cpp -ground/src/plugins/uavobjects/velocityactual.cpp -ground/src/plugins/uavobjects/velocitydesired.cpp -ground/src/plugins/uavobjects/watchdogstatus.cpp - -ground/src/plugins/uavobjects/uavobjectsinit.cpp - ground/src/plugins/uavobjects/OPLogConvert.m ground/src/plugins/uavobjects/actuatorcommand.py ground/src/plugins/uavobjects/actuatordesired.py @@ -158,54 +112,6 @@ ground/src/plugins/uavobjects/velocityactual.py ground/src/plugins/uavobjects/velocitydesired.py ground/src/plugins/uavobjects/watchdogstatus.py -ground/src/plugins/uavobjects/actuatorcommand.h -ground/src/plugins/uavobjects/actuatordesired.h -ground/src/plugins/uavobjects/actuatorsettings.h -ground/src/plugins/uavobjects/ahrscalibration.h -ground/src/plugins/uavobjects/ahrssettings.h -ground/src/plugins/uavobjects/ahrsstatus.h -ground/src/plugins/uavobjects/attitudeactual.h -ground/src/plugins/uavobjects/attitudedesired.h -ground/src/plugins/uavobjects/attituderaw.h -ground/src/plugins/uavobjects/baroaltitude.h -ground/src/plugins/uavobjects/batterysettings.h -ground/src/plugins/uavobjects/firmwareiapobj.h -ground/src/plugins/uavobjects/flightbatterystate.h -ground/src/plugins/uavobjects/flightplancontrol.h -ground/src/plugins/uavobjects/flightplansettings.h -ground/src/plugins/uavobjects/flightplanstatus.h -ground/src/plugins/uavobjects/flighttelemetrystats.h -ground/src/plugins/uavobjects/gcstelemetrystats.h -ground/src/plugins/uavobjects/gpsposition.h -ground/src/plugins/uavobjects/gpssatellites.h -ground/src/plugins/uavobjects/gpstime.h -ground/src/plugins/uavobjects/guidancesettings.h -ground/src/plugins/uavobjects/homelocation.h -ground/src/plugins/uavobjects/i2cstats.h -ground/src/plugins/uavobjects/manualcontrolcommand.h -ground/src/plugins/uavobjects/manualcontrolsettings.h -ground/src/plugins/uavobjects/mixersettings.h -ground/src/plugins/uavobjects/mixerstatus.h -ground/src/plugins/uavobjects/nedaccel.cpp -ground/src/plugins/uavobjects/nedaccel.h -ground/src/plugins/uavobjects/nedaccel.py -ground/src/plugins/uavobjects/objectpersistence.h -ground/src/plugins/uavobjects/pipxtrememodemsettings.h -ground/src/plugins/uavobjects/pipxtrememodemstatus.h -ground/src/plugins/uavobjects/positionactual.h -ground/src/plugins/uavobjects/positiondesired.h -ground/src/plugins/uavobjects/ratedesired.h -ground/src/plugins/uavobjects/stabilizationsettings.h -ground/src/plugins/uavobjects/systemalarms.h -ground/src/plugins/uavobjects/systemsettings.h -ground/src/plugins/uavobjects/systemstats.h -ground/src/plugins/uavobjects/taskinfo.h -ground/src/plugins/uavobjects/telemetrysettings.h -ground/src/plugins/uavobjects/velocityactual.h -ground/src/plugins/uavobjects/velocitydesired.h -ground/src/plugins/uavobjects/watchdogstatus.h - - openpilotgcs-build-desktop flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3 flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser diff --git a/Makefile b/Makefile index d03cf9750..75947a01e 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,7 @@ uavobject-synthetics: uavobjects: uavobjects_gcs uavobjects_flight uavobjects_gcs: uavobject-synthetics uavobjgenerator + mkdir -p $(BUILD_DIR)/uavobject-synthetics/gcs $(UAVOBJGENERATOR) -gcs "$(ROOT_DIR)/" uavobjects_flight: uavobject-synthetics uavobjgenerator diff --git a/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp b/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp index 82d8e9e06..c3926afb9 100644 --- a/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp +++ b/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp @@ -27,7 +27,7 @@ #include "uavobjectgeneratorgcs.h" using namespace std; -bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath) { +bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath,QString outputpath) { fieldTypeStrCPP << "qint8" << "qint16" << "qint32" << "quint8" << "quint16" << "quint32" << "float" << "quint8"; @@ -36,6 +36,7 @@ bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath) { << "UINT8" << "UINT16" << "UINT32" << "FLOAT32" << "ENUM"; gcsCodePath = QDir( basepath + QString(GCS_CODE_DIR)); + gcsOutputPath = QDir( outputpath + QString("gcs")); gcsCodeTemplate = readFile( gcsCodePath.absoluteFilePath("uavobjecttemplate.cpp") ); gcsIncludeTemplate = readFile( gcsCodePath.absoluteFilePath("uavobjecttemplate.h") ); @@ -60,7 +61,7 @@ bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath) { // Write the gcs object inialization files gcsInitTemplate.replace( QString("$(OBJINC)"), objInc); gcsInitTemplate.replace( QString("$(OBJINIT)"), gcsObjInit); - bool res = writeFileIfDiffrent( gcsCodePath.absolutePath() + "/uavobjectsinit.cpp", gcsInitTemplate ); + bool res = writeFileIfDiffrent( gcsOutputPath.absolutePath() + "/uavobjectsinit.cpp", gcsInitTemplate ); if (!res) { cout << "Error: Could not write output files" << endl; return false; @@ -254,12 +255,12 @@ bool UAVObjectGeneratorGCS::process_object(ObjectInfo* info) outCode.replace(QString("$(INITFIELDS)"), initfields); // Write the GCS code - bool res = writeFileIfDiffrent( gcsCodePath.absolutePath() + "/" + info->namelc + ".cpp", outCode ); + bool res = writeFileIfDiffrent( gcsOutputPath.absolutePath() + "/" + info->namelc + ".cpp", outCode ); if (!res) { cout << "Error: Could not write gcs output files" << endl; return false; } - res = writeFileIfDiffrent( gcsCodePath.absolutePath() + "/" + info->namelc + ".h", outInclude ); + res = writeFileIfDiffrent( gcsOutputPath.absolutePath() + "/" + info->namelc + ".h", outInclude ); if (!res) { cout << "Error: Could not write gcs output files" << endl; return false; diff --git a/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.h b/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.h index 59c91c68c..05ef82d6b 100644 --- a/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.h +++ b/ground/src/libs/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.h @@ -34,7 +34,7 @@ class UAVObjectGeneratorGCS { public: - bool generate(UAVObjectParser* gen,QString basepath); + bool generate(UAVObjectParser* gen,QString basepath,QString outputpath); private: bool process_object(ObjectInfo* info); @@ -42,6 +42,7 @@ private: QString gcsCodeTemplate,gcsIncludeTemplate; QStringList fieldTypeStrCPP,fieldTypeStrCPPClass; QDir gcsCodePath; + QDir gcsOutputPath; }; #endif diff --git a/ground/src/libs/uavobjgenerator/main.cpp b/ground/src/libs/uavobjgenerator/main.cpp index 8f2f766cc..2aa7c3de1 100644 --- a/ground/src/libs/uavobjgenerator/main.cpp +++ b/ground/src/libs/uavobjgenerator/main.cpp @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) if (do_gcs|do_all) { cout << "generating gcs code" << endl ; UAVObjectGeneratorGCS gcsgen; - gcsgen.generate(parser,basepath); + gcsgen.generate(parser,basepath,outputpath); } // generate java code if wanted diff --git a/ground/src/plugins/antennatrack/antennatrackwidget.cpp b/ground/src/plugins/antennatrack/antennatrackwidget.cpp index 86a2eb4d3..05d421c43 100644 --- a/ground/src/plugins/antennatrack/antennatrackwidget.cpp +++ b/ground/src/plugins/antennatrack/antennatrackwidget.cpp @@ -27,7 +27,7 @@ #include "antennatrackwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" #include diff --git a/ground/src/plugins/antennatrack/antennatrackwidget.h b/ground/src/plugins/antennatrack/antennatrackwidget.h index c5c380084..1f5a211f5 100644 --- a/ground/src/plugins/antennatrack/antennatrackwidget.h +++ b/ground/src/plugins/antennatrack/antennatrackwidget.h @@ -30,7 +30,7 @@ #include "ui_antennatrackwidget.h" #include "antennatrackgadgetconfiguration.h" -#include "uavobjects/uavobject.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/antennatrack/telemetryparser.h b/ground/src/plugins/antennatrack/telemetryparser.h index 09108836c..c83072615 100644 --- a/ground/src/plugins/antennatrack/telemetryparser.h +++ b/ground/src/plugins/antennatrack/telemetryparser.h @@ -31,8 +31,8 @@ #include #include #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include "gpsparser.h" diff --git a/ground/src/plugins/config/configahrswidget.h b/ground/src/plugins/config/configahrswidget.h index 02eac8de5..0167b2d5f 100644 --- a/ground/src/plugins/config/configahrswidget.h +++ b/ground/src/plugins/config/configahrswidget.h @@ -30,8 +30,8 @@ #include "ui_ahrs.h" #include "configtaskwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/config/configairframewidget.h b/ground/src/plugins/config/configairframewidget.h index 9a9f0498b..09e48e611 100644 --- a/ground/src/plugins/config/configairframewidget.h +++ b/ground/src/plugins/config/configairframewidget.h @@ -30,8 +30,8 @@ #include "ui_airframe.h" #include "configtaskwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/config/configccpmwidget.h b/ground/src/plugins/config/configccpmwidget.h index 01b429bc9..24536fe73 100644 --- a/ground/src/plugins/config/configccpmwidget.h +++ b/ground/src/plugins/config/configccpmwidget.h @@ -30,8 +30,8 @@ #include "ui_ccpm.h" #include "configtaskwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/config/configgadgetwidget.h b/ground/src/plugins/config/configgadgetwidget.h index 0bc640d31..ad97a9bb1 100644 --- a/ground/src/plugins/config/configgadgetwidget.h +++ b/ground/src/plugins/config/configgadgetwidget.h @@ -29,9 +29,9 @@ #include "uavtalk/telemetrymanager.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" -#include "uavobjects/objectpersistence.h" +#include "uavobjectmanager.h" +#include "uavobject.h" +#include "objectpersistence.h" #include #include diff --git a/ground/src/plugins/config/configservowidget.h b/ground/src/plugins/config/configservowidget.h index 095df6cf9..baec54be6 100644 --- a/ground/src/plugins/config/configservowidget.h +++ b/ground/src/plugins/config/configservowidget.h @@ -30,8 +30,8 @@ #include "ui_settingswidget.h" #include "configtaskwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include diff --git a/ground/src/plugins/config/configtaskwidget.h b/ground/src/plugins/config/configtaskwidget.h index 703cbf862..5abe56065 100644 --- a/ground/src/plugins/config/configtaskwidget.h +++ b/ground/src/plugins/config/configtaskwidget.h @@ -29,9 +29,9 @@ #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" -#include "uavobjects/objectpersistence.h" +#include "uavobjectmanager.h" +#include "uavobject.h" +#include "objectpersistence.h" #include #include #include diff --git a/ground/src/plugins/config/configtelemetrywidget.h b/ground/src/plugins/config/configtelemetrywidget.h index b2493eca6..f3f8bedb0 100644 --- a/ground/src/plugins/config/configtelemetrywidget.h +++ b/ground/src/plugins/config/configtelemetrywidget.h @@ -30,8 +30,8 @@ #include "ui_telemetry.h" #include "configtaskwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include diff --git a/ground/src/plugins/dial/dialgadgetoptionspage.cpp b/ground/src/plugins/dial/dialgadgetoptionspage.cpp index aec140518..feb6b408d 100644 --- a/ground/src/plugins/dial/dialgadgetoptionspage.cpp +++ b/ground/src/plugins/dial/dialgadgetoptionspage.cpp @@ -30,8 +30,8 @@ #include "dialgadgetconfiguration.h" #include "ui_dialgadgetoptionspage.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavdataobject.h" +#include "uavobjectmanager.h" +#include "uavdataobject.h" #include diff --git a/ground/src/plugins/dial/dialgadgetwidget.h b/ground/src/plugins/dial/dialgadgetwidget.h index 8ad5c0833..29291b7dd 100644 --- a/ground/src/plugins/dial/dialgadgetwidget.h +++ b/ground/src/plugins/dial/dialgadgetwidget.h @@ -31,8 +31,8 @@ #include "dialgadgetconfiguration.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/gcscontrol/gcscontrolgadget.cpp b/ground/src/plugins/gcscontrol/gcscontrolgadget.cpp index 602dadb01..afd46a5cf 100644 --- a/ground/src/plugins/gcscontrol/gcscontrolgadget.cpp +++ b/ground/src/plugins/gcscontrol/gcscontrolgadget.cpp @@ -28,8 +28,8 @@ #include "gcscontrolgadgetwidget.h" #include "gcscontrolgadgetconfiguration.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #define JOYSTICK_UPDATE_RATE 50 diff --git a/ground/src/plugins/gcscontrol/gcscontrolgadget.h b/ground/src/plugins/gcscontrol/gcscontrolgadget.h index dc1da7846..4d465b0cd 100644 --- a/ground/src/plugins/gcscontrol/gcscontrolgadget.h +++ b/ground/src/plugins/gcscontrol/gcscontrolgadget.h @@ -29,7 +29,7 @@ #define GCSControlGADGET_H_ #include -#include +#include "manualcontrolcommand.h" #include "gcscontrolgadgetconfiguration.h" #include "sdlgamepad/sdlgamepad.h" #include diff --git a/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp b/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp index 95bcdd484..d0955bd8b 100644 --- a/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp +++ b/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp @@ -34,9 +34,9 @@ #include #include -#include "uavobjects/uavobject.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/manualcontrolcommand.h" +#include "uavobject.h" +#include "uavobjectmanager.h" +#include "manualcontrolcommand.h" #include "extensionsystem/pluginmanager.h" GCSControlGadgetWidget::GCSControlGadgetWidget(QWidget *parent) : QLabel(parent) diff --git a/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.h b/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.h index 99d4f50e8..58c2ecb0f 100644 --- a/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.h +++ b/ground/src/plugins/gcscontrol/gcscontrolgadgetwidget.h @@ -29,7 +29,7 @@ #define GCSControlGADGETWIDGET_H_ #include -#include "uavobjects/manualcontrolcommand.h" +#include "manualcontrolcommand.h" class Ui_GCSControl; diff --git a/ground/src/plugins/gcscontrol/joystickcontrol.h b/ground/src/plugins/gcscontrol/joystickcontrol.h index a4cd53034..b5d73c824 100644 --- a/ground/src/plugins/gcscontrol/joystickcontrol.h +++ b/ground/src/plugins/gcscontrol/joystickcontrol.h @@ -33,7 +33,7 @@ #include #include #include -#include "uavobjects/manualcontrolcommand.h" +#include "manualcontrolcommand.h" namespace Ui { class JoystickControl; diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp index b142b9ee8..4671de4cb 100644 --- a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp +++ b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp @@ -27,7 +27,7 @@ #include "gpsdisplaywidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" #include diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.h b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.h index d61608835..4fbe85d69 100644 --- a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.h +++ b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.h @@ -31,7 +31,7 @@ #include "ui_gpsdisplaywidget.h" #include "gpsdisplaygadgetconfiguration.h" #include "gpsconstellationwidget.h" -#include "uavobjects/uavobject.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/gpsdisplay/telemetryparser.h b/ground/src/plugins/gpsdisplay/telemetryparser.h index b14ecc21a..0ba296bf1 100644 --- a/ground/src/plugins/gpsdisplay/telemetryparser.h +++ b/ground/src/plugins/gpsdisplay/telemetryparser.h @@ -31,8 +31,8 @@ #include #include #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include "gpsparser.h" diff --git a/ground/src/plugins/hitlnew/hitlwidget.cpp b/ground/src/plugins/hitlnew/hitlwidget.cpp index 2cf66a8ae..1678e64a5 100644 --- a/ground/src/plugins/hitlnew/hitlwidget.cpp +++ b/ground/src/plugins/hitlnew/hitlwidget.cpp @@ -35,7 +35,7 @@ #include #include -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" #include "coreplugin/icore.h" #include "coreplugin/threadmanager.h" diff --git a/ground/src/plugins/hitlnew/isimulator.h b/ground/src/plugins/hitlnew/isimulator.h index a18c16ba3..2f5847099 100644 --- a/ground/src/plugins/hitlnew/isimulator.h +++ b/ground/src/plugins/hitlnew/isimulator.h @@ -7,13 +7,13 @@ #include #include #include "uavtalk/telemetrymanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/actuatordesired.h" -#include "uavobjects/altitudeactual.h" -#include "uavobjects/attitudeactual.h" -#include "uavobjects/velocityactual.h" -#include "uavobjects/positionactual.h" -#include "uavobjects/gcstelemetrystats.h" +#include "uavobjectmanager.h" +#include "actuatordesired.h" +#include "altitudeactual.h" +#include "attitudeactual.h" +#include "velocityactual.h" +#include "positionactual.h" +#include "gcstelemetrystats.h" class Simulator: public QObject { diff --git a/ground/src/plugins/hitlnew/simulator.h b/ground/src/plugins/hitlnew/simulator.h index 96e3ea790..a13a9f701 100644 --- a/ground/src/plugins/hitlnew/simulator.h +++ b/ground/src/plugins/hitlnew/simulator.h @@ -34,18 +34,18 @@ #include #include "qscopedpointer.h" #include "uavtalk/telemetrymanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/actuatordesired.h" -#include "uavobjects/manualcontrolcommand.h" -// #include "uavobjects/altitudeactual.h" -#include "uavobjects/positionactual.h" -#include "uavobjects/velocityactual.h" -#include "uavobjects/baroaltitude.h" -#include "uavobjects/attitudeactual.h" -#include "uavobjects/gpsposition.h" -#include "uavobjects/homelocation.h" -#include "uavobjects/attituderaw.h" -#include "uavobjects/gcstelemetrystats.h" +#include "uavobjectmanager.h" +#include "actuatordesired.h" +#include "manualcontrolcommand.h" +// #include "altitudeactual.h" +#include "positionactual.h" +#include "velocityactual.h" +#include "baroaltitude.h" +#include "attitudeactual.h" +#include "gpsposition.h" +#include "homelocation.h" +#include "attituderaw.h" +#include "gcstelemetrystats.h" #include "utils/coordinateconversions.h" diff --git a/ground/src/plugins/lineardial/lineardialgadgetoptionspage.cpp b/ground/src/plugins/lineardial/lineardialgadgetoptionspage.cpp index 9461f22cf..517c20c31 100644 --- a/ground/src/plugins/lineardial/lineardialgadgetoptionspage.cpp +++ b/ground/src/plugins/lineardial/lineardialgadgetoptionspage.cpp @@ -29,8 +29,8 @@ #include "lineardialgadgetconfiguration.h" #include "ui_lineardialgadgetoptionspage.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavdataobject.h" +#include "uavobjectmanager.h" +#include "uavdataobject.h" #include #include diff --git a/ground/src/plugins/lineardial/lineardialgadgetwidget.h b/ground/src/plugins/lineardial/lineardialgadgetwidget.h index 62adbcc45..c1734ec57 100644 --- a/ground/src/plugins/lineardial/lineardialgadgetwidget.h +++ b/ground/src/plugins/lineardial/lineardialgadgetwidget.h @@ -30,8 +30,8 @@ #include "lineardialgadgetconfiguration.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/logging/logfile.h b/ground/src/plugins/logging/logfile.h index 6e6676d08..3f51223e3 100644 --- a/ground/src/plugins/logging/logfile.h +++ b/ground/src/plugins/logging/logfile.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include "uavobjectmanager.h" #include class LogFile : public QIODevice diff --git a/ground/src/plugins/logging/logginggadget.cpp b/ground/src/plugins/logging/logginggadget.cpp index a151c6720..f7563ed2f 100644 --- a/ground/src/plugins/logging/logginggadget.cpp +++ b/ground/src/plugins/logging/logginggadget.cpp @@ -28,8 +28,8 @@ #include "logginggadgetwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" LoggingGadget::LoggingGadget(QString classId, LoggingGadgetWidget *widget, QWidget *parent) : IUAVGadget(classId, parent), diff --git a/ground/src/plugins/logging/loggingplugin.cpp b/ground/src/plugins/logging/loggingplugin.cpp index 0b77b8c0f..18f48c1c1 100644 --- a/ground/src/plugins/logging/loggingplugin.cpp +++ b/ground/src/plugins/logging/loggingplugin.cpp @@ -44,8 +44,7 @@ #include #include #include -#include "uavobjects/uavobjectmanager.h" -#include +#include "uavobjectmanager.h" LoggingConnection::LoggingConnection() diff --git a/ground/src/plugins/logging/loggingplugin.h b/ground/src/plugins/logging/loggingplugin.h index 3b0585045..ca1933eae 100644 --- a/ground/src/plugins/logging/loggingplugin.h +++ b/ground/src/plugins/logging/loggingplugin.h @@ -29,8 +29,8 @@ #include #include -#include -#include "uavobjects/gcstelemetrystats.h" +#include "uavobjectmanager.h" +#include "gcstelemetrystats.h" #include #include diff --git a/ground/src/plugins/magicwaypoint/magicwaypointgadget.cpp b/ground/src/plugins/magicwaypoint/magicwaypointgadget.cpp index 95aac0e31..390ff9128 100644 --- a/ground/src/plugins/magicwaypoint/magicwaypointgadget.cpp +++ b/ground/src/plugins/magicwaypoint/magicwaypointgadget.cpp @@ -28,8 +28,8 @@ #include "magicwaypointgadgetwidget.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include MagicWaypointGadget::MagicWaypointGadget(QString classId, MagicWaypointGadgetWidget *widget, QWidget *parent) : diff --git a/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp b/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp index 3fa067ee9..9d8bd32c3 100644 --- a/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp +++ b/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp @@ -35,9 +35,9 @@ #include #include -#include "uavobjects/uavobject.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/manualcontrolcommand.h" +#include "uavobject.h" +#include "uavobjectmanager.h" +#include "manualcontrolcommand.h" #include "extensionsystem/pluginmanager.h" #include "extensionsystem/pluginmanager.h" diff --git a/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.h b/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.h index 1e21d0db5..388b32088 100644 --- a/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.h +++ b/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.h @@ -29,8 +29,8 @@ #define MagicWaypointGADGETWIDGET_H_ #include -#include "uavobjects/positiondesired.h" -#include "uavobjects/positionactual.h" +#include "positiondesired.h" +#include "positionactual.h" class Ui_MagicWaypoint; diff --git a/ground/src/plugins/modelview/modelviewgadgetwidget.h b/ground/src/plugins/modelview/modelviewgadgetwidget.h index 0faee59c2..96b7b6d1f 100644 --- a/ground/src/plugins/modelview/modelviewgadgetwidget.h +++ b/ground/src/plugins/modelview/modelviewgadgetwidget.h @@ -38,8 +38,8 @@ #include "sceneGraph/glc_world.h" #include "glc_exception.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/attitudeactual.h" +#include "uavobjectmanager.h" +#include "attitudeactual.h" diff --git a/ground/src/plugins/notify/notifyplugin.h b/ground/src/plugins/notify/notifyplugin.h index 229413245..cf9163381 100644 --- a/ground/src/plugins/notify/notifyplugin.h +++ b/ground/src/plugins/notify/notifyplugin.h @@ -29,8 +29,8 @@ #include #include "uavtalk/telemetrymanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include diff --git a/ground/src/plugins/notify/notifypluginoptionspage.h b/ground/src/plugins/notify/notifypluginoptionspage.h index b28fa2825..e0e65cb40 100644 --- a/ground/src/plugins/notify/notifypluginoptionspage.h +++ b/ground/src/plugins/notify/notifypluginoptionspage.h @@ -30,8 +30,8 @@ #define NOTIFYPLUGINOPTIONSPAGE_H #include "coreplugin/dialogs/ioptionspage.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include "QString" #include diff --git a/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h b/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h index b12f9d5ee..fd1ae72ea 100644 --- a/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h +++ b/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h @@ -37,8 +37,8 @@ #include #include -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/positionactual.h" +#include "uavobjectmanager.h" +#include "positionactual.h" namespace Ui { class opmap_waypointeditor_dialog; diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp index ace879444..d5eab5bae 100644 --- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp +++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp @@ -44,10 +44,10 @@ #include "uavtalk/telemetrymanager.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" -#include "uavobjects/positionactual.h" -#include "uavobjects/homelocation.h" +#include "uavobjectmanager.h" +#include "uavobject.h" +#include "positionactual.h" +#include "homelocation.h" // #define allow_manual_home_location_move diff --git a/ground/src/plugins/pfd/pfdgadgetoptionspage.cpp b/ground/src/plugins/pfd/pfdgadgetoptionspage.cpp index 57de1588d..89a877a0f 100644 --- a/ground/src/plugins/pfd/pfdgadgetoptionspage.cpp +++ b/ground/src/plugins/pfd/pfdgadgetoptionspage.cpp @@ -29,8 +29,8 @@ #include "pfdgadgetconfiguration.h" #include "ui_pfdgadgetoptionspage.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavdataobject.h" +#include "uavobjectmanager.h" +#include "uavdataobject.h" #include diff --git a/ground/src/plugins/pfd/pfdgadgetwidget.h b/ground/src/plugins/pfd/pfdgadgetwidget.h index fcad7ac25..b7aff7d25 100644 --- a/ground/src/plugins/pfd/pfdgadgetwidget.h +++ b/ground/src/plugins/pfd/pfdgadgetwidget.h @@ -30,8 +30,8 @@ #include "pfdgadgetconfiguration.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/scope/plotdata.h b/ground/src/plugins/scope/plotdata.h index 3de5d973e..2d61f12c6 100644 --- a/ground/src/plugins/scope/plotdata.h +++ b/ground/src/plugins/scope/plotdata.h @@ -28,11 +28,11 @@ #ifndef PLOTDATA_H #define PLOTDATA_H -#include "uavobjects/uavobject.h" -#include "uavobjects/baroaltitude.h" -#include "uavobjects/positionactual.h" -#include "uavobjects/attituderaw.h" -#include "uavobjects/manualcontrolcommand.h" +#include "uavobject.h" +#include "baroaltitude.h" +#include "positionactual.h" +#include "attituderaw.h" +#include "manualcontrolcommand.h" #include "qwt/src/qwt.h" diff --git a/ground/src/plugins/scope/scopegadgetoptionspage.cpp b/ground/src/plugins/scope/scopegadgetoptionspage.cpp index abaf85c5e..ed8eced4b 100644 --- a/ground/src/plugins/scope/scopegadgetoptionspage.cpp +++ b/ground/src/plugins/scope/scopegadgetoptionspage.cpp @@ -28,8 +28,8 @@ #include "scopegadgetoptionspage.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavdataobject.h" +#include "uavobjectmanager.h" +#include "uavdataobject.h" #include diff --git a/ground/src/plugins/scope/scopegadgetwidget.cpp b/ground/src/plugins/scope/scopegadgetwidget.cpp index f76228b79..93ab97da0 100644 --- a/ground/src/plugins/scope/scopegadgetwidget.cpp +++ b/ground/src/plugins/scope/scopegadgetwidget.cpp @@ -31,8 +31,8 @@ #include "uavtalk/telemetrymanager.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include "coreplugin/icore.h" #include "coreplugin/connectionmanager.h" diff --git a/ground/src/plugins/systemhealth/systemhealthgadgetwidget.cpp b/ground/src/plugins/systemhealth/systemhealthgadgetwidget.cpp index 533693819..6d93031ad 100644 --- a/ground/src/plugins/systemhealth/systemhealthgadgetwidget.cpp +++ b/ground/src/plugins/systemhealth/systemhealthgadgetwidget.cpp @@ -28,8 +28,8 @@ #include "systemhealthgadgetwidget.h" #include "utils/stylehelper.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/systemalarms.h" +#include "uavobjectmanager.h" +#include "systemalarms.h" #include #include diff --git a/ground/src/plugins/systemhealth/systemhealthgadgetwidget.h b/ground/src/plugins/systemhealth/systemhealthgadgetwidget.h index 7c5817820..c51a75a27 100644 --- a/ground/src/plugins/systemhealth/systemhealthgadgetwidget.h +++ b/ground/src/plugins/systemhealth/systemhealthgadgetwidget.h @@ -29,7 +29,7 @@ #define SYSTEMHEALTHGADGETWIDGET_H_ #include "systemhealthgadgetconfiguration.h" -#include "uavobjects/uavobject.h" +#include "uavobject.h" #include #include #include diff --git a/ground/src/plugins/uavobjectbrowser/treeitem.h b/ground/src/plugins/uavobjectbrowser/treeitem.h index e3becea10..937631b05 100644 --- a/ground/src/plugins/uavobjectbrowser/treeitem.h +++ b/ground/src/plugins/uavobjectbrowser/treeitem.h @@ -28,9 +28,9 @@ #ifndef TREEITEM_H #define TREEITEM_H -#include "uavobjects/uavobject.h" -#include "uavobjects/uavmetaobject.h" -#include "uavobjects/uavobjectfield.h" +#include "uavobject.h" +#include "uavmetaobject.h" +#include "uavobjectfield.h" #include #include #include diff --git a/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp b/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp index 89e74cf44..31c395ccc 100644 --- a/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp +++ b/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp @@ -29,7 +29,7 @@ #include "browseritemdelegate.h" #include "treeitem.h" #include "ui_uavobjectbrowser.h" -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" #include #include #include diff --git a/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h b/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h index a9a40c868..b047d37f0 100644 --- a/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h +++ b/ground/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h @@ -30,7 +30,7 @@ #include #include -#include "uavobjects/objectpersistence.h" +#include "objectpersistence.h" #include "uavobjecttreemodel.h" class QPushButton; diff --git a/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp b/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp index aac831c57..64ad9544c 100644 --- a/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp +++ b/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp @@ -27,10 +27,10 @@ #include "uavobjecttreemodel.h" #include "fieldtreeitem.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavdataobject.h" -#include "uavobjects/uavmetaobject.h" -#include "uavobjects/uavobjectfield.h" +#include "uavobjectmanager.h" +#include "uavdataobject.h" +#include "uavmetaobject.h" +#include "uavobjectfield.h" #include "extensionsystem/pluginmanager.h" #include //#include diff --git a/ground/src/plugins/uavobjects/uavobjects.pri b/ground/src/plugins/uavobjects/uavobjects.pri index b4df10403..a6a378a1d 100644 --- a/ground/src/plugins/uavobjects/uavobjects.pri +++ b/ground/src/plugins/uavobjects/uavobjects.pri @@ -1,3 +1,6 @@ include(uavobjects_dependencies.pri) +# Add the include path to the built-in uavobject include files. +INCLUDEPATH += $$PWD + LIBS *= -l$$qtLibraryTarget(UAVObjects) diff --git a/ground/src/plugins/uavobjects/uavobjects.pro b/ground/src/plugins/uavobjects/uavobjects.pro index 1d82f95af..667d5cbe0 100644 --- a/ground/src/plugins/uavobjects/uavobjects.pro +++ b/ground/src/plugins/uavobjects/uavobjects.pro @@ -3,6 +3,7 @@ TARGET = UAVObjects DEFINES += UAVOBJECTS_LIBRARY include(../../openpilotgcsplugin.pri) include(uavobjects_dependencies.pri) + HEADERS += uavobjects_global.h \ uavobject.h \ uavmetaobject.h \ @@ -10,98 +11,102 @@ HEADERS += uavobjects_global.h \ uavdataobject.h \ uavobjectfield.h \ uavobjectsinit.h \ - uavobjectsplugin.h \ - ahrsstatus.h \ - ahrscalibration.h \ - baroaltitude.h \ - attitudeactual.h \ - ahrssettings.h \ - gcstelemetrystats.h \ - attituderaw.h \ - flighttelemetrystats.h \ - systemstats.h \ - systemalarms.h \ - objectpersistence.h \ - telemetrysettings.h \ - systemsettings.h \ - stabilizationsettings.h \ - manualcontrolsettings.h \ - manualcontrolcommand.h \ - attitudedesired.h \ - actuatorsettings.h \ - actuatordesired.h \ - actuatorcommand.h \ - gpsposition.h \ - gpstime.h \ - gpssatellites.h \ - positionactual.h \ - flightbatterystate.h \ - homelocation.h \ - mixersettings.h \ - mixerstatus.h \ - velocitydesired.h \ - velocityactual.h \ - guidancesettings.h \ - positiondesired.h \ - ratedesired.h \ - firmwareiapobj.h \ - i2cstats.h \ - batterysettings.h \ - taskinfo.h \ - flightplanstatus.h \ - flightplansettings.h \ - flightplancontrol.h \ - watchdogstatus.h \ - nedaccel.h + uavobjectsplugin.h SOURCES += uavobject.cpp \ uavmetaobject.cpp \ uavobjectmanager.cpp \ uavdataobject.cpp \ uavobjectfield.cpp \ - uavobjectsinit.cpp \ - uavobjectsplugin.cpp \ - ahrsstatus.cpp \ - ahrscalibration.cpp \ - baroaltitude.cpp \ - attitudeactual.cpp \ - ahrssettings.cpp \ - gcstelemetrystats.cpp \ - attituderaw.cpp \ - flighttelemetrystats.cpp \ - systemstats.cpp \ - systemalarms.cpp \ - objectpersistence.cpp \ - telemetrysettings.cpp \ - systemsettings.cpp \ - stabilizationsettings.cpp \ - manualcontrolsettings.cpp \ - manualcontrolcommand.cpp \ - attitudedesired.cpp \ - actuatorsettings.cpp \ - actuatordesired.cpp \ - actuatorcommand.cpp \ - gpsposition.cpp \ - gpstime.cpp \ - gpssatellites.cpp \ - positionactual.cpp \ - flightbatterystate.cpp \ - homelocation.cpp \ - mixersettings.cpp \ - mixerstatus.cpp \ - velocitydesired.cpp \ - velocityactual.cpp \ - guidancesettings.cpp \ - positiondesired.cpp \ - ratedesired.cpp \ - firmwareiapobj.cpp \ - i2cstats.cpp \ - batterysettings.cpp \ - taskinfo.cpp \ - flightplanstatus.cpp \ - flightplansettings.cpp \ - flightplancontrol.cpp \ - watchdogstatus.cpp \ - nedaccel.cpp + uavobjectsplugin.cpp OTHER_FILES += UAVObjects.pluginspec + +# Add in all of the synthetic/generated uavobject files +HEADERS += $$UAVOBJECT_SYNTHETICS/ahrsstatus.h \ + $$UAVOBJECT_SYNTHETICS/ahrscalibration.h \ + $$UAVOBJECT_SYNTHETICS/baroaltitude.h \ + $$UAVOBJECT_SYNTHETICS/attitudeactual.h \ + $$UAVOBJECT_SYNTHETICS/ahrssettings.h \ + $$UAVOBJECT_SYNTHETICS/gcstelemetrystats.h \ + $$UAVOBJECT_SYNTHETICS/attituderaw.h \ + $$UAVOBJECT_SYNTHETICS/flighttelemetrystats.h \ + $$UAVOBJECT_SYNTHETICS/systemstats.h \ + $$UAVOBJECT_SYNTHETICS/systemalarms.h \ + $$UAVOBJECT_SYNTHETICS/objectpersistence.h \ + $$UAVOBJECT_SYNTHETICS/telemetrysettings.h \ + $$UAVOBJECT_SYNTHETICS/systemsettings.h \ + $$UAVOBJECT_SYNTHETICS/stabilizationsettings.h \ + $$UAVOBJECT_SYNTHETICS/manualcontrolsettings.h \ + $$UAVOBJECT_SYNTHETICS/manualcontrolcommand.h \ + $$UAVOBJECT_SYNTHETICS/attitudedesired.h \ + $$UAVOBJECT_SYNTHETICS/actuatorsettings.h \ + $$UAVOBJECT_SYNTHETICS/actuatordesired.h \ + $$UAVOBJECT_SYNTHETICS/actuatorcommand.h \ + $$UAVOBJECT_SYNTHETICS/gpsposition.h \ + $$UAVOBJECT_SYNTHETICS/gpstime.h \ + $$UAVOBJECT_SYNTHETICS/gpssatellites.h \ + $$UAVOBJECT_SYNTHETICS/positionactual.h \ + $$UAVOBJECT_SYNTHETICS/flightbatterystate.h \ + $$UAVOBJECT_SYNTHETICS/homelocation.h \ + $$UAVOBJECT_SYNTHETICS/mixersettings.h \ + $$UAVOBJECT_SYNTHETICS/mixerstatus.h \ + $$UAVOBJECT_SYNTHETICS/velocitydesired.h \ + $$UAVOBJECT_SYNTHETICS/velocityactual.h \ + $$UAVOBJECT_SYNTHETICS/guidancesettings.h \ + $$UAVOBJECT_SYNTHETICS/positiondesired.h \ + $$UAVOBJECT_SYNTHETICS/ratedesired.h \ + $$UAVOBJECT_SYNTHETICS/firmwareiapobj.h \ + $$UAVOBJECT_SYNTHETICS/i2cstats.h \ + $$UAVOBJECT_SYNTHETICS/batterysettings.h \ + $$UAVOBJECT_SYNTHETICS/taskinfo.h \ + $$UAVOBJECT_SYNTHETICS/flightplanstatus.h \ + $$UAVOBJECT_SYNTHETICS/flightplansettings.h \ + $$UAVOBJECT_SYNTHETICS/flightplancontrol.h \ + $$UAVOBJECT_SYNTHETICS/watchdogstatus.h \ + $$UAVOBJECT_SYNTHETICS/nedaccel.h + +SOURCES += $$UAVOBJECT_SYNTHETICS/ahrsstatus.cpp \ + $$UAVOBJECT_SYNTHETICS/ahrscalibration.cpp \ + $$UAVOBJECT_SYNTHETICS/baroaltitude.cpp \ + $$UAVOBJECT_SYNTHETICS/attitudeactual.cpp \ + $$UAVOBJECT_SYNTHETICS/ahrssettings.cpp \ + $$UAVOBJECT_SYNTHETICS/gcstelemetrystats.cpp \ + $$UAVOBJECT_SYNTHETICS/attituderaw.cpp \ + $$UAVOBJECT_SYNTHETICS/flighttelemetrystats.cpp \ + $$UAVOBJECT_SYNTHETICS/systemstats.cpp \ + $$UAVOBJECT_SYNTHETICS/systemalarms.cpp \ + $$UAVOBJECT_SYNTHETICS/objectpersistence.cpp \ + $$UAVOBJECT_SYNTHETICS/telemetrysettings.cpp \ + $$UAVOBJECT_SYNTHETICS/systemsettings.cpp \ + $$UAVOBJECT_SYNTHETICS/stabilizationsettings.cpp \ + $$UAVOBJECT_SYNTHETICS/manualcontrolsettings.cpp \ + $$UAVOBJECT_SYNTHETICS/manualcontrolcommand.cpp \ + $$UAVOBJECT_SYNTHETICS/attitudedesired.cpp \ + $$UAVOBJECT_SYNTHETICS/actuatorsettings.cpp \ + $$UAVOBJECT_SYNTHETICS/actuatordesired.cpp \ + $$UAVOBJECT_SYNTHETICS/actuatorcommand.cpp \ + $$UAVOBJECT_SYNTHETICS/gpsposition.cpp \ + $$UAVOBJECT_SYNTHETICS/gpstime.cpp \ + $$UAVOBJECT_SYNTHETICS/gpssatellites.cpp \ + $$UAVOBJECT_SYNTHETICS/positionactual.cpp \ + $$UAVOBJECT_SYNTHETICS/flightbatterystate.cpp \ + $$UAVOBJECT_SYNTHETICS/homelocation.cpp \ + $$UAVOBJECT_SYNTHETICS/mixersettings.cpp \ + $$UAVOBJECT_SYNTHETICS/mixerstatus.cpp \ + $$UAVOBJECT_SYNTHETICS/velocitydesired.cpp \ + $$UAVOBJECT_SYNTHETICS/velocityactual.cpp \ + $$UAVOBJECT_SYNTHETICS/guidancesettings.cpp \ + $$UAVOBJECT_SYNTHETICS/positiondesired.cpp \ + $$UAVOBJECT_SYNTHETICS/ratedesired.cpp \ + $$UAVOBJECT_SYNTHETICS/firmwareiapobj.cpp \ + $$UAVOBJECT_SYNTHETICS/i2cstats.cpp \ + $$UAVOBJECT_SYNTHETICS/batterysettings.cpp \ + $$UAVOBJECT_SYNTHETICS/taskinfo.cpp \ + $$UAVOBJECT_SYNTHETICS/flightplanstatus.cpp \ + $$UAVOBJECT_SYNTHETICS/flightplansettings.cpp \ + $$UAVOBJECT_SYNTHETICS/flightplancontrol.cpp \ + $$UAVOBJECT_SYNTHETICS/watchdogstatus.cpp \ + $$UAVOBJECT_SYNTHETICS/nedaccel.cpp \ + $$UAVOBJECT_SYNTHETICS/uavobjectsinit.cpp + diff --git a/ground/src/plugins/uavobjects/uavobjects_dependencies.pri b/ground/src/plugins/uavobjects/uavobjects_dependencies.pri index 7f369f632..9cf42e484 100644 --- a/ground/src/plugins/uavobjects/uavobjects_dependencies.pri +++ b/ground/src/plugins/uavobjects/uavobjects_dependencies.pri @@ -1,2 +1,9 @@ include(../../plugins/coreplugin/coreplugin.pri) include(../../libs/utils/utils.pri) + +# Provide the path to the auto-generated uavobject source files for the GCS. +UAVOBJECT_SYNTHETICS=$${GCS_BUILD_TREE}/../uavobject-synthetics/gcs +#message(UAVOBJECT_SYNTHETICS is $$UAVOBJECT_SYNTHETICS) + +# Add the include path to the auto-generated uavobject include files. +INCLUDEPATH += $$UAVOBJECT_SYNTHETICS diff --git a/ground/src/plugins/uavtalk/telemetry.h b/ground/src/plugins/uavtalk/telemetry.h index d6c9f52e8..23053e297 100644 --- a/ground/src/plugins/uavtalk/telemetry.h +++ b/ground/src/plugins/uavtalk/telemetry.h @@ -29,8 +29,8 @@ #define TELEMETRY_H #include "uavtalk.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/gcstelemetrystats.h" +#include "uavobjectmanager.h" +#include "gcstelemetrystats.h" #include #include #include diff --git a/ground/src/plugins/uavtalk/telemetrymanager.h b/ground/src/plugins/uavtalk/telemetrymanager.h index 33928868c..592e3df13 100644 --- a/ground/src/plugins/uavtalk/telemetrymanager.h +++ b/ground/src/plugins/uavtalk/telemetrymanager.h @@ -32,7 +32,7 @@ #include "telemetrymonitor.h" #include "telemetry.h" #include "uavtalk.h" -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" #include #include diff --git a/ground/src/plugins/uavtalk/telemetrymonitor.h b/ground/src/plugins/uavtalk/telemetrymonitor.h index 322b0a1fc..05e54706f 100644 --- a/ground/src/plugins/uavtalk/telemetrymonitor.h +++ b/ground/src/plugins/uavtalk/telemetrymonitor.h @@ -34,10 +34,10 @@ #include #include #include -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/gcstelemetrystats.h" -#include "uavobjects/flighttelemetrystats.h" -#include "uavobjects/systemstats.h" +#include "uavobjectmanager.h" +#include "gcstelemetrystats.h" +#include "flighttelemetrystats.h" +#include "systemstats.h" #include "telemetry.h" class TelemetryMonitor : public QObject diff --git a/ground/src/plugins/uavtalk/uavtalk.h b/ground/src/plugins/uavtalk/uavtalk.h index be4da1b72..22275d59d 100644 --- a/ground/src/plugins/uavtalk/uavtalk.h +++ b/ground/src/plugins/uavtalk/uavtalk.h @@ -31,7 +31,7 @@ #include #include #include -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" #include "uavtalk_global.h" class UAVTALK_EXPORT UAVTalk: public QObject diff --git a/ground/src/plugins/uavtalk/uavtalkplugin.h b/ground/src/plugins/uavtalk/uavtalkplugin.h index 0781fadea..a760b701e 100644 --- a/ground/src/plugins/uavtalk/uavtalkplugin.h +++ b/ground/src/plugins/uavtalk/uavtalkplugin.h @@ -34,7 +34,7 @@ #include "telemetry.h" #include "uavtalk.h" #include "telemetrymanager.h" -#include "uavobjects/uavobjectmanager.h" +#include "uavobjectmanager.h" class UAVTALK_EXPORT UAVTalkPlugin: public ExtensionSystem::IPlugin { diff --git a/ground/src/plugins/uploader/uploadergadgetwidget.h b/ground/src/plugins/uploader/uploadergadgetwidget.h index e44b99f64..07ff77432 100755 --- a/ground/src/plugins/uploader/uploadergadgetwidget.h +++ b/ground/src/plugins/uploader/uploadergadgetwidget.h @@ -38,8 +38,8 @@ #include "uavtalk/telemetrymanager.h" #include "extensionsystem/pluginmanager.h" -#include "uavobjects/uavobjectmanager.h" -#include "uavobjects/uavobject.h" +#include "uavobjectmanager.h" +#include "uavobject.h" #include "rawhid/rawhidplugin.h" #include