update spi_led driver.

Some ESCs don't store DShot_cmd_spin_direction_reversed persistently

.ci/Jenkinsfile-compile

@@ -28,7 +28,7 @@ pipeline {
           ]
 
           def base_builds = [
-            target: ["px4_sitl_rtps"],
+            target: ["px4_sitl_default"],
             image: docker_images.base,
             archive: false
           ]
@@ -52,23 +52,29 @@ pipeline {
                      "cuav_x7pro_default",
                      "cubepilot_cubeorange_default",
                      "cubepilot_cubeyellow_default",
+                     "diatone_mamba-f405-mk2_default",
                      "freefly_can-rtk-gps_canbootloader",
                      "freefly_can-rtk-gps_default",
                      "holybro_can-gps-v1_canbootloader",
                      "holybro_can-gps-v1_default",
                      "holybro_durandal-v1_default",
                      "holybro_kakutef7_default",
+                     "holybro_kakuteh7_default",
                      "holybro_pix32v5_default",
-                     "matek_h743-slim",
+                     "matek_gnss-m9n-f4_canbootloader",
+                     "matek_gnss-m9n-f4_default",
+                     "matek_h743-mini_default",
+                     "matek_h743-slim_default",
+                     "matek_h743_default",
                      "modalai_fc-v1_default",
                      "modalai_fc-v1_rtps",
                      "modalai_fc-v2_default",
                      "mro_ctrl-zero-f7_default",
                      "mro_ctrl-zero-f7-oem_default",
-                     "mro_ctrl-zero-h7_default",
-                     "mro_ctrl-zero-h7_rtps",
                      "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",
@@ -83,24 +89,28 @@ pipeline {
                      "nxp_ucans32k146_canbootloader",
                      "nxp_ucans32k146_default",
                      "omnibus_f4sd_default",
-                     "raspberrypi_pico_default",
                      "px4_fmu-v2_default",
                      "px4_fmu-v2_fixedwing",
+                     "px4_fmu-v2_lto",
                      "px4_fmu-v2_multicopter",
                      "px4_fmu-v2_rover",
                      "px4_fmu-v3_default",
                      "px4_fmu-v4_default",
                      "px4_fmu-v4pro_default",
+                     "px4_fmu-v5_cyphal",
                      "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-v5_uavcanv1",
                      "px4_fmu-v5x_default",
+                     "px4_fmu-v6c_default",
                      "px4_fmu-v6u_default",
                      "px4_fmu-v6x_default",
                      "px4_io-v2_default",
+                     "raspberrypi_pico_default",
+                     "sky-drones_smartap-airlink_default",
                      "spracing_h7extreme_default",
                      "uvify_core_default"
             ],

.ci/Jenkinsfile-hardware

@@ -73,10 +73,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/cubepilot_cubeorange_test/cubepilot_cubeorange_test.elf || true'
                 }
               }
@@ -145,10 +143,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/cuav_x7pro_test/cuav_x7pro_test.elf || true'
                 }
               }
@@ -217,10 +213,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 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'
                 }
               }
@@ -288,10 +282,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/px4_fmu-v4_test/px4_fmu-v4_test.elf || true'
                 }
               }
@@ -360,10 +352,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/px4_fmu-v4pro_test/px4_fmu-v4pro_test.elf || true'
                 }
               }
@@ -452,10 +442,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/px4_fmu-v5_debug/px4_fmu-v5_debug.elf || true'
                 }
               }
@@ -536,10 +524,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/px4_fmu-v5_stackcheck/px4_fmu-v5_stackcheck.elf || true'
                 }
               }
@@ -608,10 +594,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/px4_fmu-v5_test/px4_fmu-v5_test.elf || true'
                 }
               }
@@ -680,10 +664,8 @@ pipeline {
                 }
               }
               post {
-                failure {
-                  sh 'cat /tmp/pyserial_spy_file.txt'
-                }
                 always {
+                  sh 'cat /tmp/pyserial_spy_file.txt || true'
                   sh './platforms/nuttx/Debug/jlink_gdb_backtrace_simple.sh build/nxp_fmuk66-v3_test/nxp_fmuk66-v3_test.elf || true'
                 }
               }
@@ -723,18 +705,21 @@ void quickCalibrate() {
 
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "gyro_calibration status || true"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate accel quick"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate accel quick; sleep 1"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_ACC*"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate gyro"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate gyro; sleep 2"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_GYRO*"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate level"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate level; sleep 2"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show SENS*"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate mag quick"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate mag quick; sleep 1"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_MAG*"'
 
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate baro; sleep 5"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_BARO*"'
+
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_*"' // parameters after
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors status"'
 }
