Compare commits

...

5 Commits

Author SHA1 Message Date
Alexis Guijarro 91d56a0139 USBBoardInfo.json: Adding missing mRo boards to be detected by Auto-Connect (PX4) 5 months ago
alexklimaj 01167b5fe6 boards: add ARK FPV 5 months ago
Bartek Zdanowski (Zdanek) 990ed12f5b Fix cmake to include Gimbal submodule 7 months ago
Julian Oes 555c9d1f48 CI: try to save space 8 months ago
Julian Oes 7cb2da3c02 android: try SdkVersion 33 8 months ago
  1. 6
      .github/workflows/android_release.yml
  2. 2
      android/AndroidManifest.xml
  3. 2
      src/CMakeLists.txt
  4. 15
      src/Gimbal/CMakeLists.txt
  5. 1
      src/Joystick/CMakeLists.txt
  6. 2
      src/Settings/CMakeLists.txt
  7. 1
      src/Vehicle/CMakeLists.txt
  8. 1
      src/VehicleSetup/FirmwareUpgradeController.cc
  9. 6
      src/comm/USBBoardInfo.json

6
.github/workflows/android_release.yml

@ -45,6 +45,12 @@ jobs: @@ -45,6 +45,12 @@ 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: |

2
android/AndroidManifest.xml

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

2
src/CMakeLists.txt

@ -133,6 +133,7 @@ add_subdirectory(FlightDisplay) @@ -133,6 +133,7 @@ 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})
@ -176,6 +177,7 @@ target_link_libraries(qgc @@ -176,6 +177,7 @@ target_link_libraries(qgc
FlightMap
FollowMe
Geo
Gimbal
gps
Joystick
MissionManager

15
src/Gimbal/CMakeLists.txt

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

1
src/Joystick/CMakeLists.txt

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

2
src/Settings/CMakeLists.txt

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

1
src/Vehicle/CMakeLists.txt

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

1
src/VehicleSetup/FirmwareUpgradeController.cc

@ -62,6 +62,7 @@ static QMap<int, QString> px4_board_name_map { @@ -62,6 +62,7 @@ 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"},

6
src/comm/USBBoardInfo.json

@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
{ "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" },
@ -45,6 +46,11 @@ @@ -45,6 +46,11 @@
{ "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" },

Loading…
Cancel
Save