UAVCAN: publish CAN frames to uORB (ORB_ID(can_frame_out))

- can frames published to ORB_ID(can_frame_in) are injected

.ci/Jenkinsfile-compile

@@ -9,10 +9,10 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2022-08-12",
-            arm64: "px4io/px4-dev-aarch64:2022-08-12",
-            base: "px4io/px4-dev-ros2-foxy:2022-08-12",
-            nuttx: "px4io/px4-dev-nuttx-focal:2022-08-12",
+            armhf: "px4io/px4-dev-armhf:2021-09-08",
+            arm64: "px4io/px4-dev-aarch64:2021-09-08",
+            base: "px4io/px4-dev-base-bionic:2021-09-08",
+            nuttx: "px4io/px4-dev-nuttx-focal:2021-09-08",
           ]
 
           def armhf_builds = [
@@ -62,8 +62,6 @@ pipeline {
                      "holybro_durandal-v1_default",
                      "holybro_kakutef7_default",
                      "holybro_kakuteh7_default",
-                     "holybro_kakuteh7v2_default",
-                     "holybro_kakuteh7mini_default",
                      "holybro_pix32v5_default",
                      "matek_gnss-m9n-f4_canbootloader",
                      "matek_gnss-m9n-f4_default",
@@ -71,18 +69,24 @@ pipeline {
                      "matek_h743-slim_default",
                      "matek_h743_default",
                      "modalai_fc-v1_default",
+                     "modalai_fc-v1_rtps",
                      "modalai_fc-v2_default",
                      "modalai_voxl2-io_default",
                      "mro_ctrl-zero-f7_default",
                      "mro_ctrl-zero-f7-oem_default",
                      "mro_ctrl-zero-h7-oem_default",
+                     "mro_ctrl-zero-h7-oem_rtps",
                      "mro_ctrl-zero-h7_default",
+                     "mro_ctrl-zero-h7_rtps",
                      "mro_pixracerpro_default",
+                     "mro_pixracerpro_rtps",
                      "mro_x21-777_default",
                      "mro_x21_default",
                      "nxp_fmuk66-e_default",
+                     "nxp_fmuk66-e_rtps",
                      "nxp_fmuk66-e_socketcan",
                      "nxp_fmuk66-v3_default",
+                     "nxp_fmuk66-v3_rtps",
                      "nxp_fmuk66-v3_socketcan",
                      "nxp_fmurt1062-v1_default",
                      "nxp_ucans32k146_canbootloader",
@@ -100,6 +104,7 @@ pipeline {
                      "px4_fmu-v5_debug",
                      "px4_fmu-v5_default",
                      "px4_fmu-v5_lto",
+                     "px4_fmu-v5_rtps",
                      "px4_fmu-v5_stackcheck",
                      "px4_fmu-v5_uavcanv0periph",
                      "px4_fmu-v5x_default",
@@ -110,8 +115,6 @@ pipeline {
                      "raspberrypi_pico_default",
                      "sky-drones_smartap-airlink_default",
                      "spracing_h7extreme_default",
-                     "thepeach_k1_default",
-                     "thepeach_r1_default",
                      "uvify_core_default"
             ],
             image: docker_images.nuttx,

.ci/Jenkinsfile-hardware

@@ -61,13 +61,9 @@ pipeline {
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "IMU_GYRO_RATEMAX" --value "2000"'
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "13000"'   // generic vtol standard
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
-
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"' // run logger
                     checkStatus()
                     quickCalibrate()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status"'
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"' // stop logger
                   }
                 }
                 stage("print topics") {
@@ -136,12 +132,8 @@ pipeline {
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "IMU_GYRO_RATEMAX" --value "2000"'
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "13000"'   // generic vtol standard
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
-
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"' // run logger
                     checkStatus()
                     quickCalibrate()
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"' // stop logger
                   }
                 }
                 stage("print topics") {
@@ -160,6 +152,76 @@ pipeline {
           }
         }
 
+        stage("px4_fmu-v3_test") {
+          stages {
+            stage("build px4_fmu-v3_test") {
+              agent {
+                docker {
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                }
+              }
+              steps {
+                checkoutSCM()
+                sh 'make px4_fmu-v3_test'
+                sh 'make px4_fmu-v3_test bootloader_elf'
+                sh 'ccache -s'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, platforms/nuttx/NuttX/nuttx/tools/nuttx-gdbinit, Tools/HIL/*', name: 'px4_fmu-v3_test'
+              }
+              post {
+                always {
+                  sh 'make distclean; git clean -ff -x -d .'
+                }
+              }
+            } // stage build
+            stage("hardware") {
+              agent {
+                label 'px4_fmu-v3'
+              }
+              stages {
+                stage("flash") {
+                  steps {
+                    sh 'export'
+                    sh 'find /dev/serial'
+                    unstash 'px4_fmu-v3_test'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v3_test/px4_fmu-v3_bootloader.elf'
+                    // flash board and watch bootup
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v3_test/px4_fmu-v3_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    resetBoard()
+                  }
+                }
+                stage("tests") {
+                  steps {
+                    runTests()
+                  }
+                }
+                stage("status") {
+                  steps {
+                    // configure
+                    resetParameters()
+                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "13000"'   // generic vtol standard
+                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
+                    checkStatus()
+                    quickCalibrate()
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status"'
+                  }
+                }
+                stage("print topics") {
+                  steps {
+                    printTopics()
+                  }
+                }
+              }
+              post {
+                always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
+                  sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/px4_fmu-v3_test/px4_fmu-v3_test.elf || true'
+                }
+              }
+            } // stage test
+          }
+        }
+
         stage("px4_fmu-v4_test") {
           stages {
             stage("build px4_fmu-v4_test") {
@@ -209,12 +271,8 @@ pipeline {
                     resetParameters()
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "4001"'    // generic quadcopter
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
-
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"' // run logger
                     checkStatus()
                     quickCalibrate()
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"' // stop logger
                   }
                 }
                 stage("print topics") {
@@ -282,13 +340,9 @@ pipeline {
                     resetParameters()
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "13000"'   // generic vtol standard
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
-
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"' // run logger
                     checkStatus()
                     quickCalibrate()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status"'
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"' // stop logger
                   }
                 }
                 stage("print topics") {
@@ -377,7 +431,6 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 200" || true' // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0" || true'       // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_1_CONFIG 0" || true'       // limit cpu usage
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
                     checkStatus()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
@@ -460,7 +513,6 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 200" || true' // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0" || true'       // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_1_CONFIG 0" || true'       // limit cpu usage
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
                     checkStatus()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
@@ -530,13 +582,9 @@ pipeline {
                     resetParameters()
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "4001"'    // generic quadcopter
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
-
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"' // run logger
                     checkStatus()
                     quickCalibrate()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"' // stop logger
                   }
                 }
                 stage("print topics") {
@@ -605,12 +653,8 @@ pipeline {
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "IMU_GYRO_RATEMAX" --value "400"'
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "4001"'    // generic quadcopter
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
-                    sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
-
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"' // run logger
                     checkStatus()
                     quickCalibrate()
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"' // stop logger
                   }
                 }
                 stage("print topics") {
@@ -684,8 +728,14 @@ void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param save"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show SYS*"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump"'
+  sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot to apply
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show SYS*"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump"'
 
+  // run logger
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sleep 1"' // sleep before continuing
   // status commands
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/blocks"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/mount"'
@@ -715,7 +765,7 @@ void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink status" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mount"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "perf latency"'
@@ -729,6 +779,8 @@ void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb top -1 -a" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ver all"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
+  // stop logger
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"'
 }
 
 void resetParameters() {
@@ -755,11 +807,9 @@ void runTests() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors stop"' // ignore irrelevant sensor timeouts during test
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ostest"'
   sh './Tools/HIL/reboot.py --device `find /dev/serial -name *usb-*`' // reboot after ostest
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors stop"' // ignore irrelevant sensor timeouts during test
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander_tests" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "controllib_test"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "lightware_laser_test"'
@@ -769,13 +819,13 @@ void runTests() {
 
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests file" || true'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump /fs/mtd_params"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd readtest"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump /fs/mtd_params"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd rwtest"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump /fs/mtd_params"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd erase"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params" || true' // expected to fail after erase
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param dump /fs/mtd_params"'
 
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench -v"'
@@ -870,6 +920,7 @@ void printTopics() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener tune_control" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_acceleration" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_air_data" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_acceleration" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_velocity" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude_setpoint" || true'
@@ -886,7 +937,7 @@ void printTopics() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_odometry" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_rates_setpoint" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_status" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener failsafe_flags" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_status_flags" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vtol_vehicle_status" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener yaw_estimator_status" || true'
 }

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -5,7 +5,7 @@ labels: feature-request
 
 ---
 
-For general questions please use [PX4 Discuss](http://discuss.px4.io/) or Discord (you can find an invite link on this project README).
+For general questions please use [PX4 Discuss](http://discuss.px4.io/) or Slack (you can find an invite link on this project README).
 
 ## Describe problem solved by the proposed feature
 A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +1,17 @@
-<!--
+Please use [PX4 Discuss](http://discuss.px4.io/) or [Slack](http://slack.px4.io/) to align on pull requests if necessary. You can then open draft pull requests to get early feedback.
 
-Thank you for your contribution!
+## Describe problem solved by this pull request
+A clear and concise description of the problem this proposed change will solve. Or, what it will improve.
+E.g. For this use case I ran into...
 
-Get early feedback through
-- Dronecode Discord: https://discord.gg/dronecode
-- PX4 Discuss: http://discuss.px4.io/
-- opening a draft pr and sharing the link
+## Describe your solution
+A clear and concise description of what you have implemented.
 
--->
+## Describe possible alternatives
+A clear and concise description of alternative solutions or features you've considered.
 
-### Solved Problem
-When ... I found that ...
+## Test data / coverage
+How was it tested? What cases were covered? Logs uploaded to https://review.px4.io/ and screenshots of the important plot parts.
 
-Fixes #{Github issue ID}
-
-### Solution
-- Add ... for ...
-- Refactor ...
-
-### Alternatives
-We could also ...
-
-### Test coverage
-- Unit/integration test: ...
-- Simulation/hardware testing logs: https://review.px4.io/
-
-### Context
-Related links, screenshot before/after, video
+## Additional context
+Add any other related context or media.

.github/workflows/checks.yml

@@ -23,6 +23,7 @@ jobs:
           "shellcheck_all",
           "NO_NINJA_BUILD=1 px4_fmu-v5_default",
           "NO_NINJA_BUILD=1 px4_sitl_default",
+          "BUILD_MICRORTPS_AGENT=1 px4_sitl_rtps",
           "airframe_metadata",
           "module_documentation",
           "parameters_metadata",

.github/workflows/compile_nuttx.yml

@@ -30,7 +30,6 @@ jobs:
           cuav_nora,
           cuav_x7pro,
           cubepilot_cubeorange,
-          cubepilot_cubeorangeplus,
           cubepilot_cubeyellow,
           diatone_mamba-f405-mk2,
           freefly_can-rtk-gps,
@@ -55,7 +54,6 @@ jobs:
           nxp_fmuk66-e,
           nxp_fmuk66-v3,
           nxp_fmurt1062-v1,
-          nxp_mr-canhubk3,
           nxp_ucans32k146,
           omnibus_f4sd,
           px4_fmu-v2,

.github/workflows/failsafe_sim.yml

@@ -1,44 +0,0 @@
-name: Failsafe Simulator Build
-
-on:
-  push:
-    branches:
-    - 'main'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-    strategy:
-      fail-fast: false
-      matrix:
-        check: [
-          "failsafe_web",
-        ]
-    container:
-      image: px4io/px4-dev-nuttx-focal:2021-09-08
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: check environment
-      run: |
-          export
-          ulimit -a
-    - name: install emscripten
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git _emscripten_sdk
-        cd _emscripten_sdk
-        ./emsdk install latest
-        ./emsdk activate latest
-    - name: ${{matrix.check}}
-      run: |
-        . ./_emscripten_sdk/emsdk_env.sh
-        make ${{matrix.check}}

.github/workflows/mavros_mission_tests.yml

@@ -59,13 +59,13 @@ jobs:
       run: |
           export
           ulimit -a
-    - name: Build PX4 and sitl_gazebo-classic
+    - name: Build PX4 and sitl_gazebo
       env:
         PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
       run: |
         ccache -z
         make px4_sitl_default
-        make px4_sitl_default sitl_gazebo-classic
+        make px4_sitl_default sitl_gazebo
         ccache -s
 
     - name: Core dump settings

.github/workflows/mavros_offboard_tests.yml

@@ -54,13 +54,13 @@ jobs:
       run: |
           export
           ulimit -a
-    - name: Build PX4 and sitl_gazebo-classic
+    - name: Build PX4 and sitl_gazebo
       env:
         PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
       run: |
         ccache -z
         make px4_sitl_default
-        make px4_sitl_default sitl_gazebo-classic
+        make px4_sitl_default sitl_gazebo
         ccache -s
 
     - name: Core dump settings

.github/workflows/metadata.yml

@@ -116,7 +116,7 @@ jobs:
         ls -ls *
       # TODO: deploy graph_px4_sitl.json to S3 px4-travis:Firmware/master/
 
-  ROS2_msgs:
+  micrortps_agent:
     runs-on: ubuntu-latest
     container: px4io/px4-dev-base-focal:2021-09-08
     steps:
@@ -124,8 +124,34 @@ jobs:
       with:
         token: ${{ secrets.ACCESS_TOKEN }}
 
-    - name: PX4 ROS2 msgs
+    - name: microRTPS agent
+      run: |
+        make px4_sitl_rtps
+        git clone https://github.com/PX4/micrortps_agent.git
+        cp -R build/px4_sitl_rtps/src/modules/micrortps_bridge/micrortps_agent/* micrortps_agent
+
+  ROS_msgs:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2021-09-08
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: PX4 ROS msgs
       run: |
         git clone https://github.com/PX4/px4_msgs.git
-        rm px4_msgs/msg/*.msg
-        cp msg/*.msg px4_msgs/msg/
+        python3 msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/
+
+  ROS2_bridge:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2021-09-08
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: PX4 ROS2 bridge
+      run: |
+        git clone https://github.com/PX4/px4_ros_com.git
+        ./msg/tools/uorb_to_ros_urtps_topics.py -i msg/tools/urtps_bridge_topics.yaml -o px4_ros_com/templates/urtps_bridge_topics.yaml

.github/workflows/sitl_tests.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         config:
           - {model: "iris",          latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo" } # Alaska
-          # - {model: "standard_vtol", latitude: "-38.071235", longitude:  "145.281220", altitude:  "31", build_type: "AddressSanitizer" } # Australia
+          - {model: "standard_vtol", latitude: "-38.071235", longitude:  "145.281220", altitude:  "31", build_type: "AddressSanitizer" } # Australia
           - {model: "tailsitter" ,   latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo" } # Florida
           - {model: "standard_vtol", latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage" } # Zurich
 
@@ -74,14 +74,14 @@ jobs:
     - name: Build SITL Gazebo
       env:
         PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: make px4_sitl_default sitl_gazebo-classic
-    - name: ccache post-run sitl_gazebo-classic
+      run: make px4_sitl_default sitl_gazebo
+    - name: ccache post-run sitl_gazebo
       run: ccache -s
     - name: Build MAVSDK tests
       env:
         PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
         DONT_RUN: 1
-      run: make px4_sitl_default sitl_gazebo-classic mavsdk_tests
+      run: make px4_sitl_default gazebo mavsdk_tests
     - name: ccache post-run mavsdk_tests
       run: ccache -s
 

.gitignore

@@ -105,6 +105,3 @@ src/modules/simulator/simulator_config.h
 src/systemcmds/topic_listener/listener_generated.cpp
 
 !src/drivers/distance_sensor/broadcom/afbrs50/Lib/*
-
-# colcon
-log/

.gitmodules

@@ -10,22 +10,26 @@
 	path = Tools/simulation/jmavsim/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
 	branch = main
-[submodule "Tools/simulation/gazebo-classic/sitl_gazebo-classic"]
-	path = Tools/simulation/gazebo-classic/sitl_gazebo-classic
-	url = https://github.com/PX4/PX4-SITL_gazebo-classic.git
+[submodule "Tools/simulation/gazebo/sitl_gazebo"]
+	path = Tools/simulation/gazebo/sitl_gazebo
+	url = https://github.com/PX4/PX4-SITL_gazebo.git
 	branch = main
 [submodule "src/drivers/gps/devices"]
 	path = src/drivers/gps/devices
 	url = https://github.com/PX4/PX4-GPSDrivers.git
 	branch = main
+[submodule "src/modules/micrortps_bridge/micro-CDR"]
+	path = src/modules/micrortps_bridge/micro-CDR
+	url = https://github.com/PX4/Micro-CDR.git
+	branch = master
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-10.3.0+
+	branch = px4_firmware_nuttx-10.1.0+
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
 	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-10.3.0+
+	branch = px4_firmware_nuttx-10.1.0+
 [submodule "Tools/flightgear_bridge"]
 	path = Tools/simulation/flightgear/flightgear_bridge
 	url = https://github.com/PX4/PX4-FlightGear-Bridge.git
@@ -60,5 +64,4 @@
 	branch = px4
 [submodule "src/modules/microdds_client/Micro-XRCE-DDS-Client"]
 	path = src/modules/microdds_client/Micro-XRCE-DDS-Client
-	url = https://github.com/PX4/Micro-XRCE-DDS-Client.git
-	branch = px4
+	url = https://github.com/eProsima/Micro-XRCE-DDS-Client.git

.vscode/.gitignore

@@ -4,7 +4,6 @@ compile_commands.json
 
 # generated by cmake
 launch.json
-c_cpp_properties.json
 
 # C/C++ extension does some local caching in this folder
 ipch/

.vscode/c_cpp_properties.json

@@ -3,18 +3,14 @@
         {
             "name": "PX4",
             "includePath": [
-                "${workspaceFolder}/**",
+                "${workspaceFolder}/**"
             ],
             "defines": [],
             "macFrameworkPath": [],
             "configurationProvider": "ms-vscode.cmake-tools",
             "cppStandard": "c++14",
-            "cStandard": "c11",
-            "forcedInclude": [
-                 "@PX4_BINARY_DIR@/px4_boardconfig.h",
-                 "@PX4_SOURCE_DIR@/platforms/common/include/px4_platform_common/defines.h"
-                 ]
+            "cStandard": "c11"
         }
     ],
     "version": 4
-}
+}

.vscode/cmake-variants.yaml

@@ -6,11 +6,11 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_default
-    px4_sitl_nolockstep:
-      short: px4_sitl_nolockstep
+    px4_sitl_rtps:
+      short: px4_sitl_rtps
       buildType: RelWithDebInfo
       settings:
-        CONFIG: px4_sitl_nolockstep
+        CONFIG: px4_sitl_rtps
     px4_sitl_asan:
       short: px4_sitl (AddressSanitizer)
       buildType: AddressSanitizer
@@ -180,7 +180,7 @@ CONFIG:
       short: cubepilot_cubeorange
       buildType: MinSizeRel
       settings:
-        CONFIG: cubepilot_cubeorange_test
+        CONFIG: cubepilot_orange_test
     emlid_navio2_default:
       short: emlid_navio2
       buildType: MinSizeRel
@@ -266,16 +266,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: nxp_fmuk66-v3_default
-    nxp_mr-canhubk3_default:
-      short: nxp_mr-canhubk3_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_mr-canhubk3_default
-    nxp_mr-canhubk3_fmu:
-      short: nxp_mr-canhubk3_fmu
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_mr-canhubk3_fmu
     raspberrypi_pico_default:
       short: raspberrypi_pico
       buildType: MinSizeRel

.vscode/settings.json

@@ -2,6 +2,7 @@
         "astyle.astylerc": "${workspaceFolder}/Tools/astyle/astylerc",
         "astyle.c.enable": true,
         "astyle.cpp.enable": true,
+        "breadcrumbs.enabled": true,
         "C_Cpp.autoAddFileAssociations": false,
         "C_Cpp.clang_format_fallbackStyle": "none",
         "C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true,
@@ -19,6 +20,7 @@
         "cmakeExplorer.buildDir": "${workspaceFolder}/build/px4_sitl_test",
         "cmakeExplorer.parallelJobs": 1,
         "cmakeExplorer.suiteDelimiter": "-",
+        "cortex-debug.enableTelemetry": false,
         "cSpell.allowCompoundWords": true,
         "cSpell.diagnosticLevel": "Hint",
         "cSpell.showStatus": false,
@@ -29,6 +31,7 @@
         ],
         "debug.toolBarLocation": "docked",
         "editor.defaultFormatter": "chiehyu.vscode-astyle",
+        "editor.dragAndDrop": false,
         "editor.insertSpaces": false,
         "editor.minimap.maxColumn": 120,
         "editor.minimap.renderCharacters": false,
@@ -116,16 +119,20 @@
                 "utility": "cpp",
                 "valarray": "cpp",
                 "variant": "cpp",
-                "vector": "cpp",
-                "Jenkinsfile*": "groovy",
-                "*.sdf": "xml"
+                "vector": "cpp"
         },
         "search.exclude": {
                 "${workspaceFolder}/build": true
         },
         "search.showLineNumbers": true,
-        "terminal.integrated.scrollback": 15000,
+        "telemetry.enableTelemetry": false,
+        "terminal.integrated.scrollback": 5000,
+        "window.title": "${dirty} ${activeEditorMedium}${separator}${rootName}",
+        "workbench.editor.highlightModifiedTabs": true,
+        "workbench.enableExperiments": false,
+        "workbench.settings.enableNaturalLanguageSearch": false,
         "yaml.schemas": {
                 "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
-        }
+        },
+        "cortex-debug.openocdPath": "${env:PICO_SDK_PATH}/../openocd/src/openocd"       // Added for rp2040
 }

.vscode/tasks.json

@@ -49,6 +49,49 @@
                 "group": "test"
             }
         },
+        {
+            "label": "jmavsim build",
+            "type": "shell",
+            "command": "ant create_run_jar copy_res",
+            "options": {
+                "cwd": "${workspaceFolder}/Tools/simulation/jmavsim/jMAVSim"
+            },
+            "presentation": {
+                "echo": true,
+                "reveal": "never",
+                "revealProblems": "onProblem",
+                "focus": false,
+                "panel": "dedicated",
+                "showReuseMessage": false,
+                "clear": false,
+                "close": true
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "jmavsim",
+            "type": "shell",
+            "dependsOn": "jmavsim build",
+            "command": "java -Djava.ext.dirs= -jar jmavsim_run.jar -r 250 -lockstep -tcp localhost:4560 -qgc",
+            "options": {
+                "cwd": "${workspaceFolder}/Tools/simulation/jmavsim/jMAVSim/out/production",
+                "env": {
+                    "PX4_SIM_SPEED_FACTOR": "1"
+                }
+            },
+            "isBackground": true,
+            "presentation": {
+                "echo": true,
+                "reveal": "never",
+                "revealProblems": "onProblem",
+                "focus": false,
+                "panel": "dedicated",
+                "showReuseMessage": false,
+                "clear": false,
+                "close": true
+            },
+            "problemMatcher": []
+        },
         {
             "label": "jmavsim kill",
             "type": "shell",
@@ -67,9 +110,9 @@
             "dependsOn":["px4_sitl_cleanup"]
         },
         {
-            "label": "gazebo-classic build",
+            "label": "gazebo build",
             "type": "shell",
-            "command": "make px4_sitl_default sitl_gazebo-classic",
+            "command": "make px4_sitl_default sitl_gazebo",
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -86,18 +129,18 @@
             "problemMatcher": [],
         },
         {
-            "label": "gazebo-classic start",
+            "label": "gazebo start",
             "type": "shell",
-            "dependsOn": "gazebo-classic build",
+            "dependsOn": "gazebo build",
             "options": {
                 "cwd": "${workspaceFolder}",
                 "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo-classic",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models",
+                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
+                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/models",
                     "PX4_SIM_SPEED_FACTOR": "1"
                 }
             },
-            "command": "gzserver --verbose ${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/worlds/empty.world",
+            "command": "gzserver --verbose ${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/worlds/empty.world",
             "isBackground": true,
             "presentation": {
                 "echo": true,
@@ -127,58 +170,58 @@
                 }
             ]
         },
-        {
-            "label": "gazebo-classic",
-            "type": "shell",
-            "dependsOn": "gazebo-classic start",
-            "options": {
-                "cwd": "${workspaceFolder}",
-                "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo-classic",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models",
-                    "PX4_SIM_SPEED_FACTOR": "1"
-                }
-            },
-            "command": "gz model --verbose --spawn-file=${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models/iris/iris.sdf --model-name=iris -x 1.01 -y 0.98 -z 0.83",
-            "isBackground": false,
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "revealProblems": "onProblem",
-                "focus": false,
-                "panel": "dedicated",
-                "showReuseMessage": false,
-                "clear": false,
-                "close": true
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
         {
             "label": "gazebo",
             "type": "shell",
+            "dependsOn": "gazebo start",
+            "options": {
+                "cwd": "${workspaceFolder}",
+                "env": {
+                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
+                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/models",
+                    "PX4_SIM_SPEED_FACTOR": "1"
+                }
+            },
+            "command": "gz model --verbose --spawn-file=${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/models/iris/iris.sdf --model-name=iris -x 1.01 -y 0.98 -z 0.83",
+            "isBackground": false,
+            "presentation": {
+                "echo": true,
+                "reveal": "never",
+                "revealProblems": "onProblem",
+                "focus": false,
+                "panel": "dedicated",
+                "showReuseMessage": false,
+                "clear": false,
+                "close": true
+            },
+            "problemMatcher": [
+                {
+                    "pattern": [
+                        {
+                            "regexp": ".",
+                            "file": 1,
+                            "location": 2,
+                            "message": 3
+                        }
+                    ],
+                    "background": {
+                        "activeOnStart": true,
+                        "beginsPattern": ".",
+                        "endsPattern": ".",
+                    }
+                }
+            ]
+        },
+        {
+            "label": "ign gazebo",
+            "type": "shell",
             "options": {
                 "cwd": "${workspaceFolder}",
                 "env": {
                     "IGN_GAZEBO_RESOURCE_PATH": "${workspaceFolder}/Tools/simulation/gz/models",
                 }
             },
-            "command": "gz sim -v 4 -r ${workspaceFolder}/Tools/simulation/gz/worlds/${input:gzWorld}.sdf",
+            "command": "ign gazebo -v 4 -r ${workspaceFolder}/Tools/simulation/gz/worlds/${input:gzWorld}.sdf",
             "isBackground": true,
             "presentation": {
                 "echo": true,
@@ -191,10 +234,10 @@
                 "close": false
             },
             "problemMatcher": [],
-            "dependsOn":["gazebo kill"]
+            "dependsOn":["ign gazebo kill"]
         },
         {
-            "label": "gazebo-classic kill",
+            "label": "gazebo kill",
             "type": "shell",
             "command": "pkill -9 -f gzserver || true",
             "presentation": {
@@ -211,9 +254,9 @@
             "dependsOn":["px4_sitl_cleanup"]
         },
         {
-            "label": "gazebo kill",
+            "label": "ign gazebo kill",
             "type": "shell",
-            "command": "pkill -9 -f 'gz sim' || true",
+            "command": "pkill -9 -f 'ign gazebo' || true",
             "presentation": {
                 "echo": true,
                 "reveal": "never",

CMakeLists.txt

@@ -1,6 +1,6 @@
 ############################################################################
 #
-# Copyright (c) 2017 - 2022 PX4 Development Team. All rights reserved.
+# Copyright (c) 2017 - 2019 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -118,21 +118,7 @@ execute_process(
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
 	)
-
-# git describe to X.Y.Z version
-string(REPLACE "." ";" VERSION_LIST ${PX4_GIT_TAG})
-
-# major version
-list(GET VERSION_LIST 0 PX4_VERSION_MAJOR)
-string(REPLACE "v" "" PX4_VERSION_MAJOR ${PX4_VERSION_MAJOR})
-# minor version
-list(GET VERSION_LIST 1 PX4_VERSION_MINOR)
-# patch version
-list(GET VERSION_LIST 2 PX4_VERSION_PATCH)
-string(REPLACE "-" ";" PX4_VERSION_PATCH ${PX4_VERSION_PATCH})
-list(GET PX4_VERSION_PATCH 0 PX4_VERSION_PATCH)
-
-message(STATUS "PX4 version: ${PX4_GIT_TAG} (${PX4_VERSION_MAJOR}.${PX4_VERSION_MINOR}.${PX4_VERSION_PATCH})")
+message(STATUS "PX4 version: ${PX4_GIT_TAG}")
 
 define_property(GLOBAL PROPERTY PX4_MODULE_LIBRARIES
                  BRIEF_DOCS "PX4 module libs"
@@ -157,17 +143,25 @@ define_property(GLOBAL PROPERTY PX4_SRC_FILES
 # configuration
 #
 
+set(CONFIG "px4_sitl_default" CACHE STRING "desired configuration")
+
 include(px4_add_module)
 set(config_module_list)
 set(config_kernel_list)
 
 # Find Python
-find_package(PythonInterp 3)
-# We have a custom error message to tell users how to install python3.
-if(NOT PYTHONINTERP_FOUND)
-	message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
-		"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
-		"    macOS: brew install python")
+# If using catkin, Python 2 is found since it points
+# to the Python libs installed with the ROS distro
+if (NOT CATKIN_DEVEL_PREFIX)
+	find_package(PythonInterp 3)
+	# We have a custom error message to tell users how to install python3.
+	if (NOT PYTHONINTERP_FOUND)
+		message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
+			"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
+			"    macOS: brew install python")
+	endif()
+else()
+	find_package(PythonInterp REQUIRED)
 endif()
 
 option(PYTHON_COVERAGE "Python code coverage" OFF)
@@ -213,11 +207,6 @@ if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/init.cmake")
 	include(init)
 endif()
 
-#=============================================================================
-# project definition
-#
-project(px4 CXX C ASM)
-
 # CMake build type (Debug Release RelWithDebInfo MinSizeRel Coverage)
 if(NOT CMAKE_BUILD_TYPE)
 	if(${PX4_PLATFORM} STREQUAL "nuttx")
@@ -246,6 +235,11 @@ endif()
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug;Release;RelWithDebInfo;MinSizeRel;Coverage;AddressSanitizer;UndefinedBehaviorSanitizer")
 message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
 
+#=============================================================================
+# project definition
+#
+project(px4 CXX C ASM)
+
 # Check if LTO option and check if toolchain supports it
 if(LTO)
     include(CheckIPOSupported)
@@ -262,9 +256,15 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PX4_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PX4_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PX4_BINARY_DIR})
+# For the catkin build process, unset build of dynamically-linked binaries
+# and do not change CMAKE_RUNTIME_OUTPUT_DIRECTORY
+if (NOT CATKIN_DEVEL_PREFIX)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PX4_BINARY_DIR})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PX4_BINARY_DIR})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PX4_BINARY_DIR})
+else()
+	SET(BUILD_SHARED_LIBS OFF)
+endif()
 
 #=============================================================================
 
@@ -296,10 +296,7 @@ if(${PX4_PLATFORM} STREQUAL "posix")
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 	set(CMAKE_ENABLE_EXPORTS ON)
 
-	if(CMAKE_BUILD_TYPE MATCHES "Coverage")
-		include(coverage)
-	endif()
-
+	include(coverage)
 	include(sanitizers)
 
 	# Define GNU standard installation directories
@@ -312,6 +309,21 @@ endif()
 
 include(ccache)
 
+#=============================================================================
+# find programs and packages
+#
+
+# see if catkin was invoked to build this
+if (CATKIN_DEVEL_PREFIX)
+	message(STATUS "catkin ENABLED")
+	find_package(catkin REQUIRED)
+	if (catkin_FOUND)
+		catkin_package()
+	else()
+		message(FATAL_ERROR "catkin not found")
+	endif()
+endif()
+
 #=============================================================================
 # get chip and chip manufacturer
 #
@@ -438,10 +450,10 @@ add_subdirectory(src/lib/metadata EXCLUDE_FROM_ALL)
 add_subdirectory(src/lib/parameters EXCLUDE_FROM_ALL)
 
 if(${PX4_PLATFORM} STREQUAL "nuttx" AND NOT CONFIG_BUILD_FLAT)
-	target_link_libraries(parameters_interface INTERFACE usr_parameters)
-	target_link_libraries(kernel_parameters_interface INTERFACE parameters)
+target_link_libraries(parameters_interface INTERFACE usr_parameters)
+target_link_libraries(kernel_parameters_interface INTERFACE parameters)
 else()
-	target_link_libraries(parameters_interface INTERFACE parameters)
+target_link_libraries(parameters_interface INTERFACE parameters)
 endif()
 
 # firmware added last to generate the builtin for included modules
@@ -470,20 +482,21 @@ add_custom_command(OUTPUT ${uorb_graph_config}
 add_custom_target(uorb_graph DEPENDS ${uorb_graph_config})
 
 
-include(bloaty)
-
-
 include(doxygen)
 include(metadata)
 include(package)
 
+# print size
+add_custom_target(size
+	COMMAND size $<TARGET_FILE:px4>
+	DEPENDS px4
+	WORKING_DIRECTORY ${PX4_BINARY_DIR}
+	USES_TERMINAL
+	)
+
 # install python requirements using configured python
 add_custom_target(install_python_requirements
 	COMMAND ${PYTHON_EXECUTABLE} -m pip install --requirement ${PX4_SOURCE_DIR}/Tools/setup/requirements.txt
 	DEPENDS ${PX4_SOURCE_DIR}/Tools/setup/requirements.txt
 	USES_TERMINAL
 )
-
-if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/finalize.cmake")
-	include(finalize)
-endif()

Documentation/Doxyfile.in

@@ -829,6 +829,7 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = @CMAKE_SOURCE_DIR@/src/modules/uavcan/libuavcan \
+                         @CMAKE_SOURCE_DIR@/src/modules/micrortps_bridge/micro-CDR \
                          @CMAKE_SOURCE_DIR@/src/examples \
                          @CMAKE_SOURCE_DIR@/src/templates
 

Jenkinsfile

@@ -13,6 +13,76 @@ pipeline {
         }
       }
       parallel {
+        // stage('Catkin build on ROS workspace') {
+        //   agent {
+        //     docker {
+        //       image 'px4io/px4-dev-ros-melodic:2021-08-18'
+        //       args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
+        //     }
+        //   }
+        //   steps {
+        //     sh 'ls -l'
+        //     sh '''#!/bin/bash -l
+        //       echo $0;
+        //       mkdir -p catkin_ws/src;
+        //       cd catkin_ws;
+        //       git -C ${WORKSPACE}/catkin_ws/src/Firmware submodule update --init --recursive --force Tools/simulation/gazebo/sitl_gazebo
+        //       git clone --recursive ${WORKSPACE}/catkin_ws/src/Firmware/Tools/simulation/gazebo/sitl_gazebo src/mavlink_sitl_gazebo;
+        //       git -C ${WORKSPACE}/catkin_ws/src/Firmware fetch --tags;
+        //       source /opt/ros/melodic/setup.bash;
+        //       export PYTHONPATH=/opt/ros/$ROS_DISTRO/lib/python2.7/dist-packages:/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/dist-packages;
+        //       catkin init;
+        //       catkin build -j$(nproc) -l$(nproc);
+        //     '''
+        //     // test if the binary was correctly installed and runs using 'mavros_posix_sitl.launch'
+        //     sh '''#!/bin/bash -l
+        //       echo $0;
+        //       source catkin_ws/devel/setup.bash;
+        //       rostest px4 pub_test.launch;
+        //     '''
+        //   }
+        //   post {
+        //     always {
+        //       sh 'rm -rf catkin_ws'
+        //     }
+        //     failure {
+        //       archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.xml, .ros/**/*.log')
+        //     }
+        //   }
+        //   options {
+        //     checkoutToSubdirectory('catkin_ws/src/Firmware')
+        //   }
+        // }
+
+        stage('Colcon build on ROS2 workspace') {
+          agent {
+            docker {
+              image 'px4io/px4-dev-ros2-foxy:2021-08-18'
+              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
+            }
+          }
+          steps {
+            sh 'ls -l'
+            sh '''#!/bin/bash -l
+              echo $0;
+              unset ROS_DISTRO;
+              mkdir -p colcon_ws/src;
+              cd colcon_ws;
+              git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/simulation/gazebo/sitl_gazebo;
+              git -C ${WORKSPACE}/colcon_ws/src/Firmware fetch --tags;
+              source /opt/ros/foxy/setup.sh;
+              colcon build --event-handlers console_direct+ --symlink-install;
+            '''
+          }
+          post {
+            always {
+              sh 'rm -rf colcon_ws'
+            }
+          }
+          options {
+            checkoutToSubdirectory('colcon_ws/src/Firmware')
+          }
+        }
 
         stage('Airframe') {
           agent {
@@ -79,7 +149,7 @@ pipeline {
             docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
           }
           steps {
-            sh 'mkdir -p build/msg_docs; ./Tools/msg/generate_msg_docs.py -d build/msg_docs'
+            sh 'mkdir -p build/msg_docs; ./msg/tools/generate_msg_docs.py -d build/msg_docs'
             dir('build') {
               archiveArtifacts(artifacts: 'msg_docs/*.md')
               stash includes: 'msg_docs/*.md', name: 'msg_documentation'
@@ -92,36 +162,6 @@ pipeline {
           }
         }
 
-        stage('failsafe docs') {
-          agent {
-            docker { image 'px4io/px4-dev-nuttx-focal:2021-08-18' }
-          }
-          steps {
-            sh '''#!/bin/bash -l
-            echo $0;
-            git clone https://github.com/emscripten-core/emsdk.git _emscripten_sdk;
-            cd _emscripten_sdk;
-            ./emsdk install latest;
-            ./emsdk activate latest;
-            cd ..;
-            . ./_emscripten_sdk/emsdk_env.sh;
-            make failsafe_web;
-            cd build/px4_sitl_default_failsafe_web;
-            mkdir -p failsafe_sim;
-            cp index.* parameters.json failsafe_sim;
-            '''
-            dir('build/px4_sitl_default_failsafe_web') {
-              archiveArtifacts(artifacts: 'failsafe_sim/*')
-              stash includes: 'failsafe_sim/*', name: 'failsafe_sim'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean; git clean -ff -x -d .'
-            }
-          }
-        }
-
         stage('uORB graphs') {
           agent {
             docker {
@@ -163,7 +203,6 @@ pipeline {
             unstash 'metadata_parameters'
             unstash 'metadata_module_documentation'
             unstash 'msg_documentation'
-            unstash 'failsafe_sim'
             unstash 'uorb_graph'
             withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
               sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/PX4-user_guide.git')
@@ -172,7 +211,6 @@ pipeline {
               sh('cp -R modules/*.md PX4-user_guide/en/modules/')
               sh('cp -R graph_*.json PX4-user_guide/.vuepress/public/en/middleware/')
               sh('cp -R msg_docs/*.md PX4-user_guide/en/msg_docs/')
-              sh('cp -R failsafe_sim/* PX4-user_guide/.vuepress/public/en/config/failsafe')
               sh('cd PX4-user_guide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
               sh('cd PX4-user_guide; git push origin main || true')
               sh('rm -rf PX4-user_guide')
@@ -219,6 +257,37 @@ pipeline {
           }
         }
 
+        stage('microRTPS agent') {
+          agent {
+            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+          }
+          steps {
+            sh('export')
+            sh('git fetch --all --tags')
+            sh('make distclean; git clean -ff -x -d .')
+            sh('make px4_sitl_rtps')
+            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
+              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/micrortps_agent.git -b ${BRANCH_NAME}")
+              sh("rm -rf micrortps_agent/src micrortps_agent/idl")
+              sh('cp -R build/px4_sitl_rtps/src/modules/micrortps_bridge/micrortps_agent/* micrortps_agent')
+              sh('cd micrortps_agent; git status; git add src; git commit -a -m "Update microRTPS agent source code `date`" || true')
+              sh('cd micrortps_agent; git push origin ${BRANCH_NAME} || true')
+              sh('cd micrortps_agent; git status; git add idl; git commit -a -m "Update IDL definitions `date`" || true')
+              sh('cd micrortps_agent; git push origin ${BRANCH_NAME} || true')
+              sh('cd micrortps_agent; git status; git add CMakeLists.txt; git commit -a -m "Update CMakeLists.txt `date`" || true')
+              sh('cd micrortps_agent; git push origin ${BRANCH_NAME} || true')
+              sh('rm -rf micrortps_agent')
+            }
+          }
+          when {
+            anyOf {
+              branch 'main'
+              branch 'master' // should be removed, but in case there is something going on...
+              branch 'pr-jenkins' // for testing
+            }
+          }
+        }
+
         stage('PX4 ROS msgs') {
           agent {
             docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
@@ -229,16 +298,66 @@ pipeline {
             withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
               sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
               // 'main' branch
-              sh('rm -f px4_msgs/msg/*.msg')
-              sh('cp msg/*.msg px4_msgs/msg/')
+              sh('./msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
               sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
               sh('cd px4_msgs; git push origin main || true')
+              // 'ros1' branch
+              sh('cd px4_msgs; git checkout ros1')
+              sh('./msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
+              sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
+              sh('cd px4_msgs; git push origin ros1 || true')
               sh('rm -rf px4_msgs')
             }
           }
           when {
             anyOf {
               branch 'main'
+              branch 'master' // should be removed, but in case there is something going on...
+              branch 'pr-jenkins' // for testing
+            }
+          }
+        }
+
+        stage('PX4 ROS2 bridge') {
+          agent {
+            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+          }
+          steps {
+            sh('export')
+            sh('make distclean; git clean -ff -x -d .')
+            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
+              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_ros_com.git -b ${BRANCH_NAME}")
+              // deploy uORB RTPS ID map
+              sh('./msg/tools/uorb_to_ros_urtps_topics.py -i msg/tools/urtps_bridge_topics.yaml -o px4_ros_com/templates/urtps_bridge_topics.yaml')
+              sh('cd px4_ros_com; git status; git add .; git commit -a -m "Update uORB RTPS ID map `date`" || true')
+              sh('cd px4_ros_com; git push origin ${BRANCH_NAME} || true')
+              // deploy uORB RTPS required tools
+              sh('cp msg/tools/uorb_rtps_classifier.py px4_ros_com/scripts/uorb_rtps_classifier.py')
+              sh('cp msg/tools/generate_microRTPS_bridge.py px4_ros_com/scripts/generate_microRTPS_bridge.py')
+              sh('cp msg/tools/px_generate_uorb_topic_files.py px4_ros_com/scripts/px_generate_uorb_topic_files.py')
+              sh('cp msg/tools/px_generate_uorb_topic_helper.py px4_ros_com/scripts/px_generate_uorb_topic_helper.py')
+              // deploy templates
+              sh('cp msg/templates/urtps/microRTPS_agent.cpp.em px4_ros_com/templates/microRTPS_agent.cpp.em')
+              sh('cp msg/templates/urtps/microRTPS_timesync.cpp.em px4_ros_com/templates/microRTPS_timesync.cpp.em')
+              sh('cp msg/templates/urtps/microRTPS_timesync.h.em px4_ros_com/templates/microRTPS_timesync.h.em')
+              sh('cp msg/templates/urtps/microRTPS_transport.cpp px4_ros_com/templates/microRTPS_transport.cpp')
+              sh('cp msg/templates/urtps/microRTPS_transport.h px4_ros_com/templates/microRTPS_transport.h')
+              sh('cp msg/templates/urtps/Publisher.cpp.em px4_ros_com/templates/Publisher.cpp.em')
+              sh('cp msg/templates/urtps/Publisher.h.em px4_ros_com/templates/Publisher.h.em')
+              sh('cp msg/templates/urtps/Subscriber.cpp.em px4_ros_com/templates/Subscriber.cpp.em')
+              sh('cp msg/templates/urtps/Subscriber.h.em px4_ros_com/templates/Subscriber.h.em')
+              sh('cp msg/templates/urtps/RtpsTopics.cpp.em px4_ros_com/templates/RtpsTopics.cpp.em')
+              sh('cp msg/templates/urtps/RtpsTopics.h.em px4_ros_com/templates/RtpsTopics.h.em')
+              sh('cd px4_ros_com; git status; git add .; git commit -a -m "Update uORB RTPS script tools `date`" || true')
+              sh('cd px4_ros_com; git push origin ${BRANCH_NAME} || true')
+              sh('rm -rf px4_msgs')
+            }
+          }
+          when {
+            anyOf {
+              branch 'main'
+              branch 'master' // should be removed, but in case there is something going on...
+              branch 'pr-jenkins' // for testing
             }
           }
         }

Kconfig

@@ -17,8 +17,6 @@ menu "Toolchain"
             bool "posix"
         config PLATFORM_QURT
             bool "qurt"
-        config PLATFORM_ROS2
-            bool "ros2"
     endchoice
 
     config BOARD_PLATFORM
@@ -26,7 +24,6 @@ menu "Toolchain"
         default "nuttx" if PLATFORM_NUTTX
         default "posix" if PLATFORM_POSIX
         default "qurt" if PLATFORM_QURT
-        default "ros2" if PLATFORM_ROS2
 
     config BOARD_LOCKSTEP
         bool "Force enable lockstep"
@@ -40,8 +37,8 @@ menu "Toolchain"
         help
             forces nolockstep behaviour, despite REPLAY env variable
 
-    config BOARD_LINUX_TARGET
-        bool "Linux OS Target"
+    config BOARD_LINUX
+        bool "Linux OS"
         depends on PLATFORM_POSIX
         help
             Board Platform is running the Linux operating system
@@ -73,13 +70,6 @@ menu "Toolchain"
         help
             relative path to the ROMFS root directory
 
-    config BOARD_ROOTFSDIR
-        string "Root directory"
-        depends on PLATFORM_POSIX
-        default "."
-        help
-            Configure the root directory in the file system for PX4 files
-
     config BOARD_IO
         string "IO board name"
         default "px4_io-v2_default"
@@ -181,8 +171,8 @@ menu "Serial ports"
     config BOARD_SERIAL_WIFI
         string "WIFI tty port"
 
-    config BOARD_SERIAL_EXT2
-        string "EXT2 tty port"
+    config BOARD_SERIAL_PPB
+        string "PPB (Pixhawk Payload Bus) tty port"
 endmenu
 
 menu "drivers"
@@ -200,8 +190,3 @@ endmenu
 menu "examples"
 source "src/examples/Kconfig"
 endmenu
-
-menu "platforms"
-depends on PLATFORM_QURT || PLATFORM_POSIX
-source "platforms/common/Kconfig"
-endmenu

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2012 - 2023, PX4 Development Team
+Copyright (c) 2012 - 2022, PX4 Development Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -172,6 +172,11 @@ ifdef PYTHON_EXECUTABLE
 	override CMAKE_ARGS += -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
 endif
 
+# Check if the microRTPS agent is to be built
+ifdef BUILD_MICRORTPS_AGENT
+  override CMAKE_ARGS += -DBUILD_MICRORTPS_AGENT=ON
+endif
+
 # Functions
 # --------------------------------------------------------------------
 # describe how to build a cmake config
@@ -248,7 +253,7 @@ endef
 # Other targets
 # --------------------------------------------------------------------
 
-.PHONY: qgc_firmware px4fmu_firmware misc_qgc_extra_firmware
+.PHONY: qgc_firmware px4fmu_firmware misc_qgc_extra_firmware check_rtps
 
 # QGroundControl flashable NuttX firmware
 qgc_firmware: px4fmu_firmware misc_qgc_extra_firmware
@@ -273,7 +278,15 @@ misc_qgc_extra_firmware: \
 	check_airmind_mindpx-v2_default \
 	sizes
 
-.PHONY: sizes check quick_check uorb_graphs
+# builds with RTPS
+check_rtps: \
+	check_px4_fmu-v3_rtps \
+	check_px4_fmu-v4_rtps \
+	check_px4_fmu-v4pro_rtps \
+	check_px4_sitl_rtps \
+	sizes
+
+.PHONY: sizes check quick_check check_rtps uorb_graphs
 
 sizes:
 	@-find build -name *.elf -type f | xargs size 2> /dev/null || :
@@ -388,17 +401,17 @@ tests_coverage:
 
 
 rostest: px4_sitl_default
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo-classic
+	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
 
 tests_integration: px4_sitl_default
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo-classic
+	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
 	@$(MAKE) --no-print-directory px4_sitl_default mavsdk_tests
 	@"$(SRC_DIR)"/test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 test/mavsdk_tests/configs/sitl.json
 
 tests_integration_coverage:
 	@$(MAKE) clean
 	@$(MAKE) --no-print-directory px4_sitl_default PX4_CMAKE_BUILD_TYPE=Coverage
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo-classic
+	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
 	@$(MAKE) --no-print-directory px4_sitl_default mavsdk_tests
 	@"$(SRC_DIR)"/test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 test/mavsdk_tests/configs/sitl.json
 	@mkdir -p coverage
@@ -408,13 +421,13 @@ tests_mission: rostest
 	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_missions.test
 
 rostest_run: px4_sitl_default
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo-classic
+	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
 	@"$(SRC_DIR)"/test/rostest_px4_run.sh $(TEST_FILE) mission:=$(TEST_MISSION) vehicle:=$(TEST_VEHICLE)
 
 tests_mission_coverage:
 	@$(MAKE) clean
 	@$(MAKE) --no-print-directory px4_sitl_default PX4_CMAKE_BUILD_TYPE=Coverage
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo-classic PX4_CMAKE_BUILD_TYPE=Coverage
+	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo PX4_CMAKE_BUILD_TYPE=Coverage
 	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=VTOL_mission_1 vehicle:=standard_vtol
 	@$(MAKE) --no-print-directory px4_sitl_default generate_coverage
 
@@ -482,14 +495,12 @@ shellcheck_all:
 
 validate_module_configs:
 	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f \
-	-not -path "$(SRC_DIR)/src/lib/mixer_module/*" \
-	-not -path "$(SRC_DIR)/src/modules/microdds_client/dds_topics.yaml" \
-	-not -path "$(SRC_DIR)/src/lib/crypto/libtommath/*" -print0 | \
+	-not -path "$(SRC_DIR)/src/lib/mixer_module/*" -not -path "$(SRC_DIR)/src/lib/crypto/libtommath/*" -print0 | \
 	xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml
 
 # Cleanup
 # --------------------------------------------------------------------
-.PHONY: clean submodulesclean submodulesupdate distclean
+.PHONY: clean submodulesclean submodulesupdate gazeboclean distclean
 
 clean:
 	@[ ! -d "$(SRC_DIR)/build" ] || find "$(SRC_DIR)/build" -mindepth 1 -maxdepth 1 -type d -exec sh -c "echo {}; cmake --build {} -- clean || rm -rf {}" \; # use generated build system to clean, wipe build directory if it fails
@@ -507,7 +518,10 @@ submodulesupdate:
 	@git submodule update --init --recursive --jobs 4
 	@git fetch --all --tags --recurse-submodules=yes --jobs=4
 
-distclean:
+gazeboclean:
+	@rm -rf ~/.gazebo/*
+
+distclean: gazeboclean
 	@git submodule deinit --force $(SRC_DIR)
 	@rm -rf "$(SRC_DIR)/build"
 	@git clean --force -X "$(SRC_DIR)/msg/" "$(SRC_DIR)/platforms/" "$(SRC_DIR)/posix-configs/" "$(SRC_DIR)/ROMFS/" "$(SRC_DIR)/src/" "$(SRC_DIR)/test/" "$(SRC_DIR)/Tools/"
@@ -547,20 +561,17 @@ check_px4: $(call make_list,nuttx,"px4") \
 check_nxp: $(call make_list,nuttx,"nxp") \
 	sizes
 
-# helpers for running olddefconfig (nuttx) and px4_savedefconfig on all boards
-.PHONY: all_oldconfig all_px4_savedefconfig
-all_oldconfig:
-	@for targ in $(ALL_CONFIG_TARGETS); do $(MAKE) $$targ oldconfig; done
+ifneq ($(ROS2_WS_DIR),)
+  ROS2_WS_DIR := $(basename ${ROS2_WS_DIR})
+else
+  ROS2_WS_DIR := ~/colcon_ws
+endif
 
-all_px4_savedefconfig:
-	@for targ in $(ALL_CONFIG_TARGETS); do $(MAKE) $$targ px4_savedefconfig; done
+update_ros2_bridge:
+	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --all
 
-.PHONY: failsafe_web run_failsafe_web_server
-failsafe_web:
-	@if ! command -v emcc; then echo -e "Install emscripten first: https://emscripten.org/docs/getting_started/downloads.html\nAnd source the env: source <path>/emsdk_env.sh"; exit 1; fi
-	@$(MAKE) --no-print-directory px4_sitl_default failsafe_test parameters_xml \
-		PX4_CMAKE_BUILD_TYPE=Release BUILD_DIR_SUFFIX=_failsafe_web \
-		CMAKE_ARGS="-DCMAKE_CXX_COMPILER=em++ -DCMAKE_C_COMPILER=emcc"
-run_failsafe_web_server: failsafe_web
-	@cd build/px4_sitl_default_failsafe_web && \
-		python3 -m http.server
+update_px4_ros_com:
+	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --px4_ros_com
+
+update_px4_msgs:
+	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --px4_msgs

README.md

@@ -4,7 +4,7 @@
 
 [![Nuttx Targets](https://github.com/PX4/PX4-Autopilot/workflows/Nuttx%20Targets/badge.svg)](https://github.com/PX4/PX4-Autopilot/actions?query=workflow%3A%22Nuttx+Targets%22?branch=master) [![SITL Tests](https://github.com/PX4/PX4-Autopilot/workflows/SITL%20Tests/badge.svg?branch=master)](https://github.com/PX4/PX4-Autopilot/actions?query=workflow%3A%22SITL+Tests%22)
 
-[![Discord Shield](https://discordapp.com/api/guilds/1022170275984457759/widget.png?style=shield)](https://discord.gg/dronecode)
+[![Slack](/.github/slack.svg)](https://join.slack.com/t/px4/shared_invite/zt-si4xo5qs-R4baYFmMjlrT4rQK5yUnaA)
 
 This repository holds the [PX4](http://px4.io) flight control solution for drones, with the main applications located in the [src/modules](https://github.com/PX4/PX4-Autopilot/tree/main/src/modules) directory. It also contains the PX4 Drone Middleware Platform, which provides drivers and middleware to run drones.
 
@@ -44,89 +44,81 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://docs.px4.io/main/en/con
 
 ## Maintenance Team
 
-Note: This is the source of truth for the active maintainers of PX4 ecosystem.
+  * Project: Founder
+    * [Lorenz Meier](https://github.com/LorenzMeier)
+  * Architecture
+    * [Daniel Agar](https://github.com/dagar)
+  * [Dev Call](https://github.com/PX4/PX4-Autopilot/labels/devcall)
+    * [Ramon Roche](https://github.com/mrpollo)
+  * Communication Architecture
+    * [Beat Kueng](https://github.com/bkueng)
+    * [Julian Oes](https://github.com/JulianOes)
+  * UI in QGroundControl
+    * [Gus Grubba](https://github.com/dogmaphobic)
+  * [Multicopter Flight Control](https://github.com/PX4/PX4-Autopilot/labels/multicopter)
+    * [Mathieu Bresciani](https://github.com/bresch)
+  * [Multicopter Software Architecture](https://github.com/PX4/PX4-Autopilot/labels/multicopter)
+    * [Matthias Grob](https://github.com/MaEtUgR)
+  * [VTOL Flight Control](https://github.com/PX4/PX4-Autopilot/labels/vtol)
+    * [Roman Bapst](https://github.com/RomanBapst)
+  * [Fixed Wing Flight Control](https://github.com/PX4/PX4-Autopilot/labels/fixedwing)
+    * [Roman Bapst](https://github.com/RomanBapst)
+  * OS / NuttX
+    * [David Sidrane](https://github.com/davids5)
+  * Driver Architecture
+    * [Daniel Agar](https://github.com/dagar)
+  * Commander Architecture
+    * [Julian Oes](https://github.com/julianoes)
+  * [UAVCAN](https://github.com/PX4/PX4-Autopilot/labels/uavcan)
+    * [Daniel Agar](https://github.com/dagar)
+  * [State Estimation](https://github.com/PX4/PX4-Autopilot/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22)
+    * [Paul Riseborough](https://github.com/priseborough)
+  * Vision based navigation and Obstacle Avoidance
+    * [Markus Achtelik](https://github.com/markusachtelik)
+  * RTPS/ROS2 Interface
+    * [Nuno Marques](https://github.com/TSC21)
 
-| Sector | Maintainer |
-|---|---|
-| Founder | [Lorenz Meier](https://github.com/LorenzMeier) |
-| Architecture | [Daniel Agar](https://github.com/dagar) / [Beat Küng](https://github.com/bkueng)|
-| State Estimation | [Mathieu Bresciani](https://github.com/bresch) / [Paul Riseborough](https://github.com/priseborough) |
-| OS/NuttX | [David Sidrane](https://github.com/davids5) |
-| Drivers | [Daniel Agar](https://github.com/dagar) |
-| Simulation | [Jaeyoung Lim](https://github.com/Jaeyoung-Lim) |
-| ROS2 | [Beniamino Pozzan](https://github.com/beniaminopozzan) |
-| Community QnA Call | [Ramon Roche](https://github.com/mrpollo) |
-| [Documentation](https://docs.px4.io/main/en/) | [Hamish Willee](https://github.com/hamishwillee) |
-
-| Vehicle Type | Maintainer |
-|---|---|
-| Multirotor | [Matthias Grob](https://github.com/MaEtUgR) |
-| Fixed Wing | [Thomas Stastny](https://github.com/tstastny) |
-| Hybrid VTOL | [Silvan Fuhrer](https://github.com/sfuhrer) |
-| Boat | x |
-| Rover | x |
-
-See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/PX4-Autopilot/graphs/contributors) (Github). However it may be not up to date.
+See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/PX4-Autopilot/graphs/contributors) (Github).
 
 ## Supported Hardware
 
-Pixhawk standard boards and proprietary boards are shown below (discontinued boards aren't listed).
-
-For the most up to date information, please visit [PX4 user Guide > Autopilot Hardware](https://docs.px4.io/main/en/flight_controller/).
+This repository contains code supporting Pixhawk standard boards (best supported, best tested, recommended choice) and proprietary boards.
 
 ### Pixhawk Standard Boards
+  * FMUv6X and FMUv6U (STM32H7, 2021)
+    * Various vendors will provide FMUv6X and FMUv6U based designs Q3/2021
+  * FMUv5 and FMUv5X (STM32F7, 2019/20)
+    * [Pixhawk 4 (FMUv5)](https://docs.px4.io/main/en/flight_controller/pixhawk4.html)
+    * [Pixhawk 4 mini (FMUv5)](https://docs.px4.io/main/en/flight_controller/pixhawk4_mini.html)
+    * [CUAV V5+ (FMUv5)](https://docs.px4.io/main/en/flight_controller/cuav_v5_plus.html)
+    * [CUAV V5 nano (FMUv5)](https://docs.px4.io/main/en/flight_controller/cuav_v5_nano.html)
+    * [Auterion Skynode (FMUv5X)](https://docs.auterion.com/skynode)
+  * FMUv4 (STM32F4, 2015)
+    * [Pixracer](https://docs.px4.io/main/en/flight_controller/pixracer.html)
+    * [Pixhawk 3 Pro](https://docs.px4.io/main/en/flight_controller/pixhawk3_pro.html)
+  * FMUv3 (STM32F4, 2014)
+    * [Pixhawk 2](https://docs.px4.io/main/en/flight_controller/pixhawk-2.html)
+    * [Pixhawk Mini](https://docs.px4.io/main/en/flight_controller/pixhawk_mini.html)
+    * [CUAV Pixhack v3](https://docs.px4.io/main/en/flight_controller/pixhack_v3.html)
+  * FMUv2 (STM32F4, 2013)
+    * [Pixhawk](https://docs.px4.io/main/en/flight_controller/pixhawk.html)
+    * [Pixfalcon](https://docs.px4.io/main/en/flight_controller/pixfalcon.html)
 
-These boards fully comply with Pixhawk Standard, and are maintained by the PX4-Autopilot maintainers and Dronecode team
+### Manufacturer and Community supported
+  * [Holybro Durandal](https://docs.px4.io/main/en/flight_controller/durandal.html)
+  * [Hex Cube Orange](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_orange.html)
+  * [Hex Cube Yellow](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_yellow.html)
+  * [Airmind MindPX V2.8](http://www.mindpx.net/assets/accessories/UserGuide_MindPX.pdf)
+  * [Airmind MindRacer V1.2](http://mindpx.net/assets/accessories/mindracer_user_guide_v1.2.pdf)
+  * [Bitcraze Crazyflie 2.0](https://docs.px4.io/main/en/complete_vehicles/crazyflie2.html)
+  * [Omnibus F4 SD](https://docs.px4.io/main/en/flight_controller/omnibus_f4_sd.html)
+  * [Holybro Kakute F7](https://docs.px4.io/main/en/flight_controller/kakutef7.html)
+  * [Raspberry PI with Navio 2](https://docs.px4.io/main/en/flight_controller/raspberry_pi_navio2.html)
 
-* FMUv6X and FMUv6C
-  * [CUAV Pixahwk V6X (FMUv6X)](https://docs.px4.io/main/en/flight_controller/cuav_pixhawk_v6x.html)
-  * [Holybro Pixhawk 6X (FMUv6X)](https://docs.px4.io/main/en/flight_controller/pixhawk6x.html)
-  * [Holybro Pixhawk 6C (FMUv6C)](https://docs.px4.io/main/en/flight_controller/pixhawk6c.html)
-  * [Holybro Pix32 v6 (FMUv6C)](https://docs.px4.io/main/en/flight_controller/holybro_pix32_v6.html)
-* FMUv5 and FMUv5X (STM32F7, 2019/20)
-  * [Pixhawk 4 (FMUv5)](https://docs.px4.io/main/en/flight_controller/pixhawk4.html)
-  * [Pixhawk 4 mini (FMUv5)](https://docs.px4.io/main/en/flight_controller/pixhawk4_mini.html)
-  * [CUAV V5+ (FMUv5)](https://docs.px4.io/main/en/flight_controller/cuav_v5_plus.html)
-  * [CUAV V5 nano (FMUv5)](https://docs.px4.io/main/en/flight_controller/cuav_v5_nano.html)
-  * [Auterion Skynode (FMUv5X)](https://docs.auterion.com/avionics/skynode)
-* FMUv4 (STM32F4, 2015)
-  * [Pixracer](https://docs.px4.io/main/en/flight_controller/pixracer.html)
-  * [Pixhawk 3 Pro](https://docs.px4.io/main/en/flight_controller/pixhawk3_pro.html)
-* FMUv3 (STM32F4, 2014)
-  * [Pixhawk 2](https://docs.px4.io/main/en/flight_controller/pixhawk-2.html)
-  * [Pixhawk Mini](https://docs.px4.io/main/en/flight_controller/pixhawk_mini.html)
-  * [CUAV Pixhack v3](https://docs.px4.io/main/en/flight_controller/pixhack_v3.html)
-* FMUv2 (STM32F4, 2013)
-  * [Pixhawk](https://docs.px4.io/main/en/flight_controller/pixhawk.html)
-
-### Manufacturer supported
-
-These boards are maintained to be compatible with PX4-Autopilot by the Manufacturers.
-
-* [ARK Electronics ARKV6X](https://docs.px4.io/main/en/flight_controller/arkv6x.html)
-* [CubePilot Cube Orange+](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_orangeplus.html)
-* [CubePilot Cube Orange](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_orange.html)
-* [CubePilot Cube Yellow](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_yellow.html)
-* [Holybro Durandal](https://docs.px4.io/main/en/flight_controller/durandal.html)
-* [Airmind MindPX V2.8](http://www.mindpx.net/assets/accessories/UserGuide_MindPX.pdf)
-* [Airmind MindRacer V1.2](http://mindpx.net/assets/accessories/mindracer_user_guide_v1.2.pdf)
-* [Holybro Kakute F7](https://docs.px4.io/main/en/flight_controller/kakutef7.html)
-
-### Community supported
-
-These boards don't fully comply industry standards, and thus is solely maintained by the PX4 publc community members.
-
-### Experimental
-
-These boards are nor maintained by PX4 team nor Manufacturer, and is not guaranteed to be compatible with up to date PX4 releases.
-
-* [Raspberry PI with Navio 2](https://docs.px4.io/main/en/flight_controller/raspberry_pi_navio2.html)
-* [Bitcraze Crazyflie 2.0](https://docs.px4.io/main/en/complete_vehicles/crazyflie2.html)
+Additional information about supported hardware can be found in [PX4 user Guide > Autopilot Hardware](https://docs.px4.io/main/en/flight_controller/).
 
 ## Project Roadmap
 
-**Note: Outdated**
-
 A high level project roadmap is available [here](https://github.com/orgs/PX4/projects/25).
 
 ## Project Governance

ROMFS/CMakeLists.txt

@@ -137,6 +137,11 @@ add_custom_command(
 	COMMENT "ROMFS: copying, generating airframes"
 	)
 
+if(EXISTS ${PX4_BOARD_DIR}/extras/${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin)
+	set(BOARD_FIRMWARE_BIN "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
+	configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade @ONLY)
+endif()
+
 # copy extras into ROMFS
 set(extras_dependencies)
 
@@ -203,24 +208,6 @@ endforeach()
 set(OPTIONAL_BOARD_EXTRAS)
 file(GLOB OPTIONAL_BOARD_EXTRAS ${PX4_BOARD_DIR}/extras/*)
 
-# bootloader (optional)
-#  - if systemcmds/bl_update included and board bootloader available then generate rc.board_bootloader_upgrade and copy bootloader binary
-#  - otherwise remove bootloader binary from extras in final ROMFS
-foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
-	file(RELATIVE_PATH extra_file_base_name ${PX4_BOARD_DIR}/extras/ ${board_extra_file})
-	if(${extra_file_base_name} MATCHES "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
-		if(CONFIG_SYSTEMCMDS_BL_UPDATE)
-			# generate rc.board_bootloader_upgrade
-			set(BOARD_FIRMWARE_BIN "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
-			configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade @ONLY)
-		else()
-			# remove bootloader from extras
-			list(REMOVE_ITEM OPTIONAL_BOARD_EXTRAS ${board_extra_file})
-		endif()
-
-	endif()
-endforeach()
-
 foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
 
 	if(EXISTS "${board_extra_file}")

ROMFS/cannode/init.d/rcS

@@ -31,11 +31,6 @@ then
 	set PARAM_FILE /dev/eeeprom0
 fi
 
-if mft query -q -k MTD -s MTD_PARAMETERS -v /mnt/qspi/params
-then
-	set PARAM_FILE /mnt/qspi/params
-fi
-
 #
 # Load parameters.
 #

ROMFS/px4fmu_common/init.d-posix/CMakeLists.txt

@@ -36,6 +36,7 @@ add_subdirectory(airframes)
 px4_add_romfs_files(
 	px4-rc.mavlink
 	px4-rc.params
+	px4-rc.rtps
 	px4-rc.simulator
 	rc.replay
 	rcS

ROMFS/px4fmu_common/init.d-posix/airframes/10017_jmavsim_iris

@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL jMAVSim
-#
-# @type Quadrotor Wide
-#
-# @maintainer Julian Oes <julian@oes.ch>
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-

ROMFS/px4fmu_common/init.d-posix/airframes/10018_gazebo-classic_iris_foggy_lidar

@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (foggy_lidar)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-param set-default EKF2_RNG_A_HMAX 10
-

ROMFS/px4fmu_common/init.d-posix/airframes/10018_iris_foggy_lidar

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (foggy_lidar)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+param set-default EKF2_RNG_A_HMAX 10
+

ROMFS/px4fmu_common/init.d-posix/airframes/10040_quadx

@@ -12,10 +12,6 @@
 PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=quadx}
 
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-
 # disable some checks to allow to fly:
 # - with usb
 param set-default CBRK_USB_CHK 197848
@@ -45,3 +41,4 @@ param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
 
 param set SIH_VEHICLE_TYPE 0
+

ROMFS/px4fmu_common/init.d-posix/airframes/10041_airplane

@@ -11,11 +11,6 @@
 PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=airplane}
 
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 1
-
 # disable some checks to allow to fly:
 # - with usb
 param set-default CBRK_USB_CHK 197848

ROMFS/px4fmu_common/init.d-posix/airframes/10042_xvert

@@ -11,16 +11,10 @@
 PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=xvert}
 
-param set-default EKF2_FUSE_BETA 0 # side slip fusion is currently not supported for tailsitters
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_TYPE 0
 param set-default VT_FW_DIFTHR_EN 1
-param set-default VT_FW_DIFTHR_S_Y 0.3
+param set-default VT_FW_DIFTHR_SC 0.3
 param set-default MPC_MAN_Y_MAX 60
 param set-default MC_PITCH_P 5
 
@@ -55,7 +49,7 @@ param set-default CA_AIRFRAME 4
 
 param set-default CA_ROTOR_COUNT 2
 param set-default CA_ROTOR0_PX 0
-param set-default CA_ROTOR0_PY 1
+param set-default CA_ROTOR0_PY 2
 param set-default CA_ROTOR0_KM 0.05
 param set-default CA_ROTOR1_PX 0
 param set-default CA_ROTOR1_PY -1

ROMFS/px4fmu_common/init.d-posix/airframes/1010_gazebo-classic_iris_opt_flow

@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Optical Flow)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-# EKF2
-param set-default EKF2_AID_MASK 2
-param set-default EKF2_GPS_CTRL 0
-param set-default EKF2_EVP_NOISE 0.05
-param set-default EKF2_EVA_NOISE 0.05
-
-# LPE: Flow-only mode
-param set-default LPE_FUSION 242
-param set-default LPE_FAKE_ORIGIN 1
-
-param set-default MPC_ALT_MODE 2
-
-param set-default SENS_FLOW_ROT 6
-param set-default SENS_FLOW_MINHGT 0.7
-param set-default SENS_FLOW_MAXHGT 3.0
-param set-default SENS_FLOW_MAXR 2.5

ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow

@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Optical Flow)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+# EKF2
+param set-default EKF2_AID_MASK 2
+param set-default EKF2_GPS_CTRL 0
+param set-default EKF2_EVP_NOISE 0.05
+param set-default EKF2_EVA_NOISE 0.05
+
+# LPE: Flow-only mode
+param set-default LPE_FUSION 242
+param set-default LPE_FAKE_ORIGIN 1
+
+param set-default MPC_ALT_MODE 2
+
+param set-default SENS_FLOW_ROT 6
+param set-default SENS_FLOW_MINHGT 0.7
+param set-default SENS_FLOW_MAXHGT 3.0
+param set-default SENS_FLOW_MAXR 2.5

ROMFS/px4fmu_common/init.d-posix/airframes/1011_gazebo-classic_iris_irlock

@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (irlock)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-# enable fusion of landing target velocity
-param set-default LTEST_MODE 1
-param set-default PLD_HACC_RAD 0.1
-param set-default RTL_PLD_MD 2
-
-# Start up Landing Target Estimator module
-landing_target_estimator start

ROMFS/px4fmu_common/init.d-posix/airframes/1011_iris_irlock

@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (irlock)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+# enable fusion of landing target velocity
+param set-default LTEST_MODE 1
+param set-default PLD_HACC_RAD 0.1
+param set-default RTL_PLD_MD 2
+
+# Start up Landing Target Estimator module
+landing_target_estimator start

ROMFS/px4fmu_common/init.d-posix/airframes/1012_gazebo-classic_iris_rplidar

@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (rplidar)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-param set-default LPE_FUSION 242
-

ROMFS/px4fmu_common/init.d-posix/airframes/1012_iris_rplidar

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (rplidar)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+param set-default LPE_FUSION 242
+

ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision

@@ -5,12 +5,11 @@
 # @type Quadrotor Wide
 #
 
-. ${R}etc/init.d-posix/airframes/10016_gazebo-classic_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
-# EKF2: Vision position and heading, no GPS
+# EKF2: Vision position and heading
+param set-default EKF2_AID_MASK 24
 param set-default EKF2_EV_DELAY 5
-param set-default EKF2_EV_CTRL 15
-param set-default EKF2_HGT_REF 3
 param set-default EKF2_GPS_CTRL 0
 
 # LPE: Vision + baro

ROMFS/px4fmu_common/init.d-posix/airframes/1015_gazebo-classic_iris_obs_avoid

@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Obstacle Avoidance)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-param set-default COM_OBS_AVOID 1
-param set-default MPC_XY_CRUISE 5.0
-

ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Obstacle Avoidance)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+param set-default COM_OBS_AVOID 1
+param set-default MPC_XY_CRUISE 5.0
+

ROMFS/px4fmu_common/init.d-posix/airframes/1017_gazebo-classic_iris_opt_flow_mockup

@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Optical Flow)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-# EKF2
-param set-default EKF2_AID_MASK 2
-param set-default EKF2_GPS_CTRL 0
-
-# LPE: Flow-only mode
-param set-default LPE_FUSION 242
-param set-default LPE_FAKE_ORIGIN 1
-
-param set-default MPC_ALT_MODE 2

ROMFS/px4fmu_common/init.d-posix/airframes/1017_iris_opt_flow_mockup

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Optical Flow)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+# EKF2
+param set-default EKF2_AID_MASK 2
+param set-default EKF2_GPS_CTRL 0
+
+# LPE: Flow-only mode
+param set-default LPE_FUSION 242
+param set-default LPE_FAKE_ORIGIN 1
+
+param set-default MPC_ALT_MODE 2

ROMFS/px4fmu_common/init.d-posix/airframes/1018_iris_vision_velocity

@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Vision Velocity)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+# EKF2: Vision velocity and heading
+param set-default EKF2_AID_MASK 272
+param set-default EKF2_EV_DELAY 5
+param set-default EKF2_GPS_CTRL 0

ROMFS/px4fmu_common/init.d-posix/airframes/1019_gazebo-classic_iris_dual_gps

@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Dual GPS)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-# EKF2: Multi GPS blending
-param set-default SENS_GPS_MASK 7

ROMFS/px4fmu_common/init.d-posix/airframes/1019_iris_dual_gps

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Dual GPS)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+# EKF2: Multi GPS blending
+param set-default SENS_GPS_MASK 7

ROMFS/px4fmu_common/init.d-posix/airframes/1030_gazebo-classic_plane

@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
-
-param set-default FW_LND_ANG 8
-
-param set-default NPFG_PERIOD 12
-
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.5
-param set-default FW_PR_I 0.5
-param set-default TRIM_PITCH -0.15
-
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_P 0.3
-param set-default FW_RR_I 0.5
-
-param set-default FW_YR_FF 0.5
-param set-default FW_YR_P 0.6
-param set-default FW_YR_I 0.5
-
-param set-default FW_SPOILERS_LND 0.4
-
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_TRIM 0.25
-
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default FW_W_EN 1
-
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-param set-default PWM_MAIN_FUNC3 204
-param set-default PWM_MAIN_FUNC4 205
-param set-default PWM_MAIN_FUNC5 101
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-param set-default PWM_MAIN_FUNC9 206
-param set-default PWM_MAIN_REV 256
-
-

ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# @name Plane SITL with catapult
+# @name Plane SITL
 #
 
 . ${R}etc/init.d/rc.fw_defaults
@@ -11,7 +11,7 @@ param set-default EKF2_MAG_YAWLIM 0
 param set-default FW_LND_AIRSPD_SC 1
 param set-default FW_LND_ANG 8
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 
 param set-default FW_PR_P 0.9
 param set-default FW_PR_FF 0.5
@@ -74,5 +74,4 @@ param set-default PWM_MAIN_FUNC8 203
 param set-default PWM_MAIN_FUNC9 206
 param set-default PWM_MAIN_REV 256
 
-param set-default RWTO_TKOFF 0
 

ROMFS/px4fmu_common/init.d-posix/airframes/1031_gazebo-classic_plane_cam

@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with camera
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
-
-param set-default FW_LND_AIRSPD_SC 1
-param set-default FW_LND_ANG 8
-
-param set-default NPFG_PERIOD 12
-
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.5
-param set-default FW_PR_I 0.5
-param set-default TRIM_PITCH -0.15
-
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_P 0.3
-param set-default FW_RR_I 0.5
-
-param set-default FW_YR_FF 0.5
-param set-default FW_YR_P 0.6
-param set-default FW_YR_I 0.5
-
-param set-default FW_SPOILERS_LND 0.4
-
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_TRIM 0.25
-
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default FW_W_EN 1
-
-param set-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-param set-default PWM_MAIN_FUNC3 204
-param set-default PWM_MAIN_FUNC4 205
-param set-default PWM_MAIN_FUNC5 101
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-param set-default PWM_MAIN_FUNC9 206
-param set-default PWM_MAIN_REV 256
-
-# Camera trigger interface is MAVLink
-param set-default TRIG_INTERFACE 3
-
-# Distance trigger mode enabled
-param set-default TRIG_MODE 4

ROMFS/px4fmu_common/init.d-posix/airframes/1031_plane_cam

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# @name Plane SITL with camera
+#
+
+. ${R}etc/init.d-posix/airframes/1030_plane
+
+# Camera trigger interface is MAVLink
+param set-default TRIG_INTERFACE 3
+
+# Distance trigger mode enabled
+param set-default TRIG_MODE 4

ROMFS/px4fmu_common/init.d-posix/airframes/1032_plane_catapult

@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# @name Plane SITL with catapult
+#
+
+. ${R}etc/init.d-posix/airframes/1030_plane
+
+param set-default RWTO_TKOFF 0
+

ROMFS/px4fmu_common/init.d-posix/airframes/1033_rascal

@@ -5,12 +5,13 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default FW_LND_AIRSPD_SC 1.1
 param set-default FW_LND_ANG 5
 param set-default FW_LND_FL_PMIN 9.5
 param set-default FW_LND_FL_PMAX 20
 param set-default FW_LND_FLALT 5
 
-param set-default NPFG_PERIOD 25
+param set-default FW_L1_PERIOD 25
 
 param set-default FW_PR_FF 0.40
 param set-default FW_PR_I 0.05
@@ -23,14 +24,20 @@ param set-default FW_RR_P 0.085
 
 param set-default FW_W_EN 1
 
+param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 20
 param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000
 
 param set-default NAV_ACC_RAD 15
 param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
+
+param set-default RWTO_MAX_PITCH 20
+
 param set-default RWTO_PSP 8
+param set-default RWTO_AIRSPD_SCL 1.8
 
 param set-default CA_AIRFRAME 1
 

ROMFS/px4fmu_common/init.d-posix/airframes/1034_flightgear_rascal-electric

@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default FW_LND_ANG 5
-param set-default FW_LND_FL_PMIN 9.5
-param set-default FW_LND_FL_PMAX 20
-param set-default FW_LND_FLALT 5
-
-param set-default NPFG_PERIOD 25
-
-param set-default FW_PR_FF 0.40
-param set-default FW_PR_I 0.05
-param set-default FW_PR_P 0.05
-
-param set-default FW_R_TC 0.45
-param set-default FW_RR_FF 0.40
-param set-default FW_RR_I 0.132
-param set-default FW_RR_P 0.085
-
-param set-default FW_W_EN 1
-
-param set-default MIS_TAKEOFF_ALT 20
-param set-default MIS_DIST_1WP 2500
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-param set-default RWTO_PSP 8
-
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-param set-default PWM_MAIN_FUNC3 204
-param set-default PWM_MAIN_FUNC4 205
-param set-default PWM_MAIN_FUNC5 101
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-param set-default PWM_MAIN_FUNC9 206
-param set-default PWM_MAIN_REV 256

ROMFS/px4fmu_common/init.d-posix/airframes/1034_rascal-electric

@@ -5,12 +5,13 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default FW_LND_AIRSPD_SC 1.1
 param set-default FW_LND_ANG 5
 param set-default FW_LND_FL_PMIN 9.5
 param set-default FW_LND_FL_PMAX 20
 param set-default FW_LND_FLALT 5
 
-param set-default NPFG_PERIOD 25
+param set-default FW_L1_PERIOD 25
 
 param set-default FW_PR_FF 0.40
 param set-default FW_PR_I 0.05
@@ -23,14 +24,20 @@ param set-default FW_RR_P 0.085
 
 param set-default FW_W_EN 1
 
+param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 20
 param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000
 
 param set-default NAV_ACC_RAD 15
 param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
+
+param set-default RWTO_MAX_PITCH 20
+
 param set-default RWTO_PSP 8
+param set-default RWTO_AIRSPD_SCL 1.8
 
 param set-default CA_AIRFRAME 1
 

ROMFS/px4fmu_common/init.d-posix/airframes/1035_techpod

@@ -8,8 +8,11 @@
 param set-default EKF2_MAG_ACCLIM 0
 param set-default EKF2_MAG_YAWLIM 0
 
+param set-default FW_LND_AIRSPD_SC 1
 param set-default FW_LND_ANG 8
 
+param set-default FW_L1_PERIOD 15
+
 param set-default FW_P_TC 0.5
 param set-default FW_PR_FF 0.40
 param set-default FW_PR_I 0.05
@@ -20,10 +23,11 @@ param set-default FW_RR_FF 0.20
 param set-default FW_RR_I 0.02
 param set-default FW_RR_P 0.22
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 
 param set-default FW_W_EN 1
 
+param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 30
 
 param set-default NAV_ACC_RAD 15

ROMFS/px4fmu_common/init.d-posix/airframes/1036_malolo

@@ -11,7 +11,7 @@ param set-default FW_LND_FL_PMIN 9.5
 param set-default FW_LND_FL_PMAX 20
 param set-default FW_LND_FLALT 5
 
-param set-default NPFG_PERIOD 25
+param set-default FW_L1_PERIOD 25
 
 param set-default FW_PR_FF 0.40
 param set-default FW_PR_I 0.05
@@ -27,14 +27,13 @@ param set-default FW_W_EN 1
 param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 20
 param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000
 
 param set-default NAV_ACC_RAD 15
 param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
-
 param set-default RWTO_MAX_PITCH 20
-
 param set-default RWTO_PSP 8
 param set-default RWTO_AIRSPD_SCL 1.8
 
@@ -62,3 +61,4 @@ param set-default PWM_MAIN_FUNC7 202
 param set-default PWM_MAIN_FUNC8 203
 param set-default PWM_MAIN_FUNC9 206
 param set-default PWM_MAIN_REV 256
+

ROMFS/px4fmu_common/init.d-posix/airframes/1037_believer

@@ -8,9 +8,10 @@
 param set-default EKF2_MAG_ACCLIM 0
 param set-default EKF2_MAG_YAWLIM 0
 
+param set-default FW_LND_AIRSPD_SC 1
 param set-default FW_LND_ANG 8
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 
 param set-default FW_PR_P 0.9
 param set-default FW_PR_FF 0.2
@@ -33,11 +34,14 @@ param set-default FW_T_TAS_TC 2
 
 param set-default FW_W_EN 1
 
+param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 30
 
 param set-default NAV_ACC_RAD 15
 param set-default NAV_DLL_ACT 2
 
+param set-default FW_USE_NPFG 1
+
 param set-default RWTO_TKOFF 1
 
 param set-default CA_AIRFRAME 1

ROMFS/px4fmu_common/init.d-posix/airframes/1038_gazebo-classic_glider

@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with catapult
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
-
-param set-default FW_LND_AIRSPD_SC 1
-param set-default FW_LND_ANG 8
-
-param set-default NPFG_PERIOD 12
-
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.5
-param set-default FW_PR_I 0.5
-param set-default TRIM_PITCH -0.15
-
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_P 0.3
-param set-default FW_RR_I 0.5
-
-param set-default FW_YR_FF 0.5
-param set-default FW_YR_P 0.6
-param set-default FW_YR_I 0.5
-
-param set-default FW_SPOILERS_LND 0.4
-
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_TRIM 0.25
-
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default FW_W_EN 1
-
-param set-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-param set-default PWM_MAIN_FUNC3 204
-param set-default PWM_MAIN_FUNC4 205
-param set-default PWM_MAIN_FUNC5 101
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-param set-default PWM_MAIN_FUNC9 206
-param set-default PWM_MAIN_REV 256
-
-param set-default FW_THR_TRIM 0.0
-param set-default RWTO_TKOFF 0

ROMFS/px4fmu_common/init.d-posix/airframes/1038_glider

@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# @name Plane SITL with catapult
+#
+
+. ${R}etc/init.d-posix/airframes/1030_plane
+
+param set-default FW_THR_TRIM 0.0
+param set-default RWTO_TKOFF 0

ROMFS/px4fmu_common/init.d-posix/airframes/1039_advanced_plane

@@ -8,10 +8,11 @@
 param set-default EKF2_MAG_ACCLIM 0
 param set-default EKF2_MAG_YAWLIM 0
 
+param set-default FW_LND_AIRSPD_SC 1
 param set-default FW_LND_ANG 8
 param set-default FW_THR_LND_MAX 0
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 
 param set-default FW_MAN_P_MAX 30
 
@@ -30,6 +31,7 @@ param set-default FW_T_SINK_MIN 2.2
 
 param set-default FW_W_EN 1
 
+param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 30
 
 param set-default NAV_ACC_RAD 15

ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol

@@ -47,7 +47,7 @@ param set-default PWM_MAIN_FUNC6 201
 param set-default PWM_MAIN_FUNC7 202
 param set-default PWM_MAIN_FUNC8 203
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 param set-default FW_PR_FF 0.2
 param set-default FW_PR_P 0.9
 param set-default FW_PSP_OFF 2

ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter

@@ -9,13 +9,11 @@
 
 param set-default MAV_TYPE 20
 
-param set-default EKF2_FUSE_BETA 0 # side slip fusion is currently not supported for tailsitters
-
 param set-default CA_AIRFRAME 4
 
 param set-default CA_ROTOR_COUNT 4
 param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
+param set-default CA_ROTOR0_PY 2
 param set-default CA_ROTOR0_KM 0.05
 param set-default CA_ROTOR1_PX -1
 param set-default CA_ROTOR1_PY -1
@@ -44,7 +42,7 @@ param set-default PWM_MAIN_FUNC6 201
 param set-default PWM_MAIN_FUNC7 202
 param set-default PWM_MAIN_REV 96 # invert both elevons
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 param set-default FW_PR_I 0.2
 param set-default FW_PR_P 0.2
 param set-default FW_PSP_OFF 2
@@ -72,7 +70,7 @@ param set-default MPC_XY_VEL_D_ACC 0.1
 param set-default NAV_ACC_RAD 5
 
 param set-default VT_FW_DIFTHR_EN 1
-param set-default VT_FW_DIFTHR_S_Y 0.5
+param set-default VT_FW_DIFTHR_SC 0.5
 param set-default VT_F_TRANS_DUR 1.5
 param set-default VT_F_TRANS_THR 0.7
 param set-default VT_TYPE 0

ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor

@@ -46,7 +46,7 @@ param set-default PWM_MAIN_FUNC7 201
 param set-default PWM_MAIN_FUNC8 202
 param set-default PWM_MAIN_FUNC9 203
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_PERIOD 12
 param set-default FW_PR_FF 0.2
 param set-default FW_PR_P 0.9
 param set-default FW_PSP_OFF 2

ROMFS/px4fmu_common/init.d-posix/airframes/1043_gazebo-classic_standard_vtol_drop

@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# @name Standard VTOL
-#
-# @type Standard VTOL
-#
-
-. ${R}etc/init.d/rc.vtol_defaults
-
-# TODO: Enable motor failure detection when the
-# VTOL no longer reports 0A for all ESCs in SITL
-param set-default FD_ACT_EN 0
-param set-default FD_ACT_MOT_TOUT 500
-
-param set-default CA_AIRFRAME 2
-
-param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-param set-default CA_ROTOR4_AX 1.0
-param set-default CA_ROTOR4_AZ 0.0
-param set-default CA_ROTOR4_PX 0.2
-
-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-
-param set-default NPFG_PERIOD 12
-param set-default FW_PR_FF 0.2
-param set-default FW_PR_P 0.9
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-param set-default FW_RR_FF 0.1
-param set-default FW_RR_P 0.3
-param set-default FW_THR_TRIM 0.25
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default MC_ROLLRATE_P 0.3
-param set-default MC_YAW_P 1.6
-
-param set-default MIS_TAKEOFF_ALT 10
-
-param set-default MPC_ACC_HOR_MAX 2
-param set-default MPC_XY_P 0.8
-param set-default MPC_XY_VEL_P_ACC 3
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_D_ACC 0.1
-
-param set-default NAV_ACC_RAD 5
-
-param set-default VT_FWD_THRUST_EN 4
-param set-default VT_F_TRANS_THR 0.75
-param set-default VT_MOT_ID 1234
-param set-default VT_FW_MOT_OFFID 1234
-param set-default VT_B_TRANS_DUR 8
-param set-default VT_TYPE 2
-
-
-# Gimbal
-param set-default PWM_MAIN_FUNC9 420
-param set-default PWM_MAIN_FUNC10 421
-param set-default PWM_MAIN_FUNC11 422
-
-param set-default RC_MAP_AUX1 8
-param set-default RC_MAP_AUX2 9
-param set-default RC_MAP_AUX3 10
-

ROMFS/px4fmu_common/init.d-posix/airframes/1043_standard_vtol_drop

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# @name Standard VTOL
+#
+# @type Standard VTOL
+#
+
+. ${R}etc/init.d-posix/airframes/1040_standard_vtol
+
+# Gimbal
+param set-default PWM_MAIN_FUNC9 420
+param set-default PWM_MAIN_FUNC10 421
+param set-default PWM_MAIN_FUNC11 422
+
+param set-default RC_MAP_AUX1 8
+param set-default RC_MAP_AUX2 9
+param set-default RC_MAP_AUX3 10
+

ROMFS/px4fmu_common/init.d-posix/airframes/1044_gazebo-classic_plane_lidar

@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with downward facing LIDAR.
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
-
-param set-default FW_LND_AIRSPD_SC 1
-param set-default FW_LND_ANG 8
-
-param set-default NPFG_PERIOD 12
-
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.5
-param set-default FW_PR_I 0.5
-param set-default TRIM_PITCH -0.15
-
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_P 0.3
-param set-default FW_RR_I 0.5
-
-param set-default FW_YR_FF 0.5
-param set-default FW_YR_P 0.6
-param set-default FW_YR_I 0.5
-
-param set-default FW_SPOILERS_LND 0.4
-
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_TRIM 0.25
-
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default FW_W_EN 1
-
-param set-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-param set-default PWM_MAIN_FUNC3 204
-param set-default PWM_MAIN_FUNC4 205
-param set-default PWM_MAIN_FUNC5 101
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-param set-default PWM_MAIN_FUNC9 206
-param set-default PWM_MAIN_REV 256
-
-
-param set-default FW_LND_USETER 1

ROMFS/px4fmu_common/init.d-posix/airframes/1044_plane_lidar

@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# @name Plane SITL with downward facing LIDAR.
+#
+
+. ${R}etc/init.d-posix/airframes/1030_plane
+
+param set-default FW_LND_USETER 1
+

ROMFS/px4fmu_common/init.d-posix/airframes/1060_rover

@@ -18,6 +18,7 @@ param set-default GND_THR_CRUISE 0.3
 param set-default GND_THR_MAX 0.5
 param set-default GND_THR_MIN 0
 
+param set-default MIS_LTRMIN_ALT 0.01
 param set-default MIS_TAKEOFF_ALT 0.01
 param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2

ROMFS/px4fmu_common/init.d-posix/airframes/1061_r1_rover

@@ -18,6 +18,7 @@ param set-default GND_THR_CRUISE 0.3
 param set-default GND_THR_MAX 0.5
 param set-default GND_THR_MIN 0
 
+param set-default MIS_LTRMIN_ALT 0.01
 param set-default MIS_TAKEOFF_ALT 0.01
 param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2

ROMFS/px4fmu_common/init.d-posix/airframes/1062_tf-r1

@@ -25,6 +25,7 @@ param set-default GND_THR_CRUISE 0.3
 param set-default GND_THR_MAX 0.5
 param set-default GND_THR_MIN 0
 
+param set-default MIS_LTRMIN_ALT 0.01
 param set-default MIS_TAKEOFF_ALT 0.01
 param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2

ROMFS/px4fmu_common/init.d-posix/airframes/1070_boat

@@ -18,6 +18,7 @@ param set-default GND_THR_CRUISE 0.85
 param set-default GND_THR_MAX 1
 param set-default GND_THR_MIN 0
 
+param set-default MIS_LTRMIN_ALT 0.01
 param set-default MIS_TAKEOFF_ALT 0.01
 param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2

ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1

@@ -20,6 +20,7 @@ param set-default FW_W_EN 1
 
 param set-default FW_RR_P 0.08
 
+param set-default MIS_LTRMIN_ALT 50
 param set-default MIS_TAKEOFF_ALT 3
 
 param set-default NAV_ACC_RAD 20

ROMFS/px4fmu_common/init.d-posix/airframes/17002_tf-g2

@@ -20,6 +20,7 @@ param set-default FW_W_EN 1
 
 param set-default FW_RR_P 0.08
 
+param set-default MIS_LTRMIN_ALT 50
 param set-default MIS_TAKEOFF_ALT 7
 
 param set-default NAV_ACC_RAD 20

ROMFS/px4fmu_common/init.d-posix/airframes/4001_x500

@@ -11,12 +11,6 @@ PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
 PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500}
 
-param set-default SIM_GZ_EN 1
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-
 param set-default CA_AIRFRAME 0
 param set-default CA_ROTOR_COUNT 4
 
@@ -36,19 +30,19 @@ param set-default CA_ROTOR3_PX -0.13
 param set-default CA_ROTOR3_PY 0.20
 param set-default CA_ROTOR3_KM -0.05
 
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_FUNC2 102
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_FUNC4 104
+param set-default SIM_GZ_FUNC1 101
+param set-default SIM_GZ_FUNC2 102
+param set-default SIM_GZ_FUNC3 103
+param set-default SIM_GZ_FUNC4 104
 
-param set-default SIM_GZ_EC_MIN1 150
-param set-default SIM_GZ_EC_MIN2 150
-param set-default SIM_GZ_EC_MIN3 150
-param set-default SIM_GZ_EC_MIN4 150
+param set-default SIM_GZ_MIN1 150
+param set-default SIM_GZ_MIN2 150
+param set-default SIM_GZ_MIN3 150
+param set-default SIM_GZ_MIN4 150
 
-param set-default SIM_GZ_EC_MAX1 1000
-param set-default SIM_GZ_EC_MAX2 1000
-param set-default SIM_GZ_EC_MAX3 1000
-param set-default SIM_GZ_EC_MAX4 1000
+param set-default SIM_GZ_MAX1 1000
+param set-default SIM_GZ_MAX2 1000
+param set-default SIM_GZ_MAX3 1000
+param set-default SIM_GZ_MAX4 1000
 
 param set-default MPC_THR_HOVER 0.60

ROMFS/px4fmu_common/init.d-posix/airframes/4002_gz_x500_depth

@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo x500 depth
-#
-# @type Quadrotor
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_depth}
-
-param set-default SIM_GZ_EN 1
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-
-param set-default CA_AIRFRAME 0
-param set-default CA_ROTOR_COUNT 4
-
-param set-default CA_ROTOR0_PX 0.13
-param set-default CA_ROTOR0_PY 0.22
-param set-default CA_ROTOR0_KM  0.05
-
-param set-default CA_ROTOR1_PX -0.13
-param set-default CA_ROTOR1_PY -0.20
-param set-default CA_ROTOR1_KM  0.05
-
-param set-default CA_ROTOR2_PX 0.13
-param set-default CA_ROTOR2_PY -0.22
-param set-default CA_ROTOR2_KM -0.05
-
-param set-default CA_ROTOR3_PX -0.13
-param set-default CA_ROTOR3_PY 0.20
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_FUNC2 102
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_FUNC4 104
-
-param set-default SIM_GZ_EC_MIN1 150
-param set-default SIM_GZ_EC_MIN2 150
-param set-default SIM_GZ_EC_MIN3 150
-param set-default SIM_GZ_EC_MIN4 150
-
-param set-default SIM_GZ_EC_MAX1 1000
-param set-default SIM_GZ_EC_MAX2 1000
-param set-default SIM_GZ_EC_MAX3 1000
-param set-default SIM_GZ_EC_MAX4 1000
-
-param set-default MPC_THR_HOVER 0.60

ROMFS/px4fmu_common/init.d-posix/airframes/4003_gz_rc_cessna

@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo rc_cessna
-# @type Fixedwing
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=rc_cessna}
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 1
-
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
-
-param set-default FW_LND_ANG 8
-
-param set-default NPFG_PERIOD 12
-
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.5
-param set-default FW_PR_I 0.5
-param set-default TRIM_PITCH -0.15
-
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_P 0.3
-param set-default FW_RR_I 0.5
-
-param set-default FW_YR_FF 0.5
-param set-default FW_YR_P 0.6
-param set-default FW_YR_I 0.5
-
-param set-default FW_SPOILERS_LND 0.4
-
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_TRIM 0.25
-
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default FW_W_EN 1
-
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-param set-default CA_AIRFRAME 1
-
-param set-default COM_PREARM_MODE 2
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_MIN1 0
-param set-default SIM_GZ_EC_MAX1 1000
-
-param set-default SIM_GZ_SV_FUNC1 201
-param set-default SIM_GZ_SV_FUNC2 202
-param set-default SIM_GZ_SV_FUNC3 203
-param set-default SIM_GZ_SV_FUNC4 204
-param set-default SIM_GZ_SV_FUNC5 205
-param set-default SIM_GZ_SV_FUNC6 206

ROMFS/px4fmu_common/init.d-posix/airframes/4004_gz_standard_vtol

@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# @name Standard VTOL
-#
-# @type Standard VTOL
-#
-
-. ${R}etc/init.d/rc.vtol_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=standard_vtol}
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 1
-
-# TODO: Enable motor failure detection when the
-# VTOL no longer reports 0A for all ESCs in SITL
-param set-default FD_ACT_EN 0
-param set-default FD_ACT_MOT_TOUT 500
-
-param set-default CA_AIRFRAME 2
-
-param set-default COM_PREARM_MODE 2
-
-param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-param set-default CA_ROTOR4_AX 1.0
-param set-default CA_ROTOR4_AZ 0.0
-param set-default CA_ROTOR4_PX 0.2
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_MIN1 10
-param set-default SIM_GZ_EC_MAX1 1500
-param set-default SIM_GZ_EC_FUNC2 102
-param set-default SIM_GZ_EC_MIN2 10
-param set-default SIM_GZ_EC_MAX2 1500
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_MIN3 10
-param set-default SIM_GZ_EC_MAX3 1500
-param set-default SIM_GZ_EC_FUNC4 104
-param set-default SIM_GZ_EC_MIN4 10
-param set-default SIM_GZ_EC_MAX4 1500
-
-param set-default SIM_GZ_EC_FUNC5 105
-param set-default SIM_GZ_EC_MIN5 0
-param set-default SIM_GZ_EC_MAX5 3500
-
-param set-default SIM_GZ_SV_FUNC1 201
-param set-default SIM_GZ_SV_FUNC2 202
-param set-default SIM_GZ_SV_FUNC3 203
-
-param set-default COM_RC_IN_MODE 1
-param set-default ASPD_PRIMARY 1
-
-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1.0
-
-param set-default FW_L1_PERIOD 12
-param set-default FW_PR_FF 0.2
-param set-default FW_PR_P 0.9
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-param set-default FW_RR_FF 0.1
-param set-default FW_RR_P 0.3
-param set-default FW_THR_TRIM 0.25
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default MC_AIRMODE 1
-param set-default MC_ROLLRATE_P 0.3
-param set-default MC_YAW_P 1.6
-
-param set-default MIS_TAKEOFF_ALT 10
-
-param set-default MPC_ACC_HOR_MAX 2
-param set-default MPC_XY_P 0.8
-param set-default MPC_XY_VEL_P_ACC 3
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_D_ACC 0.1
-
-param set-default NAV_ACC_RAD 5
-
-param set-default VT_FWD_THRUST_EN 4
-param set-default VT_F_TRANS_THR 0.75
-param set-default VT_B_TRANS_DUR 8
-param set-default VT_TYPE 2
-param set-default FD_ESCS_EN 0

ROMFS/px4fmu_common/init.d-posix/airframes/4005_gz_x500_vision

@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo x500 vision
-#
-# @type Quadrotor
-#
-
-. ${R}etc/init.d-posix/airframes/4001_gz_x500
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_vision}

ROMFS/px4fmu_common/init.d-posix/airframes/6011_typhoon_h480.post

@@ -1,6 +1,8 @@
 
 mavlink start -x -u 14558 -r 4000 -f -m onboard -o 14530 -p
 
+# shellcheck disable=SC2154
+mavlink stream -r 10 -s MOUNT_ORIENTATION -u $udp_gcs_port_local
 # shellcheck disable=SC2154
 mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_offboard_port_local
 mavlink stream -r 10 -s MOUNT_ORIENTATION -u $udp_offboard_port_local

ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt

@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (c) 2020-2023 PX4 Development Team. All rights reserved.
+#   Copyright (c) 2020 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -32,63 +32,54 @@
 ############################################################################
 
 px4_add_romfs_files(
+	10016_iris
+	10018_iris_foggy_lidar
+	10019_omnicopter
+	10030_px4vision
+	10040_quadx
+	10041_airplane
+	10042_xvert
+	1010_iris_opt_flow
+	1010_iris_opt_flow.post
+	1011_iris_irlock
+	1012_iris_rplidar
+	1013_iris_vision
+	1013_iris_vision.post
+	1015_iris_obs_avoid
+	1015_iris_obs_avoid.post
+	1017_iris_opt_flow_mockup
+	1018_iris_vision_velocity
+	1019_iris_dual_gps
+	1021_uuv_hippocampus
+	1022_uuv_bluerov2_heavy
+	1030_plane
+	1031_plane_cam
+	1032_plane_catapult
+	1033_rascal
+	1034_rascal-electric
+	1035_techpod
+	1036_malolo
+	1037_believer
+	1038_glider
+	1039_advanced_plane
+	1040_standard_vtol
+	1041_tailsitter
+	1042_tiltrotor
+	1043_standard_vtol_drop
+	1044_plane_lidar
+	1060_rover
+	1061_r1_rover
+	1062_tf-r1
+	1070_boat
+	3010_quadrotor_x
+	3011_hexarotor_x
 
-	1010_gazebo-classic_iris_opt_flow
-	1010_gazebo-classic_iris_opt_flow.post
-	1011_gazebo-classic_iris_irlock
-	1012_gazebo-classic_iris_rplidar
-	1013_gazebo-classic_iris_vision
-	1013_gazebo-classic_iris_vision.post
-	1015_gazebo-classic_iris_obs_avoid
-	1015_gazebo-classic_iris_obs_avoid.post
-	1017_gazebo-classic_iris_opt_flow_mockup
-	1019_gazebo-classic_iris_dual_gps
-	1021_gazebo-classic_uuv_hippocampus
-	1022_gazebo-classic_uuv_bluerov2_heavy
-	1030_gazebo-classic_plane
-	1031_gazebo-classic_plane_cam
-	1032_gazebo-classic_plane_catapult
-	1033_jsbsim_rascal
-	1034_flightgear_rascal-electric
-	1035_gazebo-classic_techpod
-	1036_jsbsim_malolo
-	1037_gazebo-classic_believer
-	1038_gazebo-classic_glider
-	1039_gazebo-classic_advanced_plane
-	1040_gazebo-classic_standard_vtol
-	1041_gazebo-classic_tailsitter
-	1042_gazebo-classic_tiltrotor
-	1043_gazebo-classic_standard_vtol_drop
-	1044_gazebo-classic_plane_lidar
-	1060_gazebo-classic_rover
-	1061_gazebo-classic_r1_rover
-	1062_flightgear_tf-r1
-	1070_gazebo-classic_boat
+	4001_x500
 
-	2507_gazebo-classic_cloudship
+	17001_tf-g1
+	17002_tf-g2
+	2507_cloudship
 
-	3010_jsbsim_quadrotor_x
-	3011_jsbsim_hexarotor_x
-
-	4001_gz_x500
-	4002_gz_x500_depth
-	4003_gz_rc_cessna
-	4004_gz_standard_vtol
-	4005_gz_x500_vision
-
-	6011_gazebo-classic_typhoon_h480
-	6011_gazebo-classic_typhoon_h480.post
-
-	10016_gazebo-classic_iris
-	10017_jmavsim_iris
-	10018_gazebo-classic_iris_foggy_lidar
-	10019_gazebo-classic_omnicopter
-	10030_gazebo-classic_px4vision
-
-	10040_sihsim_quadx
-	10041_sihsim_airplane
-	10042_sihsim_xvert
-
-	17001_flightgear_tf-g1
-	17002_flightgear_tf-g2
+	6011_typhoon_h480
+	6011_typhoon_h480.post
 )

ROMFS/px4fmu_common/init.d-posix/px4-rc.mavlink

@@ -3,7 +3,7 @@
 
 udp_offboard_port_local=$((14580+px4_instance))
 udp_offboard_port_remote=$((14540+px4_instance))
-[ "$px4_instance" -gt 9 ] && udp_offboard_port_remote=14549 # use the same ports for more than 10 instances to avoid port overlaps
+[ $px4_instance -gt 9 ] && udp_offboard_port_remote=14549 # use the same ports for more than 10 instances to avoid port overlaps
 udp_onboard_payload_port_local=$((14280+px4_instance))
 udp_onboard_payload_port_remote=$((14030+px4_instance))
 udp_onboard_gimbal_port_local=$((13030+px4_instance))

ROMFS/px4fmu_common/init.d-posix/px4-rc.rtps

@@ -0,0 +1,4 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+micrortps_client start -t UDP -r $((2019+2*px4_instance)) -s $((2020+2*px4_instance))

ROMFS/px4fmu_common/init.d-posix/px4-rc.simulator

@@ -6,188 +6,118 @@ param set-default IMU_INTEG_RATE 250
 
 if [ "$PX4_SIMULATOR" = "sihsim" ] || [ "$(param show -q SYS_AUTOSTART)" -eq "0" ]; then
 
-	echo "INFO  [init] SIH simulator"
-
-	if [ -n "${PX4_HOME_LAT}" ]; then
-		param set SIH_LOC_LAT0 ${PX4_HOME_LAT}
-	fi
-
-	if [ -n "${PX4_HOME_LON}" ]; then
-		param set SIH_LOC_LON0 ${PX4_HOME_LON}
-	fi
-
 	if simulator_sih start; then
 
-		if param compare -s SENS_EN_BAROSIM 1
-		then
-			sensor_baro_sim start
-		fi
-		if param compare -s SENS_EN_GPSSIM 1
-		then
-			sensor_gps_sim start
-		fi
-		if param compare -s SENS_EN_MAGSIM 1
-		then
-			sensor_mag_sim start
-		fi
+		sensor_baro_sim start
+		sensor_gps_sim start
+		sensor_mag_sim start
 
 	else
-		echo "ERROR [init] simulator_sih failed to start"
+		echo "ERROR  [init] simulator_sih failed to start"
 		exit 1
 	fi
 
-elif [ "$PX4_SIMULATOR" = "gz" ] || [ "$(param show -q SIM_GZ_EN)" -eq "1" ]; then
+elif [ "$PX4_SIMULATOR" = "gz" ]; then
 
-	# source generated gz_env.sh for GZ_SIM_RESOURCE_PATH
-	if [ -f ./gz_env.sh ]; then
-		. ./gz_env.sh
-
-	elif [ -f ../gz_env.sh ]; then
-		. ../gz_env.sh
+	# source generated gazebo_env.sh for IGN_GAZEBO_RESOURCE_PATH
+	if [ -f gazebo_env.sh ]; then
+		. ./gazebo_env.sh
+	elif [ -f ../gazebo_env.sh ]; then
+		. ../gazebo_env.sh
 	fi
 
-	# "gz sim" only avaiilable in Garden and later
-	GZ_SIM_VERSIONS=$(gz sim --versions 2>&1)
-	if [ $? -eq 0 ] && [ "${GZ_SIM_VERSIONS}" != "" ]
-	then
-		# "gz sim" from Garden on
-		gz_command="gz"
-		gz_sub_command="sim"
-	else
-		echo "ERROR [init] Gazebo gz please install gz-garden"
-		exit 1
-	fi
-
-	# look for running ${gz_command} gazebo world
-	gz_world=$( ${gz_command} topic -l | grep -m 1 -e "/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
-
-	# shellcheck disable=SC2153
-	if [ -z "${gz_world}" ] && [ -n "${PX4_GZ_WORLDS}" ] && [ -n "${PX4_GZ_WORLD}" ]; then
-
-		echo "INFO  [init] starting gazebo with world: ${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf"
-
-		${gz_command} ${gz_sub_command} --verbose=1 -r -s "${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf" &
-
-		if [ -z "${HEADLESS}" ]; then
-			# HEADLESS not set, starting gui
-			${gz_command} ${gz_sub_command} -g &
+# shellcheck disable=SC2236
+	if [ ! -z $PX4_GZ_VERBOSE ]; then
+		if [ "$PX4_GZ_VERBOSE" -le "4" ] && [ "$PX4_GZ_VERBOSE" -ge "1" ]; then
+			gz_verbose=$PX4_GZ_VERBOSE
+		else
+			gz_verbose=4
+			echo "WARN  [init] PX4_GZ_VERBOSE was passed: $PX4_GZ_VERBOSE, not in range [1,4], defaulting to: $gz_verbose."
 		fi
-
+		echo "INFO  [init] PX4_GZ_VERBOSE set to $gz_verbose."
 	else
-		echo "INFO  [init] gazebo already running world: ${gz_world}"
-		PX4_GZ_WORLD=${gz_world}
+		gz_verbose=1
+		echo "INFO  [init] PX4_GZ_VERBOSE not explicitly set, defaulting to: $gz_verbose."
 	fi
 
-	# start gz_bridge
-	if [ -n "${PX4_GZ_MODEL}" ] && [ -z "${PX4_GZ_MODEL_NAME}" ]; then
-		# model specified, gz_bridge will spawn model
+	gz_world=$( ign topic -l | grep -m 1 -e "/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
+	
+	gz_version_major=$( ign gazebo --versions | sed 's/\..*//g' )
+	gz_version_minor=$( ign gazebo --versions | sed 's/'"${gz_version_major}"\.'//; s/\..*//g' )
+	gz_version_point=$( ign gazebo --versions | sed 's/'"${gz_version_major}"\.'//; s/'"${gz_version_minor}"\.'//')
 
-		if [ -n "${PX4_GZ_MODEL_POSE}" ]; then
+	if [ "$gz_version_major" -gt "6" ] || { [ "$gz_version_major" -eq "6" ] && [ "$gz_version_minor" -gt "12" ]; } || { [ "$gz_version_major" -eq "6" ] && [ "$gz_version_minor" -eq "12" ] && [ "$gz_version_point" -gt "0" ]; }; then
+		echo "INFO  [init] using latest version of MultiCopterMotor plugin."
+	else
+		echo "WARN  [init] using older version of MultiCopterMotor plugin, please update to latest gazebo > 6.12.0."
+		if [ "$PX4_SIM_MODEL" = "x500" ]; then
+			PX4_SIM_MODEL="x500-Legacy"
+			echo "WARN  [init] setting PX4_SIM_MODEL -> $PX4_SIM_MODEL from x500 till gazebo > 6.12.0"
+		fi
+	fi
+
+	if [ -z $gz_world ]; then
+
+		# starting ign gazebo with ${PX4_GZ_WORLD} world
+		echo "INFO  [init] starting ign gazebo"
+# shellcheck disable=SC2153
+		ign gazebo --verbose=$gz_verbose -r -s "${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf" &
+
+		if [ -z $HEADLESS ]; then
+			# HEADLESS not set, starting ign gazebo gui
+			ign gazebo -g &
+		fi
+	else
+		echo "INFO  [init] ign gazebo already running world: $gz_world"
+		PX4_GZ_WORLD=$gz_world
+	fi
+
+# shellcheck disable=SC2236
+	if [ ! -z $PX4_GZ_MODEL ] && [ -z $PX4_GZ_MODEL_NAME ]; then
+
+# shellcheck disable=SC2236
+		if [ ! -z $PX4_GZ_MODEL_POSE ]; then
 			# Clean potential input line formatting.
-			model_pose="$( echo "${PX4_GZ_MODEL_POSE}" | sed -e 's/^[ \t]*//; s/[ \t]*$//; s/,/ /g; s/  / /g; s/ /,/g' )"
+			model_pose="$( echo ${PX4_GZ_MODEL_POSE} | sed -e 's/^[ \t]*//; s/[ \t]*$//; s/,/ /g; s/  / /g; s/ /,/g' )"
 			echo "INFO  [init] PX4_GZ_MODEL_POSE set, spawning at: ${model_pose}"
-
 		else
 			echo "WARN  [init] PX4_GZ_MODEL_POSE not set, spawning at origin."
 			model_pose="0,0,0,0,0,0"
 		fi
-
 		# start gz bridge with pose arg.
-		if gz_bridge start -p "${model_pose}" -m "${PX4_GZ_MODEL}" -w "${PX4_GZ_WORLD}" -i "${px4_instance}"; then
-			if param compare -s SENS_EN_BAROSIM 1
-			then
-				sensor_baro_sim start
-			fi
-			if param compare -s SENS_EN_GPSSIM 1
-			then
-				sensor_gps_sim start
-			fi
-			if param compare -s SENS_EN_MAGSIM 1
-			then
-				sensor_mag_sim start
-			fi
-			if param compare -s SENS_EN_ARSPDSIM 1
-			then
-				sensor_airspeed_sim start
-			fi
-
+		if gz_bridge start -p "${model_pose}"  -m "${PX4_GZ_MODEL}" -w "${PX4_GZ_WORLD}" -i "${px4_instance}"; then
+			sensor_baro_sim start
+			sensor_gps_sim start
+			sensor_mag_sim start
 		else
-			echo "ERROR [init] gz_bridge failed to start"
+			echo "ERROR  [init] ign gazebo failed to start"
 			exit 1
 		fi
-
-	elif [ -n "${PX4_GZ_MODEL_NAME}" ] && [ -z "${PX4_GZ_MODEL}" ]; then
-		# model name specificed, gz_bridge will attach to existing model
-
+	elif [ ! -z $PX4_GZ_MODEL_NAME ] && [ -z $PX4_GZ_MODEL ]; then
 		if gz_bridge start -n "${PX4_GZ_MODEL_NAME}" -w "${PX4_GZ_WORLD}"; then
-			if param compare -s SENS_EN_BAROSIM 1
-			then
-				sensor_baro_sim start
-			fi
-			if param compare -s SENS_EN_GPSSIM 1
-			then
-				sensor_gps_sim start
-			fi
-			if param compare -s SENS_EN_MAGSIM 1
-			then
-				sensor_mag_sim start
-			fi
-			if param compare -s SENS_EN_ARSPDSIM 1
-			then
-				sensor_airspeed_sim start
-			fi
-
+			sensor_baro_sim start
+			sensor_gps_sim start
+			sensor_mag_sim start
 		else
-			echo "ERROR [init] gz_bridge failed to start"
+			echo "ERROR  [init] ign gazebo failed to start"
 			exit 1
 		fi
-
-	elif [ -n "${PX4_SIM_MODEL}" ] && [ -z "${PX4_GZ_MODEL_NAME}" ] && [ -z "${PX4_GZ_MODEL}" ]; then
-
+	elif [ ! -z $PX4_SIM_MODEL ] && [ -z $PX4_GZ_MODEL_NAME ] && [ -z $PX4_GZ_MODEL ]; then
 		echo "WARN  [init] PX4_GZ_MODEL_NAME or PX4_GZ_MODEL not set using PX4_SIM_MODEL."
-
-		if gz_bridge start -m "${PX4_SIM_MODEL#*gz_}" -w "${PX4_GZ_WORLD}" -i "${px4_instance}"; then
-			if param compare -s SENS_EN_BAROSIM 1
-			then
-				sensor_baro_sim start
-			fi
-			if param compare -s SENS_EN_GPSSIM 1
-			then
-				sensor_gps_sim start
-			fi
-			if param compare -s SENS_EN_MAGSIM 1
-			then
-				sensor_mag_sim start
-			fi
-			if param compare -s SENS_EN_ARSPDSIM 1
-			then
-				sensor_airspeed_sim start
-			fi
-
+		if gz_bridge start -m "${PX4_SIM_MODEL}" -w "${PX4_GZ_WORLD}" -i "${px4_instance}"; then
+			sensor_baro_sim start
+			sensor_gps_sim start
+			sensor_mag_sim start
 		else
-			echo "ERROR [init] gz_bridge failed to start"
+			echo "ERROR  [init] ign gazebo failed to start"
 			exit 1
 		fi
 
 	else
-		echo "ERROR [init] failed to pass only PX4_GZ_MODEL_NAME or PX4_GZ_MODEL"
+		echo "ERROR  [init] failed to pass only PX4_GZ_MODEL_NAME or PX4_GZ_MODEL"
 		exit 1
 	fi
 
-elif [ "$PX4_SIM_MODEL" = "jmavsim_iris" ] || [ "$(param show -q SYS_AUTOSTART)" -eq "10017" ]; then
-
-	echo "INFO  [init] jMAVSim simulator"
-
-	if jps | grep -i jmavsim; then
-		kill "$(jps | grep -i jmavsim | awk '{print $1}')" || true
-		sleep 1
-	fi
-
-	param set IMU_INTEG_RATE 250
-	./jmavsim_run.sh -l -r 250 &
-
-	simulator_mavlink start -h localhost $((4560+px4_instance))
-
 else
 	# otherwise start simulator (mavlink) module
 	simulator_tcp_port=$((4560+px4_instance))
@@ -198,16 +128,16 @@ else
 	if [ -z "${PX4_SIM_HOSTNAME}" ]; then
 
 		if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
-			echo "INFO  [init] PX4_SIM_HOSTNAME: localhost"
+			echo "PX4 SIM HOST: localhost"
 			simulator_mavlink start -c $simulator_tcp_port
 		else
-			echo "INFO  [init] PX4_SIM_HOSTNAME: ${PX4_SIM_HOST_ADDR}"
-			simulator_mavlink start -t "${PX4_SIM_HOST_ADDR}" "${simulator_tcp_port}"
+			echo "PX4 SIM HOST: $PX4_SIM_HOST_ADDR"
+			simulator_mavlink start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port
 		fi
 
 	else
-		echo "INFO  [init] PX4_SIM_HOSTNAME: ${PX4_SIM_HOSTNAME}"
-		simulator_mavlink start -h "${PX4_SIM_HOSTNAME}" "${simulator_tcp_port}"
+		echo "PX4 SIM HOST: $PX4_SIM_HOSTNAME"
+		simulator_mavlink start -h $PX4_SIM_HOSTNAME $simulator_tcp_port
 	fi
 
 fi

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -74,7 +74,7 @@ if [ -f $PARAM_FILE ]; then
 	then
 		echo "ERROR [init] param import failed"
 
-		bsondump $PARAM_FILE
+		param dump $PARAM_FILE
 
 		# try to make a backup copy
 		cp $PARAM_FILE param_import_fail.bson
@@ -85,7 +85,7 @@ if [ -f $PARAM_FILE ]; then
 			echo "[init] importing from parameter backup"
 
 			# dump current backup file contents for comparison
-			bsondump $PARAM_BACKUP_FILE
+			param dump $PARAM_BACKUP_FILE
 
 			param import $PARAM_BACKUP_FILE
 
@@ -142,9 +142,7 @@ then
 	param set CAL_GYRO2_ID 1311004 # 1311004: DRV_IMU_DEVTYPE_SIM, BUS: 3, ADDR: 1, TYPE: SIMULATION
 
 	param set CAL_MAG0_ID 197388
-	param set CAL_MAG0_PRIO 50
 	param set CAL_MAG1_ID 197644
-	param set CAL_MAG1_PRIO 50
 
 	param set SENS_BOARD_X_OFF 0.000001
 	param set SENS_DPRES_OFF 0.001
@@ -184,9 +182,6 @@ param set-default SDLOG_DIRS_MAX 7
 param set-default TRIG_INTERFACE 3
 
 param set-default SYS_FAILURE_EN 1
-# Enable low-battery actions by default for (automated) testing. Battery sim
-# does not go below 50% by default, but failure injection can trigger failsafes.
-param set-default COM_LOW_BAT_ACT 2
 
 # Adapt timeout parameters if simulation runs faster or slower than realtime.
 if [ -n "$PX4_SIM_SPEED_FACTOR" ]; then
@@ -264,20 +259,11 @@ fi
 
 navigator start
 
-# Try to start the microdds_client with UDP transport if module exists
-microdds_ns=""
-if [ "$px4_instance" -ne "0" ]
+# Try to start the micrortps_client with UDP transport if module exists
+if px4-micrortps_client status > /dev/null 2>&1
 then
-	# Assign new xrce dds key based on instance number and set default namespace
-	param set XRCE_DDS_KEY ${px4_instance}
-	microdds_ns="-n px4_$px4_instance"
+	. px4-rc.rtps
 fi
-if [ -n "$PX4_MICRODDS_NS" ]
-then
-	# Override namespace if environment variable is defined
-	microdds_ns="-n $PX4_MICRODDS_NS"
-fi
-microdds_client start -t udp -h 127.0.0.1 -p 8888 $microdds_ns
 
 if param greater -s MNT_MODE_IN -1
 then

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -36,7 +36,6 @@ add_subdirectory(airframes)
 px4_add_romfs_files(
 	rc.airship_apps
 	rc.airship_defaults
-	rc.autostart_ext
 	rc.balloon_apps
 	rc.balloon_defaults
 	rc.boat_defaults

ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil

@@ -31,6 +31,7 @@ param set-default MC_PITCH_P 6
 param set-default MC_PITCHRATE_P 0.2
 param set-default MC_ROLL_P 6
 param set-default MC_ROLLRATE_P 0.3
+param set-default MIS_LTRMIN_ALT 10
 param set-default MIS_TAKEOFF_ALT 10
 param set-default MIS_YAW_TMT 10