Convert AirLinkManager & UTMSPManager to Singletons

mavlink · Oct 17, 2024 · f6ff5e2 · f6ff5e2
1 parent 13031c3
commit f6ff5e2
Show file tree

Hide file tree

Showing 36 changed files with 609 additions and 708 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -269,7 +269,6 @@ list(APPEND QGC_RESOURCES
 )
 
 if(QGC_UTM_ADAPTER)
-    add_definitions(-DQGC_UTM_ADAPTER)
     list(APPEND QGC_RESOURCES ${CMAKE_SOURCE_DIR}/src/UTMSP/utmsp.qrc)
 else()
     list(APPEND QGC_RESOURCES ${CMAKE_SOURCE_DIR}/src/UTMSP/dummy/utmsp_dummy.qrc)

diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc
@@ -31,7 +31,7 @@
 		<file alias="QGroundControl/FlightMap/MapLineArrow.qml">../src/FlightMap/MapItems/MapLineArrow.qml</file>
 		<file alias="QGroundControl/FlightMap/SplitIndicator.qml">../src/FlightMap/MapItems/SplitIndicator.qml</file>
 		<file alias="ADSBServerSettings.qml">../src/UI/preferences/ADSBServerSettings.qml</file>
-		<file alias="AirLinkSettings.qml">../src/AirLink/AirLinkSettings.qml</file>
+		<file alias="AirLinkSettings.qml">../src/Comms/AirLink/AirLinkSettings.qml</file>
 		<file alias="AnalyzeView.qml">../src/AnalyzeView/AnalyzeView.qml</file>
 		<file alias="AppSettings.qml">../src/UI/AppSettings.qml</file>
 		<file alias="BluetoothSettings.qml">../src/UI/preferences/BluetoothSettings.qml</file>

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
@@ -31,7 +31,7 @@
         <file alias="QGroundControl/FlightMap/MapLineArrow.qml">src/FlightMap/MapItems/MapLineArrow.qml</file>
         <file alias="QGroundControl/FlightMap/SplitIndicator.qml">src/FlightMap/MapItems/SplitIndicator.qml</file>
         <file alias="ADSBServerSettings.qml">src/UI/preferences/ADSBServerSettings.qml</file>
-        <file alias="AirLinkSettings.qml">src/AirLink/AirLinkSettings.qml</file>
+        <file alias="AirLinkSettings.qml">src/Comms/AirLink/AirLinkSettings.qml</file>
         <file alias="AnalyzeView.qml">src/AnalyzeView/AnalyzeView.qml</file>
         <file alias="AppSettings.qml">src/UI/AppSettings.qml</file>
         <file alias="BluetoothSettings.qml">src/UI/preferences/BluetoothSettings.qml</file>

diff --git a/src/AirLink/AirLinkManager.cc b/src/AirLink/AirLinkManager.cc
diff --git a/src/AirLink/AirLinkManager.h b/src/AirLink/AirLinkManager.h
diff --git a/src/AirLink/AirlinkLink.cc b/src/AirLink/AirlinkLink.cc