From fe3a27c789c4028e4f2fcd446f6c4c70cf7a6aef Mon Sep 17 00:00:00 2001 From: lm Date: Sat, 16 Jul 2011 13:01:02 +0200 Subject: [PATCH] Changes to MAVLinkGen, now a standalone generator included in QGC --- CMakeLists.txt | 9 -------- qgroundcontrol.pro | 34 ++++++++++++++---------------- src/apps/mavlinkgen/mavlinkgen.pri | 30 ++++++++++++++++++++------ src/apps/mavlinkgen/mavlinkgen.pro | 8 ++++++- 4 files changed, 47 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8259b663b..8b114d188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,7 +381,6 @@ set (qgroundcontrolHdrs src/ui/map/Waypoint2DIcon.h src/ui/map/MAV2DIcon.h src/ui/OgreWidget.h - src/ui/mavlink/DomItem.h src/ui/generated/ObjectDetectionView.h src/ui/generated/MAVLinkSettingsWidget.h src/ui/generated/SerialSettings.h @@ -427,7 +426,6 @@ set(qgroundcontrolMocSrc src/comm/AS4Protocol.h src/comm/MAVLinkSwarmSimulationLink.h src/comm/ProtocolInterface.h - src/comm/MAVLinkSyntaxHighlighter.h #src/comm/OpalLink.h src/comm/MAVLinkProtocol.h src/comm/SerialLinkInterface.h @@ -435,7 +433,6 @@ set(qgroundcontrolMocSrc src/comm/UDPLink.h src/comm/LinkManager.h src/comm/LinkInterface.h - src/comm/MAVLinkXMLParser.h src/comm/MAVLinkSimulationLink.h src/comm/SerialSimulationLink.h src/comm/MAVLinkSimulationWaypointPlanner.h @@ -495,7 +492,6 @@ set(qgroundcontrolMocSrc src/ui/QGCMAVLinkLogPlayer.h src/ui/QGCUDPLinkConfiguration.h #src/ui/OpalLinkConfigurationWindow.h - src/ui/mavlink/DomModel.h src/ui/SlugsHilSim.h src/ui/WaypointList.h src/ui/JoystickWidget.h @@ -529,8 +525,6 @@ set (qgroundcontrolSrc src/comm/MAVLinkSimulationMAV.cc src/comm/MAVLinkSimulationWaypointPlanner.cc src/comm/MAVLinkSwarmSimulationLink.cc - src/comm/MAVLinkSyntaxHighlighter.cc - src/comm/MAVLinkXMLParser.cc src/comm/SerialLink.cc src/comm/SerialSimulationLink.cc src/comm/UDPLink.cc @@ -584,7 +578,6 @@ set (qgroundcontrolSrc #src/ui/SlugsVideoCamControl.cpp src/ui/WaypointList.cc src/ui/WaypointView.cc - src/ui/XMLCommProtocolWidget.cc src/ui/designer/QGCActionButton.cc src/ui/designer/QGCParamSlider.cc src/ui/designer/QGCToolWidget.cc @@ -598,8 +591,6 @@ set (qgroundcontrolSrc src/ui/map/MAV2DIcon.cc src/ui/map/Waypoint2DIcon.cc src/ui/map3D/QGCWebPage.cc - src/ui/mavlink/DomItem.cc - src/ui/mavlink/DomModel.cc src/ui/uas/QGCUnconnectedInfoWidget.cc src/ui/uas/UASControlWidget.cc src/ui/uas/UASInfoWidget.cc diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 30c6143e6..c49f065f3 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -33,10 +33,6 @@ include(lib/nmea/nmea.pri) # (We're not reusing any part of the OP GCS, just the map library) -# Include MAVLink generator -include(src/apps/mavlinkgen.pri) - - # Try to get it from OP mainline, if this fails fall back to internal copies exists(../openpilot-xxxxxxx/ground/openpilotgcs/src/libs) { include(../openpilot/ground/openpilotgcs/src/libs/utils/utils_external.pri) @@ -146,11 +142,26 @@ contains(MAVLINK_CONF, ardupilotmega) { } # } -# Include general settings for MAVGround +# Include general settings for QGroundControl # necessary as last include to override any non-acceptable settings # done by the plugins above include(qgroundcontrol.pri) + + +# Include MAVLink generator +DEPENDPATH += \ + src/apps/mavlinkgen + +INCLUDEPATH += \ + src/apps/mavlinkgen \ + src/apps/mavlinkgen/ui \ + src/apps/mavlinkgen/generator + +include(src/apps/mavlinkgen/mavlinkgen.pri) + + + # Include QWT plotting library include(src/lib/qwt/qwt.pri) DEPENDPATH += . \ @@ -194,7 +205,6 @@ FORMS += src/ui/MainWindow.ui \ src/ui/ObjectDetectionView.ui \ src/ui/JoystickWidget.ui \ src/ui/DebugConsole.ui \ - src/ui/XMLCommProtocolWidget.ui \ src/ui/HDDisplay.ui \ src/ui/MAVLinkSettingsWidget.ui \ src/ui/AudioOutputWidget.ui \ @@ -279,10 +289,6 @@ HEADERS += src/MG.h \ src/input/JoystickInput.h \ src/ui/JoystickWidget.h \ src/ui/DebugConsole.h \ - src/ui/XMLCommProtocolWidget.h \ - src/ui/mavlink/DomItem.h \ - src/ui/mavlink/DomModel.h \ - src/comm/MAVLinkXMLParser.h \ src/ui/HDDisplay.h \ src/ui/MAVLinkSettingsWidget.h \ src/ui/AudioOutputWidget.h \ @@ -294,7 +300,6 @@ HEADERS += src/MG.h \ src/uas/SlugsMAV.h \ src/uas/PxQuadMAV.h \ src/uas/ArduPilotMegaMAV.h \ - src/comm/MAVLinkSyntaxHighlighter.h \ src/ui/watchdog/WatchdogControl.h \ src/ui/watchdog/WatchdogProcessView.h \ src/ui/watchdog/WatchdogView.h \ @@ -340,7 +345,6 @@ HEADERS += src/MG.h \ src/ui/map/QGCMapWidget.h \ src/ui/map/MAV2DIcon.h \ src/ui/map/Waypoint2DIcon.h \ - src/ui/mavlink/QGCMAVLinkTextEdit.h \ src/ui/map/QGCMapTool.h \ src/ui/map/QGCMapToolBar.h \ src/libs/qextserialport/qextserialenumerator.h @@ -410,10 +414,6 @@ SOURCES += src/main.cc \ src/input/JoystickInput.cc \ src/ui/JoystickWidget.cc \ src/ui/DebugConsole.cc \ - src/ui/XMLCommProtocolWidget.cc \ - src/ui/mavlink/DomItem.cc \ - src/ui/mavlink/DomModel.cc \ - src/comm/MAVLinkXMLParser.cc \ src/ui/HDDisplay.cc \ src/ui/MAVLinkSettingsWidget.cc \ src/ui/AudioOutputWidget.cc \ @@ -425,7 +425,6 @@ SOURCES += src/main.cc \ src/uas/SlugsMAV.cc \ src/uas/PxQuadMAV.cc \ src/uas/ArduPilotMegaMAV.cc \ - src/comm/MAVLinkSyntaxHighlighter.cc \ src/ui/watchdog/WatchdogControl.cc \ src/ui/watchdog/WatchdogProcessView.cc \ src/ui/watchdog/WatchdogView.cc \ @@ -470,7 +469,6 @@ SOURCES += src/main.cc \ src/ui/map/QGCMapWidget.cc \ src/ui/map/MAV2DIcon.cc \ src/ui/map/Waypoint2DIcon.cc \ - src/ui/mavlink/QGCMAVLinkTextEdit.cc \ src/ui/map/QGCMapTool.cc \ src/ui/map/QGCMapToolBar.cc macx|win32-msvc2008::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc diff --git a/src/apps/mavlinkgen/mavlinkgen.pri b/src/apps/mavlinkgen/mavlinkgen.pri index 368239b49..8b8370053 100644 --- a/src/apps/mavlinkgen/mavlinkgen.pri +++ b/src/apps/mavlinkgen/mavlinkgen.pri @@ -1,5 +1,24 @@ -# MAVLink code generator -# generates code in several languages for MAVLink encoding/decoding +# Third-party includes. +# if you include this file with the commands below into +# your Qt project, you can enable your application +# to generate MAVLink code easily. + +###### EXAMPLE BEGIN + +## Include MAVLink generator +#DEPENDPATH += \ +# src/apps/mavlinkgen +# +#INCLUDEPATH += \ +# src/apps/mavlinkgen +# src/apps/mavlinkgen/ui \ +# src/apps/mavlinkgen/generator +# +#include(src/apps/mavlinkgen/mavlinkgen.pri) + +###### EXAMPLE END + + INCLUDEPATH += .\ ui \ @@ -7,18 +26,17 @@ INCLUDEPATH += .\ FORMS += ui/XMLCommProtocolWidget.ui -HEADERS += MAVLinkGen.h \ +HEADERS += \ ui/XMLCommProtocolWidget.h \ generator/MAVLinkXMLParser.h \ ui/DomItem.h \ ui/DomModel.h \ ui/QGCMAVLinkTextEdit.h -SOURCES += main.cc \ - MAVLinkGen.cc \ +SOURCES += \ ui/XMLCommProtocolWidget.cc \ ui/DomItem.cc \ ui/DomModel.cc \ generator/MAVLinkXMLParser.cc \ ui/QGCMAVLinkTextEdit.cc - + RESOURCES = mavlinkgen.qrc diff --git a/src/apps/mavlinkgen/mavlinkgen.pro b/src/apps/mavlinkgen/mavlinkgen.pro index 46c6a0205..48e3bba52 100644 --- a/src/apps/mavlinkgen/mavlinkgen.pro +++ b/src/apps/mavlinkgen/mavlinkgen.pro @@ -8,4 +8,10 @@ TARGET = mavlinkgen LANGUAGE = C++ -include(mavlinkgen.pri) \ No newline at end of file +# Widget files (can be included in third-party Qt applications) +include(mavlinkgen.pri) + +# Standalone files +HEADERS += MAVLinkGen.h +SOURCES += main.cc \ + MAVLinkGen.cc \ No newline at end of file -- 2.22.0