.github/workflows/android_release.yml

@@ -45,12 +45,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@v1.3.1
-        with:
-          android: 'false'
-        continue-on-error: true
-
       - name: Get all tags for correct version determination
         working-directory:  ${{ github.workspace }}
         run: |

android/AndroidManifest.xml

@@ -77,7 +77,7 @@
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
     </application>
 
-    <uses-sdk android:targetSdkVersion="33"/>
+    <uses-sdk android:targetSdkVersion="30"/>
 
     <!-- Needed to keep working while 'asleep' -->
     <uses-permission android:name="android.permission.WAKE_LOCK"/>

src/CMakeLists.txt

@@ -133,7 +133,6 @@ add_subdirectory(FlightDisplay)
 add_subdirectory(FlightMap)
 add_subdirectory(FollowMe)
 add_subdirectory(Geo)
-add_subdirectory(Gimbal)
 add_subdirectory(GPS)
 add_subdirectory(Joystick)
 if (${QGC_GST_MICROHARD_ENABLED})
@@ -177,7 +176,6 @@ target_link_libraries(qgc
 		FlightMap
 		FollowMe
 		Geo
-		Gimbal
 		gps
 		Joystick
 		MissionManager

src/Gimbal/CMakeLists.txt

@@ -1,15 +0,0 @@
-
-add_library(Gimbal
-	GimbalController.cc
-)
-
-target_link_libraries(Gimbal
-	PUBLIC
-		qgc
-)
-
-target_include_directories(Gimbal
-	PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}
-)
-

src/Joystick/CMakeLists.txt

@@ -17,7 +17,6 @@ add_library(Joystick
 
 target_link_libraries(Joystick
         PRIVATE
-			Gimbal
             ui
 	PUBLIC
 		qgc

src/Settings/CMakeLists.txt

@@ -12,8 +12,6 @@ add_library(Settings
 	BrandImageSettings.h
 	FirmwareUpgradeSettings.cc
 	FirmwareUpgradeSettings.h
-	GimbalControllerSettings.cc
-	GimbalControllerSettings.h
 	FlightMapSettings.cc
 	FlightMapSettings.h
 	FlyViewSettings.cc

src/Vehicle/CMakeLists.txt

@@ -113,7 +113,6 @@ add_library(Vehicle
 target_link_libraries(Vehicle
 	PRIVATE
 		Actuators
-		Gimbal
 		ui
 		compression
 		libevents_generated

src/VehicleSetup/FirmwareUpgradeController.cc

@@ -62,7 +62,6 @@ static QMap<int, QString> px4_board_name_map {
     {54, "px4_fmu-v6u_default"},
     {56, "px4_fmu-v6c_default"},
     {57, "ark_fmu-v6x_default"},
-    {59, "ark_fpv_default"},
     {35, "px4_fmu-v6xrt_default"},
     {55, "sky-drones_smartap-airlink_default"},
     {88, "airmind_mindpx-v2_default"},

src/comm/USBBoardInfo.json

@@ -31,7 +31,6 @@
         { "vendorID": 12643, "productID": 76,       "boardClass": "Pixhawk",    "name": "CUAV Flight Controller" },
         { "vendorID": 1155, "productID": 55,        "boardClass": "Pixhawk",    "name": "PX4 FMU SmartAP AIRLink" },
         { "vendorID": 12677, "productID": 57,       "boardClass": "Pixhawk",    "name": "ARK FMU V6X" },
-        { "vendorID": 12677, "productID": 59,       "boardClass": "Pixhawk",    "name": "ARK FPV" },
 
         { "vendorID": 1155, "productID": 22336,     "boardClass": "Pixhawk",    "name": "ArduPilot ChibiOS" },
         { "vendorID": 4617, "productID": 22336,     "boardClass": "Pixhawk",    "name": "ArduPilot ChibiOS" },
@@ -46,11 +45,6 @@
 
         { "vendorID": 9900, "productID": 21,        "boardClass": "PX4 Flow",   "name": "PX4 Flow" },
 
-        { "vendorID": 9900, "productID": 4119,      "boardClass": "Pixhawk",    "name": "mRo Pixracer Pro" },
-        { "vendorID": 9900, "productID": 4130,      "boardClass": "Pixhawk",    "name": "mRo Control Zero Classic" },
-        { "vendorID": 9900, "productID": 4131,      "boardClass": "Pixhawk",    "name": "mRo Control Zero H7" },
-        { "vendorID": 9900, "productID": 4132,      "boardClass": "Pixhawk",    "name": "mRo Control Zero H7 OEM" },
-
         { "vendorID": 1027, "productID": 24597,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "3DR Radio" },
         { "vendorID": 1027, "productID": 24577,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "3DR Radio on FTDI" },
         { "vendorID": 4292, "productID": 60000,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "SILabs Radio" },