Add windshear plugin

This commit adds SITL targets for the dynamic soaring aircraft and additional plugins in the sitl_gazebo submodule

.ci/Jenkinsfile-compile

@@ -9,10 +9,10 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2021-04-29",
-            arm64: "px4io/px4-dev-aarch64:2021-04-29",
-            base: "px4io/px4-dev-base-bionic:2021-04-29",
-            nuttx: "px4io/px4-dev-nuttx-focal:2021-04-29",
+            armhf: "px4io/px4-dev-armhf:2021-02-04",
+            arm64: "px4io/px4-dev-aarch64:2021-02-04",
+            base: "px4io/px4-dev-base-bionic:2021-02-04",
+            nuttx: "px4io/px4-dev-nuttx-focal:2021-02-04",
             snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
           ]
 
@@ -46,7 +46,9 @@ pipeline {
                      "cuav_can-gps-v1_default",
                      "cuav_nora_default",
                      "cuav_x7pro_default",
+                     "cubepilot_cubeorange_console",
                      "cubepilot_cubeorange_default",
+                     "cubepilot_cubeyellow_console",
                      "cubepilot_cubeyellow_default",
                      "holybro_can-gps-v1_canbootloader",
                      "holybro_can-gps-v1_default",
@@ -54,7 +56,6 @@ pipeline {
                      "holybro_kakutef7_default",
                      "holybro_pix32v5_default",
                      "modalai_fc-v1_default",
-                     "modalai_fc-v1_rtps",
                      "mro_ctrl-zero-f7_default",
                      "mro_ctrl-zero-f7-oem_default",
                      "mro_ctrl-zero-h7_default",
@@ -76,6 +77,7 @@ pipeline {
                      "px4_fmu-v2_fixedwing",
                      "px4_fmu-v2_multicopter",
                      "px4_fmu-v2_rover",
+                     "px4_fmu-v2_test",
                      "px4_fmu-v3_default",
                      "px4_fmu-v4_cannode",
                      "px4_fmu-v4_default",
@@ -94,6 +96,7 @@ pipeline {
                      "px4_fmu-v5x_base_phy_DP83848C",
                      "px4_fmu-v5x_default",
                      "px4_fmu-v6u_default",
+                     "px4_fmu-v6u_test",
                      "px4_fmu-v6x_default",
                      "px4_io-v2_default",
                      "spracing_h7extreme_default",
@@ -130,7 +133,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     // stage('S3 Upload') {
     //   agent {
-    //     docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+    //     docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
     //   }
     //   options {
     //         skipDefaultCheckout()

.ci/Jenkinsfile-hardware

@@ -7,12 +7,12 @@ pipeline {
 
       parallel {
 
-        stage("cubepilot_cubeorange_test") {
+        stage("cubepilot_cubeorange_console") {
           stages {
-            stage("build cubepilot_cubeorange_test") {
+            stage("build cubepilot_cubeorange_console") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -22,10 +22,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make cubepilot_cubeorange_test'
+                sh 'make cubepilot_cubeorange_console'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'cubepilot_cubeorange_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'cubepilot_cubeorange_console'
               }
               post {
                 always {
@@ -42,9 +42,9 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'cubepilot_cubeorange_test'
+                    unstash 'cubepilot_cubeorange_console'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cubepilot_cubeorange_test/cubepilot_cubeorange_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cubepilot_cubeorange_console/cubepilot_cubeorange_console.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
@@ -52,12 +52,12 @@ pipeline {
                     // configure
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 2000"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
                     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 "px4io forceupdate 14662 /etc/extras/cubepilot_io-v2_default.bin" || true' // force px4io update
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
                   }
                 }
                 stage("status") {
@@ -84,12 +84,12 @@ pipeline {
           }
         }
 
-        stage("cuav_x7pro_test") {
+        stage("cuav_x7pro_default") {
           stages {
-            stage("build cuav_x7pro_test") {
+            stage("build cuav_x7pro_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -99,10 +99,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make cuav_x7pro_test'
+                sh 'make cuav_x7pro_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'cuav_x7pro_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'cuav_x7pro_default'
               }
               post {
                 always {
@@ -119,21 +119,21 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'cuav_x7pro_test'
+                    unstash 'cuav_x7pro_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cuav_x7pro_test/cuav_x7pro_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cuav_x7pro_default/cuav_x7pro_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 2000"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
                   }
                 }
                 stage("status") {
@@ -160,12 +160,64 @@ pipeline {
           }
         }
 
-        stage("px4_fmu-v3_test") {
+        // stage("px4_fmu-v2_test") {
+        //   stages {
+        //     stage("build px4_fmu-v2_test") {
+        //       agent {
+        //         docker {
+        //           image 'px4io/px4-dev-nuttx-focal:2020-09-14'
+        //           args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+        //         }
+        //       }
+        //       steps {
+        //         sh 'export'
+        //         sh 'make distclean'
+        //         sh 'ccache -s'
+        //         sh 'git fetch --tags'
+        //         sh 'make px4_fmu-v2_test'
+        //         sh 'make sizes'
+        //         sh 'ccache -s'
+        //         stash includes: 'build/px4_fmu-v2_test/px4_fmu-v2_test.elf', name: 'px4_fmu-v2_test'
+        //       }
+        //       post {
+        //         always {
+        //             sh 'make distclean'
+        //         }
+        //       }
+        //     } // stage build
+        //     stage("test") {
+        //       agent {
+        //         label 'px4_fmu-v2'
+        //       }
+        //       stages {
+        //         stage("flash") {
+        //           steps {
+        //             sh 'export'
+        //             sh 'find /dev/serial'
+        //             unstash 'px4_fmu-v2_test'
+        //             // flash board and watch bootup
+        //             sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v2_test/px4_fmu-v2_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+        //           }
+        //         }
+        //         stage("reset") {
+        //           steps {
+        //             cleanupFTDI();
+        //           }
+        //         }
+        //       }
+        //       options {
+        //         timeout(time: 90, unit: 'MINUTES')
+        //       }
+        //     }
+        //   }
+        // }
+
+        stage("px4_fmu-v3_default") {
           stages {
-            stage("build px4_fmu-v3_test") {
+            stage("build px4_fmu-v3_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -175,10 +227,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make px4_fmu-v3_test'
+                sh 'make px4_fmu-v3_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v3_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v3_default'
               }
               post {
                 always {
@@ -195,21 +247,21 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'px4_fmu-v3_test'
+                    unstash 'px4_fmu-v3_default'
                     // 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'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v3_default/px4_fmu-v3_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 13000"'   // generic vtol standard
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 13000"' // generic vtol standard
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io forceupdate 14662 /etc/extras/px4_io-v2_default.bin" || true' // force px4io update
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -236,12 +288,12 @@ pipeline {
           }
         }
 
-        stage("px4_fmu-v4_test") {
+        stage("px4_fmu-v4_default") {
           stages {
-            stage("build px4_fmu-v4_test") {
+            stage("build px4_fmu-v4_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -251,10 +303,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make px4_fmu-v4_test'
+                sh 'make px4_fmu-v4_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v4_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v4_default'
               }
               post {
                 always {
@@ -271,21 +323,20 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'px4_fmu-v4_test'
+                    unstash 'px4_fmu-v4_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v4_test/px4_fmu-v4_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v4_default/px4_fmu-v4_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'  // generic multicopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -312,12 +363,12 @@ pipeline {
           }
         }
 
-        stage("px4_fmu-v4pro_test") {
+        stage("px4_fmu-v4pro_default") {
           stages {
-            stage("build px4_fmu-v4pro_test") {
+            stage("build px4_fmu-v4pro_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -327,10 +378,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make px4_fmu-v4pro_test'
+                sh 'make px4_fmu-v4pro_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v4pro_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v4pro_default'
               }
               post {
                 always {
@@ -347,21 +398,21 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'px4_fmu-v4pro_test'
+                    unstash 'px4_fmu-v4pro_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v4pro_test/px4_fmu-v4pro_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v4pro_default/px4_fmu-v4pro_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 13000"'   // generic vtol standard
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 13000"' // generic vtol standard
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io forceupdate 14662 /etc/extras/px4_io-v2_default.bin" || true' // force px4io update
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -388,12 +439,12 @@ pipeline {
           }
         }
 
-        stage("px4_fmu-v5_test") {
+        stage("px4_fmu-v5_default") {
           stages {
-            stage("build px4_fmu-v5_test") {
+            stage("build px4_fmu-v5_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -403,10 +454,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make px4_fmu-v5_test'
+                sh 'make px4_fmu-v5_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v5_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v5_default'
               }
               post {
                 always {
@@ -423,21 +474,21 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'px4_fmu-v5_test'
+                    unstash 'px4_fmu-v5_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_test/px4_fmu-v5_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_default/px4_fmu-v5_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"' // generic quadcopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io forceupdate 14662 /etc/extras/px4_io-v2_default.bin" || true' // force px4io update
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -469,7 +520,7 @@ pipeline {
             stage("build px4_fmu-v5_debug") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -510,14 +561,13 @@ pipeline {
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 250"'  // limit cpu usage
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'   // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 250"' // limit cpu usage
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'   // generic multicopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io forceupdate 14662 /etc/extras/px4_io-v2_default.bin" || true' // force px4io update
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                 // reboot to apply
                   }
                 }
                 stage("status") {
@@ -549,7 +599,7 @@ pipeline {
             stage("build px4_fmu-v5_optimized") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -587,13 +637,12 @@ pipeline {
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"' // generic quadcopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -625,7 +674,7 @@ pipeline {
             stage("build px4_fmu-v5_stackcheck") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -666,14 +715,13 @@ pipeline {
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 250"'  // limit cpu usage
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0"'        // limit cpu usage
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'   // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 250"' // limit cpu usage
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0"'       // limit cpu usage
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'   // generic multicopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                 // reboot to apply
                   }
                 }
                 stage("status") {
@@ -700,12 +748,12 @@ pipeline {
           }
         }
 
-        stage("modalai_fc-v1_test") {
+        stage("modalai_fc-v1_default") {
           stages {
-            stage("build modalai_fc-v1_test") {
+            stage("build modalai_fc-v1_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -715,10 +763,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make modalai_fc-v1_test'
+                sh 'make modalai_fc-v1_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'modalai_fc-v1_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'modalai_fc-v1_default'
               }
               post {
                 always {
@@ -735,21 +783,20 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'modalai_fc-v1_test'
+                    unstash 'modalai_fc-v1_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/modalai_fc-v1_test/modalai_fc-v1_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/modalai_fc-v1_default/modalai_fc-v1_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'  // generic vtol standardulticopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -776,12 +823,12 @@ pipeline {
           }
         }
 
-        stage("holybro_durandal-v1_test") {
+        stage("holybro_durandal-v1_default") {
           stages {
-            stage("build holybro_durandal-v1_test") {
+            stage("build holybro_durandal-v1_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -791,10 +838,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make holybro_durandal-v1_test'
+                sh 'make holybro_durandal-v1_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'holybro_durandal-v1_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'holybro_durandal-v1_default'
               }
               post {
                 always {
@@ -811,21 +858,24 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'holybro_durandal-v1_test'
+                    unstash 'holybro_durandal-v1_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/holybro_durandal-v1_test/holybro_durandal-v1_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/holybro_durandal-v1_default/holybro_durandal-v1_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set DSHOT_CONFIG 600"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 4000"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_USE_IO 0"'          // for dshot
                     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 "px4io forceupdate 14662 /etc/extras/px4_io-v2_default.bin" || true' // force px4io update
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
                   }
                 }
                 stage("status") {
@@ -853,12 +903,12 @@ pipeline {
           }
         }
 
-        stage("nxp_fmuk66-v3_test") {
+        stage("nxp_fmuk66-v3_default") {
           stages {
-            stage("build nxp_fmuk66-v3_test") {
+            stage("build nxp_fmuk66-v3_default") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+                  image 'px4io/px4-dev-nuttx-focal:2020-09-14'
                   args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -868,10 +918,10 @@ pipeline {
                 sh 'make distclean'
                 sh 'ccache -s'
                 sh 'git fetch --tags'
-                sh 'make nxp_fmuk66-v3_test'
+                sh 'make nxp_fmuk66-v3_default'
                 sh 'make sizes'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'nxp_fmuk66-v3_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'nxp_fmuk66-v3_default'
               }
               post {
                 always {
@@ -888,21 +938,20 @@ pipeline {
                   steps {
                     sh 'export'
                     sh 'find /dev/serial'
-                    unstash 'nxp_fmuk66-v3_test'
+                    unstash 'nxp_fmuk66-v3_default'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/nxp_fmuk66-v3_test/nxp_fmuk66-v3_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/nxp_fmuk66-v3_default/nxp_fmuk66-v3_default.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("configure") {
                   steps {
                     // configure
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'    // disable buzzer
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'    // generic quadcopter
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'       // update bootloader
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"'  // disable buzzer
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"'  // generic multicopter
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_BL_UPDATE 1"'     // update bootloader
                     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 "reboot" || true'                  // reboot to apply
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'                // reboot to apply
                   }
                 }
                 stage("status") {
@@ -978,7 +1027,6 @@ void statusFTDI() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_accel_fifo"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_baro"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_combined"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_gps"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_gyro"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_gyro_fifo"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_mag"'
@@ -990,7 +1038,6 @@ void statusFTDI() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_acceleration"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_velocity"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_gps_position"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_imu"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_imu_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_local_position"'

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
 {
 	"name": "px4-dev-nuttx",
-	"image": "px4io/px4-dev-nuttx-focal:2021-04-29",
+	"image": "px4io/px4-dev-nuttx-focal:2021-02-04",
 
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
 

.github/workflows/checks.yml

@@ -18,7 +18,7 @@ jobs:
           "check_format",
           "tests",
           "tests_coverage",
-          "px4_fmu-v2_default stack_check",
+          # "px4_fmu-v2_default stack_check",
           "validate_module_configs",
           "shellcheck_all",
           "NO_NINJA_BUILD=1 px4_fmu-v5_default",
@@ -28,7 +28,7 @@ jobs:
           "parameters_metadata",
         ]
     container:
-      image: ghcr.io/px4/px4-dev:2021-05-06
+      image: px4io/px4-dev-nuttx-focal:2021-02-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1

.github/workflows/clang-tidy.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-clang:2021-04-29
+    container: px4io/px4-dev-clang:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:

.github/workflows/compile_linux.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2021-04-29
+    container: px4io/px4-dev-armhf:2021-02-04
     strategy:
       matrix:
         config: [

.github/workflows/compile_linux_arm64.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-aarch64:2021-04-29
+    container: px4io/px4-dev-aarch64:2021-02-04
     strategy:
       matrix:
         config: [

.github/workflows/compile_nuttx.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
     - 'master'
-    - 'github-actions'
   pull_request:
     branches:
     - '*'
@@ -12,27 +11,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-nuttx-focal:2021-02-04
     strategy:
       matrix:
         config: [
-          airmind_mindpx-v2_default,
-          ark_can-flow_canbootloader,
-          ark_can-flow_debug,
-          ark_can-flow_default,
-          av_x-v1_default,
-          bitcraze_crazyflie21_default,
-          bitcraze_crazyflie_default,
-          cuav_can-gps-v1_canbootloader,
-          cuav_can-gps-v1_debug,
-          cuav_can-gps-v1_default,
-          cuav_nora_default,
-          cuav_x7pro_default,
-          cubepilot_cubeorange_default,
-          cubepilot_cubeorange_test,
-          cubepilot_cubeyellow_default,
-          cubepilot_cubeyellow_test,
-          cubepilot_io-v2_default,
+          # airmind_mindpx-v2_default,
+          # ark_can-flow_canbootloader,
+          # ark_can-flow_debug,
+          # ark_can-flow_default,
+          # av_x-v1_default,
+          # bitcraze_crazyflie21_default,
+          # bitcraze_crazyflie_default,
+          # cuav_can-gps-v1_canbootloader,
+          # cuav_can-gps-v1_debug,
+          # cuav_can-gps-v1_default,
+          # cuav_nora_default,
+          # cuav_x7pro_default,
+          # cubepilot_cubeorange_console,
+          # cubepilot_cubeorange_default,
+          # cubepilot_cubeyellow_console,
+          # cubepilot_cubeyellow_default,
+          # cubepilot_io-v2_default,
           holybro_can-gps-v1_canbootloader,
           holybro_can-gps-v1_debug,
           holybro_can-gps-v1_default,
@@ -40,28 +39,28 @@ jobs:
           holybro_kakutef7_default,
           holybro_pix32v5_default,
           modalai_fc-v1_default,
-          modalai_fc-v1_rtps,
-          mro_ctrl-zero-f7-oem_default,
-          mro_ctrl-zero-f7_default,
-          mro_ctrl-zero-h7-oem_default,
-          mro_ctrl-zero-h7_default,
-          mro_pixracerpro_default,
-          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,
-          nxp_ucans32k146_default,
+          # mro_ctrl-zero-f7-oem_default,
+          # mro_ctrl-zero-f7_default,
+          # mro_ctrl-zero-h7-oem_default,
+          # mro_ctrl-zero-h7_default,
+          # mro_pixracerpro_default,
+          # 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,
+          # nxp_ucans32k146_default,
           omnibus_f4sd_default,
-          px4_fmu-v2_default,
-          px4_fmu-v2_fixedwing,
-          px4_fmu-v2_multicopter,
-          px4_fmu-v2_rover,
+          # px4_fmu-v2_default,
+          # px4_fmu-v2_fixedwing,
+          # px4_fmu-v2_multicopter,
+          # px4_fmu-v2_rover,
+          # px4_fmu-v2_test,
           px4_fmu-v3_default,
           px4_fmu-v4_cannode,
           px4_fmu-v4_default,
@@ -77,13 +76,14 @@ jobs:
           px4_fmu-v5_stackcheck,
           px4_fmu-v5_uavcanv0periph,
           px4_fmu-v5_uavcanv1,
-          px4_fmu-v5x_base_phy_DP83848C,
-          px4_fmu-v5x_default,
+          # px4_fmu-v5x_base_phy_DP83848C,
+          # px4_fmu-v5x_default,
           px4_fmu-v6u_default,
+          px4_fmu-v6u_test,
           px4_fmu-v6x_default,
           px4_io-v2_default,
           spracing_h7extreme_default,
-          uvify_core_default
+          # uvify_core_default
           ]
     steps:
     - uses: actions/checkout@v1
@@ -124,8 +124,6 @@ jobs:
       run: make ${{matrix.config}} bloaty_symbols || true
     - name: make ${{matrix.config}} bloaty_templates
       run: make ${{matrix.config}} bloaty_templates || true
-    - name: make ${{matrix.config}} bloaty_ram
-      run: make ${{matrix.config}} bloaty_ram || true
     - name: make ${{matrix.config}} bloaty_compare_master
       run: make ${{matrix.config}} bloaty_compare_master || true
     - name: ccache post-run

.github/workflows/compile_nuttx_cannode.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-nuttx-focal:2021-02-04
     strategy:
       matrix:
         config: [

.github/workflows/container.yml

@@ -1,31 +0,0 @@
-name: Build and publish Docker image
-
-on:
-  push:
-    branches:
-    - 'master'
-    - 'github-actions'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: |
-            px4/px4-dev:latest
-            ghcr.io/px4/px4-dev:latest
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/deploy_all.yml

@@ -23,7 +23,7 @@ jobs:
     needs: enumerate_targets
     strategy:
       matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
-    container: px4io/px4-dev-${{ matrix.container }}:2021-04-29
+    container: px4io/px4-dev-${{ matrix.container }}:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:

.github/workflows/mavros_avoidance_tests.yml

@@ -0,0 +1,131 @@
+name: MAVROS Avoidance Tests
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {test_file: "mavros_posix_test_avoidance.test",    vehicle: "iris_obs_avoid", mission: "avoidance",       build_type: "RelWithDebInfo"}
+          - {test_file: "mavros_posix_test_safe_landing.test", vehicle: "iris_obs_avoid", mission: "MC_safe_landing", build_type: "RelWithDebInfo"}
+
+    container:
+      image: px4io/px4-dev-ros-melodic:2021-02-04
+      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: sitl_tests-${{matrix.config.build_type}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: sitl_tests-${{matrix.config.build_type}}-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
+    - name: check environment
+      run: |
+          export
+          ulimit -a
+    - 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
+        ccache -s
+
+    - name: Core dump settings
+      run: |
+          ulimit -c unlimited
+          echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
+
+    - name: Run SITL tests
+      env:
+        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+      run: |
+        export
+        ./test/rostest_avoidance_run.sh ${{matrix.config.test_file}} mission:=${{matrix.config.mission}} vehicle:=${{matrix.config.vehicle}} || true
+
+    - name: Look at core files
+      if: failure()
+      run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
+    - name: Upload px4 coredump
+      if: failure()
+      uses: actions/upload-artifact@v2-preview
+      with:
+        name: coredump
+        path: px4.core
+
+    # - name: ecl EKF analysis
+    #   if: always()
+    #   run: ./Tools/ecl_ekf/process_logdata_ekf.py ~/.ros/log/*/*.ulg
+
+    - name: Upload logs to flight review
+      if: always()
+      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ~/.ros/log/*/*.ulg
+
+    - name: Upload px4 binary
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: binary
+        path: build/px4_sitl_default/bin/px4
+
+    - name: Store PX4 log
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: px4_log
+        path: ~/.ros/log/*/*.ulg
+
+    - name: Store ROS log
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: ros_log
+        path: ~/.ros/**/rostest-*.log
+
+    # Report test coverage
+    - name: Upload coverage
+      if: contains(matrix.config.build_type, 'Coverage')
+      run: |
+          git config --global credential.helper "" # disable the keychain credential helper
+          git config --global --add credential.helper store # enable the local store credential helper
+          echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
+          git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
+          mkdir -p coverage
+          lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
+    - name: Upload coverage information to Codecov
+      if: contains(matrix.config.build_type, 'Coverage')
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        flags: mavros_avoidance
+        file: coverage/lcov.info

.github/workflows/mavros_mission_tests.yml

@@ -25,7 +25,7 @@ jobs:
           #- {vehicle: "tiltrotor",     mission: "VTOL_mission_1",  build_type: "RelWithDebInfo"}
 
     container:
-      image: px4io/px4-dev-ros-melodic:2021-04-29
+      image: px4io/px4-dev-ros-melodic:2021-02-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1

.github/workflows/mavros_offboard_tests.yml

@@ -20,7 +20,7 @@ jobs:
           #- {test_file: "mavros_posix_tests_offboard_rpyrt_ctl.test", vehicle: "iris", build_type: "RelWithDebInfo"}
 
     container:
-      image: px4io/px4-dev-ros-melodic:2021-04-29
+      image: px4io/px4-dev-ros-melodic:2021-02-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1

.github/workflows/metadata.yml

@@ -11,7 +11,7 @@ jobs:
 
   airframe:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-base-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -26,7 +26,7 @@ jobs:
 
   module:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-base-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -41,7 +41,7 @@ jobs:
 
   parameter:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-base-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -65,7 +65,7 @@ jobs:
 
   uorb_graph:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-nuttx-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -80,7 +80,7 @@ jobs:
 
   micrortps_agent:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-base-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -94,7 +94,7 @@ jobs:
 
   ROS_msgs:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-base-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -107,7 +107,7 @@ jobs:
 
   ROS2_bridge:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
+    container: px4io/px4-dev-base-focal:2021-02-04
     steps:
     - uses: actions/checkout@v1
       with:

.github/workflows/python_checks.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Install Python3
       run: sudo apt-get install python3 python3-setuptools python3-pip -y
     - name: Install tools
-      run: pip3 install --user mypy flake8
+      run: pip3 install --user mypy types-requests flake8
     - name: Check MAVSDK test scripts with mypy
       run: $HOME/.local/bin/mypy --strict test/mavsdk_tests/*.py
     - name: Check MAVSDK test scripts with flake8

.github/workflows/rotors_tests.yml

@@ -0,0 +1,55 @@
+name: RotorS PX4 Build Test
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        container:
+        - 'px4io/px4-dev-simulation-bionic:2020-11-18' # Gazebo 9
+    container:
+      image: ${{ matrix.container }}
+      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: rotors_tests-RelWithDebInfo-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: rotors_tests-RelWithDebInfo-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+    - name: Install glog
+      run: apt update && apt install -y libgoogle-glog-dev libyaml-cpp-dev
+    - name: Build PX4 RotorS
+      env:
+        PX4_CMAKE_BUILD_TYPE: RelWithDebInfo
+        DONT_RUN: 1
+      run: make px4_sitl rotors
+    - name: ccache post-run px4/firmware
+      run: ccache -s

.github/workflows/sitl_tests.yml

@@ -20,7 +20,7 @@ jobs:
           - {latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo", model: "tailsitter"    } # Florida
           - {latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage",       model: "standard_vtol" } # Zurich
     container:
-      image: px4io/px4-dev-simulation-focal:2021-04-29
+      image: px4io/px4-dev-simulation-focal:2021-02-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1
@@ -28,9 +28,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/v0.36.0/mavsdk_0.36.0_ubuntu20.04_amd64.deb
     - name: Install MAVSDK
-      run: dpkg -i "mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+      run: dpkg -i mavsdk_0.36.0_ubuntu20.04_amd64.deb
 
     - name: Prepare ccache timestamp
       id: ccache_cache_timestamp

.github/workflows/upstream_sync.yml

@@ -0,0 +1,22 @@
+# This pipeline keeps the master branch up to date with upstream master
+name: Upstream Synchronization
+
+on:
+  schedule:
+  - cron:  "*/15 * * * *"
+  workflow_dispatch:
+
+jobs:
+  repo-sync:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        persist-credentials: false
+    - name: repo-sync
+      uses: repo-sync/github-sync@v2
+      with:
+        source_repo: "https://github.com/PX4/PX4-Autopilot.git"
+        source_branch: "master"
+        destination_branch: "master"
+        github_token: ${{ secrets.PAT }}

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "mavlink/include/mavlink/v2.0"]
 	path = mavlink/include/mavlink/v2.0
-	url = https://github.com/mavlink/c_library_v2.git
+	url = https://github.com/ethz-asl/fw_mavlink_c_library_v2.git
 	branch = master
 [submodule "src/drivers/uavcan/libuavcan"]
 	path = src/drivers/uavcan/libuavcan
@@ -33,7 +33,7 @@
 [submodule "src/modules/micrortps_bridge/micro-CDR"]
 	path = src/modules/micrortps_bridge/micro-CDR
 	url = https://github.com/PX4/Micro-CDR.git
-	branch = master
+	branch = px4
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
@@ -59,11 +59,10 @@
 	url = https://github.com/UAVCAN/public_regulated_data_types.git
 [submodule "src/drivers/uavcannode_gps_demo/public_regulated_data_types"]
 	path = src/drivers/uavcannode_gps_demo/public_regulated_data_types
-	url = https://github.com/UAVCAN/public_regulated_data_types.git
+	url = https://github.com/UAVCAN/public_regulated_data_types
 [submodule "src/drivers/uavcannode_gps_demo/libcanard"]
 	path = src/drivers/uavcannode_gps_demo/libcanard
-	url = https://github.com/UAVCAN/libcanard.git
-[submodule "src/drivers/uavcan_v1/legacy_data_types"]
-	path = src/drivers/uavcan_v1/legacy_data_types
-	url = https://github.com/px4/public_regulated_data_types/
-	branch = legacy
+	url = https://github.com/UAVCAN/libcanard
+[submodule "Tools/rotors_simulator"]
+	path = Tools/rotors_simulator
+	url = https://github.com/ethz-asl/rotors_simulator.git

.vscode/cmake-variants.yaml

@@ -96,11 +96,16 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: cuav_x7pro_default
-    cubepilot_cubeorange_test:
+    cubepilot_cubeorange_default:
       short: cubepilot_cubeorange
       buildType: MinSizeRel
       settings:
-        CONFIG: cubepilot_orange_test
+        CONFIG: cubepilot_orange_default
+    cubepilot_cubeyellow_default:
+      short: cubepilot_cubeyellow
+      buildType: MinSizeRel
+      settings:
+        CONFIG: cubepilot_cubeyellow_default
     emlid_navio2_default:
       short: emlid_navio2
       buildType: MinSizeRel

CMakeLists.txt

@@ -185,8 +185,6 @@ if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "Coverage")
 	set(MAX_CUSTOM_OPT_LEVEL -O0)
 elseif(CMAKE_BUILD_TYPE MATCHES "Sanitizer")
 	set(MAX_CUSTOM_OPT_LEVEL -O1)
-elseif(CMAKE_BUILD_TYPE MATCHES "Release")
-	set(MAX_CUSTOM_OPT_LEVEL -O3)
 else()
 	if(px4_constrained_flash_build)
 		set(MAX_CUSTOM_OPT_LEVEL -Os)

Dockerfile

@@ -1,29 +0,0 @@
-#
-# PX4 development environment
-#
-
-FROM ubuntu:20.04
-LABEL maintainer="Daniel Agar <daniel@agar.ca>"
-
-COPY Tools/setup/ubuntu.sh /tmp/ubuntu.sh
-COPY Tools/setup/requirements.txt /tmp/requirements.txt
-RUN DEBIAN_FRONTEND=noninteractive /tmp/ubuntu.sh --no-sim-tools \
-	&& apt-get -y autoremove \
-	&& apt-get clean autoclean \
-	&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
-
-# create user with id 1001 (jenkins docker workflow default)
-RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user
-
-ENV CCACHE_UMASK=000
-ENV PATH="/usr/lib/ccache:$PATH"
-
-# SITL UDP PORTS
-EXPOSE 14556/udp
-EXPOSE 14557/udp
-
-# create and start as LOCAL_USER_ID
-COPY Tools/setup/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]

Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
         // stage('Catkin build on ROS workspace') {
         //   agent {
         //     docker {
-        //       image 'px4io/px4-dev-ros-melodic:2021-04-29'
+        //       image 'px4io/px4-dev-ros-melodic:2021-02-04'
         //       args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
         //     }
         //   }
@@ -56,7 +56,7 @@ pipeline {
         stage('Colcon build on ROS2 workspace') {
           agent {
             docker {
-              image 'px4io/px4-dev-ros2-foxy:2021-04-29'
+              image 'px4io/px4-dev-ros2-foxy:2021-02-04'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -85,11 +85,10 @@ pipeline {
 
         stage('Airframe') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh 'make distclean'
-            sh 'git fetch --all --tags'
             sh 'make airframe_metadata'
             dir('build/px4_sitl_default/docs') {
               archiveArtifacts(artifacts: 'airframes.md, airframes.xml')
@@ -105,11 +104,10 @@ pipeline {
 
         stage('Parameter') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh 'make distclean'
-            sh 'git fetch --all --tags'
             sh 'make parameters_metadata'
             dir('build/px4_sitl_default/docs') {
               archiveArtifacts(artifacts: 'parameters.md, parameters.xml, parameters.json.xz')
@@ -125,11 +123,10 @@ pipeline {
 
         stage('Module') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh 'make distclean'
-            sh 'git fetch --all --tags'
             sh 'make module_documentation'
             dir('build/px4_sitl_default/docs') {
               archiveArtifacts(artifacts: 'modules/*.md')
@@ -146,14 +143,13 @@ pipeline {
         stage('uORB graphs') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-focal:2021-04-29'
+              image 'px4io/px4-dev-nuttx-focal:2021-02-04'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
           steps {
             sh 'export'
             sh 'make distclean'
-            sh 'git fetch --all --tags'
             sh 'make uorb_graphs'
             dir('Tools/uorb_graph') {
               archiveArtifacts(artifacts: 'graph_px4_sitl.json')
@@ -176,7 +172,7 @@ pipeline {
 
         stage('Userguide') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh('export')
@@ -206,7 +202,7 @@ pipeline {
 
         stage('QGroundControl') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh('export')
@@ -234,7 +230,7 @@ pipeline {
 
         stage('microRTPS agent') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh('export')
@@ -264,7 +260,7 @@ pipeline {
 
         stage('PX4 ROS msgs') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh('export')
@@ -293,7 +289,7 @@ pipeline {
 
         stage('PX4 ROS2 bridge') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh('export')
@@ -336,7 +332,7 @@ pipeline {
 
         stage('S3') {
           agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
+            docker { image 'px4io/px4-dev-base-focal:2021-02-04' }
           }
           steps {
             sh('export')

Makefile

@@ -303,7 +303,7 @@ check_%:
 	@echo
 
 uorb_graphs:
-	@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --exclude-path src/lib --file Tools/uorb_graph/graph_full
+	@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --file Tools/uorb_graph/graph_full
 	@$(MAKE) --no-print-directory px4_fmu-v2_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v4_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
@@ -469,7 +469,6 @@ validate_module_configs:
 
 clean:
 	@rm -rf "$(SRC_DIR)"/build
-	@git submodule foreach git clean -df
 
 submodulesclean:
 	@git submodule foreach --quiet --recursive git clean -ff -x -d
@@ -487,7 +486,7 @@ gazeboclean:
 
 distclean: gazeboclean
 	@git submodule deinit -f .
-	@git clean -ff -x -d -e ".cproject" -e ".idea" -e ".project" -e ".settings" -e ".vscode"
+	@git clean -ff -x -d -e ".project" -e ".cproject" -e ".idea" -e ".settings" -e ".vscode"
 
 # Help / Error
 # --------------------------------------------------------------------

README.md

@@ -17,7 +17,7 @@ PX4 is highly portable, OS-independent and supports Linux, NuttX and QuRT out of
   * [VTOL](https://docs.px4.io/master/en/frames_vtol/)
   * [Autogyro](https://docs.px4.io/master/en/frames_autogyro/)
   * [Rover](https://docs.px4.io/master/en/frames_rover/)
-  * many more experimental types (Blimps, Boats, Submarines, High altitude balloons, etc)
+  * many more experimental types (Blimps, Boats, Submarines, Autogyros, etc)
 * Releases: [Downloads](https://github.com/PX4/PX4-Autopilot/releases)
 
 

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

@@ -34,9 +34,6 @@
 add_subdirectory(airframes)
 
 px4_add_romfs_files(
-	px4-rc.params
-	px4-rc.simulator
-	px4-rc.mavlink
 	rc.replay
 	rcS
 )

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

@@ -10,39 +10,43 @@
 . ${R}etc/init.d/rc.mc_defaults
 . ${R}etc/init.d/rc.ctrlalloc
 
-param set-default MPC_USE_HTE 0
+if [ $AUTOCNF = yes ]
+then
+	param set MPC_USE_HTE 0
 
-param set-default VM_MASS 1.5
-param set-default VM_INERTIA_XX 0.03
-param set-default VM_INERTIA_YY 0.03
-param set-default VM_INERTIA_ZZ 0.05
+	param set VM_MASS 1.5
+	param set VM_INERTIA_XX 0.03
+	param set VM_INERTIA_YY 0.03
+	param set VM_INERTIA_ZZ 0.05
 
-param set-default CA_AIRFRAME 0
-param set-default CA_METHOD 1
-param set-default CA_ACT0_MIN 0.0
-param set-default CA_ACT1_MIN 0.0
-param set-default CA_ACT2_MIN 0.0
-param set-default CA_ACT3_MIN 0.0
-param set-default CA_ACT0_MAX 1.0
-param set-default CA_ACT1_MAX 1.0
-param set-default CA_ACT2_MAX 1.0
-param set-default CA_ACT3_MAX 1.0
+	param set CA_AIRFRAME 0
+	param set CA_METHOD 1
+	param set CA_ACT0_MIN 0.0
+	param set CA_ACT1_MIN 0.0
+	param set CA_ACT2_MIN 0.0
+	param set CA_ACT3_MIN 0.0
+	param set CA_ACT0_MAX 1.0
+	param set CA_ACT1_MAX 1.0
+	param set CA_ACT2_MAX 1.0
+	param set CA_ACT3_MAX 1.0
 
-param set-default CA_MC_R0_PX 0.1515
-param set-default CA_MC_R0_PY 0.245
-param set-default CA_MC_R0_CT 6.5
-param set-default CA_MC_R0_KM 0.05
-param set-default CA_MC_R1_PX -0.1515
-param set-default CA_MC_R1_PY -0.1875
-param set-default CA_MC_R1_CT 6.5
-param set-default CA_MC_R1_KM 0.05
-param set-default CA_MC_R2_PX 0.1515
-param set-default CA_MC_R2_PY -0.245
-param set-default CA_MC_R2_CT 6.5
-param set-default CA_MC_R2_KM -0.05
-param set-default CA_MC_R3_PX -0.1515
-param set-default CA_MC_R3_PY 0.1875
-param set-default CA_MC_R3_CT 6.5
-param set-default CA_MC_R3_KM -0.05
+	param set CA_MC_R0_PX 0.1515
+	param set CA_MC_R0_PY 0.245
+	param set CA_MC_R0_CT 6.5
+	param set CA_MC_R0_KM 0.05
+	param set CA_MC_R1_PX -0.1515
+	param set CA_MC_R1_PY -0.1875
+	param set CA_MC_R1_CT 6.5
+	param set CA_MC_R1_KM 0.05
+	param set CA_MC_R2_PX 0.1515
+	param set CA_MC_R2_PY -0.245
+	param set CA_MC_R2_CT 6.5
+	param set CA_MC_R2_KM -0.05
+	param set CA_MC_R3_PX -0.1515
+	param set CA_MC_R3_PY 0.1875
+	param set CA_MC_R3_CT 6.5
+	param set CA_MC_R3_KM -0.05
+
+fi
 
 set MIXER direct

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

@@ -7,6 +7,8 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-param set-default EKF2_RNG_AID 1
-param set-default EKF2_RNG_A_HMAX 10
-
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_RNG_AID 1
+	param set EKF2_RNG_A_HMAX 10
+fi

ROMFS/px4fmu_common/init.d-posix/airframes/10020_if750a

@@ -8,12 +8,15 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-# EKF2: Multi GPS blending (as the model has 2 GPS's)
-param set-default SENS_GPS_MASK 7
-param set-default TRIG_INTERFACE 3
-param set-default TRIG_MODE 4
-param set-default MNT_MODE_IN 4
-param set-default MNT_MODE_OUT 2
-param set-default MNT_DO_STAB 2
+if [ $AUTOCNF = yes ]
+then
+	# EKF2: Multi GPS blending (as the model has 2 GPS's)
+	param set EKF2_GPS_MASK 7 # Uses speed, hpos and vpos accuracy
+	param set TRIG_INTERFACE 3
+	param set TRIG_MODE 4
+	param set MNT_MODE_IN 4
+	param set MNT_MODE_OUT 2
+	param set MNT_DO_STAB 2
+fi
 
 set MIXER quad_x

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

@@ -7,14 +7,16 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-# EKF2
-param set-default EKF2_AID_MASK 2
-param set-default EKF2_EVP_NOISE 0.05
-param set-default EKF2_EVA_NOISE 0.05
+if [ $AUTOCNF = yes ]
+then
+	# EKF2
+	param set EKF2_AID_MASK 2
+	param set EKF2_EVP_NOISE 0.05
+	param set 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
+	# LPE: Flow-only mode
+	param set LPE_FUSION 242
+	param set LPE_FAKE_ORIGIN 1
 
+	param set MPC_ALT_MODE 2
+fi

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

@@ -7,9 +7,12 @@
 
 . ${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
+if [ $AUTOCNF = yes ]
+then
+	# enable fusion of landing target velocity
+	param set LTEST_MODE 1
+	param set PLD_HACC_RAD 0.1
+fi
 
 # Start up Landing Target Estimator module
 landing_target_estimator start

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

@@ -7,5 +7,7 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-param set-default LPE_FUSION 242
-
+if [ $AUTOCNF = yes ]
+then
+	param set LPE_FUSION 242
+fi

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

@@ -7,13 +7,15 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-# EKF2: Vision position and heading
-param set-default EKF2_AID_MASK 24
-param set-default EKF2_EV_DELAY 5
+if [ $AUTOCNF = yes ]
+then
+	# EKF2: Vision position and heading
+	param set EKF2_AID_MASK 24
+	param set EKF2_EV_DELAY 5
 
-# LPE: Vision + baro
-param set-default LPE_FUSION 132
-
-# AEQ: External heading set to use vision input
-param set-default ATT_EXT_HDG_M 1
+	# LPE: Vision + baro
+	param set LPE_FUSION 132
 
+	# AEQ: External heading set to use vision input
+	param set ATT_EXT_HDG_M 1
+fi

ROMFS/px4fmu_common/init.d-posix/airframes/1014_solo

@@ -7,7 +7,10 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-param set-default MC_PITCHRATE_P 0.1
-param set-default MC_ROLLRATE_P 0.1
+if [ $AUTOCNF = yes ]
+then
+	param set MC_PITCHRATE_P 0.1
+	param set MC_ROLLRATE_P 0.1
+fi
 
 set MIXER quad_x

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

@@ -7,6 +7,8 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-param set-default COM_OBS_AVOID 1
-param set-default MPC_XY_CRUISE 5.0
-
+if [ $AUTOCNF = yes ]
+then
+	param set COM_OBS_AVOID 1
+	param set MPC_XY_CRUISE 5.0
+fi

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

@@ -7,12 +7,15 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-# EKF2
-param set-default EKF2_AID_MASK 2
-param set-default SENS_FLOW_ROT 0
+if [ $AUTOCNF = yes ]
+then
+	# EKF2
+	param set EKF2_AID_MASK 2
+	param set SENS_FLOW_ROT 0
 
-# LPE: Flow-only mode
-param set-default LPE_FUSION 242
-param set-default LPE_FAKE_ORIGIN 1
+	# LPE: Flow-only mode
+	param set LPE_FUSION 242
+	param set LPE_FAKE_ORIGIN 1
 
-param set-default MPC_ALT_MODE 2
+	param set MPC_ALT_MODE 2
+fi

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

@@ -7,6 +7,9 @@
 
 . ${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
+if [ $AUTOCNF = yes ]
+then
+	# EKF2: Vision velocity and heading
+	param set EKF2_AID_MASK 272
+	param set EKF2_EV_DELAY 5
+fi

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

@@ -7,5 +7,8 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
-# EKF2: Multi GPS blending
-param set-default SENS_GPS_MASK 7
+if [ $AUTOCNF = yes ]
+then
+	# EKF2: Multi GPS blending
+	param set EKF2_GPS_MASK 7 # Uses speed, hpos and vpos accuracy
+fi

ROMFS/px4fmu_common/init.d-posix/airframes/1020_uuv_generic

@@ -5,13 +5,16 @@
 
 . ${R}etc/init.d/rc.uuv_defaults
 
-#Set data link loss failsafe mode (0: disabled)
-param set-default NAV_DLL_ACT 0
+if [ $AUTOCNF = yes ]
+then
+	#Set data link loss failsafe mode (0: disabled)
+	param set NAV_DLL_ACT 0
 
-# disable circuit breaker for airspeed sensor
-param set-default CBRK_AIRSPD_CHK 162128
+	# disable circuit breaker for airspeed sensor
+	param set CBRK_AIRSPD_CHK 162128
 
-#param set CBRK_GPSFAIL 240024
+	#param set CBRK_GPSFAIL 240024
+fi
 
 set MAV_TYPE 12
 param set MAV_TYPE ${MAV_TYPE}

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

@@ -5,13 +5,16 @@
 
 . ${R}etc/init.d/rc.uuv_defaults
 
-#Set data link loss failsafe mode (0: disabled)
-param set-default NAV_DLL_ACT 0
+if [ $AUTOCNF = yes ]
+then
+	#Set data link loss failsafe mode (0: disabled)
+	param set NAV_DLL_ACT 0
 
-# disable circuit breaker for airspeed sensor
-param set-default CBRK_AIRSPD_CHK 162128
+	# disable circuit breaker for airspeed sensor
+	param set CBRK_AIRSPD_CHK 162128
 
-#param set CBRK_GPSFAIL 240024
+	#param set CBRK_GPSFAIL 240024
+fi
 
 set MAV_TYPE 12
 param set MAV_TYPE ${MAV_TYPE}

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

@@ -5,11 +5,15 @@
 
 . ${R}etc/init.d/rc.uuv_defaults
 
-#Set data link loss failsafe mode (0: disabled)
-param set-default NAV_DLL_ACT 0
+if [ $AUTOCNF = yes ]
+then
+	#Set data link loss failsafe mode (0: disabled)
+	param set NAV_DLL_ACT 0
 
-# disable circuit breaker for airspeed sensor
-param set-default CBRK_AIRSPD_CHK 162128
+	# disable circuit breaker for airspeed sensor
+	param set CBRK_AIRSPD_CHK 162128
+
+fi
 
 set PWM_OUT 12345678
 set MIXER_FILE etc/mixers-sitl/vectored6dof_sitl.main.mix

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

@@ -5,50 +5,54 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
-param set-default EKF2_ARSP_THR 8
-param set-default EKF2_FUSE_BETA 1
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	param set EKF2_MAG_ACCLIM 0
+	param set 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 FW_LND_AIRSPD_SC 1
+	param set FW_LND_ANG 8
+	param set FW_THR_LND_MAX 0
 
-param set-default FW_L1_PERIOD 12
+	param set FW_L1_PERIOD 12
 
-param set-default FW_MAN_P_MAX 30
+	param set FW_MAN_P_MAX 30
 
-param set-default FW_PR_I 0.4
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.2
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-param set-default FW_P_LIM_MIN -15
+	param set FW_PR_I 0.4
+	param set FW_PR_P 0.9
+	param set FW_PR_FF 0.2
+	param set FW_PSP_OFF 2
+	param set FW_P_LIM_MAX 32
+	param set FW_P_LIM_MIN -15
 
-param set-default FW_RR_FF 0.1
-param set-default FW_RR_P 0.3
+	param set FW_RR_FF 0.1
+	param set FW_RR_P 0.3
 
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_CRUISE 0.25
+	param set FW_THR_MAX 0.6
+	param set FW_THR_MIN 0.05
+	param set FW_THR_CRUISE 0.25
 
-param set-default FW_T_ALT_TC 2
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_HRATE_FF 0.5
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-param set-default FW_T_TAS_TC 2
+	param set FW_T_ALT_TC 2
+	param set FW_T_CLMB_MAX 8
+	param set FW_T_HRATE_FF 0.5
+	param set FW_T_SINK_MAX 2.7
+	param set FW_T_SINK_MIN 2.2
+	param set FW_T_TAS_TC 2
 
-param set-default FW_W_EN 1
+	param set FW_W_EN 1
 
-param set-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
+	param set MIS_LTRMIN_ALT 30
+	param set MIS_TAKEOFF_ALT 30
 
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 50
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50
 
-param set-default RWTO_TKOFF 1
+	param set RWTO_TKOFF 1
+
+fi
 
 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom

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

@@ -5,8 +5,10 @@
 
 . ${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
+if [ $AUTOCNF = yes ]
+then
+	# Camera trigger interface is MAVLink
+	param set TRIG_INTERFACE 3
+	# Distance trigger mode enabled
+	param set TRIG_MODE 4
+fi

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

@@ -5,5 +5,8 @@
 
 . ${R}etc/init.d-posix/airframes/1030_plane
 
-param set-default RWTO_TKOFF 0
+if [ $AUTOCNF = yes ]
+then
+	param set RWTO_TKOFF 0
 
+fi

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

@@ -5,5 +5,8 @@
 
 . ${R}etc/init.d-posix/airframes/1030_plane
 
-param set-default FW_LND_USETER 1
+if [ $AUTOCNF = yes ]
+then
+	param set FW_LND_USETER 1
 
+fi

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

@@ -5,55 +5,54 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
-param set-default EKF2_ARSP_THR 8
-param set-default EKF2_FUSE_BETA 1
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	#param set EKF2_MAG_ACCLIM 0
+	#param set EKF2_MAG_YAWLIM 0
 
-param set-default FW_LND_AIRSPD_SC 1.1
-param set-default FW_LND_ANG 5
-param set-default FW_THR_LND_MAX 0
-param set-default FW_LND_HHDIST 30
-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 FW_LND_TLALT 15
+	param set FW_LND_AIRSPD_SC 1.1
+	param set FW_LND_ANG 5
+	param set FW_THR_LND_MAX 0
+	param set FW_LND_HHDIST 30
+	param set FW_LND_FL_PMIN 9.5
+	param set FW_LND_FL_PMAX 20
+	param set FW_LND_FLALT 5
+	param set FW_LND_TLALT 15
 
-param set-default FW_L1_PERIOD 25
+	param set FW_L1_PERIOD 25
 
-param set-default FW_P_TC 0.4
-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 FW_P_TC 0.4
+	param set FW_PR_FF 0.40
+	param set FW_PR_I 0.05
+	param set 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 FW_R_TC 0.45
+	param set FW_RR_FF 0.40
+	param set FW_RR_I 0.132
+	param set FW_RR_P 0.085
 
-param set-default FW_W_EN 1
+	param set 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 MIS_LTRMIN_ALT 30
+	param set MIS_TAKEOFF_ALT 20
+	param set MIS_DIST_1WP 2500
+	param set MIS_DIST_WPS 10000
 
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 50
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50
 
-param set-default RWTO_TKOFF 1
-
-# fix takeoff failure for JSBsim in autonomous mission mode.
-#param set FW_THR_SLEW_MAX 0.3
-
-param set-default RWTO_MAX_PITCH 20
-param set-default RWTO_MAX_ROLL 10
-
-# fix takeoff failure for JSBsim in autonomous mission mode.
-#param set-default RWTO_MAX_THR 0.6
-
-param set-default RWTO_PSP 8
-param set-default RWTO_AIRSPD_SCL 1.8
+	param set RWTO_TKOFF 1
+	#param set FW_THR_SLEW_MAX 0.3 # fix takeoff failure for JSBsim in autonomous mission mode.
+	param set RWTO_MAX_PITCH 20
+	param set RWTO_MAX_ROLL 10
+	#param set RWTO_MAX_THR 0.6		# fix takeoff failure for JSBsim in autonomous mission mode.
+	param set RWTO_PSP 8
+	param set RWTO_AIRSPD_SCL 1.8
 
+fi
 
 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom

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

@@ -5,54 +5,54 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
-param set-default EKF2_ARSP_THR 8
-param set-default EKF2_FUSE_BETA 1
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	#param set EKF2_MAG_ACCLIM 0
+	#param set EKF2_MAG_YAWLIM 0
 
-param set-default FW_LND_AIRSPD_SC 1.1
-param set-default FW_LND_ANG 5
-param set-default FW_THR_LND_MAX 0
-param set-default FW_LND_HHDIST 30
-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 FW_LND_TLALT 15
+	param set FW_LND_AIRSPD_SC 1.1
+	param set FW_LND_ANG 5
+	param set FW_THR_LND_MAX 0
+	param set FW_LND_HHDIST 30
+	param set FW_LND_FL_PMIN 9.5
+	param set FW_LND_FL_PMAX 20
+	param set FW_LND_FLALT 5
+	param set FW_LND_TLALT 15
 
-param set-default FW_L1_PERIOD 25
+	param set FW_L1_PERIOD 25
 
-param set-default FW_P_TC 0.4
-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 FW_P_TC 0.4
+	param set FW_PR_FF 0.40
+	param set FW_PR_I 0.05
+	param set 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 FW_R_TC 0.45
+	param set FW_RR_FF 0.40
+	param set FW_RR_I 0.132
+	param set FW_RR_P 0.085
 
-param set-default FW_W_EN 1
+	param set 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 MIS_LTRMIN_ALT 30
+	param set MIS_TAKEOFF_ALT 20
+	param set MIS_DIST_1WP 2500
+	param set MIS_DIST_WPS 10000
 
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 50
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50
 
-param set-default RWTO_TKOFF 1
+	param set RWTO_TKOFF 1
+	#param set FW_THR_SLEW_MAX 0.3 # fix takeoff failure for JSBsim in autonomous mission mode.
+	param set RWTO_MAX_PITCH 20
+	param set RWTO_MAX_ROLL 10
+	#param set RWTO_MAX_THR 0.6		# fix takeoff failure for JSBsim in autonomous mission mode.
+	param set RWTO_PSP 8
+	param set RWTO_AIRSPD_SCL 1.8
 
-# fix takeoff failure for JSBsim in autonomous mission mode.
-#param set FW_THR_SLEW_MAX 0.3
-
-param set-default RWTO_MAX_PITCH 20
-param set-default RWTO_MAX_ROLL 10
-
-# fix takeoff failure for JSBsim in autonomous mission mode.
-#param set RWTO_MAX_THR 0.6
-
-param set-default RWTO_PSP 8
-param set-default RWTO_AIRSPD_SCL 1.8
+fi
 
 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom

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

@@ -5,39 +5,43 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
-param set-default EKF2_ARSP_THR 8
-param set-default EKF2_FUSE_BETA 1
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	param set EKF2_MAG_ACCLIM 0
+	param set 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 FW_LND_AIRSPD_SC 1
+	param set FW_LND_ANG 8
+	param set FW_THR_LND_MAX 0
 
-param set-default FW_L1_PERIOD 15
+	param set 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
-param set-default FW_PR_P 0.05
+	param set FW_P_TC 0.5
+	param set FW_PR_FF 0.40
+	param set FW_PR_I 0.05
+	param set FW_PR_P 0.05
 
-param set-default FW_R_TC 0.7
-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 FW_R_TC 0.7
+	param set FW_RR_FF 0.20
+	param set FW_RR_I 0.02
+	param set FW_RR_P 0.22
 
-param set-default FW_L1_PERIOD 12
+	param set FW_L1_PERIOD 12
 
-param set-default FW_W_EN 1
+	param set FW_W_EN 1
 
-param set-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
+	param set MIS_LTRMIN_ALT 30
+	param set MIS_TAKEOFF_ALT 30
 
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 50
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50
 
-param set-default RWTO_TKOFF 1
+	param set RWTO_TKOFF 1
+
+fi
 
 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom

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

@@ -5,46 +5,52 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
-param set-default EKF2_ARSP_THR 8
-param set-default EKF2_FUSE_BETA 1
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	#param set EKF2_MAG_ACCLIM 0
+	#param set EKF2_MAG_YAWLIM 0
 
-param set-default FW_LND_AIRSPD_SC 1.1
-param set-default FW_LND_ANG 5
-param set-default FW_THR_LND_MAX 0
-param set-default FW_LND_HHDIST 30
-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 FW_LND_TLALT 15
+	param set FW_LND_AIRSPD_SC 1.1
+	param set FW_LND_ANG 5
+	param set FW_THR_LND_MAX 0
+	param set FW_LND_HHDIST 30
+	param set FW_LND_FL_PMIN 9.5
+	param set FW_LND_FL_PMAX 20
+	param set FW_LND_FLALT 5
+	param set FW_LND_TLALT 15
 
-param set-default FW_L1_PERIOD 25
+	param set FW_L1_PERIOD 25
 
-param set-default FW_P_TC 0.4
-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 FW_P_TC 0.4
+	param set FW_PR_FF 0.40
+	param set FW_PR_I 0.05
+	param set 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 FW_R_TC 0.45
+	param set FW_RR_FF 0.40
+	param set FW_RR_I 0.132
+	param set FW_RR_P 0.085
 
-param set-default FW_W_EN 1
+	param set 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 MIS_LTRMIN_ALT 30
+	param set MIS_TAKEOFF_ALT 20
+	param set MIS_DIST_1WP 2500
+	param set MIS_DIST_WPS 10000
 
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 50
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50
 
-param set-default RWTO_TKOFF 1
-param set-default RWTO_MAX_PITCH 20
-param set-default RWTO_MAX_ROLL 10
-param set-default RWTO_PSP 8
-param set-default RWTO_AIRSPD_SCL 1.8
+	param set RWTO_TKOFF 1
+	param set RWTO_MAX_PITCH 20
+	param set RWTO_MAX_ROLL 10
+	param set RWTO_PSP 8
+	param set RWTO_AIRSPD_SCL 1.8
+
+fi
 
 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom

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

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# @name Plane SITL
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+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 FW_L1_PERIOD 12
+
+param set-default FW_MAN_P_MAX 30
+
+param set-default FW_PR_I 0.4
+param set-default FW_PR_P 0.9
+param set-default FW_PR_FF 0.2
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+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_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_THR_CRUISE 0.25
+
+param set-default FW_T_ALT_TC 2
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_HRATE_FF 0.5
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+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 NAV_LOITER_RAD 50
+
+param set-default RWTO_TKOFF 1
+
+set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
+set MIXER custom

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

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# @name Plane SITL
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	param set EKF2_MAG_ACCLIM 0
+	param set EKF2_MAG_YAWLIM 0
+
+	param set FW_LND_AIRSPD_SC 1
+	param set FW_LND_ANG 8
+	param set FW_THR_LND_MAX 0
+
+	param set FW_L1_PERIOD 12
+
+	param set FW_MAN_P_MAX 30
+
+	param set FW_PR_I 0.4
+	param set FW_PR_P 0.9
+	param set FW_PR_FF 0.2
+	param set FW_PSP_OFF 2
+	param set FW_P_LIM_MAX 32
+	param set FW_P_LIM_MIN -15
+
+	param set FW_RR_FF 0.1
+	param set FW_RR_P 0.3
+
+	param set FW_THR_MAX 0.6
+	param set FW_THR_MIN 0.05
+	param set FW_THR_CRUISE 0.25
+
+	param set FW_T_ALT_TC 2
+	param set FW_T_CLMB_MAX 8
+	param set FW_T_HRATE_FF 0.5
+	param set FW_T_SINK_MAX 2.7
+	param set FW_T_SINK_MIN 2.2
+	param set FW_T_TAS_TC 2
+
+	param set FW_W_EN 1
+
+	param set MIS_LTRMIN_ALT 30
+	param set MIS_TAKEOFF_ALT 30
+
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50
+
+	param set RWTO_TKOFF 1
+
+fi
+
+set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
+set MIXER custom

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

@@ -7,46 +7,50 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
-param set-default FW_L1_PERIOD 12
-param set-default FW_MAN_P_MAX 30
-param set-default FW_PR_FF 0.2
-param set-default FW_PR_I 0.4
-param set-default FW_PR_P 0.9
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-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_CRUISE 0.25
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_ALT_TC 2
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_HRATE_FF 0.5
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-param set-default FW_T_TAS_TC 2
+if [ $AUTOCNF = yes ]
+then
+	param set FW_L1_PERIOD 12
+	param set FW_MAN_P_MAX 30
+	param set FW_PR_FF 0.2
+	param set FW_PR_I 0.4
+	param set FW_PR_P 0.9
+	param set FW_PSP_OFF 2
+	param set FW_P_LIM_MAX 32
+	param set FW_P_LIM_MIN -15
+	param set FW_RR_FF 0.1
+	param set FW_RR_P 0.3
+	param set FW_THR_CRUISE 0.25
+	param set FW_THR_MAX 0.6
+	param set FW_THR_MIN 0.05
+	param set FW_T_ALT_TC 2
+	param set FW_T_CLMB_MAX 8
+	param set FW_T_HRATE_FF 0.5
+	param set FW_T_SINK_MAX 2.7
+	param set FW_T_SINK_MIN 2.2
+	param set FW_T_TAS_TC 2
 
-param set-default MC_ROLLRATE_P 0.3
-param set-default MC_YAW_P 1.6
+	param set MC_ROLLRATE_P 0.3
+	param set MC_YAW_P 1.6
 
-param set-default MIS_TAKEOFF_ALT 10
+	param set 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 MPC_ACC_HOR_MAX 2
+	param set MPC_XY_P 0.8
+	param set MPC_XY_VEL_P_ACC 3
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_D_ACC 0.1
 
-param set-default NAV_ACC_RAD 5
-param set-default NAV_LOITER_RAD 80
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80
 
-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
+	param set VT_FWD_THRUST_EN 4
+	param set VT_F_TRANS_THR 0.75
+	param set VT_MOT_ID 1234
+	param set VT_FW_MOT_OFFID 1234
+	param set VT_B_TRANS_DUR 8
+	param set VT_TYPE 2
+
+fi
 
 set MAV_TYPE 22
 

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

@@ -7,40 +7,44 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
-param set-default FW_L1_PERIOD 12
-param set-default FW_MAN_P_MAX 30
-param set-default FW_PR_I 0.2
-param set-default FW_PR_P 0.3
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-param set-default FW_P_LIM_MIN -15
-param set-default FW_RR_P 0.3
-param set-default FW_THR_CRUISE 0.33
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_ALT_TC 2
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_HRATE_FF 0.5
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-param set-default FW_T_TAS_TC 2
+if [ $AUTOCNF = yes ]
+then
+	param set FW_L1_PERIOD 12
+	param set FW_MAN_P_MAX 30
+	param set FW_PR_I 0.2
+	param set FW_PR_P 0.3
+	param set FW_PSP_OFF 2
+	param set FW_P_LIM_MAX 32
+	param set FW_P_LIM_MIN -15
+	param set FW_RR_P 0.3
+	param set FW_THR_CRUISE 0.33
+	param set FW_THR_MAX 0.6
+	param set FW_THR_MIN 0.05
+	param set FW_T_ALT_TC 2
+	param set FW_T_CLMB_MAX 8
+	param set FW_T_HRATE_FF 0.5
+	param set FW_T_SINK_MAX 2.7
+	param set FW_T_SINK_MIN 2.2
+	param set FW_T_TAS_TC 2
 
-param set-default MC_ROLLRATE_P 0.3
+	param set MC_ROLLRATE_P 0.3
 
-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 MPC_ACC_HOR_MAX 2
+	param set MPC_XY_P 0.8
+	param set MPC_XY_VEL_P_ACC 3
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_D_ACC 0.1
 
-param set-default NAV_ACC_RAD 5
-param set-default NAV_LOITER_RAD 80
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80
 
-param set-default VT_F_TRANS_DUR 1.5
-param set-default VT_F_TRANS_THR 0.7
-param set-default VT_TYPE 0
+	param set VT_F_TRANS_DUR 1.5
+	param set VT_F_TRANS_THR 0.7
+	param set VT_TYPE 0
 
-param set-default WV_EN 0
+	param set WV_EN 0
+
+fi
 
 set MAV_TYPE 20
 

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

@@ -7,44 +7,48 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
-param set-default FW_L1_PERIOD 12
-param set-default FW_MAN_P_MAX 30
-param set-default FW_PR_FF 0.2
-param set-default FW_PR_I 0.4
-param set-default FW_PR_P 0.9
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-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_CRUISE 0.38
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_ALT_TC 2
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_HRATE_FF 0.5
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-param set-default FW_T_TAS_TC 2
+if [ $AUTOCNF = yes ]
+then
+	param set FW_L1_PERIOD 12
+	param set FW_MAN_P_MAX 30
+	param set FW_PR_FF 0.2
+	param set FW_PR_I 0.4
+	param set FW_PR_P 0.9
+	param set FW_PSP_OFF 2
+	param set FW_P_LIM_MAX 32
+	param set FW_P_LIM_MIN -15
+	param set FW_RR_FF 0.1
+	param set FW_RR_P 0.3
+	param set FW_THR_CRUISE 0.38
+	param set FW_THR_MAX 0.6
+	param set FW_THR_MIN 0.05
+	param set FW_T_ALT_TC 2
+	param set FW_T_CLMB_MAX 8
+	param set FW_T_HRATE_FF 0.5
+	param set FW_T_SINK_MAX 2.7
+	param set FW_T_SINK_MIN 2.2
+	param set FW_T_TAS_TC 2
 
-param set-default MC_YAW_P 1.6
+	param set MC_YAW_P 1.6
 
-param set-default MIS_TAKEOFF_ALT 10
+	param set 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 MPC_ACC_HOR_MAX 2
+	param set MPC_XY_P 0.8
+	param set MPC_XY_VEL_P_ACC 3
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_D_ACC 0.1
 
-param set-default NAV_ACC_RAD 5
-param set-default NAV_LOITER_RAD 80
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80
 
-param set-default VT_B_TRANS_DUR 8
-param set-default VT_FWD_THRUST_EN 4
-param set-default VT_MOT_ID 1234
-param set-default VT_TILT_TRANS 0.6
-param set-default VT_TYPE 1
+	param set VT_B_TRANS_DUR 8
+	param set VT_FWD_THRUST_EN 4
+	param set VT_MOT_ID 1234
+	param set VT_TILT_TRANS 0.6
+	param set VT_TYPE 1
+
+fi
 
 set MAV_TYPE 21
 

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

@@ -7,50 +7,53 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
-param set-default FW_L1_PERIOD 12
-param set-default FW_MAN_P_MAX 30
-param set-default FW_PR_FF 0.2
-param set-default FW_PR_I 0.4
-param set-default FW_PR_P 0.9
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-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_CRUISE 0.25
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_ALT_TC 2
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_HRATE_FF 0.5
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-param set-default FW_T_TAS_TC 2
+if [ $AUTOCNF = yes ]
+then
+	param set FW_L1_PERIOD 12
+	param set FW_MAN_P_MAX 30
+	param set FW_PR_FF 0.2
+	param set FW_PR_I 0.4
+	param set FW_PR_P 0.9
+	param set FW_PSP_OFF 2
+	param set FW_P_LIM_MAX 32
+	param set FW_P_LIM_MIN -15
+	param set FW_RR_FF 0.1
+	param set FW_RR_P 0.3
+	param set FW_THR_CRUISE 0.25
+	param set FW_THR_MAX 0.6
+	param set FW_THR_MIN 0.05
+	param set FW_T_ALT_TC 2
+	param set FW_T_CLMB_MAX 8
+	param set FW_T_HRATE_FF 0.5
+	param set FW_T_SINK_MAX 2.7
+	param set FW_T_SINK_MIN 2.2
+	param set FW_T_TAS_TC 2
 
-param set-default MC_ROLLRATE_P 0.3
-param set-default MC_YAW_P 1.6
+	param set MC_ROLLRATE_P 0.3
+	param set MC_YAW_P 1.6
 
-param set-default MIS_TAKEOFF_ALT 10
+	param set 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 MPC_ACC_HOR_MAX 2
+	param set MPC_XY_P 0.8
+	param set MPC_XY_VEL_P_ACC 3
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_D_ACC 0.1
 
-param set-default NAV_ACC_RAD 5
-param set-default NAV_LOITER_RAD 80
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80
 
-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
+	param set VT_FWD_THRUST_EN 4
+	param set VT_F_TRANS_THR 0.75
+	param set VT_MOT_ID 1234
+	param set VT_FW_MOT_OFFID 1234
+	param set VT_B_TRANS_DUR 8
+	param set VT_TYPE 2
 
-param set-default RC_MAP_AUX1 8
-param set-default RC_MAP_AUX2 9
-param set-default RC_MAP_AUX3 10
+	param set RC_MAP_AUX1 8
+	param set RC_MAP_AUX2 9
+	param set RC_MAP_AUX3 10
+fi
 
 set MAV_TYPE 22
 

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

@@ -5,28 +5,32 @@
 
 . ${R}etc/init.d/rc.rover_defaults
 
-param set-default GND_L1_DIST 5
-param set-default GND_L1_PERIOD 10
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 0.001
-param set-default GND_SPEED_I 3
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 0.25
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 4
-param set-default GND_THR_CRUISE 0.3
-param set-default GND_THR_MAX 0.5
-param set-default GND_THR_MIN 0
+if [ $AUTOCNF = yes ]
+then
+	param set GND_L1_DIST 5
+	param set GND_L1_PERIOD 10
+	param set GND_SP_CTRL_MODE 1
+	param set GND_SPEED_D 0.001
+	param set GND_SPEED_I 3
+	param set GND_SPEED_IMAX 0.125
+	param set GND_SPEED_P 0.25
+	param set GND_SPEED_THR_SC 1
+	param set GND_SPEED_TRIM 4
+	param set GND_THR_CRUISE 0.3
+	param set GND_THR_MAX 0.5
+	param set 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
+	param set MIS_LTRMIN_ALT 0.01
+	param set MIS_TAKEOFF_ALT 0.01
+	param set NAV_ACC_RAD 0.5
+	param set NAV_LOITER_RAD 2
 
-param set-default CBRK_AIRSPD_CHK 162128
+	param set CBRK_AIRSPD_CHK 162128
 
-param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 2.0
+	param set GND_MAX_ANG 0.6
+	param set GND_WHEEL_BASE 2.0
+
+fi
 
 set MAV_TYPE 10
 

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

@@ -6,27 +6,31 @@
 
 . ${R}etc/init.d/rc.rover_defaults
 
-param set-default GND_L1_DIST 5
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 3
-param set-default GND_SPEED_I 0.001
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 0.25
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 4
-param set-default GND_THR_CRUISE 0.3
-param set-default GND_THR_MAX 0.5
-param set-default GND_THR_MIN 0
+if [ $AUTOCNF = yes ]
+then
+	param set GND_L1_DIST 5
+	param set GND_SP_CTRL_MODE 1
+	param set GND_SPEED_D 3
+	param set GND_SPEED_I 0.001
+	param set GND_SPEED_IMAX 0.125
+	param set GND_SPEED_P 0.25
+	param set GND_SPEED_THR_SC 1
+	param set GND_SPEED_TRIM 4
+	param set GND_THR_CRUISE 0.3
+	param set GND_THR_MAX 0.5
+	param set 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
+	param set MIS_LTRMIN_ALT 0.01
+	param set MIS_TAKEOFF_ALT 0.01
+	param set NAV_ACC_RAD 0.5
+	param set NAV_LOITER_RAD 2
 
-param set-default CBRK_AIRSPD_CHK 162128
+	param set CBRK_AIRSPD_CHK 162128
 
-param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 2.0
+	param set GND_MAX_ANG 0.6
+	param set GND_WHEEL_BASE 2.0
+
+fi
 
 set MAV_TYPE 10
 

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

@@ -10,28 +10,32 @@
 
 . ${R}etc/init.d/rc.rover_defaults
 
-param set-default GND_L1_DIST 5
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 3
-param set-default GND_SPEED_I 0.001
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 0.25
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 15
-param set-default GND_SPEED_MAX 25
-param set-default GND_THR_CRUISE 0.3
-param set-default GND_THR_MAX 0.5
-param set-default GND_THR_MIN 0
+if [ $AUTOCNF = yes ]
+then
+	param set GND_L1_DIST 5
+	param set GND_SP_CTRL_MODE 1
+	param set GND_SPEED_D 3
+	param set GND_SPEED_I 0.001
+	param set GND_SPEED_IMAX 0.125
+	param set GND_SPEED_P 0.25
+	param set GND_SPEED_THR_SC 1
+	param set GND_SPEED_TRIM 15
+	param set GND_SPEED_MAX 25
+	param set GND_THR_CRUISE 0.3
+	param set GND_THR_MAX 0.5
+	param set 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
+	param set MIS_LTRMIN_ALT 0.01
+	param set MIS_TAKEOFF_ALT 0.01
+	param set NAV_ACC_RAD 0.5
+	param set NAV_LOITER_RAD 2
 
-param set-default CBRK_AIRSPD_CHK 162128
+	param set CBRK_AIRSPD_CHK 162128
 
-param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 3.0
+	param set GND_MAX_ANG 0.6
+	param set GND_WHEEL_BASE 3.0
+
+fi
 
 set MAV_TYPE 10
 

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

@@ -5,28 +5,32 @@
 
 . ${R}etc/init.d/rc.boat_defaults
 
-param set-default GND_L1_DIST 5
-param set-default GND_L1_PERIOD 100
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 0.001
-param set-default GND_SPEED_I 8
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 2
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 1
-param set-default GND_THR_CRUISE 0.85
-param set-default GND_THR_MAX 1
-param set-default GND_THR_MIN 0
+if [ $AUTOCNF = yes ]
+then
+	param set GND_L1_DIST 5
+	param set GND_L1_PERIOD 100
+	param set GND_SP_CTRL_MODE 1
+	param set GND_SPEED_D 0.001
+	param set GND_SPEED_I 8
+	param set GND_SPEED_IMAX 0.125
+	param set GND_SPEED_P 2
+	param set GND_SPEED_THR_SC 1
+	param set GND_SPEED_TRIM 1
+	param set GND_THR_CRUISE 0.85
+	param set GND_THR_MAX 1
+	param set 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
+	param set MIS_LTRMIN_ALT 0.01
+	param set MIS_TAKEOFF_ALT 0.01
+	param set NAV_ACC_RAD 0.5
+	param set NAV_LOITER_RAD 2
 
-param set-default CBRK_AIRSPD_CHK 162128
+	param set CBRK_AIRSPD_CHK 162128
 
-param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 2.0
+	param set GND_MAX_ANG 0.6
+	param set GND_WHEEL_BASE 2.0
+
+fi
 
 set MAV_TYPE 11
 

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

@@ -12,47 +12,52 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
-param set-default EKF2_ARSP_THR 8
-param set-default EKF2_FUSE_BETA 1
-param set-default ASPD_STALL 10.0
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	param set ASPD_STALL 10.0
 
-param set-default FW_P_RMAX_NEG 20.0
-param set-default FW_P_RMAX_POS 60.0
-param set-default FW_W_RMAX 10
-param set-default FW_W_EN 1
+	param set FW_P_RMAX_NEG 20.0
+	param set FW_P_RMAX_POS 60.0
+	param set FW_W_RMAX 10
+	param set FW_W_EN 1
 
-param set-default FW_PR_IMAX 0.4
-param set-default FW_R_TC 0.4
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_I 0.1
-param set-default FW_RR_IMAX 0.2
-param set-default FW_RR_P 0.08
+	param set FW_PR_IMAX 0.4
+	param set FW_R_TC 0.4
+	param set FW_RR_FF 0.5
+	param set FW_RR_I 0.1
+	param set FW_RR_IMAX 0.2
+	param set FW_RR_P 0.08
 
-param set-default MIS_LTRMIN_ALT 50
-param set-default MIS_TAKEOFF_ALT 3
+	param set MIS_LTRMIN_ALT 50
+	param set MIS_TAKEOFF_ALT 3
 
-param set-default NAV_ACC_RAD 20
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 100
+	param set NAV_ACC_RAD 20
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 100
 
-param set-default RWTO_TKOFF 1
+	param set RWTO_TKOFF 1
 
-param set-default FW_ARSP_SCALE_EN 0
+	param set FW_ARSP_SCALE_EN 0
 
-param set-default FW_AIRSPD_MAX 35
-param set-default FW_AIRSPD_MIN 7
-param set-default FW_AIRSPD_TRIM 15
+	param set FW_AIRSPD_MAX 35
+	param set FW_AIRSPD_MIN 7
+	param set FW_AIRSPD_TRIM 15
 
-param set-default FW_P_LIM_MAX 25
-param set-default FW_P_LIM_MIN -5
-param set-default FW_R_LIM 30
+	param set FW_P_LIM_MAX 25
+	param set FW_P_LIM_MIN -5
+	param set FW_R_LIM 30
 
-param set-default FW_MAN_P_MAX 30.0
-param set-default FW_MAN_R_MAX 30.0
+	param set FW_MAN_P_MAX 30.0
+	param set FW_MAN_R_MAX 30.0
+
+	param set FW_THR_CRUISE 0.8
+	param set FW_THR_IDLE 0
+	param set COM_DISARM_PRFLT 0
+
+fi
 
-param set-default FW_THR_CRUISE 0.8
-param set-default FW_THR_IDLE 0
-param set-default COM_DISARM_PRFLT 0
 
 set MIXER_FILE etc/mixers-sitl/autogyro_sitl.main.mix
 set MIXER custom

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

@@ -9,21 +9,24 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-param set-default MC_PITCHRATE_P 0.1
-param set-default MC_PITCHRATE_I 0.05
-param set-default MC_PITCH_P 6.0
-param set-default MC_ROLLRATE_P 0.15
-param set-default MC_ROLLRATE_I 0.1
-param set-default MC_ROLL_P 6.0
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_P_ACC 3
+if [ $AUTOCNF = yes ]
+then
+	param set MC_PITCHRATE_P 0.1
+	param set MC_PITCHRATE_I 0.05
+	param set MC_PITCH_P 6.0
+	param set MC_ROLLRATE_P 0.15
+	param set MC_ROLLRATE_I 0.1
+	param set MC_ROLL_P 6.0
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_P_ACC 3
 
-param set-default RTL_DESCEND_ALT 10
+	param set RTL_DESCEND_ALT 10
 
-param set-default TRIG_INTERFACE 3
-param set-default TRIG_MODE 4
-param set-default MNT_MODE_IN 4
-param set-default MNT_DO_STAB 2
+	param set TRIG_INTERFACE 3
+	param set TRIG_MODE 4
+	param set MNT_MODE_IN 4
+	param set MNT_DO_STAB 2
+fi
 
 set MAV_TYPE 13
 

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

@@ -7,24 +7,27 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-param set-default MC_PITCHRATE_P 0.0800
-param set-default MC_PITCHRATE_I 0.0400
-param set-default MC_PITCHRATE_D 0.0010
-param set-default MC_PITCH_P 9.0
-param set-default MC_ROLLRATE_P 0.0800
-param set-default MC_ROLLRATE_I 0.0400
-param set-default MC_ROLLRATE_D 0.0010
-param set-default MC_ROLL_P 9.0
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_P_ACC 3
+if [ $AUTOCNF = yes ]
+then
+	param set MC_PITCHRATE_P 0.0800
+	param set MC_PITCHRATE_I 0.0400
+	param set MC_PITCHRATE_D 0.0010
+	param set MC_PITCH_P 9.0
+	param set MC_ROLLRATE_P 0.0800
+	param set MC_ROLLRATE_I 0.0400
+	param set MC_ROLLRATE_D 0.0010
+	param set MC_ROLL_P 9.0
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_P_ACC 3
 
-param set-default RTL_DESCEND_ALT 10
+	param set RTL_DESCEND_ALT 10
 
-param set-default TRIG_INTERFACE 3
-param set-default TRIG_MODE 4
-param set-default MNT_MODE_IN 4
-param set-default MNT_MODE_OUT 2
-param set-default MAV_PROTO_VER 2
+	param set TRIG_INTERFACE 3
+	param set TRIG_MODE 4
+	param set MNT_MODE_IN 4
+	param set MNT_MODE_OUT 2
+	param set MAV_PROTO_VER 2
+fi
 
 set MAV_TYPE 13
 

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

@@ -8,63 +8,66 @@
 . ${R}etc/init.d/rc.mc_defaults
 . ${R}etc/init.d/rc.ctrlalloc
 
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_P_ACC 3
+if [ $AUTOCNF = yes ]
+then
+	param set MPC_XY_VEL_I_ACC 4
+	param set MPC_XY_VEL_P_ACC 3
 
-param set-default RTL_DESCEND_ALT 10
-param set-default RTL_LAND_DELAY 0
+	param set RTL_DESCEND_ALT 10
+	param set RTL_LAND_DELAY 0
 
-param set-default TRIG_INTERFACE 3
-param set-default TRIG_MODE 4
-param set-default MNT_MODE_IN 0
-param set-default MAV_PROTO_VER 2
+	param set TRIG_INTERFACE 3
+	param set TRIG_MODE 4
+	param set MNT_MODE_IN 0
+	param set MAV_PROTO_VER 2
 
-param set-default MPC_USE_HTE 0
+	param set MPC_USE_HTE 0
 
-param set-default VM_MASS 2.66
-param set-default VM_INERTIA_XX 0.06
-param set-default VM_INERTIA_YY 0.06
-param set-default VM_INERTIA_ZZ 0.10
+	param set VM_MASS 2.66
+	param set VM_INERTIA_XX 0.06
+	param set VM_INERTIA_YY 0.06
+	param set VM_INERTIA_ZZ 0.10
 
-param set-default CA_AIRFRAME 0
-param set-default CA_METHOD 1
-param set-default CA_ACT0_MIN 0.0
-param set-default CA_ACT1_MIN 0.0
-param set-default CA_ACT2_MIN 0.0
-param set-default CA_ACT3_MIN 0.0
-param set-default CA_ACT4_MIN 0.0
-param set-default CA_ACT5_MIN 0.0
-param set-default CA_ACT0_MAX 1.0
-param set-default CA_ACT1_MAX 1.0
-param set-default CA_ACT2_MAX 1.0
-param set-default CA_ACT3_MAX 1.0
-param set-default CA_ACT4_MAX 1.0
-param set-default CA_ACT5_MAX 1.0
+	param set CA_AIRFRAME 0
+	param set CA_METHOD 1
+	param set CA_ACT0_MIN 0.0
+	param set CA_ACT1_MIN 0.0
+	param set CA_ACT2_MIN 0.0
+	param set CA_ACT3_MIN 0.0
+	param set CA_ACT4_MIN 0.0
+	param set CA_ACT5_MIN 0.0
+	param set CA_ACT0_MAX 1.0
+	param set CA_ACT1_MAX 1.0
+	param set CA_ACT2_MAX 1.0
+	param set CA_ACT3_MAX 1.0
+	param set CA_ACT4_MAX 1.0
+	param set CA_ACT5_MAX 1.0
 
-param set-default CA_MC_R0_PX 0.0
-param set-default CA_MC_R0_PY 1.0
-param set-default CA_MC_R0_CT 9.5
-param set-default CA_MC_R0_KM -0.05
-param set-default CA_MC_R1_PX 0.0
-param set-default CA_MC_R1_PY -1.0
-param set-default CA_MC_R1_CT 9.5
-param set-default CA_MC_R1_KM 0.05
-param set-default CA_MC_R2_PX 0.866025
-param set-default CA_MC_R2_PY -0.5
-param set-default CA_MC_R2_CT 9.5
-param set-default CA_MC_R2_KM -0.05
-param set-default CA_MC_R3_PX -0.866025
-param set-default CA_MC_R3_PY 0.5
-param set-default CA_MC_R3_CT 9.5
-param set-default CA_MC_R3_KM 0.05
-param set-default CA_MC_R4_PX 0.866025
-param set-default CA_MC_R4_PY 0.5
-param set-default CA_MC_R4_CT 9.5
-param set-default CA_MC_R4_KM 0.05
-param set-default CA_MC_R5_PX -0.866025
-param set-default CA_MC_R5_PY -0.5
-param set-default CA_MC_R5_CT 9.5
-param set-default CA_MC_R5_KM -0.05
+	param set CA_MC_R0_PX 0.0
+	param set CA_MC_R0_PY 1.0
+	param set CA_MC_R0_CT 9.5
+	param set CA_MC_R0_KM -0.05
+	param set CA_MC_R1_PX 0.0
+	param set CA_MC_R1_PY -1.0
+	param set CA_MC_R1_CT 9.5
+	param set CA_MC_R1_KM 0.05
+	param set CA_MC_R2_PX 0.866025
+	param set CA_MC_R2_PY -0.5
+	param set CA_MC_R2_CT 9.5
+	param set CA_MC_R2_KM -0.05
+	param set CA_MC_R3_PX -0.866025
+	param set CA_MC_R3_PY 0.5
+	param set CA_MC_R3_CT 9.5
+	param set CA_MC_R3_KM 0.05
+	param set CA_MC_R4_PX 0.866025
+	param set CA_MC_R4_PY 0.5
+	param set CA_MC_R4_CT 9.5
+	param set CA_MC_R4_KM 0.05
+	param set CA_MC_R5_PX -0.866025
+	param set CA_MC_R5_PY -0.5
+	param set CA_MC_R5_CT 9.5
+	param set CA_MC_R5_KM -0.05
+fi
 
 set MAV_TYPE 13
 

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

@@ -62,6 +62,8 @@ px4_add_romfs_files(
 	1034_rascal-electric
 	1035_techpod
 	1036_malolo
+	1037_believer
+	1038_plane_dynamicsoaring
 	1040_standard_vtol
 	1041_tailsitter
 	1042_tiltrotor

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

@@ -1,32 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-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
-udp_onboard_payload_port_local=$((14280+px4_instance))
-udp_onboard_payload_port_remote=$((14030+px4_instance))
-udp_onboard_gimbal_port_local=$((13030+px4_instance))
-udp_onboard_gimbal_port_remote=$((13280+px4_instance))
-udp_gcs_port_local=$((18570+px4_instance))
-
-# GCS link
-mavlink start -x -u $udp_gcs_port_local -r 4000000 -f
-mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u $udp_gcs_port_local
-mavlink stream -r 50 -s LOCAL_POSITION_NED -u $udp_gcs_port_local
-mavlink stream -r 50 -s GLOBAL_POSITION_INT -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE_TARGET -u $udp_gcs_port_local
-mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u $udp_gcs_port_local
-mavlink stream -r 20 -s RC_CHANNELS -u $udp_gcs_port_local
-mavlink stream -r 10 -s OPTICAL_FLOW_RAD -u $udp_gcs_port_local
-
-# API/Offboard link
-mavlink start -x -u $udp_offboard_port_local -r 4000000 -f -m onboard -o $udp_offboard_port_remote
-
-# Onboard link to camera
-mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $udp_onboard_payload_port_remote
-
-# Onboard link to gimbal
-mavlink start -x -u $udp_onboard_gimbal_port_local -r 400000 -m gimbal -o $udp_onboard_gimbal_port_remote

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

@@ -1,5 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-#param set MAV_SYS_ID $((px4_instance+1))
-#param set IMU_INTEG_RATE 250

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

@@ -1,20 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-simulator_tcp_port=$((4560+px4_instance))
-
-# Check if PX4_SIM_HOSTNAME environment variable is empty
-# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
-# If both are empty use localhost for simulator
-if [ -z "${PX4_SIM_HOSTNAME}" ]; then
-  if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
-    echo "PX4 SIM HOST: localhost"
-    simulator start -c $simulator_tcp_port
-  else
-    echo "PX4 SIM HOST: $PX4_SIM_HOST_ADDR"
-    simulator start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port
-  fi
-else
-  echo "PX4 SIM HOST: $PX4_SIM_HOSTNAME"
-  simulator start -h $PX4_SIM_HOSTNAME $simulator_tcp_port
-fi

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -5,8 +5,7 @@
 # shellcheck disable=SC1091
 . px4-alias.sh
 
-#search path for sourcing px4-rc.*
-PATH="$PATH:${R}etc/init.d-posix"
+SCRIPT_DIR="$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)"
 
 #
 # Main SITL startup script
@@ -46,9 +45,9 @@ else
 	# Find the matching Autostart ID (file name has the form: [0-9]+_${PX4_SIM_MODEL})
 	# TODO: unify with rc.autostart generation
 	# shellcheck disable=SC2012
-	REQUESTED_AUTOSTART=$(ls "${R}etc/init.d-posix/airframes" | sed -n 's/^\([0-9][0-9]*\)_'${PX4_SIM_MODEL}'$/\1/p')
+	REQUESTED_AUTOSTART=$(ls "$SCRIPT_DIR/airframes" | sed -n 's/^\([0-9][0-9]*\)_'${PX4_SIM_MODEL}'$/\1/p')
 	if [ -z "$REQUESTED_AUTOSTART" ]; then
-		echo "Error: Unknown model $PX4_SIM_MODEL (not found by name on ${R}etc/init.d-posix/airframes)"
+		echo "Error: Unknown model $PX4_SIM_MODEL (not found by name on $SCRIPT_DIR/airframes)"
 		exit 1
 	else
 		echo "Info: found model autostart file as SYS_AUTOSTART=$REQUESTED_AUTOSTART"
@@ -105,6 +104,15 @@ fi
 # multi-instance setup
 # shellcheck disable=SC2154
 param set MAV_SYS_ID $((px4_instance+1))
+simulator_tcp_port=$((4560+px4_instance))
+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
+udp_onboard_payload_port_local=$((14280+px4_instance))
+udp_onboard_payload_port_remote=$((14030+px4_instance))
+udp_onboard_gimbal_port_local=$((13030+px4_instance))
+udp_onboard_gimbal_port_remote=$((13280+px4_instance))
+udp_gcs_port_local=$((18570+px4_instance))
 
 if [ $AUTOCNF = yes ]
 then
@@ -208,14 +216,25 @@ fi
 # Simulator IMU data provided at 250 Hz
 param set IMU_INTEG_RATE 250
 
-#user defined params for instances can be in PATH
-. px4-rc.params
-
 dataman start
 # only start the simulator if not in replay mode, as both control the lockstep time
 if ! replay tryapplyparams
 then
-  . px4-rc.simulator
+  # Check if PX4_SIM_HOSTNAME environment variable is empty
+  # If empty check if PX4_SIM_HOST_ADDR environment variable is empty
+  # If both are empty use localhost for simulator
+  if [ -z "${PX4_SIM_HOSTNAME}" ]; then
+    if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
+      echo "PX4 SIM HOST: localhost"
+      simulator start -c $simulator_tcp_port
+    else
+      echo "PX4 SIM HOST: $PX4_SIM_HOST_ADDR"
+      simulator start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port 
+    fi
+  else
+    echo "PX4 SIM HOST: $PX4_SIM_HOSTNAME"
+    simulator start -h $PX4_SIM_HOSTNAME $simulator_tcp_port 
+  fi
 fi
 load_mon start
 battery_simulator start
@@ -253,8 +272,32 @@ fi
 #
 . ${R}etc/init.d/rc.vehicle_setup
 
-#user defined mavlink streams for instances can be in PATH
-. px4-rc.mavlink
+if [ -e etc/init.d-posix/rc.mavlink_override ]
+then
+	echo "Running non-default mavlink config rc.mavlink_override"
+	. ${R}etc/init.d-posix/rc.mavlink_override
+else
+	# GCS link
+	mavlink start -x -u $udp_gcs_port_local -r 4000000 -f
+	mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u $udp_gcs_port_local
+	mavlink stream -r 50 -s LOCAL_POSITION_NED -u $udp_gcs_port_local
+	mavlink stream -r 50 -s GLOBAL_POSITION_INT -u $udp_gcs_port_local
+	mavlink stream -r 50 -s ATTITUDE -u $udp_gcs_port_local
+	mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_gcs_port_local
+	mavlink stream -r 50 -s ATTITUDE_TARGET -u $udp_gcs_port_local
+	mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u $udp_gcs_port_local
+	mavlink stream -r 20 -s RC_CHANNELS -u $udp_gcs_port_local
+	mavlink stream -r 10 -s OPTICAL_FLOW_RAD -u $udp_gcs_port_local
+
+	# API/Offboard link
+	mavlink start -x -u $udp_offboard_port_local -r 4000000 -f -m onboard -o $udp_offboard_port_remote
+
+	# Onboard link to camera
+	mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $udp_onboard_payload_port_remote
+
+	# Onboard link to gimbal
+	mavlink start -x -u $udp_onboard_gimbal_port_local -r 400000 -m gimbal -o $udp_onboard_gimbal_port_remote
+fi
 
 # execute autostart post script if any
 [ -e "$autostart_file".post ] && . "$autostart_file".post

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

@@ -14,7 +14,7 @@
 . ${R}etc/init.d/rc.vtol_defaults
 
 
-param set-default PWM_AUX_DISARM 1000
+param set-default PWM_AUX_DISARMED 1000
 param set-default PWM_AUX_MAX 2000
 param set-default PWM_AUX_MIN 1000
 param set-default PWM_AUX_RATE 50

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

@@ -112,7 +112,7 @@ param set-default MPC_YAWRAUTO_MAX 20
 param set-default NAV_DLL_ACT 0
 param set-default NAV_LOITER_RAD 100
 
-param set-default PWM_AUX_DISARM 950
+param set-default PWM_AUX_DISARMED 950
 
 param set-default PWM_MAIN_DIS5 1500
 param set-default PWM_MAIN_DIS6 1500

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

@@ -111,6 +111,5 @@ set MAV_TYPE 22
 set MIXER babyshark
 set MIXER_AUX pass
 
-# Mark outputs for the alternate rate
-# or D-Shot
 set PWM_OUT 5678
+set PWM_AUX_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/22000_asl_easyglider

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# @name ASL_EasyGlider
+#
+# @type Standard Plane
+# @class Plane
+#
+# @output MAIN1 aileron
+# @output MAIN2 aileron
+# @output MAIN3 elevator
+# @output MAIN4 rudder
+# @output MAIN5 throttle
+# @output MAIN6 wheel
+# @output MAIN7 flaps
+#
+# @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 Philipp Oettershagen <philipp.oettershagen@mavt.ethz.ch>
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+if [ $AUTOCNF == yes ]
+then
+    param set FW_AIRSPD_MIN 10
+    param set FW_AIRSPD_TRIM 15
+    param set FW_AIRSPD_MAX 20
+
+    param set FW_MAN_P_MAX 45
+    param set FW_MAN_R_MAX 45
+    param set FW_R_LIM 45
+
+    param set FW_WR_FF 0.2
+    param set FW_WR_I 0.2
+    param set FW_WR_IMAX 0.8
+    param set FW_WR_P 1
+    param set FW_W_RMAX 0
+
+    # set disarmed value for the ESC
+    param set PWM_DISARMED 1000
+
+    param set-default SENS_EN_ADIS164X 1
+    param set SENS_EN_ADIS164X 4
+fi
+
+set MIXER asl_easyglider
+
+# use PWM parameters for throttle channel
+set PWM_OUT 5

ROMFS/px4fmu_common/init.d/airframes/22001_asl_techpod

@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# @name ASL_Techpod
+#
+# @type Plane A-Tail
+# @class Plane
+#
+# @output MAIN1 aileron right
+# @output MAIN2 aileron left
+# @output MAIN3 v-tail right
+# @output MAIN4 v-tail left
+# @output MAIN5 throttle
+# @output MAIN6 wheel
+# @output MAIN7 flaps right
+# @output MAIN8 flaps left
+#
+# @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 Philipp Oettershagen <philipp.oettershagen@mavt.ethz.ch>
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+if [ $AUTOCNF == yes ]
+then
+    param set FW_AIRSPD_MIN 10
+    param set FW_AIRSPD_TRIM 15
+    param set FW_AIRSPD_MAX 20
+
+    param set FW_MAN_P_MAX 55
+    param set FW_MAN_R_MAX 55
+    param set FW_R_LIM 55
+
+    param set FW_WR_FF 0.2
+    param set FW_WR_I 0.2
+    param set FW_WR_IMAX 0.8
+    param set FW_WR_P 1
+    param set FW_W_RMAX 0
+
+    # set disarmed value for the ESC
+    param set PWM_DISARMED 1000
+fi
+
+set MIXER asl_techpod
+
+# use PWM parameters for throttle channel
+set PWM_OUT 5

ROMFS/px4fmu_common/init.d/airframes/22002_asl_sensesoar2

@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# @name ASL_SenseSoar2
+#
+# @type Plane A-Tail
+# @class Plane
+#
+# @output MAIN1 aileron right
+# @output MAIN2 aileron left
+# @output MAIN3 v-tail right
+# @output MAIN4 v-tail left
+# @output MAIN5 throttle
+# @output MAIN6 wheel
+# @output MAIN7 flaps right
+# @output MAIN8 flaps left
+#
+# @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 Philipp Oettershagen <philipp.oettershagen@mavt.ethz.ch>
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+if [ $AUTOCNF == yes ]
+then
+    param set FW_AIRSPD_MIN 12
+    param set FW_AIRSPD_TRIM 15
+    param set FW_AIRSPD_MAX 20
+
+    param set FW_MAN_P_MAX 45
+    param set FW_MAN_R_MAX 45
+    param set FW_R_LIM 55
+
+    param set FW_WR_FF 0.2
+    param set FW_WR_I 0.2
+    param set FW_WR_IMAX 0.8
+    param set FW_WR_P 1
+    param set FW_W_RMAX 0
+
+    # set disarmed value for the ESC
+    param set PWM_DISARMED 1000
+fi
+
+set MIXER asl_sensoar2
+
+# use PWM parameters for throttle channel
+set PWM_OUT 5

ROMFS/px4fmu_common/init.d/airframes/22003_asl_believer

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# @name Autonomous Systems Lab, ETH Zurich Believer
+#
+# @type Plane V-Tail
+# @class Plane
+#
+# @output MAIN1 aileron right
+# @output MAIN2 aileron left
+# @output MAIN3 v-tail right
+# @output MAIN4 v-tail left
+# @output MAIN5 throttle
+# @output MAIN6 wheel
+# @output MAIN7 flaps right
+# @output MAIN8 flaps left
+#
+# @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 Jaeyoung Lim <jalim@ethz.ch>
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default FW_AIRSPD_MIN 10
+param set-default FW_AIRSPD_TRIM 15
+param set-default FW_AIRSPD_MAX 20
+
+param set-default FW_MAN_P_MAX 55
+param set-default FW_MAN_R_MAX 55
+param set-default FW_R_LIM 55
+
+param set-default FW_WR_FF 0.2
+param set-default FW_WR_I 0.2
+param set-default FW_WR_IMAX 0.8
+param set-default FW_WR_P 1
+param set-default FW_W_RMAX 0
+
+# set disarmed value for the ESC
+param set-default PWM_MAIN_DISARM 1500
+param set-default PWM_MAIN_DIS5 900
+param set-default PWM_MAIN_DIS6 900
+
+# The Mini Talon does not have a wheel and
+# no flaps. I leave them here because the mixer
+# computes also wheel and flap controls.
+set MIXER AAVVTTFF_vtail
+
+# use PWM parameters for throttle channel
+set PWM_OUT 56

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

@@ -31,7 +31,7 @@ set VEHICLE_TYPE mc
 param set-default NAV_ACC_RAD 2
 
 param set-default PWM_AUX_RATE 400
-param set-default PWM_AUX_DISARM 900
+param set-default PWM_AUX_DISARMED 900
 param set-default PWM_AUX_MIN 1075
 param set-default PWM_AUX_MAX 1950
 

ROMFS/px4fmu_common/init.d/airframes/4040_reaper

@@ -33,7 +33,7 @@ param set-default MC_YAW_P 4
 
 param set-default NAV_ACC_RAD 2
 
-param set-default PWM_AUX_DISARM 950
+param set-default PWM_AUX_DISARMED 950
 param set-default PWM_AUX_RATE 50
 param set-default PWM_MAIN_MIN 1100
 param set-default PWM_MAIN_MAX 1900

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

@@ -157,6 +157,11 @@ px4_add_romfs_files(
 	18001_TF-B1
 
 	# [22000, 22999] Reserve for custom models
+	# ETHZ ASL Vehicles
+	22000_asl_easyglider
+	22001_asl_techpod
+	22002_asl_sensesoar2
+	22003_asl_believer
 
 	24001_dodeca_cox
 

ROMFS/px4fmu_common/init.d/rc.fw_defaults

@@ -16,8 +16,6 @@ param set-default COM_POS_FS_EPV 30
 param set-default COM_POS_FS_GAIN 0
 param set-default COM_POS_FS_PROB 1
 param set-default COM_VEL_FS_EVH 5
-# Disable preflight disarm to not interfere with external launching
-param set-default COM_DISARM_PRFLT -1
 
 param set-default EKF2_ARSP_THR 8
 param set-default EKF2_FUSE_BETA 1

ROMFS/px4fmu_common/init.d/rc.sensors

@@ -21,6 +21,23 @@ fi
 #                           Begin Optional drivers                            #
 ###############################################################################
 
+# ADIS16448 spi external IMU
+if param compare -s SENS_EN_ADIS164X 1
+then
+	if param compare -s SENS_OR_ADIS164X 0
+	then
+		adis16448 -S start
+	fi
+	if param compare -s SENS_OR_ADIS164X 4
+	then
+		adis16448 -S start -R 4
+	fi
+
+	# add a sleep to make sure the mag is the priority one
+	usleep 1000000
+fi
+
+
 if param compare -s SENS_EN_BATT 1
 then
 	batt_smbus start -X
@@ -108,18 +125,62 @@ then
 	vl53l1x start -X
 fi
 
-# ADIS16448 spi external IMU
-if param compare -s SENS_EN_ADIS164X 1
+# Hall effect sensors si7210
+# Potentially remove the -k option if possible and improve the startup if possible
+if param greater CAL_AV_AOA_ID -1
 then
-	adis16448 -S start
+	set AOA_I2C_ID 0
+	if param compare CAL_AV_AOA_ID 48
+	then
+		set AOA_I2C_ID 48
+	fi
+	if param compare CAL_AV_AOA_ID 49
+	then
+		set AOA_I2C_ID 49
+	fi
+	if param compare CAL_AV_AOA_ID 50
+	then
+		set AOA_I2C_ID 50
+	fi
+	if param compare CAL_AV_AOA_ID 51
+	then
+		set AOA_I2C_ID 51
+	fi
+
+	si7210 start -X -k -a ${AOA_I2C_ID}
+	unset AOA_I2C_ID
 fi
 
+if param greater CAL_AV_SLIP_ID -1
+then
+	set SLIP_I2C_ID 0
+	if param compare CAL_AV_SLIP_ID 48
+	then
+		set SLIP_I2C_ID 48
+	fi
+	if param compare CAL_AV_SLIP_ID 49
+	then
+		set SLIP_I2C_ID 49
+	fi
+	if param compare CAL_AV_SLIP_ID 50
+	then
+		set SLIP_I2C_ID 50
+	fi
+	if param compare CAL_AV_SLIP_ID 51
+	then
+		set SLIP_I2C_ID 51
+	fi
+
+	si7210 start -X -k -a ${SLIP_I2C_ID}
+	unset SLIP_I2C_ID
+fi
+
+
 # probe for optional external I2C devices
 if param compare SENS_EXT_I2C_PRB 1
 then
-	icm20948_i2c_passthrough -X -q start
-
 	# compasses
+	ak09916 -X -R 6 -q start # external AK09916 (Here2) is rotated 270 degrees yaw
 	hmc5883 -T -X -q start
 	ist8308 -X -q start
 	ist8310 -X -q start
@@ -128,9 +189,6 @@ then
 	qmc5883l -X -q start
 	rm3100 -X -q start
 
-	# start last (wait for possible icm20948 passthrough mode)
-	ak09916 -X -q start
-
 	# differential pressure sensors
 	if [ ${VEHICLE_TYPE} = fw -o ${VEHICLE_TYPE} = vtol ]
 	then
@@ -159,5 +217,3 @@ fi
 ###############################################################################
 #                            End Optional drivers                             #
 ###############################################################################
-
-sensors start

ROMFS/px4fmu_common/init.d/rc.vtol_defaults

@@ -23,7 +23,6 @@ param set-default MPC_XY_ERR_MAX 5
 param set-default MPC_XY_VEL_MAX 4
 param set-default MPC_Z_VEL_MAX_DN 1.5
 param set-default MPC_JERK_MAX 4.5
-param set-default MPC_YAW_MODE 4
 
 param set-default NAV_ACC_RAD 3
 

ROMFS/px4fmu_common/init.d/rcS

@@ -254,34 +254,6 @@ else
 		param set SYS_AUTOCONFIG 0
 	fi
 
-	#
-	# Check if UAVCAN is enabled, default to it for ESCs.
-	#
-	if param greater -s UAVCAN_ENABLE 0
-	then
-		# Start core UAVCAN module.
-		if uavcan start
-		then
-			if param greater UAVCAN_ENABLE 1
-			then
-				# Start UAVCAN firmware update server and dynamic node ID allocation server.
-				uavcan start fw
-				tune_control play -t 1
-				if param greater UAVCAN_ENABLE 2
-				then
-					set OUTPUT_MODE uavcan_esc
-				fi
-			fi
-		else
-			tune_control play error
-		fi
-	else
-		if param greater -s UAVCAN_V1_ENABLE 0
-		then
-			uavcan_v1 start
-		fi
-	fi
-
 	#
 	# Check if PX4IO present and update firmware if needed.
 	# Assumption IOFW set to firmware file and IO_PRESENT = no
@@ -313,8 +285,6 @@ else
 					else
 						tune_control play -t 18 # tune 18 = PROG_PX4IO_ERR
 					fi
-				else
-					tune_control stop
 				fi
 			fi
 		fi
@@ -362,6 +332,8 @@ else
 		#
 		# board sensors: rc.sensors
 		#
+		. ${R}etc/init.d/rc.sensors
+
 		set BOARD_RC_SENSORS ${R}etc/init.d/rc.board_sensors
 		if [ -f $BOARD_RC_SENSORS ]
 		then
@@ -370,7 +342,7 @@ else
 		fi
 		unset BOARD_RC_SENSORS
 
-		. ${R}etc/init.d/rc.sensors
+		sensors start
 
 		if param compare -s BAT1_SOURCE 2
 		then
@@ -426,6 +398,34 @@ else
 		camera_feedback start
 	fi
 
+	#
+	# Check if UAVCAN is enabled, default to it for ESCs.
+	#
+	if param greater -s UAVCAN_ENABLE 0
+	then
+		# Start core UAVCAN module.
+		if uavcan start
+		then
+			if param greater UAVCAN_ENABLE 1
+			then
+				# Start UAVCAN firmware update server and dynamic node ID allocation server.
+				uavcan start fw
+				tune_control play -t 1
+				if param greater UAVCAN_ENABLE 2
+				then
+					set OUTPUT_MODE uavcan_esc
+				fi
+			fi
+		else
+			tune_control play error
+		fi
+	fi
+
+	if param greater -s UAVCAN_V1_ENABLE 0
+	then
+		uavcan_v1 start
+	fi
+
 	#
 	# Optional board mavlink streams: rc.board_mavlink
 	#

ROMFS/px4fmu_common/mixers/AAVVTTFF_vtail.main.mix

@@ -0,0 +1,61 @@
+Aileron/v-tail/throttle/wheel/flaps mixer for PX4FMU
+=======================================================
+
+This file defines mixers suitable for controlling a fixed wing aircraft with
+aileron, v-tail (rudder, elevator), throttle, steerable wheel and flaps
+using PX4FMU.
+The configuration assumes the aileron servos are connected to PX4FMU servo
+output 0 and 1, the tail servos to output 2 and 3, the throttle
+to output 4, the wheel to output 5 and the flaps to output 6 and 7.
+
+Inputs to the mixer come from channel group 0 (vehicle attitude), channels 0
+(roll), 1 (pitch), 2 (yaw) and 3 (thrust) 4 (flaps) 6 (flaperon).
+
+Aileron mixer (roll + flaperon)
+---------------------------------
+
+This mixer assumes that the aileron servos are set up mechanically reversed.
+
+M: 2
+S: 0 0 -10000 -10000      0 -10000  10000
+S: 0 6  10000  10000      0 -10000  10000
+
+M: 2
+S: 0 0 -10000 -10000      0 -10000  10000
+S: 0 6 -10000 -10000      0 -10000  10000
+
+V-tail mixers
+-------------
+Three scalers total (output, roll, pitch).
+
+M: 2
+S: 0 2   7000   7000      0 -10000  10000
+S: 0 1  -8000  -8000      0 -10000  10000
+
+M: 2
+S: 0 2   7000   7000      0 -10000  10000
+S: 0 1   8000   8000      0 -10000  10000
+
+Motor speed mixer
+-----------------
+Two scalers total (output, thrust).
+
+This mixer generates a full-range output (-1 to 1) from an input in the (0 - 1)
+range.  Inputs below zero are treated as zero.
+
+M: 1
+S: 0 3      0  20000 -10000 -10000  10000
+
+M: 1
+S: 0 3      0  20000 -10000 -10000  10000
+
+Flaps mixer
+------------
+Flap servos are physically reversed.
+
+M: 1
+S: 0 4      0   5000 -10000 -10000  10000
+
+M: 1
+S: 0 4      0  -5000  10000 -10000  10000
+

ROMFS/px4fmu_common/mixers/CMakeLists.txt

@@ -35,6 +35,7 @@ px4_add_romfs_files(
 	AAERTWF.main.mix
 	AAVVTWFF.main.mix
 	AAVVTWFF_vtail.main.mix
+	AAVVTTFF_vtail.main.mix
 	AERT.main.mix
 	AETRFG.main.mix
 	babyshark.main.mix
@@ -95,4 +96,8 @@ px4_add_romfs_files(
 	vtol_delta.aux.mix
 	vtol_tailsitter_duo.main.mix
 	wingwing.main.mix
+	#ETHZ ASL Custom Mixers
+	asl_easyglider.main.mix
+	asl_sensesoar2.main.mix
+	asl_techpod.main.mix
 )

ROMFS/px4fmu_common/mixers/asl_easyglider.main.mix

@@ -0,0 +1,70 @@
+ASL EasyGlider mixer
+=============================
+
+Documentation: https://dev.px4.io/en/concept/mixing.html
+
+Inputs to the mixer come from channel group 0 (vehicle attitude), channels 0
+(roll), 1 (pitch), 2 (yaw) and 3 (thrust) 4 (flaps).
+
+Motor speed mixer
+-----------------
+Two scalers total (output, thrust).
+
+This mixer generates a full-range output (-1 to 1) from an input in the (0 - 1)
+range.  Inputs below zero are treated as zero.
+
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 3      0  20000 -10000 -10000  10000
+
+Right Aileron mixer
+---------------------------------
+
+This mixer assumes that the aileron servos are set up correctly mechanically;
+depending on the actual configuration it may be necessary to reverse the scaling
+factors (to reverse the servo movement) and adjust the offset, scaling and
+endpoints to suit.
+
+M: 2
+O:      10000  10000      0 -10000  10000
+S: 0 0   6000  10000      0 -10000  10000
+S: 0 4      0 -10000      0 -10000  10000
+
+Elevator mixer
+------------
+Two scalers total (output, roll).
+
+This mixer assumes that the elevator servo is set up correctly mechanically;
+depending on the actual configuration it may be necessary to reverse the scaling
+factors (to reverse the servo movement) and adjust the offset, scaling and
+endpoints to suit.
+
+M: 1
+O:       10000   10000      0 -10000  10000
+S: 0 1  -10000  -10000      0 -10000  10000
+
+Rudder mixer
+------------
+Two scalers total (output, yaw).
+
+This mixer assumes that the rudder servo is set up correctly mechanically;
+depending on the actual configuration it may be necessary to reverse the scaling
+factors (to reverse the servo movement) and adjust the offset, scaling and
+endpoints to suit.
+
+M: 1
+O:     -10000 -10000      0 -10000  10000
+S: 0 2  10000  10000      0 -10000  10000
+
+Left Aileron mixer
+---------------------------------
+
+This mixer assumes that the aileron servos are set up correctly mechanically;
+depending on the actual configuration it may be necessary to reverse the scaling
+factors (to reverse the servo movement) and adjust the offset, scaling and
+endpoints to suit.
+
+M: 2
+O:      10000  10000      0 -10000  10000
+S: 0 0 -10000  -6000      0 -10000  10000
+S: 0 4      0 -10000      0 -10000  10000

ROMFS/px4fmu_common/mixers/asl_sensesoar2.main.mix

@@ -0,0 +1,61 @@
+ASL SenseSoar2 mixer for PX4IO
+=============================
+
+Documentation: https://dev.px4.io/en/concept/mixing.html
+
+Note1: CH2 AilR is down for pos PWM signal change, CH5 Ail L the other way around.
+Note2: The mixer defines a certain aileron differential, but the phyiscal differential
+       is stronger because of the servo mechanics (70% mixer diff -> ca. 60% physical).
+Note3: In the extras.txt on the sd-card, set pwm min/max such that the ailerons have
+       2.5cm upwards and 2.0cm downwards travel at FULL (u=+/- 1.0) mixer output. The
+       downwards travel with the mixer differential is then obviously less.
+
+=============================
+
+### Motor
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 3      0  20000 -10000 -10000  10000
+
+
+### Right aileron (with differential)
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 0  -7000 -10000      0 -10000  10000
+
+
+### Right ruddervator
+M: 2
+O:       6000   6000      0 -10000  10000
+S: 0 1  -6500  -6500      0 -10000  10000
+S: 0 2   7500   7500      0 -10000  10000
+
+
+### Left ruddervator
+M: 2
+O:       6000   6000      0 -10000  10000
+S: 0 1   6500   6500      0 -10000  10000
+S: 0 2   7500   7500      0 -10000  10000
+
+
+### Left aileron (with differential)
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 0 -10000  -7000      0 -10000  10000
+
+
+### Right flap
+#M: 1
+#O:      10000  10000      0 -10000   4000
+#S: 3 4  10000  10000      0 -10000  10000
+
+### Right flap
+M: 1
+O:      10000  10000      0 -10000   4000
+S: 0 4      0  20000 -10000 -10000  10000
+
+
+### Left flap
+M: 1
+O:      10000  10000      0  -4000  10000
+S: 0 4      0 -20000  10000 -10000  10000

ROMFS/px4fmu_common/mixers/asl_techpod.main.mix

@@ -0,0 +1,47 @@
+ASL Techpod mixer for PX4IO
+=============================
+
+Documentation: https://dev.px4.io/en/concept/mixing.html
+
+=============================
+
+### Motor
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 3      0  20000 -10000 -10000  10000
+
+
+### Right aileron (with differential)
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 0 -7500  -10000      0 -10000  10000
+
+
+### Elevator
+M: 1
+O:       6000   6000      0 -10000  10000
+S: 0 1   6000   6000      0  -6000   6000
+
+
+### Rudder
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 2  -6000  -6000      0  -6000   6000
+
+
+### Left aileron (with differential)
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 0 -10000  -7500      0 -10000  10000
+
+
+### Right flap
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 4  10000  10000      0  -4000   4000
+
+
+### Left flap
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 4  10000  10000      0  -4000   4000

Tools/astyle/check_code_style_all.sh

@@ -59,7 +59,7 @@ if [ ! -f $HOOK_FILE ] && [ "$CI" != "true" ]; then
 	fi
 fi
 
-${DIR}/files_to_check_code_style.sh | xargs -P 8 -I % ${DIR}/check_code_style.sh %
+${DIR}/files_to_check_code_style.sh | xargs -n 1 -P 8 -I % ${DIR}/check_code_style.sh %
 
 if [ $? -eq 0 ]; then
     echo "Format checks passed"

Tools/bloaty_static_ram.bloaty

@@ -1,13 +0,0 @@
-custom_data_source: {
-  name: "bloaty_static_ram"
-  base_data_source: "sections"
-
-  rewrite: {
-    pattern: "^\\.bss"
-    replacement: "ram"
-  }
-  rewrite: {
-    pattern: "^\\.data"
-    replacement: "ram"
-  }
-}

Tools/docker_run.sh

@@ -2,7 +2,10 @@
 
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	echo "guessing PX4_DOCKER_REPO based on input";
-	if [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]]; then
+	if [[ $@ =~ .*px4_fmu.* ]]; then
+		# nuttx-px4fmu-v{1,2,3,4,5}
+		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-02-04"
+	elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]]; then
 		# beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default
 		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2021-02-04"
 	elif [[ $@ =~ .*pilotpi.arm64 ]]; then
@@ -27,7 +30,7 @@ fi
 
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="ghcr.io/px4/px4-dev:2021-05-06"
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-09-14"
 fi
 
 # docker hygiene
@@ -64,5 +67,4 @@ docker run -it --rm -w "${SRC_DIR}" \
 	--publish 14556:14556/udp \
 	--volume=${CCACHE_DIR}:${CCACHE_DIR}:rw \
 	--volume=${SRC_DIR}:${SRC_DIR}:rw \
-	-v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY -h $HOSTNAME
 	${PX4_DOCKER_REPO} /bin/bash -c "$1 $2 $3"

Tools/process_sensor_caldata.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python
 
 from __future__ import print_function
 
@@ -7,7 +7,6 @@ import os
 import math
 import matplotlib.pyplot as plt
 import numpy as np
-import scipy as sp
 
 from pyulog import *
 
@@ -64,9 +63,6 @@ def resampleWithDeltaX(x,y):
 
     return resampledX,resampledY
 
-def median_filter(data):
-    return sp.signal.medfilt(data, 31)
-
 parser = argparse.ArgumentParser(description='Reads in IMU data from a static thermal calibration test and performs a curve fit of gyro, accel and baro bias vs temperature')
 parser.add_argument('filename', metavar='file.ulg', help='ULog input file')
 parser.add_argument('--no_resample', dest='noResample', action='store_const',
@@ -188,16 +184,12 @@ if num_gyros >= 1 and not math.isnan(sensor_gyro_0['temperature'][0]):
     temp_rel_resample = np.linspace(gyro_0_params['TC_G0_TMIN']-gyro_0_params['TC_G0_TREF'], gyro_0_params['TC_G0_TMAX']-gyro_0_params['TC_G0_TREF'], 100)
     temp_resample = temp_rel_resample + gyro_0_params['TC_G0_TREF']
 
-    sensor_gyro_0['x'] = median_filter(sensor_gyro_0['x'])
-    sensor_gyro_0['y'] = median_filter(sensor_gyro_0['y'])
-    sensor_gyro_0['z'] = median_filter(sensor_gyro_0['z'])
-
     # fit X axis
     if noResample:
-        coef_gyro_0_x = np.polyfit(temp_rel, sensor_gyro_0['x'], 3)
+        coef_gyro_0_x = np.polyfit(temp_rel,sensor_gyro_0['x'],3)
     else:
-        temp, sens = resampleWithDeltaX(temp_rel, sensor_gyro_0['x'])
-        coef_gyro_0_x = np.polyfit(temp, sens, 3)
+        temp, sens = resampleWithDeltaX(temp_rel,sensor_gyro_0['x'])
+        coef_gyro_0_x = np.polyfit(temp, sens ,3)
 
     gyro_0_params['TC_G0_X3_0'] = coef_gyro_0_x[0]
     gyro_0_params['TC_G0_X2_0'] = coef_gyro_0_x[1]
@@ -208,10 +200,10 @@ if num_gyros >= 1 and not math.isnan(sensor_gyro_0['temperature'][0]):
 
     # fit Y axis
     if noResample:
-        coef_gyro_0_y = np.polyfit(temp_rel, sensor_gyro_0['y'], 3)
+        coef_gyro_0_y = np.polyfit(temp_rel,sensor_gyro_0['y'],3)
     else:
         temp, sens = resampleWithDeltaX(temp_rel,sensor_gyro_0['y'])
-        coef_gyro_0_y = np.polyfit(temp, sens, 3)
+        coef_gyro_0_y = np.polyfit(temp, sens ,3)
 
     gyro_0_params['TC_G0_X3_1'] = coef_gyro_0_y[0]
     gyro_0_params['TC_G0_X2_1'] = coef_gyro_0_y[1]
@@ -222,9 +214,9 @@ if num_gyros >= 1 and not math.isnan(sensor_gyro_0['temperature'][0]):
 
     # fit Z axis
     if noResample:
-        coef_gyro_0_z = np.polyfit(temp_rel, sensor_gyro_0['z'],3)
+        coef_gyro_0_z = np.polyfit(temp_rel,sensor_gyro_0['z'],3)
     else:
-        temp, sens = resampleWithDeltaX(temp_rel, sensor_gyro_0['z'])
+        temp, sens = resampleWithDeltaX(temp_rel,sensor_gyro_0['z'])
         coef_gyro_0_z = np.polyfit(temp, sens ,3)
 
     gyro_0_params['TC_G0_X3_2'] = coef_gyro_0_z[0]
@@ -300,10 +292,6 @@ if num_gyros >= 2 and not math.isnan(sensor_gyro_1['temperature'][0]):
     temp_rel_resample = np.linspace(gyro_1_params['TC_G1_TMIN']-gyro_1_params['TC_G1_TREF'], gyro_1_params['TC_G1_TMAX']-gyro_1_params['TC_G1_TREF'], 100)
     temp_resample = temp_rel_resample + gyro_1_params['TC_G1_TREF']
 
-    sensor_gyro_1['x'] = median_filter(sensor_gyro_1['x'])
-    sensor_gyro_1['y'] = median_filter(sensor_gyro_1['y'])
-    sensor_gyro_1['z'] = median_filter(sensor_gyro_1['z'])
-
     # fit X axis
     if noResample:
         coef_gyro_1_x = np.polyfit(temp_rel,sensor_gyro_1['x'],3)
@@ -412,10 +400,6 @@ if num_gyros >= 3 and not math.isnan(sensor_gyro_2['temperature'][0]):
     temp_rel_resample = np.linspace(gyro_2_params['TC_G2_TMIN']-gyro_2_params['TC_G2_TREF'], gyro_2_params['TC_G2_TMAX']-gyro_2_params['TC_G2_TREF'], 100)
     temp_resample = temp_rel_resample + gyro_2_params['TC_G2_TREF']
 
-    sensor_gyro_2['x'] = median_filter(sensor_gyro_2['x'])
-    sensor_gyro_2['y'] = median_filter(sensor_gyro_2['y'])
-    sensor_gyro_2['z'] = median_filter(sensor_gyro_2['z'])
-
     # fit X axis
     if noResample:
         coef_gyro_2_x = np.polyfit(temp_rel,sensor_gyro_2['x'],3)
@@ -432,10 +416,10 @@ if num_gyros >= 3 and not math.isnan(sensor_gyro_2['temperature'][0]):
 
     # fit Y axis
     if noResample:
-        coef_gyro_2_y = np.polyfit(temp_rel, sensor_gyro_2['y'], 3)
+        coef_gyro_2_y = np.polyfit(temp_rel,sensor_gyro_2['y'],3)
     else:
-        temp, sens = resampleWithDeltaX(temp_rel, sensor_gyro_2['y'])
-        coef_gyro_2_y = np.polyfit(temp, sens, 3)
+        temp, sens = resampleWithDeltaX(temp_rel,sensor_gyro_2['y'])
+        coef_gyro_2_y = np.polyfit(temp, sens ,3)
 
     gyro_2_params['TC_G2_X3_1'] = coef_gyro_2_y[0]
     gyro_2_params['TC_G2_X2_1'] = coef_gyro_2_y[1]
@@ -446,10 +430,10 @@ if num_gyros >= 3 and not math.isnan(sensor_gyro_2['temperature'][0]):
 
     # fit Z axis
     if noResample:
-        coef_gyro_2_z = np.polyfit(temp_rel,sensor_gyro_2['z'], 3)
+        coef_gyro_2_z = np.polyfit(temp_rel,sensor_gyro_2['z'],3)
     else:
         temp, sens = resampleWithDeltaX(temp_rel,sensor_gyro_2['z'])
-        coef_gyro_2_z = np.polyfit(temp, sens, 3)
+        coef_gyro_2_z = np.polyfit(temp, sens ,3)
 
     gyro_2_params['TC_G2_X3_2'] = coef_gyro_2_z[0]
     gyro_2_params['TC_G2_X2_2'] = coef_gyro_2_z[1]
@@ -524,12 +508,8 @@ if num_gyros >= 4 and not math.isnan(sensor_gyro_3['temperature'][0]):
     temp_rel_resample = np.linspace(gyro_3_params['TC_G3_TMIN']-gyro_3_params['TC_G3_TREF'], gyro_3_params['TC_G3_TMAX']-gyro_3_params['TC_G3_TREF'], 100)
     temp_resample = temp_rel_resample + gyro_3_params['TC_G3_TREF']
 
-    sensor_gyro_3['x'] = median_filter(sensor_gyro_3['x'])
-    sensor_gyro_3['y'] = median_filter(sensor_gyro_3['y'])
-    sensor_gyro_3['z'] = median_filter(sensor_gyro_3['z'])
-
     # fit X axis
-    coef_gyro_3_x = np.polyfit(temp_rel,sensor_gyro_3['x'], 3)
+    coef_gyro_3_x = np.polyfit(temp_rel,sensor_gyro_3['x'],3)
     gyro_3_params['TC_G3_X3_0'] = coef_gyro_3_x[0]
     gyro_3_params['TC_G3_X2_0'] = coef_gyro_3_x[1]
     gyro_3_params['TC_G3_X1_0'] = coef_gyro_3_x[2]
@@ -538,7 +518,7 @@ if num_gyros >= 4 and not math.isnan(sensor_gyro_3['temperature'][0]):
     gyro_3_x_resample = fit_coef_gyro_3_x(temp_rel_resample)
 
     # fit Y axis
-    coef_gyro_3_y = np.polyfit(temp_rel,sensor_gyro_3['y'], 3)
+    coef_gyro_3_y = np.polyfit(temp_rel,sensor_gyro_3['y'],3)
     gyro_3_params['TC_G3_X3_1'] = coef_gyro_3_y[0]
     gyro_3_params['TC_G3_X2_1'] = coef_gyro_3_y[1]
     gyro_3_params['TC_G3_X1_1'] = coef_gyro_3_y[2]
@@ -547,7 +527,7 @@ if num_gyros >= 4 and not math.isnan(sensor_gyro_3['temperature'][0]):
     gyro_3_y_resample = fit_coef_gyro_3_y(temp_rel_resample)
 
     # fit Z axis
-    coef_gyro_3_z = np.polyfit(temp_rel,sensor_gyro_3['z'], 3)
+    coef_gyro_3_z = np.polyfit(temp_rel,sensor_gyro_3['z'],3)
     gyro_3_params['TC_G3_X3_2'] = coef_gyro_3_z[0]
     gyro_3_params['TC_G3_X2_2'] = coef_gyro_3_z[1]
     gyro_3_params['TC_G3_X1_2'] = coef_gyro_3_z[2]
@@ -560,8 +540,8 @@ if num_gyros >= 4 and not math.isnan(sensor_gyro_3['temperature'][0]):
 
     # draw plots
     plt.subplot(3,1,1)
-    plt.plot(sensor_gyro_3['temperature'],sensor_gyro_3['x'], 'b')
-    plt.plot(temp_resample,gyro_3_x_resample, 'r')
+    plt.plot(sensor_gyro_3['temperature'],sensor_gyro_3['x'],'b')
+    plt.plot(temp_resample,gyro_3_x_resample,'r')
     plt.title('Gyro 2 ({}) Bias vs Temperature'.format(gyro_3_params['TC_G3_ID']))
     plt.ylabel('X bias (rad/s)')
     plt.xlabel('temperature (degC)')
@@ -621,17 +601,13 @@ if num_accels >= 1 and not math.isnan(sensor_accel_0['temperature'][0]):
     temp_rel_resample = np.linspace(accel_0_params['TC_A0_TMIN']-accel_0_params['TC_A0_TREF'], accel_0_params['TC_A0_TMAX']-accel_0_params['TC_A0_TREF'], 100)
     temp_resample = temp_rel_resample + accel_0_params['TC_A0_TREF']
 
-    sensor_accel_0['x'] = median_filter(sensor_accel_0['x'])
-    sensor_accel_0['y'] = median_filter(sensor_accel_0['y'])
-    sensor_accel_0['z'] = median_filter(sensor_accel_0['z'])
-
     # fit X axis
     correction_x = sensor_accel_0['x'] - np.median(sensor_accel_0['x'])
     if noResample:
-        coef_accel_0_x = np.polyfit(temp_rel,correction_x, 3)
+        coef_accel_0_x = np.polyfit(temp_rel,correction_x,3)
     else:
         temp, sens = resampleWithDeltaX(temp_rel,correction_x)
-        coef_accel_0_x = np.polyfit(temp, sens, 3)
+        coef_accel_0_x = np.polyfit(temp, sens ,3)
 
     accel_0_params['TC_A0_X3_0'] = coef_accel_0_x[0]
     accel_0_params['TC_A0_X2_0'] = coef_accel_0_x[1]
@@ -641,12 +617,12 @@ if num_accels >= 1 and not math.isnan(sensor_accel_0['temperature'][0]):
     correction_x_resample = fit_coef_accel_0_x(temp_rel_resample)
 
     # fit Y axis
-    correction_y = sensor_accel_0['y'] - np.median(sensor_accel_0['y'])
+    correction_y = sensor_accel_0['y']-np.median(sensor_accel_0['y'])
     if noResample:
-        coef_accel_0_y = np.polyfit(temp_rel, correction_y, 3)
+        coef_accel_0_y = np.polyfit(temp_rel,correction_y,3)
     else:
         temp, sens = resampleWithDeltaX(temp_rel,correction_y)
-        coef_accel_0_y = np.polyfit(temp, sens, 3)
+        coef_accel_0_y = np.polyfit(temp, sens ,3)
 
     accel_0_params['TC_A0_X3_1'] = coef_accel_0_y[0]
     accel_0_params['TC_A0_X2_1'] = coef_accel_0_y[1]
@@ -656,12 +632,12 @@ if num_accels >= 1 and not math.isnan(sensor_accel_0['temperature'][0]):
     correction_y_resample = fit_coef_accel_0_y(temp_rel_resample)
 
     # fit Z axis
-    correction_z = sensor_accel_0['z'] - np.median(sensor_accel_0['z'])
+    correction_z = sensor_accel_0['z']-np.median(sensor_accel_0['z'])
     if noResample:
-        coef_accel_0_z = np.polyfit(temp_rel,correction_z, 3)
+        coef_accel_0_z = np.polyfit(temp_rel,correction_z,3)
     else:
         temp, sens = resampleWithDeltaX(temp_rel,correction_z)
-        coef_accel_0_z = np.polyfit(temp, sens, 3)
+        coef_accel_0_z = np.polyfit(temp, sens ,3)
 
     accel_0_params['TC_A0_X3_2'] = coef_accel_0_z[0]
     accel_0_params['TC_A0_X2_2'] = coef_accel_0_z[1]
@@ -736,17 +712,13 @@ if num_accels >= 2 and not math.isnan(sensor_accel_1['temperature'][0]):
     temp_rel_resample = np.linspace(accel_1_params['TC_A1_TMIN']-accel_1_params['TC_A1_TREF'], accel_1_params['TC_A1_TMAX']-accel_1_params['TC_A1_TREF'], 100)
     temp_resample = temp_rel_resample + accel_1_params['TC_A1_TREF']
 
-    sensor_accel_1['x'] = median_filter(sensor_accel_1['x'])
-    sensor_accel_1['y'] = median_filter(sensor_accel_1['y'])
-    sensor_accel_1['z'] = median_filter(sensor_accel_1['z'])
-
     # fit X axis
-    correction_x = sensor_accel_1['x'] - np.median(sensor_accel_1['x'])
+    correction_x = sensor_accel_1['x']-np.median(sensor_accel_1['x'])
     if noResample:
-        coef_accel_1_x = np.polyfit(temp_rel, correction_x, 3)
+        coef_accel_1_x = np.polyfit(temp_rel,correction_x,3)
     else:
-        temp, sens = resampleWithDeltaX(temp_rel, correction_x)
-        coef_accel_1_x = np.polyfit(temp, sens, 3)
+        temp, sens = resampleWithDeltaX(temp_rel,correction_x)
+        coef_accel_1_x = np.polyfit(temp, sens ,3)
 
     accel_1_params['TC_A1_X3_0'] = coef_accel_1_x[0]
     accel_1_params['TC_A1_X2_0'] = coef_accel_1_x[1]
@@ -756,7 +728,7 @@ if num_accels >= 2 and not math.isnan(sensor_accel_1['temperature'][0]):
     correction_x_resample = fit_coef_accel_1_x(temp_rel_resample)
 
     # fit Y axis
-    correction_y = sensor_accel_1['y'] - np.median(sensor_accel_1['y'])
+    correction_y = sensor_accel_1['y']-np.median(sensor_accel_1['y'])
     if noResample:
         coef_accel_1_y = np.polyfit(temp_rel,correction_y,3)
     else:
@@ -771,12 +743,12 @@ if num_accels >= 2 and not math.isnan(sensor_accel_1['temperature'][0]):
     correction_y_resample = fit_coef_accel_1_y(temp_rel_resample)
 
     # fit Z axis
-    correction_z = sensor_accel_1['z'] - np.median(sensor_accel_1['z'])
+    correction_z = (sensor_accel_1['z'])-np.median(sensor_accel_1['z'])
     if noResample:
-        coef_accel_1_z = np.polyfit(temp_rel,correction_z, 3)
+        coef_accel_1_z = np.polyfit(temp_rel,correction_z,3)
     else:
         temp, sens = resampleWithDeltaX(temp_rel,correction_z)
-        coef_accel_1_z = np.polyfit(temp, sens, 3)
+        coef_accel_1_z = np.polyfit(temp, sens ,3)
 
     accel_1_params['TC_A1_X3_2'] = coef_accel_1_z[0]
     accel_1_params['TC_A1_X2_2'] = coef_accel_1_z[1]
@@ -852,17 +824,13 @@ if num_accels >= 3 and not math.isnan(sensor_accel_2['temperature'][0]):
     temp_rel_resample = np.linspace(accel_2_params['TC_A2_TMIN']-accel_2_params['TC_A2_TREF'], accel_2_params['TC_A2_TMAX']-accel_2_params['TC_A2_TREF'], 100)
     temp_resample = temp_rel_resample + accel_2_params['TC_A2_TREF']
 
-    sensor_accel_2['x'] = median_filter(sensor_accel_2['x'])
-    sensor_accel_2['y'] = median_filter(sensor_accel_2['y'])
-    sensor_accel_2['z'] = median_filter(sensor_accel_2['z'])
-
     # fit X axis
-    correction_x = sensor_accel_2['x'] - np.median(sensor_accel_2['x'])
+    correction_x = sensor_accel_2['x']-np.median(sensor_accel_2['x'])
     if noResample:
-        coef_accel_2_x = np.polyfit(temp_rel,correction_x, 3)
+        coef_accel_2_x = np.polyfit(temp_rel,correction_x,3)
     else:
-        temp, sens = resampleWithDeltaX(temp_rel, correction_x)
-        coef_accel_2_x = np.polyfit(temp, sens, 3)
+        temp, sens = resampleWithDeltaX(temp_rel,correction_x)
+        coef_accel_2_x = np.polyfit(temp, sens ,3)
 
     accel_2_params['TC_A2_X3_0'] = coef_accel_2_x[0]
     accel_2_params['TC_A2_X2_0'] = coef_accel_2_x[1]
@@ -872,7 +840,7 @@ if num_accels >= 3 and not math.isnan(sensor_accel_2['temperature'][0]):
     correction_x_resample = fit_coef_accel_2_x(temp_rel_resample)
 
     # fit Y axis
-    correction_y = sensor_accel_2['y'] - np.median(sensor_accel_2['y'])
+    correction_y = sensor_accel_2['y']-np.median(sensor_accel_2['y'])
     if noResample:
         coef_accel_2_y = np.polyfit(temp_rel,correction_y,3)
     else:
@@ -887,7 +855,7 @@ if num_accels >= 3 and not math.isnan(sensor_accel_2['temperature'][0]):
     correction_y_resample = fit_coef_accel_2_y(temp_rel_resample)
 
     # fit Z axis
-    correction_z = sensor_accel_2['z'] - np.median(sensor_accel_2['z'])
+    correction_z = sensor_accel_2['z']-np.median(sensor_accel_2['z'])
     if noResample:
         coef_accel_2_z = np.polyfit(temp_rel,correction_z,3)
     else:
@@ -967,13 +935,9 @@ if num_accels >= 4 and not math.isnan(sensor_accel_3['temperature'][0]):
     temp_rel_resample = np.linspace(accel_3_params['TC_A3_TMIN']-accel_3_params['TC_A3_TREF'], accel_3_params['TC_A3_TMAX']-accel_3_params['TC_A3_TREF'], 100)
     temp_resample = temp_rel_resample + accel_3_params['TC_A3_TREF']
 
-    sensor_accel_3['x'] = median_filter(sensor_accel_3['x'])
-    sensor_accel_3['y'] = median_filter(sensor_accel_3['y'])
-    sensor_accel_3['z'] = median_filter(sensor_accel_3['z'])
-
     # fit X axis
-    correction_x = sensor_accel_3['x'] - np.median(sensor_accel_3['x'])
-    coef_accel_3_x = np.polyfit(temp_rel, correction_x, 3)
+    correction_x = sensor_accel_3['x']-np.median(sensor_accel_3['x'])
+    coef_accel_3_x = np.polyfit(temp_rel,correction_x,3)
     accel_3_params['TC_A3_X3_0'] = coef_accel_3_x[0]
     accel_3_params['TC_A3_X2_0'] = coef_accel_3_x[1]
     accel_3_params['TC_A3_X1_0'] = coef_accel_3_x[2]
@@ -982,8 +946,8 @@ if num_accels >= 4 and not math.isnan(sensor_accel_3['temperature'][0]):
     correction_x_resample = fit_coef_accel_3_x(temp_rel_resample)
 
     # fit Y axis
-    correction_y = sensor_accel_3['y'] - np.median(sensor_accel_3['y'])
-    coef_accel_3_y = np.polyfit(temp_rel, correction_y, 3)
+    correction_y = sensor_accel_3['y']-np.median(sensor_accel_3['y'])
+    coef_accel_3_y = np.polyfit(temp_rel,correction_y,3)
     accel_3_params['TC_A3_X3_1'] = coef_accel_3_y[0]
     accel_3_params['TC_A3_X2_1'] = coef_accel_3_y[1]
     accel_3_params['TC_A3_X1_1'] = coef_accel_3_y[2]
@@ -992,8 +956,8 @@ if num_accels >= 4 and not math.isnan(sensor_accel_3['temperature'][0]):
     correction_y_resample = fit_coef_accel_3_y(temp_rel_resample)
 
     # fit Z axis
-    correction_z = sensor_accel_3['z'] - np.median(sensor_accel_3['z'])
-    coef_accel_3_z = np.polyfit(temp_rel, correction_z, 3)
+    correction_z = sensor_accel_3['z']-np.median(sensor_accel_3['z'])
+    coef_accel_3_z = np.polyfit(temp_rel,correction_z,3)
     accel_3_params['TC_A3_X3_2'] = coef_accel_3_z[0]
     accel_3_params['TC_A3_X2_2'] = coef_accel_3_z[1]
     accel_3_params['TC_A3_X1_2'] = coef_accel_3_z[2]
@@ -1060,10 +1024,8 @@ temp_rel = sensor_baro_0['temperature'] - baro_0_params['TC_B0_TREF']
 temp_rel_resample = np.linspace(baro_0_params['TC_B0_TMIN']-baro_0_params['TC_B0_TREF'], baro_0_params['TC_B0_TMAX']-baro_0_params['TC_B0_TREF'], 100)
 temp_resample = temp_rel_resample + baro_0_params['TC_B0_TREF']
 
-sensor_baro_0['pressure'] = median_filter(sensor_baro_0['pressure'])
-
 # fit data
-median_pressure = np.median(sensor_baro_0['pressure'])
+median_pressure = np.median(sensor_baro_0['pressure']);
 if noResample:
     coef_baro_0_x = np.polyfit(temp_rel,100*(sensor_baro_0['pressure']-median_pressure),5) # convert from hPa to Pa
 else:
@@ -1119,10 +1081,8 @@ if num_baros >= 2:
     temp_rel_resample = np.linspace(baro_1_params['TC_B1_TMIN']-baro_1_params['TC_B1_TREF'], baro_1_params['TC_B1_TMAX']-baro_1_params['TC_B1_TREF'], 100)
     temp_resample = temp_rel_resample + baro_1_params['TC_B1_TREF']
 
-    sensor_baro_1['pressure'] = median_filter(sensor_baro_1['pressure'])
-
     # fit data
-    median_pressure = np.median(sensor_baro_1['pressure'])
+    median_pressure = np.median(sensor_baro_1['pressure']);
     if noResample:
         coef_baro_1_x = np.polyfit(temp_rel,100*(sensor_baro_1['pressure']-median_pressure),5) # convert from hPa to Pa
     else:
@@ -1179,10 +1139,8 @@ if num_baros >= 3:
     temp_rel_resample = np.linspace(baro_2_params['TC_B2_TMIN']-baro_2_params['TC_B2_TREF'], baro_2_params['TC_B2_TMAX']-baro_2_params['TC_B2_TREF'], 100)
     temp_resample = temp_rel_resample + baro_2_params['TC_B2_TREF']
 
-    sensor_baro_2['pressure'] = median_filter(sensor_baro_2['pressure'])
-
     # fit data
-    median_pressure = np.median(sensor_baro_2['pressure'])
+    median_pressure = np.median(sensor_baro_2['pressure']);
     if noResample:
         coef_baro_2_x = np.polyfit(temp_rel,100*(sensor_baro_2['pressure']-median_pressure),5) # convert from hPa to Pa
     else:
@@ -1239,8 +1197,6 @@ if num_baros >= 4:
     temp_rel_resample = np.linspace(baro_3_params['TC_B3_TMIN']-baro_3_params['TC_B3_TREF'], baro_3_params['TC_B3_TMAX']-baro_3_params['TC_B3_TREF'], 100)
     temp_resample = temp_rel_resample + baro_3_params['TC_B3_TREF']
 
-    sensor_baro_3['pressure'] = median_filter(sensor_baro_3['pressure'])
-
     # fit data
     median_pressure = np.median(sensor_baro_3['pressure'])
     coef_baro_3_x = np.polyfit(temp_rel,100*(sensor_baro_3['pressure']-median_pressure),5) # convert from hPa to Pa

Tools/px4airframes/srcparser.py

@@ -98,8 +98,6 @@ class ParameterGroup(object):
             return "Boat"
         elif (self.name == "Balloon"):
             return "Balloon"
-        elif (self.name == "Vectored 6 DOF UUV"):
-            return "Vectored6DofUUV"
         return "AirframeUnknown"
 
     def GetParams(self):

Tools/serial/generate_config.py

@@ -190,6 +190,7 @@ if rc_serial_output_dir is None and serial_params_output_file is None:
 serial_commands = []
 ethernet_configuration = []
 additional_params = ""
+additional_ethernet_params = ""
 
 if ethernet_supported:
     ethernet_configuration.append({
@@ -210,7 +211,7 @@ def parse_yaml_serial_config(yaml_config):
         ret.append(serial_config)
     return ret
 
-def parse_yaml_parameters_config(yaml_config, ethernet_supported):
+def parse_yaml_parameters_config(yaml_config):
     """ parse the parameters section from the yaml config file """
     if 'parameters' not in yaml_config:
         return ''
@@ -223,7 +224,79 @@ def parse_yaml_parameters_config(yaml_config, ethernet_supported):
         param_group = parameters_section.get('group', None)
         for param_name in definitions:
             param = definitions[param_name]
-            if param.get('requires_ethernet', False) and not ethernet_supported:
+            if 'ethernet' in param:
+                continue
+            num_instances = param.get('num_instances', 1)
+            instance_start = param.get('instance_start', 0) # offset
+
+            # get the type and extract all tags
+            tags = '@group {:}'.format(param_group)
+            if param['type'] == 'enum':
+                param_type = 'INT32'
+                for key in param['values']:
+                    tags += '\n * @value {:} {:}'.format(key, param['values'][key])
+            elif param['type'] == 'boolean':
+                param_type = 'INT32'
+                tags += '\n * @boolean'
+            elif param['type'] == 'int32':
+                param_type = 'INT32'
+            elif param['type'] == 'float':
+                param_type = 'FLOAT'
+            else:
+                raise Exception("unknown param type {:}".format(param['type']))
+
+            for tag in ['decimal', 'increment', 'category', 'volatile', 'bit',
+                        'min', 'max', 'unit', 'reboot_required']:
+                if tag in param:
+                    tags += '\n * @{:} {:}'.format(tag, param[tag])
+
+            for i in range(num_instances):
+                # default value
+                default_value = 0
+                if 'default' in param:
+                    # default can be a list of num_instances or a single value
+                    if type(param['default']) == list:
+                        assert len(param['default']) == num_instances
+                        default_value = param['default'][i]
+                    else:
+                        default_value = param['default']
+
+                if type(default_value) == bool:
+                    default_value = int(default_value)
+
+                # output the existing C-style format
+                ret += '''
+/**
+ * {short_descr}
+ *
+ * {long_descr}
+ *
+ * {tags}
+ */
+PARAM_DEFINE_{param_type}({name}, {default_value});
+'''.format(short_descr=param['description']['short'].replace("\n", "\n * "),
+           long_descr=param['description']['long'].replace("\n", "\n * "),
+           tags=tags,
+           param_type=param_type,
+           name=param_name,
+           default_value=default_value,
+          ).replace('${i}', str(i+instance_start))
+    return ret
+
+def parse_yaml_ethernet_parameters_config(yaml_config):
+    """ parse the parameters section from the yaml config file """
+    if 'parameters' not in yaml_config:
+        return ''
+    parameters_section_list = yaml_config['parameters']
+    for parameters_section in parameters_section_list:
+        if 'definitions' not in parameters_section:
+            return ''
+        definitions = parameters_section['definitions']
+        ret = ''
+        param_group = parameters_section.get('group', None)
+        for param_name in definitions:
+            param = definitions[param_name]
+            if 'ethernet' not in param:
                 continue
             num_instances = param.get('num_instances', 1)
             instance_start = param.get('instance_start', 0) # offset
@@ -289,8 +362,9 @@ for yaml_file in args.config_files:
             serial_commands.extend(parse_yaml_serial_config(yaml_config))
 
             # TODO: additional params should be parsed in a separate script
-            additional_params += parse_yaml_parameters_config(
-                yaml_config, ethernet_supported)
+            additional_params += parse_yaml_parameters_config(yaml_config)
+            if ethernet_supported:
+                additional_ethernet_params += parse_yaml_ethernet_parameters_config(yaml_config)
 
         except yaml.YAMLError as exc:
             print(exc)
@@ -355,7 +429,7 @@ for serial_command in serial_commands:
             'default_port': default_port,
             'param_group': port_config['group'],
             'description_extended': port_config.get('description_extended', ''),
-			'supports_networking': serial_command.get('supports_networking', False)
+			'ethernet_config': serial_command.get('ethernet', 'none')
             })
 
 if verbose:
@@ -399,5 +473,6 @@ if serial_params_output_file is not None:
         fid.write(template.render(serial_devices=serial_devices,
             ethernet_configuration=ethernet_configuration,
             commands=commands, serial_ports=serial_ports,
-            additional_definitions=additional_params))
+            additional_definitions=additional_params,
+            additional_ethernet_definitions=additional_ethernet_params))
 

Tools/serial/rc.serial_port.jinja

@@ -17,9 +17,9 @@ if param compare "$PRT" {{ serial_device.index }}; then
 fi
 
 {% endfor %}
-
 {% for config in ethernet_configuration -%}
 if param compare "$PRT" {{ config.index }}; then
 	set SERIAL_DEV ethernet
 fi
+
 {% endfor %}

Tools/serial/serial_params.c.jinja

@@ -58,11 +58,10 @@ PARAM_DEFINE_INT32(SER_{{ serial_device.tag }}_BAUD, {{ serial_device.default_ba
 {%- for serial_device in serial_devices %}
  * @value {{ serial_device.index }} {{ serial_device.label }}
 {%- endfor %}
-{%- if command.supports_networking %}
+{%- if command.ethernet_config != "none" %}
 {%- for config in ethernet_configuration %}
  * @value {{ config.index }} {{ config.label }}
-{%- endfor %}
-{%- endif %}
+{%- endfor %}{% endif %}
  * @group {{ command.param_group }}
  * @reboot_required true
  */
@@ -73,3 +72,5 @@ PARAM_DEFINE_INT32({{ command.port_param_name }}, {{ command.default_port }});
 
 {{ additional_definitions }}
 
+{{ additional_ethernet_definitions }}
+

Tools/setup/Makefile

@@ -1,11 +0,0 @@
-.PHONY: docker_build docker_push all
-
-DATE := $(shell date +%Y-%m-%d)
-
-docker_build:
-	docker build -f Dockerfile -t px4-dev:${DATE} .
-
-docker_push: build
-        docker push px4io/px4-dev:${DATE}
-
-all: docker_build

Tools/setup/arch.sh

@@ -155,7 +155,8 @@ if [[ $INSTALL_SIM == "true" ]]; then
 			# fix VMWare 3D graphics acceleration for gazebo
 			exportline="export SVGA_VGPU10=0"
 
-			if !grep -Fxq "$exportline" $HOME/.profile; then
+			if grep -Fxq "$exportline" $HOME/.profile; then
+			else
 				echo $exportline >> $HOME/.profile;
 			fi
 		fi