@@ -793,7 +778,7 @@ void checkStatus() {
   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 "uavcan status" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb status" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb top -1 -a"'
+  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
@@ -809,7 +794,7 @@ void resetParameters() {
 void runTests() {
 
   // test loading a range of airframes
-  sh './Tools/HIL/test_airframes.sh `find /dev/serial -name *usb-*` 1000 1001 2100 3000 4001 4018 6001 8001 10016'
+  sh './Tools/HIL/test_airframes.sh `find /dev/serial -name *usb-*` 2100 3000 4001 6001 8001 10016'
 
   resetParameters()
 
@@ -824,6 +809,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 "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 "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"'
@@ -862,7 +850,7 @@ void runTests() {
 void printTopics() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /obj"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb top -1 -a"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb top -1 -a" || true'
 
   // these are for casually inspecting the system, output failure doesn't matter
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_armed" || true'
@@ -879,12 +867,15 @@ void printTopics() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener cpuload" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener distance_sensor" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener ekf2_timestamps" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener ekf_gps_drift" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener esc_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_aid_src_fake_pos" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_aid_src_gnss_pos" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_aid_src_gnss_vel" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_attitude" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_baro_bias" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_event_flags" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_global_position" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_gps_status" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovation_test_ratios" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovation_variances" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovations" || true'

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -1,32 +1,34 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Create a report to help us improve
+labels: bug-report
 
 ---
 
-**Describe the bug**
+## Describe the bug
 A clear and concise description of the bug.
 
-**To Reproduce**
+## To Reproduce
 Steps to reproduce the behavior:
 1. Drone switched on '...'
 2. Uploaded mission '....' (attach QGC mission file)
 3. Took off '....'
 4. See error
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Log Files and Screenshots**
+## Log Files and Screenshots
 *Always* provide a link to the flight log file:
 - Download the flight log file from the vehicle ([tutorial](https://docs.px4.io/master/en/getting_started/flight_reporting.html)).
-- Share the link to a log showing the problem on [PX4 Flight Review](http://logs.px4.io/).
+- Upload the log to the [PX4 Flight Review](http://logs.px4.io/)
+- Share the link to the log (Copy and paste the URL of the log)
 
 Add screenshots to help explain your problem.
 
-**Drone (please complete the following information):**
+## Drone (please complete the following information):
 - Describe the type of drone.
 - Photo of the IMU / autopilot setup if possible.
 
-**Additional context**
+## Additional context
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -1,19 +1,20 @@
 ---
 name: 🚀 Feature Request
 about: Suggest an idea for this project
+labels: feature-request
 
 ---
 
 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**
+## 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 ...
 
-**Describe your preferred solution**
+## Describe your preferred solution
 A clear and concise description of what you want to happen.
 
-**Describe possible alternatives**
+## Describe possible alternatives
 A clear and concise description of alternative solutions or features you've considered.
 
-**Additional context**
+## Additional context
 Add any other context or screenshots for the feature request here.

.github/ISSUE_TEMPLATE/3_Support_question.md

@@ -1,10 +1,13 @@
 ---
 name: ⛔ Support Question
-about: See [PX4 Discuss](http://discuss.px4.io/) for questions about using PX4.
+about: See http://discuss.px4.io/ for questions about using PX4.
 
 ---
 
-We use GitHub issues only to discuss PX4 bugs and new features. For
-questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).
+## Attention! Please read the note below
+
+We use GitHub issues only to discuss PX4 bugs and new features.
+
+**For questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).**
 
 Thanks!

.github/ISSUE_TEMPLATE/4_Documentation_issue.md

@@ -1,9 +1,11 @@
 ---
 name: ⛔ Documentation Issue
-about: See https://github.com/PX4/Devguide for documentation issues
+about: See https://github.com/PX4/px4_user_guide for documentation issues
 
 ---
 
-PX4 has dedicated repositories for developer documentation (https://github.com/PX4/Devguide) and user documentation (https://github.com/PX4/px4_user_guide).
+## Attention! Please read the note below
+
+**Please submit the documentation issue to the [User Guide](https://github.com/PX4/px4_user_guide) repository.**
 
 Thanks!

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +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.
+
+## 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...
+
+## 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.
+
+## 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.
+
+## Additional context
+Add any other related context or media.

.github/workflows/compile_nuttx.yml

@@ -20,6 +20,7 @@ jobs:
           ark_can-flow,
           ark_can-gps,
           ark_can-rtk-gps,
+          ark_cannode,
           atl_mantis-edu,
           av_x-v1,
           bitcraze_crazyflie,
@@ -29,12 +30,16 @@ jobs:
           cuav_x7pro,
           cubepilot_cubeorange,
           cubepilot_cubeyellow,
+          diatone_mamba-f405-mk2,
           freefly_can-rtk-gps,
           holybro_can-gps-v1,
           holybro_durandal-v1,
           holybro_kakutef7,
           holybro_kakuteh7,
           holybro_pix32v5,
+          matek_gnss-m9n-f4,
+          matek_h743,
+          matek_h743-mini,
           matek_h743-slim,
           modalai_fc-v1,
           modalai_fc-v2,
@@ -50,15 +55,17 @@ jobs:
           nxp_fmurt1062-v1,
           nxp_ucans32k146,
           omnibus_f4sd,
-          raspberrypi_pico,
           px4_fmu-v2,
           px4_fmu-v3,
           px4_fmu-v4,
           px4_fmu-v4pro,
           px4_fmu-v5,
           px4_fmu-v5x,
+          px4_fmu-v6c,
           px4_fmu-v6u,
           px4_fmu-v6x,
+          raspberrypi_pico,
+          sky-drones_smartap-airlink,
           spracing_h7extreme,
           uvify_core
           ]

.github/workflows/sitl_tests.yml

@@ -29,9 +29,9 @@ jobs:
         token: ${{ secrets.ACCESS_TOKEN }}
 
     - name: Download MAVSDK
-      run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+      run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
     - name: Install MAVSDK
-      run: dpkg -i "mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+      run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
 
     - name: Prepare ccache timestamp
       id: ccache_cache_timestamp

.gitmodules

@@ -36,14 +36,14 @@
 [submodule "Tools/jsbsim_bridge"]
 	path = Tools/jsbsim_bridge
 	url = https://github.com/PX4/px4-jsbsim-bridge.git
-[submodule "src/drivers/uavcan_v1/libcanard"]
-	path = src/drivers/uavcan_v1/libcanard
-	url = https://github.com/UAVCAN/libcanard.git
-[submodule "src/drivers/uavcan_v1/public_regulated_data_types"]
-	path = src/drivers/uavcan_v1/public_regulated_data_types
-	url = https://github.com/UAVCAN/public_regulated_data_types.git
-[submodule "src/drivers/uavcan_v1/legacy_data_types"]
-	path = src/drivers/uavcan_v1/legacy_data_types
+[submodule "src/drivers/cyphal/libcanard"]
+	path = src/drivers/cyphal/libcanard
+	url = https://github.com/opencyphal/libcanard.git
+[submodule "src/drivers/cyphal/public_regulated_data_types"]
+	path = src/drivers/cyphal/public_regulated_data_types
+	url = https://github.com/opencyphal/public_regulated_data_types.git
+[submodule "src/drivers/cyphal/legacy_data_types"]
+	path = src/drivers/cyphal/legacy_data_types
 	url = https://github.com/PX4/public_regulated_data_types.git
 	branch = legacy
 [submodule "src/lib/crypto/monocypher"]
@@ -64,3 +64,6 @@
 	path = src/lib/crypto/libtommath
 	url = https://github.com/PX4/libtommath.git
 	branch = px4
+[submodule "src/modules/microdds_client/Micro-XRCE-DDS-Client"]
+	path = src/modules/microdds_client/Micro-XRCE-DDS-Client
+	url = https://github.com/eProsima/Micro-XRCE-DDS-Client.git

.vscode/.gitignore

@@ -9,3 +9,5 @@ launch.json
 ipch/
 
 browse.vc.db*
+
+*.log

.vscode/cmake-variants.yaml

@@ -31,11 +31,6 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_test
-    px4_ros2_default:
-      short: px4_ros2
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_ros2_default
     px4_io-v2_default:
       short: px4_io-v2
       buildType: MinSizeRel
@@ -126,6 +121,16 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_can-rtk-gps_canbootloader
+    ark_cannode_default:
+      short: ark_cannode_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_cannode_default
+    ark_cannode_canbootloader:
+      short: ark_cannode_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_cannode_canbootloader
     atl_mantis-edu_default:
       short: atl_mantis-edu
       buildType: MinSizeRel
@@ -201,6 +206,16 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: matek_h743-slim_default
+    matek_gnss-m9n-f4_canbootloader:
+      short: matek_gnss-m9n-f4_canbootloader
+      buildType: MiniSizeRel
+      settings:
+        CONFIG: matek_m9nf4can_canbootloader
+    matek_gnss-m9n-f4_default:
+      short: matek_gnss-m9n-f4_default
+      buildType: MiniSizeRel
+      settings:
+        CONFIG: matek_gnss-m9n-f4_default
     modalai_fc-v1_default:
       short: modalai_fc-v1
       buildType: MinSizeRel

.vscode/settings.json

@@ -6,7 +6,7 @@
         "C_Cpp.autoAddFileAssociations": false,
         "C_Cpp.clang_format_fallbackStyle": "none",
         "C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true,
-        "C_Cpp.default.cppStandard": "c++17",
+        "C_Cpp.default.cppStandard": "c++14",
         "C_Cpp.default.cStandard": "c11",
         "C_Cpp.formatting": "Disabled",
         "C_Cpp.intelliSenseEngine": "Default",
@@ -121,14 +121,11 @@
                 "variant": "cpp",
                 "vector": "cpp"
         },
-        "ros.distro": "foxy",
         "search.exclude": {
                 "${workspaceFolder}/build": true
         },
         "search.showLineNumbers": true,
         "telemetry.enableTelemetry": false,
-        "terminal.integrated.copyOnSelection": true,
-        "terminal.integrated.rightClickBehavior": "paste",
         "terminal.integrated.scrollback": 5000,
         "window.title": "${dirty} ${activeEditorMedium}${separator}${rootName}",
         "workbench.editor.highlightModifiedTabs": true,
@@ -137,7 +134,5 @@
         "yaml.schemas": {
                 "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
         },
-        "python.autoComplete.extraPaths": [
-                "/opt/ros/foxy/lib/python3.8/site-packages"
-        ]
+        "cortex-debug.openocdPath": "${env:PICO_SDK_PATH}/../openocd/src/openocd"       // Added for rp2040
 }

CMakeLists.txt

@@ -99,9 +99,7 @@
 #
 #=============================================================================
 
-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
-
-cmake_policy(SET CMP0058 NEW)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
 set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE FILEPATH "PX4 source directory" FORCE)
 set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE FILEPATH "PX4 binary directory" FORCE)
@@ -126,6 +124,12 @@ define_property(GLOBAL PROPERTY PX4_MODULE_LIBRARIES
                  BRIEF_DOCS "PX4 module libs"
                  FULL_DOCS "List of all PX4 module libraries"
                  )
+
+define_property(GLOBAL PROPERTY PX4_KERNEL_MODULE_LIBRARIES
+                 BRIEF_DOCS "PX4 kernel side module libs"
+                 FULL_DOCS "List of all PX4 kernel module libraries"
+                 )
+
 define_property(GLOBAL PROPERTY PX4_MODULE_PATHS
                  BRIEF_DOCS "PX4 module paths"
                  FULL_DOCS "List of paths to all PX4 modules"
@@ -134,40 +138,30 @@ define_property(GLOBAL PROPERTY PX4_SRC_FILES
                  BRIEF_DOCS "src files from all PX4 modules & libs"
                  FULL_DOCS "SRC files from px4_add_{module,library}"
                  )
-define_property(GLOBAL PROPERTY PX4_PUBLICATIONS
-                 BRIEF_DOCS "PX4 publication topics"
-                 FULL_DOCS "List of topics published by PX4 modules"
-                 )
-define_property(GLOBAL PROPERTY PX4_SUBSCRIPTIONS
-                 BRIEF_DOCS "PX4 subscription topics"
-                 FULL_DOCS "List of topics subscribed by PX4 modules"
-                 )
+
 #=============================================================================
 # configuration
 #
 
-# default to px4_ros2_default if building within a ROS2 colcon environment
-if((DEFINED ENV{COLCON_PREFIX_PATH}) AND (DEFINED ENV{ROS_VERSION}))
-	if("$ENV{ROS_VERSION}" MATCHES "2")
-		message(STATUS "ROS_VERSION: $ENV{ROS_VERSION}")
-		set(CONFIG "px4_ros2_default" CACHE STRING "desired configuration") # TODO
-	endif()
-endif()
-
-if(NOT CONFIG)
-	set(CONFIG "px4_sitl_default" CACHE STRING "desired configuration")
-endif()
+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)
@@ -203,6 +197,10 @@ set_property(GLOBAL PROPERTY PX4_MODULE_CONFIG_FILES)
 include(platforms/${PX4_PLATFORM}/cmake/px4_impl_os.cmake)
 list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake)
 
+if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/init.cmake")
+	include(init)
+endif()
+
 # CMake build type (Debug Release RelWithDebInfo MinSizeRel Coverage)
 if(NOT CMAKE_BUILD_TYPE)
 	if(${PX4_PLATFORM} STREQUAL "nuttx")
@@ -236,9 +234,17 @@ message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
 #
 project(px4 CXX C ASM)
 
+# Check if LTO option and check if toolchain supports it
+if(LTO)
+    include(CheckIPOSupported)
+    check_ipo_supported()
+    message(AUTHOR_WARNING "LTO enabled: LTO is highly experimental and should not be used in production")
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif()
+
 set(package-contact "px4users@googlegroups.com")
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
@@ -254,10 +260,6 @@ else()
 	SET(BUILD_SHARED_LIBS OFF)
 endif()
 
-if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/init.cmake")
-	include(init)
-endif()
-
 #=============================================================================
 
 # gold linker - use if available (posix only for now)
@@ -327,13 +329,6 @@ if(NOT PX4_CHIP)
 	message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP")
 endif()
 
-#=============================================================================
-# board cmake init (optional)
-#
-if(EXISTS ${PX4_BOARD_DIR}/cmake/init.cmake)
-	include(${PX4_BOARD_DIR}/cmake/init.cmake)
-endif()
-
 #=============================================================================
 # build flags
 #
@@ -341,6 +336,13 @@ include(px4_add_common_flags)
 px4_add_common_flags()
 px4_os_add_flags()
 
+#=============================================================================
+# board cmake init (optional)
+#
+if(EXISTS ${PX4_BOARD_DIR}/cmake/init.cmake)
+	include(${PX4_BOARD_DIR}/cmake/init.cmake)
+endif()
+
 #=============================================================================
 # message, and airframe generation
 #
@@ -418,17 +420,13 @@ endif()
 # subdirectories
 #
 add_library(parameters_interface INTERFACE)
+add_library(kernel_parameters_interface INTERFACE)
 
 include(px4_add_library)
 add_subdirectory(src/lib EXCLUDE_FROM_ALL)
 
-add_subdirectory(platforms/${PX4_PLATFORM}/src/px4 EXCLUDE_FROM_ALL)
-
-if(${PX4_PLATFORM} MATCHES "ros2") # TODO: fix
-	add_subdirectory(platforms/common/work_queue EXCLUDE_FROM_ALL)
-else()
-	add_subdirectory(platforms EXCLUDE_FROM_ALL)
-endif()
+add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
+add_subdirectory(platforms EXCLUDE_FROM_ALL)
 
 if(EXISTS "${PX4_BOARD_DIR}/CMakeLists.txt")
 	add_subdirectory(${PX4_BOARD_DIR})
@@ -445,131 +443,17 @@ add_subdirectory(src/lib/metadata EXCLUDE_FROM_ALL)
 
 # must be the last module before firmware
 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)
+else()
 target_link_libraries(parameters_interface INTERFACE parameters)
+endif()
 
 # firmware added last to generate the builtin for included modules
 add_subdirectory(platforms/${PX4_PLATFORM})
 
-
-set(PX4_ORB_TOPIC_COUNT 0)
-
-if(${PX4_PLATFORM} MATCHES "ros2") # TODO: fix
-
-	configure_file(${CMAKE_SOURCE_DIR}/build/px4_fmu-v5x_default/uORBTopics.cpp ${CMAKE_BINARY_DIR}/uORBTopics.cpp COPYONLY)
-	configure_file(${CMAKE_SOURCE_DIR}/build/px4_fmu-v5x_default/uORBTopics.hpp ${CMAKE_BINARY_DIR}/uORBTopics.hpp COPYONLY)
-
-	set(PX4_ORB_TOPIC_COUNT 1)
-
-else()
-
-	get_property(publications GLOBAL PROPERTY PX4_PUBLICATIONS)
-	get_property(subscriptions GLOBAL PROPERTY PX4_SUBSCRIPTIONS)
-
-	# TODO: for now combine subsriptions and publications for complete topic list
-	list(APPEND publications ${subscriptions})
-
-	list(SORT publications)
-	list(REMOVE_DUPLICATES publications)
-
-	set(pub_all_topics)
-	set(PX4_MSG_TYPE_ID)
-	set(PX4_MSG_TOPIC_ID)
-	set(PX4_MSG_TOPIC_ID_STRING)
-	set(PX4_MSG_TOPIC_ORB_ID)
-
-	set(PX4_ORB_DECLARE_STR)
-	set(PX4_ORB_DEFINE_STR)
-	set(PX4_ORB_HEADER_INCLUDE_STR)
-
-
-	foreach(pub ${publications})
-		#message(STATUS "pub: ${pub}")
-		string(REPLACE " /" ";" pub ${pub})
-
-		list(GET pub 0 pub_type)
-		list(GET pub 1 pub_topic)
-
-		string(REPLACE "::" ";" pub_type_split ${pub_type})
-		list(GET pub_type_split 2 pub_type_simple_lower)
-
-		# Pascal case to snake case (PubType -> pub_type)
-		string(REGEX REPLACE "(.)([A-Z][a-z]+)" "\\1_\\2" pub_type_simple_lower "${pub_type_simple_lower}")
-		string(REGEX REPLACE "([a-z0-9])([A-Z])" "\\1_\\2" pub_type_simple_lower "${pub_type_simple_lower}")
-		string(TOLOWER "${pub_type_simple_lower}" pub_type_simple_lower)
-
-		#message(STATUS "pub: Type: ${pub_type}, Topic: ${pub_topic} (${pub_type_simple_lower})")
-
-
-
-
-		# pub_type to include path (eg px4::msg::VehicleStatus => px4/msg/vehicle_status.hpp)
-		#  temporary create px4/msg/vehicle_status.hpp which simply includes <uORB/topics/vehicle_status.h>
-
-
-
-
-		list(APPEND pub_all_topics ${pub_topic})
-
-		list(APPEND PX4_MSG_TYPE_ID ${pub_type})
-
-		#list(APPEND PX4_MSG_TOPIC_ID ${pub_topic})
-		set(PX4_MSG_TOPIC_ID "${PX4_MSG_TOPIC_ID}\t${pub_topic},\n")
-		#set(PX4_MSG_TOPIC_ID_STRING "${PX4_MSG_TOPIC_ID_STRING}\t"case ORB_ID::${pub_topic}: return \"${pub_topic}\";"\n")
-		set(PX4_MSG_TOPIC_ORB_ID "${PX4_MSG_TOPIC_ORB_ID}\tORB_ID(${pub_topic}),\n")
-
-		list(APPEND PX4_MSG_TOPIC_ID_STRING
-			"case ORB_ID::${pub_topic}: return \"${pub_topic}\";\n"
-		)
-
-		# PX4_MSG_TYPE_ID
-		# PX4_MSG_TOPIC_ID
-
-		# .h  ORB_DECLARE(actuator_controls_0);
-		# .c  ORB_DEFINE(actuator_controls_0, struct actuator_controls_s, 48, __orb_actuator_controls_fields, static_cast<uint8_t>(ORB_ID::actuator_controls_0));
-
-
-		set(PX4_ORB_DECLARE_STR
-			"${PX4_ORB_DECLARE_STR}ORB_DECLARE(${pub_topic});\n")
-
-		# ORB_DEFINE(actuator_armed, struct actuator_armed_s, 16, __orb_actuator_armed_fields, static_cast<uint8_t>(ORB_ID::actuator_armed));
-		set(PX4_ORB_DEFINE_STR
-			"${PX4_ORB_DEFINE_STR}ORB_DEFINE(${pub_topic}, ${pub_type}, px4_embedded::${pub_type_simple_lower}_s::SIZE_NO_PADDING, px4_embedded::${pub_type_simple_lower}_s::FIELDS, static_cast<uint8_t>(ORB_ID::${pub_topic}));\n")
-
-		set(PX4_ORB_HEADER_INCLUDE_STR
-			"${PX4_ORB_HEADER_INCLUDE_STR}#include <uORB/topics/${pub_type_simple_lower}.h>\n")
-
-		math(EXPR PX4_ORB_TOPIC_COUNT "${PX4_ORB_TOPIC_COUNT}+1")
-
-	endforeach()
-	list(REMOVE_DUPLICATES PX4_MSG_TYPE_ID)
-	#list(REMOVE_DUPLICATES PX4_MSG_TOPIC_ID)
-
-	#message(STATUS "PX4_MSG_TYPE_ID: ${PX4_MSG_TYPE_ID}")
-	#message(STATUS "PX4_MSG_TOPIC_ID: ${PX4_MSG_TOPIC_ID}")
-
-	if(PX4_ORB_TOPIC_COUNT GREATER 0)
-		configure_file(uORBTopics.cpp.in ${CMAKE_BINARY_DIR}/uORBTopics.cpp)
-		configure_file(uORBTopics.hpp.in ${CMAKE_BINARY_DIR}/uORBTopics.hpp)
-	endif()
-
-	# .hpp enum ORB_ID
-	# .cpp struct orb_metadat ORB_ID() array
-
-	foreach(f ${msg_files})
-		#message(STATUS "MSG: ${f}")
-	endforeach()
-endif()
-
-if(PX4_ORB_TOPIC_COUNT GREATER 0)
-	add_library(uorb_msgs ${uorb_headers} ${CMAKE_BINARY_DIR}/uORBTopics.cpp ${CMAKE_BINARY_DIR}/uORBTopics.hpp)
-	add_dependencies(uorb_msgs prebuild_targets uorb_headers)
-endif()
-
-if(${PX4_PLATFORM} MATCHES "ros2") # TODO: fix
-	ament_target_dependencies(uorb_msgs rclcpp std_msgs)
-	rosidl_target_interfaces(uorb_msgs ${PROJECT_NAME} "rosidl_typesupport_cpp")
-endif()
-
 #=============================================================================
 # uORB graph generation: add a custom target 'uorb_graph'
 #
@@ -597,13 +481,17 @@ 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()

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"
@@ -54,6 +51,13 @@ menu "Toolchain"
         string "Architecture"
         default ""
 
+    config BOARD_LTO
+        bool "(EXPERIMENTAL) Link Time Optimization (LTO)"
+        default n
+        help
+            Enables LTO flag in linker
+            Note: Highly EXPERIMENTAL, furthermore make sure you're using a modern compiler GCC 9 or later
+
     config BOARD_FULL_OPTIMIZATION
         bool "Full optmization (O3)"
         default n
@@ -121,6 +125,11 @@ config BOARD_CRYPTO
     help
         Enable PX4 Crypto Support. Select the implementation under drivers
 
+config BOARD_PROTECTED
+    bool "Memory protection"
+    help
+        Enable memory protection via MPU/MMU
+
 menu "Serial ports"
 
     config BOARD_SERIAL_URT6

Makefile

@@ -325,12 +325,13 @@ px4io_update: px4_io-v2_default cubepilot_io-v2_default
 	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5/extras/px4_io-v2_default.bin
 	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5x/extras/px4_io-v2_default.bin
 	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6x/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6c/extras/px4_io-v2_default.bin
 	# cubepilot_io-v2_default
 	cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeorange/extras/cubepilot_io-v2_default.bin
 	cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeyellow/extras/cubepilot_io-v2_default.bin
 	git status
 
-bootloaders_update: cuav_nora_bootloader cuav_x7pro_bootloader cubepilot_cubeorange_bootloader holybro_durandal-v1_bootloader matek_h743-slim_bootloader modalai_fc-v2_bootloader mro_ctrl-zero-h7_bootloader mro_ctrl-zero-h7-oem_bootloader mro_pixracerpro_bootloader px4_fmu-v6u_bootloader px4_fmu-v6x_bootloader
+bootloaders_update: cuav_nora_bootloader cuav_x7pro_bootloader cubepilot_cubeorange_bootloader holybro_durandal-v1_bootloader holybro_kakuteh7_bootloader matek_h743_bootloader matek_h743-mini_bootloader matek_h743-slim_bootloader modalai_fc-v2_bootloader mro_ctrl-zero-classic_bootloader mro_ctrl-zero-h7_bootloader mro_ctrl-zero-h7-oem_bootloader mro_pixracerpro_bootloader px4_fmu-v6c_bootloader px4_fmu-v6u_bootloader px4_fmu-v6x_bootloader
 	git status
 
 .PHONY: coverity_scan
@@ -479,7 +480,7 @@ clang-tidy-quiet: px4_sitl_default-clang
 # TODO: Fix cppcheck errors then try --enable=warning,performance,portability,style,unusedFunction or --enable=all
 cppcheck: px4_sitl_default
 	@mkdir -p "$(SRC_DIR)"/build/cppcheck
-	@cppcheck -i"$(SRC_DIR)"/src/examples --enable=performance --std=c++17 --std=c99 --std=posix --project="$(SRC_DIR)"/build/px4_sitl_default/compile_commands.json --xml-version=2 2> "$(SRC_DIR)"/build/cppcheck/cppcheck-result.xml > /dev/null
+	@cppcheck -i"$(SRC_DIR)"/src/examples --enable=performance --std=c++14 --std=c99 --std=posix --project="$(SRC_DIR)"/build/px4_sitl_default/compile_commands.json --xml-version=2 2> "$(SRC_DIR)"/build/cppcheck/cppcheck-result.xml > /dev/null
 	@cppcheck-htmlreport --source-encoding=ascii --file="$(SRC_DIR)"/build/cppcheck/cppcheck-result.xml --report-dir="$(SRC_DIR)"/build/cppcheck --source-dir="$(SRC_DIR)"/src/
 
 shellcheck_all:

PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-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.
-
-**Describe problem solved by this pull request**
-A clear and concise description of the problem this proposed change will solve.
-E.g. For this use case I ran into...
-
-**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.
-
-**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.
-
-**Additional context**
-Add any other related context or media.

ROMFS/cannode/init.d/rcS

@@ -65,8 +65,11 @@ unset BOARD_RC_DEFAULTS
 #
 # Start system state indicator.
 #
-rgbled start -X -q
-rgbled_ncp5623c start -X -q
+if [ $UCAN146 == none ]
+then
+	rgbled start -X -q
+	rgbled_ncp5623c start -X -q
+fi
 
 #
 # board sensors: rc.sensors
@@ -86,10 +89,16 @@ unset BOARD_RC_SENSORS
 . ${R}etc/init.d/rc.serial
 
 # Check for flow sensor
-if param compare SENS_EN_PX4FLOW 1
+if [ $UCAN146 == none ]
 then
-	px4flow start -X
+	if param compare SENS_EN_PX4FLOW 1
+	then
+		px4flow start -X &
+	fi
 fi
 
-uavcannode start
+if [ $UCAN146 == none ]
+then
+	uavcannode start
+fi
 unset R

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

@@ -10,6 +10,7 @@
 # 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/1020_uuv_generic

@@ -8,8 +8,5 @@
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
-set MAV_TYPE 12
-param set MAV_TYPE ${MAV_TYPE}
-
 set MIXER_FILE etc/mixers-sitl/uuv_x_sitl.main.mix
 set MIXER custom

ROMFS/px4fmu_common/init.d-posix/airframes/1021_uuv_hippocampus

@@ -8,8 +8,5 @@
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
-set MAV_TYPE 12
-param set MAV_TYPE ${MAV_TYPE}
-
 set MIXER_FILE etc/mixers-sitl/uuv_x_sitl.main.mix
 set MIXER custom

ROMFS/px4fmu_common/init.d-posix/airframes/1022_uuv_bluerov2_heavy

@@ -67,4 +67,3 @@ param set-default PWM_MAIN_FUNC7 107
 param set-default PWM_MAIN_FUNC8 108
 
 set MIXER skip
-

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

@@ -25,6 +25,8 @@ 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_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_CRUISE 0.25

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

@@ -44,6 +44,8 @@ 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
 
 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix

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

@@ -7,10 +7,15 @@
 
 . ${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 SYS_CTRL_ALLOC 1
 param set-default CA_AIRFRAME 2
 
-param set-default CA_ROTOR_COUNT 4
+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
@@ -23,6 +28,9 @@ 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
@@ -68,7 +76,6 @@ 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 NAV_LOITER_RAD 80
 
 param set-default VT_FWD_THRUST_EN 4
 param set-default VT_F_TRANS_THR 0.75
@@ -77,7 +84,5 @@ param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_B_TRANS_DUR 8
 param set-default VT_TYPE 2
 
-set MAV_TYPE 22
-
 set MIXER_FILE etc/mixers-sitl/standard_vtol_sitl.main.mix
 set MIXER custom

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

@@ -7,6 +7,8 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 20
+
 # param set-default SYS_CTRL_ALLOC 1
 param set-default CA_AIRFRAME 4
 
@@ -68,7 +70,6 @@ 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 NAV_LOITER_RAD 80
 
 param set-default VT_FW_DIFTHR_EN 1
 param set-default VT_FW_DIFTHR_SC 0.5
@@ -78,7 +79,5 @@ param set-default VT_TYPE 0
 
 param set-default WV_EN 0
 
-set MAV_TYPE 20
-
 set MIXER_FILE etc/mixers-sitl/quad_x_vtol.main.mix
 set MIXER custom

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

@@ -7,7 +7,9 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
-# param set-default SYS_CTRL_ALLOC 1
+param set-default MAV_TYPE 21
+
+param set-default SYS_CTRL_ALLOC 1
 param set-default CA_AIRFRAME 3
 
 param set-default CA_ROTOR_COUNT 4
@@ -25,9 +27,7 @@ param set-default CA_ROTOR3_PY 0.1875
 param set-default CA_ROTOR3_KM -0.05
 
 param set-default CA_ROTOR0_TILT 1
-param set-default CA_ROTOR1_TILT 2
 param set-default CA_ROTOR2_TILT 3
-param set-default CA_ROTOR3_TILT 4
 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
@@ -80,7 +80,6 @@ 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 NAV_LOITER_RAD 80
 
 param set-default VT_B_TRANS_DUR 8
 param set-default VT_FWD_THRUST_EN 4
@@ -88,7 +87,5 @@ param set-default VT_MOT_ID 1234
 param set-default VT_TILT_TRANS 0.6
 param set-default VT_TYPE 1
 
-set MAV_TYPE 21
-
 set MIXER_FILE etc/mixers-sitl/tiltrotor_sitl.main.mix
 set MIXER custom

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

@@ -38,7 +38,6 @@ 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 NAV_LOITER_RAD 80
 
 param set-default VT_FWD_THRUST_EN 4
 param set-default VT_F_TRANS_THR 0.75
@@ -51,7 +50,5 @@ param set-default RC_MAP_AUX1 8
 param set-default RC_MAP_AUX2 9
 param set-default RC_MAP_AUX3 10
 
-set MAV_TYPE 22
-
 set MIXER_FILE etc/mixers-sitl/standard_vtol_sitl.main.mix
 set MIXER custom

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

@@ -37,6 +37,4 @@ param set-default PWM_MAIN_FUNC2 201
 param set-default PWM_MAIN_FUNC6 101
 param set-default PWM_MAIN_FUNC7 101
 
-set MAV_TYPE 10
-
 set MIXER_FILE skip

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

@@ -37,6 +37,4 @@ param set-default PWM_MAIN_FUNC2 101
 param set-default PWM_MAIN_FUNC6 102
 param set-default PWM_MAIN_FUNC7 102
 
-set MAV_TYPE 10
-
 set MIXER_FILE skip

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

@@ -10,6 +10,8 @@
 
 . ${R}etc/init.d/rc.rover_defaults
 
+param set-default MAV_TYPE 10
+
 param set-default GND_L1_DIST 5
 param set-default GND_SP_CTRL_MODE 1
 param set-default GND_SPEED_D 3
@@ -33,6 +35,4 @@ param set-default CBRK_AIRSPD_CHK 162128
 param set-default GND_MAX_ANG 0.6
 param set-default GND_WHEEL_BASE 3.0
 
-set MAV_TYPE 10
-
 set MIXER_FILE etc/mixers-sitl/rover_ackermann_sitl.main.mix

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

@@ -47,6 +47,4 @@ param set-default CA_R_REV 3
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
 
-set MAV_TYPE 11
-
 set MIXER skip

ROMFS/px4fmu_common/init.d-posix/airframes/3011_hexarotor_x

@@ -9,6 +9,8 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+param set-default MAV_TYPE 13
+
 param set-default MC_PITCHRATE_P 0.1
 param set-default MC_PITCHRATE_I 0.05
 param set-default MC_PITCH_P 6.0
@@ -24,6 +26,4 @@ param set-default TRIG_MODE 4
 param set-default MNT_MODE_IN 4
 param set-default MNT_DO_STAB 2
 
-set MAV_TYPE 13
-
 set MIXER hexa_x

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

@@ -7,6 +7,8 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+param set-default MAV_TYPE 13
+
 param set-default MC_PITCHRATE_P 0.0800
 param set-default MC_PITCHRATE_I 0.0400
 param set-default MC_PITCHRATE_D 0.0010
@@ -26,6 +28,4 @@ param set-default MNT_MODE_IN 4
 param set-default MNT_MODE_OUT 2
 param set-default MAV_PROTO_VER 2
 
-set MAV_TYPE 13
-
 set MIXER hexa_x

ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_h480_ctrlalloc

@@ -7,6 +7,8 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+param set-default MAV_TYPE 13
+
 param set-default SYS_CTRL_ALLOC 1
 
 param set-default MC_PITCHRATE_P 0.0800
@@ -58,7 +60,5 @@ param set-default PWM_MAIN_FUNC4 104
 param set-default PWM_MAIN_FUNC5 105
 param set-default PWM_MAIN_FUNC6 106
 
-set MAV_TYPE 13
-
 set MIXER skip
 set MIXER_AUX none

ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_h480_ctrlalloc.post

@@ -1,6 +1,4 @@
 
-mixer append /dev/pwm_output0 etc/mixers/mount_legs.aux.mix
-
 mavlink start -x -u 14558 -r 4000 -f -m onboard -o 14530 -p
 
 # shellcheck disable=SC2154

ROMFS/px4fmu_common/init.d-posix/rc.replay

@@ -10,7 +10,7 @@ fi
 
 if [ ! -f replay_params.txt ]; then
 	echo "Creating $(pwd)/replay_params.txt"
-	ulog_params -i "${replay}" -d ' ' | grep -e '^EKF2' > replay_params.txt
+	ulog_params -i "${replay}" -l ' ' | grep -e '^EKF2' > replay_params.txt
 fi
 
 publisher_rules_file="orb_publisher.rules"
@@ -21,6 +21,7 @@ ignore_others: false
 EOF
 
 param set SDLOG_DIRS_MAX 7
+param set SDLOG_PROFILE 3
 
 # apply all params before ekf starts, as some params cannot be changed after startup
 replay tryapplyparams

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -24,7 +24,6 @@ fi
 
 # initialize script variables
 set IO_PRESENT                  no
-set MAV_TYPE                    none
 set MIXER                       none
 set MIXER_AUX                   none
 set MIXER_FILE                  none
@@ -96,10 +95,9 @@ fi
 
 if param compare SYS_AUTOCONFIG 1
 then
+	# Reset params except Airframe, RC calibration, sensor calibration, flight modes, total flight time, and next flight UUID.
+	param reset_all SYS_AUTOSTART RC* CAL_* COM_FLTMODE* LND_FLIGHT* TC_* COM_FLIGHT*
 	set AUTOCNF yes
-
-	# Wipe out params except RC*, flight modes, total flight time, accel cal, gyro cal, next flight UUID
-	param reset_all SYS_AUTO* RC* COM_FLTMODE* LND_FLIGHT* TC_* CAL_ACC* CAL_GYRO* COM_FLIGHT*
 fi
 
 # multi-instance setup
@@ -197,14 +195,6 @@ fi
 
 . "$autostart_file"
 
-#
-# If autoconfig parameter was set, reset it and save parameters.
-#
-if [ $AUTOCNF = yes ]
-then
-	param set SYS_AUTOCONFIG 0
-fi
-
 # Simulator IMU data provided at 250 Hz
 param set IMU_INTEG_RATE 250
 
@@ -224,6 +214,13 @@ rc_update start
 manual_control start
 sensors start
 commander start
+
+# Configure vehicle type specific parameters.
+# Note: rc.vehicle_setup is the entry point for rc.interface,
+#       rc.fw_apps, rc.mc_apps, rc.rover_apps, and rc.vtol_apps.
+#
+. ${R}etc/init.d/rc.vehicle_setup
+
 navigator start
 
 # Try to start the micrortps_client with UDP transport if module exists
@@ -234,7 +231,7 @@ fi
 
 if param greater -s MNT_MODE_IN -1
 then
-	vmount start
+	gimbal start
 fi
 
 if param greater -s TRIG_MODE 0
@@ -253,12 +250,6 @@ then
 	gyro_calibration start
 fi
 
-# Configure vehicle type specific parameters.
-# Note: rc.vehicle_setup is the entry point for rc.interface,
-#       rc.fw_apps, rc.mc_apps, rc.rover_apps, and rc.vtol_apps.
-#
-. ${R}etc/init.d/rc.vehicle_setup
-
 #user defined mavlink streams for instances can be in PATH
 . px4-rc.mavlink
 

ROMFS/px4fmu_common/init.d/airframes/1000_rc_fw_easystar.hil

@@ -39,8 +39,30 @@ param set-default FW_RR_P 0.3
 
 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 4
+param set-default CA_SV_CS0_TRQ_R 0.5
+param set-default CA_SV_CS0_TYPE 2
+param set-default CA_SV_CS1_TRQ_P 1.0
+param set-default CA_SV_CS1_TYPE 3
+param set-default CA_SV_CS2_TRQ_Y 1.0
+param set-default CA_SV_CS2_TYPE 4
+param set-default CA_SV_CS3_TYPE 10
+
+param set-default HIL_ACT_REV 2
+param set-default HIL_ACT_FUNC1 201
+param set-default HIL_ACT_FUNC2 202
+param set-default HIL_ACT_FUNC3 203
+param set-default HIL_ACT_FUNC4 101
+param set-default HIL_ACT_FUNC5 204
+param set-default HIL_ACT_FUNC6 400
+
 param set SYS_HITL 1
 
+param set UAVCAN_ENABLE 0
+
 # disable some checks to allow to fly
 # - with usb
 param set-default CBRK_USB_CHK 197848

ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d

@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# @name Steadidrone QU4D
-#
-# @type Quadrotor Wide
-# @class Copter
-#
-# @output MAIN1 motor 1
-# @output MAIN2 motor 2
-# @output MAIN3 motor 3
-# @output MAIN4 motor 4
-# @output MAIN5 feed-through of RC AUX1 channel
-# @output MAIN6 feed-through of RC AUX2 channel
-#
-# @output AUX1 feed-through of RC AUX1 channel
-# @output AUX2 feed-through of RC AUX2 channel
-# @output AUX3 feed-through of RC AUX3 channel
-# @output AUX4 feed-through of RC FLAPS channel
-#
-# @maintainer Lorenz Meier <lorenz@px4.io>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default BAT1_N_CELLS 4
-
-param set-default MC_ROLL_P 7
-param set-default MC_ROLLRATE_P 0.13
-param set-default MC_ROLLRATE_I 0.05
-param set-default MC_ROLLRATE_D 0.004
-param set-default MC_PITCH_P 7
-param set-default MC_PITCHRATE_P 0.19
-param set-default MC_PITCHRATE_I 0.05
-param set-default MC_PITCHRATE_D 0.004
-param set-default MC_YAW_P 4
-set MIXER quad_w

ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil

@@ -15,6 +15,25 @@ set MIXER quad_x
 
 param set SYS_HITL 1
 
+param set UAVCAN_ENABLE 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default HIL_ACT_FUNC1 101
+param set-default HIL_ACT_FUNC2 102
+param set-default HIL_ACT_FUNC3 103
+param set-default HIL_ACT_FUNC4 104
+
 # disable some checks to allow to fly
 # - with usb
 param set-default CBRK_USB_CHK 197848

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

@@ -49,7 +49,6 @@ param set-default MPC_Z_VEL_MAX_DN 1.5
 
 param set-default NAV_ACC_RAD 5
 param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 80
 
 param set-default RTL_DESCEND_ALT 10
 param set-default RTL_RETURN_ALT 30
@@ -61,9 +60,42 @@ param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_TYPE 2
 
+param set-default CA_AIRFRAME 2
+param set-default CA_ROTOR_COUNT 5
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+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_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 HIL_ACT_FUNC1 101
+param set-default HIL_ACT_FUNC2 102
+param set-default HIL_ACT_FUNC3 103
+param set-default HIL_ACT_FUNC4 104
+param set-default HIL_ACT_FUNC5 105
+param set-default HIL_ACT_FUNC6 201
+param set-default HIL_ACT_FUNC7 202
+param set-default HIL_ACT_FUNC8 203
+
 
 param set SYS_HITL 1
 
+param set UAVCAN_ENABLE 0
+
 # disable some checks to allow to fly
 # - with usb
 param set-default CBRK_USB_CHK 197848
@@ -73,7 +105,7 @@ param set-default CBRK_SUPPLY_CHK 894281
 param set-default COM_PREARM_MODE 0
 param set-default CBRK_IO_SAFETY 22027
 
-set MAV_TYPE 22
+param set-default MAV_TYPE 22
 
 set MIXER standard_vtol_hitl
 

ROMFS/px4fmu_common/init.d/airframes/1100_rc_quad_x_sih.hil

@@ -17,6 +17,23 @@ set PWM_OUT 1234
 
 param set UAVCAN_ENABLE 0
 
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default HIL_ACT_FUNC1 101
+param set-default HIL_ACT_FUNC2 102
+param set-default HIL_ACT_FUNC3 103
+param set-default HIL_ACT_FUNC4 104
+
 # set SYS_HITL to 2 to start the SIH and avoid sensors startup
 param set SYS_HITL 2
 

ROMFS/px4fmu_common/init.d/airframes/1101_rc_plane_sih.hil

@@ -17,6 +17,26 @@ set PWM_OUT 1234
 
 param set UAVCAN_ENABLE 0
 
+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 4
+param set-default CA_SV_CS0_TRQ_R 0.5
+param set-default CA_SV_CS0_TYPE 2
+param set-default CA_SV_CS1_TRQ_P 1.0
+param set-default CA_SV_CS1_TYPE 3
+param set-default CA_SV_CS2_TRQ_Y 1.0
+param set-default CA_SV_CS2_TYPE 4
+param set-default CA_SV_CS3_TYPE 10
+
+param set-default HIL_ACT_REV 2
+param set-default HIL_ACT_FUNC1 201
+param set-default HIL_ACT_FUNC2 202
+param set-default HIL_ACT_FUNC3 203
+param set-default HIL_ACT_FUNC4 101
+param set-default HIL_ACT_FUNC5 204
+param set-default HIL_ACT_FUNC6 400
+
 # set SYS_HITL to 2 to start the SIH and avoid sensors startup
 param set-default SYS_HITL 2
 

ROMFS/px4fmu_common/init.d/airframes/1102_tailsitter_duo_sih.hil

@@ -26,8 +26,28 @@ param set-default VT_FW_DIFTHR_SC 0.3
 param set-default MPC_MAN_Y_MAX 60
 param set-default MC_PITCH_P 5
 
+param set-default CA_AIRFRAME 4
+param set-default CA_ROTOR_COUNT 2
+param set-default CA_ROTOR0_KM -0.05
+param set-default CA_ROTOR0_PY 0.2
+param set-default CA_ROTOR1_KM -0.05
+param set-default CA_ROTOR1_PY -0.2
+param set-default CA_SV_CS_COUNT 2
+param set-default CA_SV_CS0_TRQ_P 0.3
+param set-default CA_SV_CS0_TRQ_Y 0.3
+param set-default CA_SV_CS0_TYPE 5
+param set-default CA_SV_CS1_TRQ_P 0.3
+param set-default CA_SV_CS1_TRQ_Y -0.3
+param set-default CA_SV_CS1_TYPE 6
+
+param set-default HIL_ACT_FUNC1 101
+param set-default HIL_ACT_FUNC2 102
+param set-default HIL_ACT_FUNC5 202
+param set-default HIL_ACT_FUNC6 201
+param set-default HIL_ACT_REV 32
+
 param set-default MAV_TYPE 19
-set MAV_TYPE 19
+
 set MIXER vtol_tailsitter_duo_sat
 
 set PWM_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik

@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# @name Steadidrone MAVRIK
-#
-# @type Octo Coax Wide
-# @class Copter
-#
-# @output MAIN1 motor 1
-# @output MAIN2 motor 2
-# @output MAIN3 motor 3
-# @output MAIN4 motor 4
-# @output MAIN5 motor 5
-# @output MAIN6 motor 6
-# @output MAIN7 motor 7
-# @output MAIN8 motor 8
-#
-# @maintainer Simon Wilks <simon@uaventure.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-
-param set-default MC_PITCH_P 4
-param set-default MC_PITCHRATE_P 0.24
-param set-default MC_PITCHRATE_I 0.09
-param set-default MC_PITCHRATE_D 0.013
-param set-default MC_PITCHRATE_MAX 180
-
-param set-default MC_ROLL_P 4
-param set-default MC_ROLLRATE_P 0.16
-param set-default MC_ROLLRATE_I 0.07
-param set-default MC_ROLLRATE_D 0.009
-param set-default MC_ROLLRATE_MAX 180
-
-param set-default MC_YAW_P 3
-
-param set-default MPC_HOLD_MAX_XY 0.25
-param set-default MPC_THR_MIN 0.15
-param set-default MPC_Z_VEL_MAX_DN 2
-
-param set-default BAT1_N_CELLS 4
-
-set MIXER octo_cox_w
-
-set PWM_OUT 12345678

ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard

@@ -24,13 +24,38 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default CA_AIRFRAME 2
+param set-default CA_ROTOR_COUNT 5
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+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 4
+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 CA_SV_CS3_TRQ_Y 1.0
+param set-default CA_SV_CS3_TYPE 4
 
 param set-default PWM_AUX_DIS5 950
 
 param set-default VT_TYPE 2
 param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234
-set MAV_TYPE 22
+
+param set-default MAV_TYPE 22
 
 set MIXER quad_x
 set MIXER_AUX vtol_AAERT

ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol

@@ -19,7 +19,6 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
-
 param set-default MAV_TYPE 19
 
 param set-default MC_ROLL_P 6
@@ -38,7 +37,6 @@ param set-default VT_IDLE_PWM_MC  1080
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_MOT_ID 12
 param set-default VT_TYPE 0
-set MAV_TYPE 19
 
 set MIXER vtol_tailsitter_duo
 

ROMFS/px4fmu_common/init.d/airframes/13002_firefly6

@@ -23,6 +23,7 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 21
 
 param set-default MC_ROLL_P 7
 param set-default MC_ROLLRATE_P 0.19
@@ -45,7 +46,6 @@ param set-default VT_TILT_TRANS 0.5
 param set-default VT_TILT_FW 0.9
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_TYPE 1
-set MAV_TYPE 21
 
 set MIXER firefly6
 set MIXER_AUX firefly6

ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter

@@ -13,13 +13,33 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 20
+
+param set-default CA_AIRFRAME 4
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
+param set-default CA_SV_CS_COUNT 2
+param set-default CA_SV_CS0_TRQ_P 0.5
+param set-default CA_SV_CS0_TRQ_Y 0.5
+param set-default CA_SV_CS0_TYPE 5
+param set-default CA_SV_CS1_TRQ_P 0.5
+param set-default CA_SV_CS1_TRQ_Y -0.5
+param set-default CA_SV_CS1_TYPE 6
 
 param set-default PWM_MAIN_MAX 2000
 
 param set-default VT_MOT_ID 1234
 param set-default VT_IDLE_PWM_MC  1080
 param set-default VT_TYPE 0
-set MAV_TYPE 20
 
 set MIXER quad_x_vtol
 

ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter

@@ -7,8 +7,8 @@
 #
 # @output MAIN1 motor 1
 # @output MAIN2 motor 2
-# @output MAIN3 motor 4
-# @output MAIN4 motor 5
+# @output MAIN3 motor 3
+# @output MAIN4 motor 4
 # @output MAIN5 elevon left
 # @output MAIN6 elevon right
 # @output MAIN7 canard surface
@@ -22,13 +22,13 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 20
+
 param set-default PWM_MAIN_MAX 2000
 
 param set-default VT_IDLE_PWM_MC  1080
 param set-default VT_TYPE 0
 
-set MAV_TYPE 20
-
 set MIXER quad_+_vtol
 
 set PWM_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad

@@ -52,7 +52,6 @@ param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_IDLE_PWM_MC 1080
 param set-default VT_TYPE 2
-set MAV_TYPE 22
 
 set MIXER quad_x
 set MIXER_AUX vtol_AAERT

ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta

@@ -41,7 +41,6 @@ param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_F_TRANS_THR 0.75
 param set-default VT_IDLE_PWM_MC 1080
 param set-default VT_TYPE 2
-set MAV_TYPE 22
 
 set MIXER quad_x
 set MIXER_AUX vtol_delta

ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad

@@ -33,7 +33,6 @@ param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_IDLE_PWM_MC 1080
 param set-default VT_TYPE 2
-set MAV_TYPE 22
 
 set MIXER quad_x
 set MIXER_AUX vtol_AAVVT

ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger

@@ -46,7 +46,6 @@ param set-default VT_IDLE_PWM_MC 1080
 param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_TYPE 2
-set MAV_TYPE 22
 
 set MIXER quad_x
 set MIXER_AUX vtol_AAERT

ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger

@@ -77,8 +77,6 @@ param set-default VT_TRANS_MIN_TM 5
 param set-default VT_TRANS_TIMEOUT    30
 param set-default VT_TYPE 2
 
-set MAV_TYPE 22
-
 set MIXER quad_x
 set MIXER_AUX vtol_AAERT
 

ROMFS/px4fmu_common/init.d/airframes/13010_claire

@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# @name CruiseAder Claire
-#
-# @type VTOL Tiltrotor
-# @class VTOL
-#
-# @maintainer Samay Siga <samay_s@icloud.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.vtol_defaults
-
-param set-default PWM_AUX_DISARM 1000
-param set-default PWM_AUX_MAX 2000
-param set-default PWM_AUX_MIN 1000
-param set-default PWM_AUX_RATE 50
-
-param set-default PWM_MAIN_MAX 2000
-
-param set-default VT_MOT_ID 1234
-param set-default VT_FW_MOT_OFFID 13
-param set-default VT_IDLE_PWM_MC 1080
-param set-default VT_TILT_FW 0.9
-param set-default VT_TILT_MC 0.08
-param set-default VT_TILT_TRANS 0.5
-param set-default VT_ELEV_MC_LOCK 0
-param set-default VT_TYPE 1
-set MAV_TYPE 21
-
-set MIXER claire
-set MIXER_AUX claire
-
-set PWM_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/13012_convergence

@@ -22,6 +22,8 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 21
+
 param set-default CBRK_AIRSPD_CHK 162128
 
 param set-default FW_ARSP_MODE 1
@@ -64,8 +66,12 @@ param set-default VT_TRANS_MIN_TM 1.2
 param set-default VT_TRANS_P2_DUR 1.3
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_TYPE 1
-set MAV_TYPE 21
 
 set MIXER vtol_convergence
 
-set PWM_OUT 1234
+if ! ver hwcmp MATEK_H743
+then
+	set PWM_OUT 1234
+else
+	set PWM_OUT 3456
+fi	

ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad

@@ -22,6 +22,8 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 22
+
 param set-default BAT1_CAPACITY 23000
 param set-default BAT1_N_CELLS 4
 param set-default BAT1_R_INTERNAL 0.0025
@@ -129,12 +131,10 @@ param set-default VT_F_TRANS_DUR 1
 param set-default VT_IDLE_PWM_MC 1025
 param set-default VT_B_REV_OUT 0.5
 param set-default VT_B_TRANS_THR 0.7
-param set-default VT_FW_PERM_STAB 1
 param set-default VT_TRANS_TIMEOUT 22
 param set-default VT_F_TRANS_RAMP 4
 
 param set-default COM_RC_OVERRIDE 0
-set MAV_TYPE 22
 
 set MIXER deltaquad
 set MIXER_AUX pass

ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark

@@ -23,6 +23,8 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 22
+
 param set-default BAT1_N_CELLS 6
 
 param set-default FW_AIRSPD_MAX 30
@@ -94,8 +96,6 @@ param set-default VT_PSHER_RMP_DT 2
 param set-default VT_TRANS_MIN_TM 4
 param set-default VT_TYPE 2
 
-set MAV_TYPE 22
-
 set MIXER babyshark
 set MIXER_AUX pass
 

ROMFS/px4fmu_common/init.d/airframes/13030_generic_vtol_quad_tiltrotor

@@ -27,11 +27,37 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 21
+
 param set-default VT_IDLE_PWM_MC 1100
 param set-default VT_TYPE 1
 param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 24
-set MAV_TYPE 21
+
+param set-default CA_AIRFRAME 3
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR0_TILT 1
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR1_TILT 2
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR2_TILT 3
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
+param set-default CA_ROTOR3_TILT 4
+param set-default CA_SV_CS_COUNT 4
+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_TL_COUNT 4
 
 set MIXER quad_x
 set MIXER_AUX vtol_TTTTAAER

ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo

@@ -31,7 +31,6 @@ param set-default PWM_AUX_DIS5 950
 param set-default VT_TYPE 2
 param set-default VT_MOT_ID 12345678
 param set-default VT_FW_MOT_OFFID 12345678
-set MAV_TYPE 22
 
 set MIXER octo_cox
 set MIXER_AUX vtol_AAERT

ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter

@@ -19,12 +19,26 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+param set-default MAV_TYPE 19
+
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_MOT_COUNT 2
 param set-default VT_TYPE 0
 
-param set-default MAV_TYPE 19
-set MAV_TYPE 19
+param set-default CA_AIRFRAME 4
+param set-default CA_ROTOR_COUNT 2
+param set-default CA_ROTOR0_KM -0.05
+param set-default CA_ROTOR0_PY 0.2
+param set-default CA_ROTOR1_KM -0.05
+param set-default CA_ROTOR1_PY -0.2
+param set-default CA_SV_CS_COUNT 2
+param set-default CA_SV_CS0_TRQ_P 0.5
+param set-default CA_SV_CS0_TRQ_Y 0.5
+param set-default CA_SV_CS0_TYPE 5
+param set-default CA_SV_CS1_TRQ_P 0.5
+param set-default CA_SV_CS1_TRQ_Y -0.5
+param set-default CA_SV_CS1_TYPE 6
+
 set MIXER vtol_tailsitter_duo
 
 set PWM_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+

@@ -18,4 +18,7 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+# MAV_TYPE_TRICOPTER 15
+param set-default MAV_TYPE 15
+
 set MIXER tri_y_yaw+

ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw-

@@ -18,4 +18,7 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+# MAV_TYPE_TRICOPTER 15
+param set-default MAV_TYPE 15
+
 set MIXER tri_y_yaw-

ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli

@@ -17,7 +17,9 @@
 #
 
 . ${R}etc/init.d/rc.mc_defaults
-set MIXER coax
+
+# MAV_TYPE_COAXIAL 3
+param set-default MAV_TYPE 3
 
 param set-default MC_ROLLRATE_P 0.17
 param set-default MC_ROLLRATE_I 0.05
@@ -36,6 +38,9 @@ param set-default PWM_MAIN_RATE 400
 
 param set-default RTL_RETURN_ALT 30
 param set-default RTL_DESCEND_ALT 10
+
+set MIXER coax
+
 # This is the gimbal pass mixer
 set MIXER_AUX pass
 

ROMFS/px4fmu_common/init.d/airframes/16001_helicopter

@@ -20,7 +20,7 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 # Configure as helicopter (number 4 defined in commander_helper.cpp)
-set MAV_TYPE 4
+param set-default MAV_TYPE 4
 
 set MIXER blade130
 

ROMFS/px4fmu_common/init.d/airframes/17003_TF-G2

@@ -41,5 +41,6 @@ param set-default FW_R_LIM 40
 param set-default FW_P_LIM_MAX 25
 param set-default FW_P_LIM_MIN -5
 param set-default FW_P_RMAX_NEG 20
+
 set MIXER TF-G2
 set MIXER_AUX pass

ROMFS/px4fmu_common/init.d/airframes/18001_TF-B1

@@ -24,8 +24,5 @@ param set-default MAV_0_CONFIG 102
 param set-default GPS_UBX_DYNMODEL 8
 param set-default SER_TEL2_BAUD 9600
 
-set MAV_TYPE 8
-param set MAV_TYPE ${MAV_TYPE}
-
 set MIXER IO_pass
 set MIXER_AUX pass

ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane

@@ -23,6 +23,18 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+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 4
+param set-default CA_SV_CS0_TRQ_R -0.5
+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 PWM_AUX_RATE 50
 param set-default PWM_MAIN_RATE 50
 

ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox

@@ -26,7 +26,7 @@
 # @board px4_fmu-v2 exclude
 #
 
-set VEHICLE_TYPE mc
+. ${R}etc/init.d/rc.mc_defaults
 
 param set-default NAV_ACC_RAD 2
 
@@ -39,6 +39,7 @@ param set-default PWM_MAIN_RATE 400
 
 param set-default RTL_DESCEND_ALT 10
 param set-default RTL_RETURN_ALT 30
+
 set MIXER dodeca_top_cox
 set MIXER_AUX dodeca_bottom_cox
 

ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer

@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# @name IO Camflyer
-#
-# @type Flying Wing
-# @class Plane
-#
-# @output MAIN1 left aileron
-# @output MAIN2 right aileron
-# @output MAIN4 throttle
-#
-# @output AUX1 feed-through of RC AUX1 channel
-# @output AUX2 feed-through of RC AUX2 channel
-# @output AUX3 feed-through of RC AUX3 channel
-#
-# @maintainer Simon Wilks <simon@uaventure.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default FW_AIRSPD_MAX 15
-param set-default FW_AIRSPD_TRIM 13
-param set-default FW_R_TC 0.3
-param set-default FW_P_TC 0.3
-param set-default FW_L1_DAMPING 0.74
-param set-default FW_L1_PERIOD 16
-param set-default FW_LND_ANG 15
-param set-default FW_LND_FLALT 5
-param set-default FW_LND_HVIRT 13
-param set-default FW_LND_TLALT 5
-param set-default FW_THR_LND_MAX 0
-param set-default FW_PR_FF 0.35
-param set-default FW_RR_FF 0.6
-param set-default FW_RR_P 0.04
-
-param set-default PWM_MAIN_DISARM 1000
-
-
-set MIXER fw_generic_wing
-
-# Provide ESC a constant 1000 us pulse while disarmed
-set PWM_OUT 4

ROMFS/px4fmu_common/init.d/airframes/3033_wingwing

@@ -41,9 +41,6 @@ param set-default FW_RR_P 0.04
 
 param set-default PWM_MAIN_DISARM 1000
 
-# Configure this as plane.
-set MAV_TYPE 1
-
 # Set mixer.
 set MIXER fw_generic_wing
 

ROMFS/px4fmu_common/init.d/airframes/3034_fx79

@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# @name FX-79 Buffalo Flying Wing
-#
-# @type Flying Wing
-# @class Plane
-#
-# @output MAIN1 right aileron
-# @output MAIN2 left aileron
-# @output MAIN4 throttle
-#
-# @output AUX1 feed-through of RC AUX1 channel
-# @output AUX2 feed-through of RC AUX2 channel
-# @output AUX3 feed-through of RC AUX3 channel
-#
-# @maintainer Simon Wilks <simon@uaventure.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default FW_AIRSPD_MAX 30
-param set-default FW_AIRSPD_MIN 13
-
-param set-default NAV_LOITER_RAD 150
-
-set MIXER fw_generic_wing

ROMFS/px4fmu_common/init.d/airframes/3035_viper

@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# @name Viper
-#
-# @type Flying Wing
-# @class Plane
-# @output MAIN1 left aileron
-# @output MAIN2 right aileron
-# @output MAIN4 throttle
-#
-# @output AUX1 feed-through of RC AUX1 channel
-# @output AUX2 feed-through of RC AUX2 channel
-# @output AUX3 feed-through of RC AUX3 channel
-#
-# @maintainer Simon Wilks <simon@uaventure.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-set MIXER Viper

ROMFS/px4fmu_common/init.d/airframes/3037_parrot_disco_mod

@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# @name Modified Parrot Disco
-#
-# @url
-#
-# @type Flying Wing
-# @class Plane
-#
-# @output MAIN1 left aileron
-# @output MAIN2 right aileron
-# @output MAIN4 throttle
-#
-# @output AUX1 feed-through of RC AUX1 channel
-# @output AUX2 feed-through of RC AUX2 channel
-# @output AUX3 feed-through of RC AUX3 channel
-#
-# @maintainer Jan Liphardt <JTLiphardt@gmail.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-####################################
-# Airspeed
-####################################
-param set-default FW_AIRSPD_MAX  27 # = 52 knots
-
-####################################
-# Pitch
-####################################
-
-# Pitch rate feed forward (def = 0.5 %/rad/sec)
-param set-default FW_PR_FF 0.35
-
-####################################
-# Roll
-####################################
-
-# Basic limits (def = 50 deg)
-param set-default FW_R_LIM 40
-
-# Roll rate upper limit (def = 70 deg/s)
-param set-default FW_R_RMAX 50
-
-param set-default PWM_MAIN_DISARM 1000
-
-set MIXER fw_generic_wing.main.mix
-
-# Provide ESC a constant 1000 us pulse
-set PWM_OUT 4

ROMFS/px4fmu_common/init.d/airframes/4001_quad_x

@@ -21,3 +21,16 @@
 #
 
 . ${R}etc/init.d/rc.mc_defaults
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
+

ROMFS/px4fmu_common/init.d/airframes/4010_dji_f330

@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# @name DJI F330 w/ DJI ESCs
-#
-# @type Quadrotor x
-# @class Copter
-#
-# @maintainer Lorenz Meier <lorenz@px4.io>
-# @board px4_fmu-v2 exclude
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default MC_ROLL_P 7
-param set-default MC_ROLLRATE_I 0.05
-param set-default MC_PITCH_P 7
-param set-default MC_PITCHRATE_I 0.05
-
-
-# DJI ESCs do not support calibration and need a higher min
-param set-default PWM_MAIN_MIN 1230

ROMFS/px4fmu_common/init.d/airframes/4011_dji_f450

@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# @name DJI F450 w/ DJI ESCs
-#
-# @type Quadrotor x
-# @class Copter
-#
-# @maintainer Lorenz Meier <lorenz@px4.io>
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default MC_ROLL_P 7
-param set-default MC_ROLLRATE_I 0.05
-param set-default MC_PITCH_P 7
-param set-default MC_PITCHRATE_I 0.05
-param set-default MC_YAWRATE_P 0.3
-
-# DJI ESCs do not support calibration and need a higher min
-param set-default PWM_MAIN_MIN 1230

ROMFS/px4fmu_common/init.d/airframes/4018_s500_ctrlalloc

@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# @name S500 with control allocation
-#
-# @type Quadrotor x
-# @class Copter
-#
-# @maintainer Silvan Fuhrer
-#
-# @board px4_fmu-v2 exclude
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-set MIXER skip
-set MIXER_AUX none
-
-param set-default SYS_CTRL_ALLOC 1
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.177
-param set-default CA_ROTOR0_PY 0.177
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.177
-param set-default CA_ROTOR1_PY -0.177
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.177
-param set-default CA_ROTOR2_PY -0.177
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.177
-param set-default CA_ROTOR3_PY 0.177
-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/airframes/4051_s250aq

@@ -24,8 +24,6 @@
 
 set MIXER quad_s250aq
 
-set MAV_TYPE 2
-
 param set-default ATT_BIAS_MAX 0
 
 param set-default CBRK_IO_SAFETY 22027

ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100

@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# @name DJI Matrice 100
-#
-# @type Quadrotor x
-# @class Copter
-#
-# @maintainer James Goppert <james.goppert@gmail.com>
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default BAT1_N_CELLS 6
-
-param set-default MC_ROLLRATE_P 0.05
-param set-default MC_ROLLRATE_I 0.05
-param set-default MC_ROLLRATE_D 0.001
-param set-default MC_PITCHRATE_P 0.05
-param set-default MC_PITCHRATE_I 0.05
-param set-default MC_PITCHRATE_D 0.001
-
-param set-default MC_YAWRATE_I 0
-
-param set-default PWM_MAIN_MIN 1200

ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu

@@ -46,7 +46,7 @@ param set-default COM_RC_LOSS_T 3
 
 
 # ekf2
-param set-default EKF2_AID_MASK 35
+param set-default EKF2_AID_MASK 33
 param set-default EKF2_BARO_DELAY 0
 param set-default EKF2_BARO_NOISE 2.0
 
@@ -147,7 +147,7 @@ param set-default MPC_Z_VEL_P 0.27
 
 
 # gimbal configuration
-param set-default MNT_MODE_IN 1
+param set-default MNT_MODE_IN 0
 param set-default MNT_MODE_OUT 1
 param set-default MNT_MAN_PITCH 2
 param set-default MNT_RC_IN_MODE 1
@@ -164,6 +164,8 @@ param set-default RC_MAP_AUX2       5
 param set-default RC_MAP_AUX3       10
 param set-default RC_MAP_AUX4       8
 param set-default RC_MAP_FLTMODE    6
+param set-default RC_MAP_RETURN_SW  7
+
 param set-default RC1_TRIM          1000
 
 

ROMFS/px4fmu_common/init.d/airframes/4071_ifo

@@ -21,10 +21,7 @@
 # @board cuav_x7pro exclude
 #
 
-set VEHICLE_TYPE mc
-set MIXER quad_x
-set PWM_OUT 1234
-
+. ${R}etc/init.d/rc.mc_defaults
 
 # Attitude & rate gains
 param set-default MC_ROLLRATE_D 0.0013

ROMFS/px4fmu_common/init.d/airframes/4073_ifo-s

@@ -21,10 +21,7 @@
 # @maintainer Hyon Lim <lim@uvify.com>
 #
 
-set VEHICLE_TYPE mc
-set MIXER quad_x
-set PWM_OUT 1234
-
+. ${R}etc/init.d/rc.mc_defaults
 
 # Attitude & rate gains
 param set-default MC_ROLLRATE_D 0.0013

ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor

@@ -24,10 +24,6 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-
-# Configure this as Quadrotor
-# set MAV_TYPE 14
-
 # Set mixer
 set MIXER tilt_quad
 set MIXER_AUX tilt_quad

ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle

@@ -48,8 +48,6 @@ param set-default NAV_ACC_RAD 0.5
 param set-default PWM_MAIN_DISARM 1500
 param set-default PWM_MAIN_MAX 2000
 param set-default PWM_MAIN_MIN 1000
-# Configure this as rover
-set MAV_TYPE 10
 
 # Set mixer
 set MIXER rover_generic

ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover

@@ -76,9 +76,6 @@ param set-default RBCLW_SER_CFG 104
 # Start this driver after setting parameters, because the driver uses some of those parameters.
 # roboclaw start /dev/ttyS3
 
-# Configure this as rover
-set MAV_TYPE 10
-
 # Set mixer
 set MIXER generic_diff_rover
 

ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx

@@ -65,9 +65,6 @@ param set-default PWM_MAIN_MIN4 970
 # Enable Airspeed check circuit breaker because Rovers will have no airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
-# Configure this as rover
-set MAV_TYPE 10
-
 # Set mixer
 set MIXER rover_diff_and_servo
 

ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic

@@ -16,7 +16,4 @@
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
-set MAV_TYPE 12
-param set MAV_TYPE ${MAV_TYPE}
-
 set MIXER uuv_x

ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus

@@ -16,7 +16,4 @@
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
-set MAV_TYPE 12
-param set MAV_TYPE ${MAV_TYPE}
-
 set MIXER uuv_x

ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x

@@ -23,6 +23,26 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+# MAV_TYPE_HEXAROTOR 13
+param set-default MAV_TYPE 13
+
+param set-default CA_ROTOR_COUNT 6
+param set-default CA_ROTOR0_PX 0.0
+param set-default CA_ROTOR0_PY 0.5
+param set-default CA_ROTOR0_KM -0.05
+param set-default CA_ROTOR1_PX 0.0
+param set-default CA_ROTOR1_PY -0.5
+param set-default CA_ROTOR2_PX 0.43
+param set-default CA_ROTOR2_PY -0.25
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.43
+param set-default CA_ROTOR3_PY 0.25
+param set-default CA_ROTOR4_PX 0.43
+param set-default CA_ROTOR4_PY 0.25
+param set-default CA_ROTOR5_PX -0.43
+param set-default CA_ROTOR5_PY -0.25
+param set-default CA_ROTOR5_KM -0.05
+
 set MIXER hexa_x
 
 # Need to set all 8 channels

ROMFS/px4fmu_common/init.d/airframes/6002_draco_r

@@ -27,9 +27,8 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-set MIXER hexa_x
-set PWM_OUT 12345678
-
+# MAV_TYPE_HEXAROTOR 13
+param set-default MAV_TYPE 13
 
 ###############################################
 # Attitude & rate gains
@@ -120,3 +119,7 @@ param set-default MAV_1_MODE 2
 param set-default MAV_1_FORWARD 1
 param set-default MAV_1_RATE 800000
 param set-default SER_TEL2_BAUD 921600
+
+
+set MIXER hexa_x
+set PWM_OUT 12345678

ROMFS/px4fmu_common/init.d/airframes/6003_hexa_x_ctrlalloc

@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# @name Hex X with control allocation
-#
-# @type Hexarotor x
-# @class Copter
-#
-# @maintainer Silvan Fuhrer
-#
-# @board px4_fmu-v2 exclude
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default SYS_CTRL_ALLOC 1
-
-param set-default CA_AIRFRAME 0
-param set-default CA_ROTOR_COUNT 6
-
-param set-default CA_ROTOR0_PX 0.0
-param set-default CA_ROTOR0_PY 0.275
-param set-default CA_ROTOR0_KM -0.05
-
-param set-default CA_ROTOR1_PX 0.0
-param set-default CA_ROTOR1_PY -0.275
-param set-default CA_ROTOR1_KM 0.05
-
-param set-default CA_ROTOR2_PX 0.238
-param set-default CA_ROTOR2_PY -0.1375
-param set-default CA_ROTOR2_KM -0.05
-
-param set-default CA_ROTOR3_PX -0.238
-param set-default CA_ROTOR3_PY 0.1375
-param set-default CA_ROTOR3_KM 0.05
-
-param set-default CA_ROTOR4_PX 0.238
-param set-default CA_ROTOR4_PY 0.1375
-param set-default CA_ROTOR4_KM 0.05
-
-param set-default CA_ROTOR5_PX -0.238
-param set-default CA_ROTOR5_PY -0.1375
-param set-default CA_ROTOR5_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 PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 106
-
-set MIXER skip
-set MIXER_AUX none

ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+

@@ -23,6 +23,26 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+# MAV_TYPE_HEXAROTOR 13
+param set-default MAV_TYPE 13
+
+param set-default CA_ROTOR_COUNT 6
+param set-default CA_ROTOR0_PX 0.5
+param set-default CA_ROTOR0_PY 0.0
+param set-default CA_ROTOR0_KM -0.05
+param set-default CA_ROTOR1_PX -0.5
+param set-default CA_ROTOR1_PY 0.0
+param set-default CA_ROTOR2_PX -0.25
+param set-default CA_ROTOR2_PY -0.43
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX 0.25
+param set-default CA_ROTOR3_PY 0.43
+param set-default CA_ROTOR4_PX 0.25
+param set-default CA_ROTOR4_PY -0.43
+param set-default CA_ROTOR5_PX -0.25
+param set-default CA_ROTOR5_PY 0.43
+param set-default CA_ROTOR5_KM -0.05
+
 set MIXER hexa_+
 
 # Need to set all 8 channels

ROMFS/px4fmu_common/init.d/airframes/8001_octo_x

@@ -25,6 +25,31 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+# MAV_TYPE_OCTOROTOR 14
+param set-default MAV_TYPE 14
+
+param set-default CA_ROTOR_COUNT 8
+param set-default CA_ROTOR0_KM -0.05
+param set-default CA_ROTOR0_PX 0.46
+param set-default CA_ROTOR0_PY 0.19
+param set-default CA_ROTOR1_KM -0.05
+param set-default CA_ROTOR1_PX -0.46
+param set-default CA_ROTOR1_PY -0.19
+param set-default CA_ROTOR2_PX 0.19
+param set-default CA_ROTOR2_PY 0.46
+param set-default CA_ROTOR3_PX -0.46
+param set-default CA_ROTOR3_PY 0.19
+param set-default CA_ROTOR4_PX 0.46
+param set-default CA_ROTOR4_PY -0.19
+param set-default CA_ROTOR5_PX -0.19
+param set-default CA_ROTOR5_PY -0.46
+param set-default CA_ROTOR6_KM -0.05
+param set-default CA_ROTOR6_PX 0.19
+param set-default CA_ROTOR6_PY -0.46
+param set-default CA_ROTOR7_KM -0.05
+param set-default CA_ROTOR7_PX -0.19
+param set-default CA_ROTOR7_PY 0.46
+
 set MIXER octo_x
 
 set PWM_OUT 12345678

ROMFS/px4fmu_common/init.d/airframes/9001_octo_+

@@ -25,6 +25,9 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+# MAV_TYPE_OCTOROTOR 14
+param set-default MAV_TYPE 14
+
 set MIXER octo_+
 
 set PWM_OUT 12345678

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

@@ -52,27 +52,20 @@ px4_add_romfs_files(
 
 	# [3000, 3999] Flying wing"
 	3000_generic_wing
-	3030_io_camflyer
 	3031_phantom
 	3032_skywalker_x5
 	3033_wingwing
-	3034_fx79
-	3035_viper
 	3036_pigeon
-	3037_parrot_disco_mod
 	3100_tbs_caipirinha
 
 	# [4000, 4999] Quadrotor x"
 	4001_quad_x
 	4003_qavr5
 	4009_qav250
-	4010_dji_f330
-	4011_dji_f450
 	4014_s500
 	4015_holybro_s500
 	4016_holybro_px4vision
 	4017_nxp_hovergames
-	4018_s500_ctrlalloc
 	4019_x500_v2
 	4030_3dr_solo
 	4031_3dr_quad
@@ -82,7 +75,6 @@ px4_add_romfs_files(
 	4051_s250aq
 	4052_holybro_qav250
 	4053_holybro_kopis2
-	4060_dji_matrice_100
 	4061_atl_mantis_edu
 	4071_ifo
 	4072_draco
@@ -100,7 +92,6 @@ px4_add_romfs_files(
 	# [6000, 6999] Hexarotor x"
 	6001_hexa_x
 	6002_draco_r
-	6003_hexa_x_ctrlalloc
 
 	# [7000, 7999] Hexarotor +"
 	7001_hexa_+
@@ -114,7 +105,6 @@ px4_add_romfs_files(
 	# [10000, 10999] Quadrotor Wide arm / H frame"
 	10015_tbs_discovery
 	10016_3dr_iris
-	10017_steadidrone_qu4d
 	10018_tbs_endurance
 
 	# [11000, 11999] Hexa Cox
@@ -122,7 +112,6 @@ px4_add_romfs_files(
 
 	# [12000, 12999] Octo Cox
 	12001_octo_cox
-	12002_steadidrone_mavrik
 
 	# [13000, 13999] VTOL
 	13000_generic_vtol_standard
@@ -135,7 +124,6 @@ px4_add_romfs_files(
 	13007_vtol_AAVVT_quad
 	13008_QuadRanger
 	13009_vtol_spt_ranger
-	13010_claire
 	13012_convergence
 	13013_deltaquad
 	13014_vtol_babyshark

ROMFS/px4fmu_common/init.d/rc.airship_defaults

@@ -7,6 +7,9 @@
 
 set VEHICLE_TYPE airship
 
+# MAV_TYPE_AIRSHIP 7
+param set-default MAV_TYPE 7
+
 #
 # This is the gimbal pass mixer.
 #

ROMFS/px4fmu_common/init.d/rc.balloon_defaults

@@ -7,6 +7,9 @@
 
 set VEHICLE_TYPE fw
 
+# MAV_TYPE_FREE_BALLOON 8
+param set-default MAV_TYPE 8
+
 #
 # Default parameters for balloon UAVs.
 #