Merge branch 'main' into pr-vtol-backtransition-pos-feedback

oravla5 · Nov 11, 2024 · 7a85323 · 7a85323
2 parents eb2553b + b35ec38
commit 7a85323
Show file tree

Hide file tree

Showing 69 changed files with 5,009 additions and 434 deletions.
diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
@@ -96,8 +96,10 @@ pipeline {
                      "nxp_fmuk66-v3_default",
                      "nxp_fmuk66-v3_socketcan",
                      "nxp_mr-canhubk3_default",
+                     "nxp_mr-canhubk3_fmu",
                      "nxp_ucans32k146_canbootloader",
                      "nxp_ucans32k146_default",
+                     "nxp_tropic-community_default",
                      "omnibus_f4sd_default",
                      "px4_fmu-v2_default",
                      "px4_fmu-v2_fixedwing",

diff --git a/.github/workflows/build_all_targets.yml b/.github/workflows/build_all_targets.yml
@@ -75,6 +75,7 @@ jobs:
     needs: group_targets
     strategy:
       matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }}
+      fail-fast: false
     container:
       image: ${{ matrix.container }}
     steps:

diff --git a/.vscode/cmake-variants.yaml b/.vscode/cmake-variants.yaml
@@ -356,6 +356,11 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: nxp_mr-canhubk3_fmu
+    nxp_tropic-community_default:
+      short: nxp_tropic-community_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: nxp_tropic-community_default
     raspberrypi_pico_default:
       short: raspberrypi_pico
       buildType: MinSizeRel

diff --git a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad
diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark
diff --git a/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
@@ -129,8 +129,6 @@ if(CONFIG_MODULES_VTOL_ATT_CONTROL)
 		# [13000, 13999] VTOL
 		13000_generic_vtol_standard
 		13100_generic_vtol_tiltrotor
-		13013_deltaquad
-		13014_vtol_babyshark
 		13030_generic_vtol_quad_tiltrotor
 		13200_generic_vtol_tailsitter
 	)

diff --git a/Tools/astyle/files_to_check_code_style.sh b/Tools/astyle/files_to_check_code_style.sh
@@ -32,4 +32,5 @@ exec find boards msg src platforms test \
     -path src/lib/cdrstream/rosidl -prune -o \
     -path src/modules/zenoh/zenoh-pico -prune -o \
     -path boards/modalai/voxl2/libfc-sensor-api -prune -o \
+    -path src/drivers/actuators/vertiq_io/iq-module-communication-cpp -prune -o \
     \( -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) -print \) | grep $PATTERN