Merge branch 'modalai:main' into intelliterra/emergency_status

PX4 · Mar 1, 2024 · 5cda32d · 5cda32d
2 parents f002e49 + b405d75
commit 5cda32d
Show file tree

Hide file tree

Showing 1,718 changed files with 82,191 additions and 41,970 deletions.
diff --git a/.ackrc b/.ackrc
diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
@@ -40,16 +40,16 @@ pipeline {
                      "ark_can-flow_default",
                      "ark_can-gps_canbootloader",
                      "ark_can-gps_default",
-                     "ark_cannode_canbootloader",
-                     "ark_cannode_default",
                      "ark_can-rtk-gps_canbootloader",
                      "ark_can-rtk-gps_default",
+                     "ark_cannode_canbootloader",
+                     "ark_cannode_default",
                      "ark_fmu-v6x_bootloader",
                      "ark_fmu-v6x_default",
                      "atl_mantis-edu_default",
                      "av_x-v1_default",
-                     "bitcraze_crazyflie_default",
                      "bitcraze_crazyflie21_default",
+                     "bitcraze_crazyflie_default",
                      "cuav_can-gps-v1_canbootloader",
                      "cuav_can-gps-v1_default",
                      "cuav_nora_default",
@@ -66,8 +66,8 @@ pipeline {
                      "holybro_durandal-v1_default",
                      "holybro_kakutef7_default",
                      "holybro_kakuteh7_default",
-                     "holybro_kakuteh7v2_default",
                      "holybro_kakuteh7mini_default",
+                     "holybro_kakuteh7v2_default",
                      "holybro_pix32v5_default",
                      "matek_gnss-m9n-f4_canbootloader",
                      "matek_gnss-m9n-f4_default",
@@ -77,8 +77,8 @@ pipeline {
                      "modalai_fc-v1_default",
                      "modalai_fc-v2_default",
                      "mro_ctrl-zero-classic_default",
-                     "mro_ctrl-zero-f7_default",
                      "mro_ctrl-zero-f7-oem_default",
+                     "mro_ctrl-zero-f7_default",
                      "mro_ctrl-zero-h7-oem_default",
                      "mro_ctrl-zero-h7_default",
                      "mro_pixracerpro_default",
@@ -88,7 +88,6 @@ pipeline {
                      "nxp_fmuk66-e_socketcan",
                      "nxp_fmuk66-v3_default",
                      "nxp_fmuk66-v3_socketcan",
-                     "nxp_fmurt1062-v1_default",
                      "nxp_mr-canhubk3_default",
                      "nxp_ucans32k146_canbootloader",
                      "nxp_ucans32k146_default",
@@ -105,19 +104,28 @@ pipeline {
                      "px4_fmu-v5_debug",
                      "px4_fmu-v5_default",
                      "px4_fmu-v5_lto",
+                     "px4_fmu-v5_rover",
                      "px4_fmu-v5_stackcheck",
                      "px4_fmu-v5_uavcanv0periph",
                      "px4_fmu-v5x_default",
+                     "px4_fmu-v5x_rover",
                      "px4_fmu-v6c_default",
+                     "px4_fmu-v6c_rover",
                      "px4_fmu-v6u_default",
+                     "px4_fmu-v6u_rover",
                      "px4_fmu-v6x_default",
+                     "px4_fmu-v6x_rover",
+                     "px4_fmu-v6xrt_bootloader",
+                     "px4_fmu-v6xrt_default",
+                     "px4_fmu-v6xrt_rover",
                      "px4_io-v2_default",
                      "raspberrypi_pico_default",
+                     "siyi_n7_default"
                      "sky-drones_smartap-airlink_default",
                      "spracing_h7extreme_default",
                      "thepeach_k1_default",
                      "thepeach_r1_default",
-                     "uvify_core_default"
+                     "uvify_core_default",
             ],
             image: docker_images.nuttx,
             archive: true

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -29,7 +29,8 @@
 		"twxs.cmake",
 		"uavcan.dsdl",
 		"wholroyd.jinja",
-		"zixuanwang.linkerscript"
+		"zixuanwang.linkerscript",
+		"ms-vscode.makefile-tools"
 	],
 
 	"containerUser": "user",

diff --git a/.github/workflows/compile_macos.yml b/.github/workflows/compile_macos.yml
@@ -18,6 +18,11 @@ jobs:
           px4_sitl
           ]
     steps:
+    - name: install Python 3.10
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.10"
+
     - uses: actions/checkout@v1
       with:
         token: ${{secrets.ACCESS_TOKEN}}

diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml
@@ -25,6 +25,7 @@ jobs:
           ark_can-rtk-gps,
           ark_cannode,
           ark_fmu-v6x,
+          ark_septentrio-gps,
           atl_mantis-edu,
           av_x-v1,
           bitcraze_crazyflie,
@@ -48,6 +49,7 @@ jobs:
           matek_h743-slim,
           modalai_fc-v1,
           modalai_fc-v2,
+          mro_ctrl-zero-classic,
           mro_ctrl-zero-f7,
           mro_ctrl-zero-f7-oem,
           mro_ctrl-zero-h7,
@@ -57,7 +59,6 @@ jobs:
           mro_x21-777,
           nxp_fmuk66-e,
           nxp_fmuk66-v3,
-          nxp_fmurt1062-v1,
           nxp_mr-canhubk3,
           nxp_ucans32k146,
           omnibus_f4sd,
@@ -70,10 +71,12 @@ jobs:
           px4_fmu-v6c,
           px4_fmu-v6u,
           px4_fmu-v6x,
+          px4_fmu-v6xrt,
           raspberrypi_pico,
           sky-drones_smartap-airlink,
           spracing_h7extreme,
-          uvify_core
+          uvify_core,
+          siyi_n7
           ]
     steps:
     - uses: actions/checkout@v1

diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml
@@ -128,4 +128,6 @@ jobs:
       run: |
         git clone https://github.com/PX4/px4_msgs.git
         rm px4_msgs/msg/*.msg
+        rm px4_msgs/srv/*.srv
         cp msg/*.msg px4_msgs/msg/
+        cp srv/*.srv px4_msgs/srv/
diff --git a/.github/workflows/nuttx_env_config.yml b/.github/workflows/nuttx_env_config.yml
@@ -0,0 +1,32 @@
+name: Nuttx Target with extra env config
+
+on:
+  push:
+    branches:
+    - 'main'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-nuttx-focal:2022-08-12
+    strategy:
+      matrix:
+        config: [
+          px4_fmu-v5,
+          ]
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{secrets.ACCESS_TOKEN}}
+
+    - name: make ${{matrix.config}}
+      env:
+        PX4_EXTRA_NUTTX_CONFIG: "CONFIG_NSH_LOGIN_PASSWORD=\"test\";CONFIG_NSH_CONSOLE_LOGIN=y"
+      run: |
+        echo "PX4_EXTRA_NUTTX_CONFIG: $PX4_EXTRA_NUTTX_CONFIG"
+        make ${{matrix.config}} nuttx_context
+        # Check that the config option is set
+        grep CONFIG_NSH_LOGIN_PASSWORD build/${{matrix.config}}_default/NuttX/nuttx/.config
diff --git a/.github_changelog_generator b/.github_changelog_generator
diff --git a/.gitmodules b/.gitmodules
@@ -62,3 +62,24 @@
 	path = src/modules/uxrce_dds_client/Micro-XRCE-DDS-Client
 	url = https://github.com/PX4/Micro-XRCE-DDS-Client.git
 	branch = px4
+[submodule "src/lib/cdrstream/cyclonedds"]
+	path = src/lib/cdrstream/cyclonedds
+	url = https://github.com/px4/cyclonedds
+[submodule "src/lib/cdrstream/rosidl"]
+	path = src/lib/cdrstream/rosidl
+	url = https://github.com/px4/rosidl
+[submodule "src/modules/zenoh/zenoh-pico"]
+	path = src/modules/zenoh/zenoh-pico
+	url = https://github.com/px4/zenoh-pico
+	branch = pr-zubf-werror-fix
+[submodule "src/lib/heatshrink/heatshrink"]
+	path = src/lib/heatshrink/heatshrink
+	url = https://github.com/PX4/heatshrink.git
+	branch = px4
+[submodule "Tools/simulation/gz"]
+	path = Tools/simulation/gz
+	url = https://github.com/PX4/PX4-gazebo-models.git
+	branch = main
+[submodule "boards/modalai/voxl2/libfc-sensor-api"]
+	path = src/modules/muorb/apps/libfc-sensor-api
+	url = https://gitlab.com/voxl-public/voxl-sdk/core-libs/libfc-sensor-api.git
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/cmake-variants.yaml b/.vscode/cmake-variants.yaml
@@ -71,6 +71,26 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: px4_fmu-v5x_default
+    px4_fmu-v6c_default:
+      short: px4_fmu-v6c
+      buildType: MinSizeRel
+      settings:
+        CONFIG: px4_fmu-v6c_default
+    px4_fmu-v6c_bootloader:
+      short: px4_fmu-v6c_bootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: px4_fmu-v6c_bootloader
+    px4_fmu-v6u_default:
+      short: px4_fmu-v6u
+      buildType: MinSizeRel
+      settings:
+        CONFIG: px4_fmu-v6u_default
+    px4_fmu-v6u_bootloader:
+      short: px4_fmu-v6u_bootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: px4_fmu-v6u_bootloader
     px4_fmu-v6x_default:
       short: px4_fmu-v6x
       buildType: MinSizeRel
@@ -81,6 +101,16 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: px4_fmu-v6x_bootloader
+    px4_fmu-v6xrt_default:
+      short: px4_fmu-v6xrt
+      buildType: MinSizeRel
+      settings:
+        CONFIG: px4_fmu-v6xrt_default
+    px4_fmu-v6xrt_bootloader:
+      short: px4_fmu-v6xrt_bootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: px4_fmu-v6xrt_bootloader
     airmind_mindpx-v2_default:
       short: airmind_mindpx-v2
       buildType: MinSizeRel
@@ -121,6 +151,16 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_can-rtk-gps_canbootloader
+    ark_septentrio_gps_default:
+      short: ark_septentrio_gps_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_septentrio_gps_default
+    ark_septentrio_gps_canbootloader:
+      short: ark_septentrio_gps_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_septentrio_gps_canbootloader
     ark_cannode_default:
       short: ark_cannode_default
       buildType: MinSizeRel
@@ -181,6 +221,11 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: cubepilot_cubeorange_test
+    cubepilot_cubeorangeplus_test:
+      short: cubepilot_cubeorangeplus
+      buildType: MinSizeRel
+      settings:
+        CONFIG: cubepilot_cubeorangeplus_test
     emlid_navio2_default:
       short: emlid_navio2
       buildType: MinSizeRel

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -18,6 +18,7 @@
         "twxs.cmake",
         "uavcan.dsdl",
         "wholroyd.jinja",
-        "zixuanwang.linkerscript"
+        "zixuanwang.linkerscript",
+        "ms-vscode.makefile-tools"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -127,5 +127,6 @@
         "terminal.integrated.scrollback": 15000,
         "yaml.schemas": {
                 "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
-        }
+        },
+        "ros.distro": "humble"
 }