github actions add timeout-minutes

.ci/Jenkinsfile-compile

@@ -9,10 +9,10 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2021-09-08",
+            armhf: "px4io/px4-dev-armhf:2021-05-04",
-            arm64: "px4io/px4-dev-aarch64:2021-09-08",
+            arm64: "px4io/px4-dev-aarch64:2021-05-04",
-            base: "px4io/px4-dev-base-bionic:2021-09-08",
+            base: "px4io/px4-dev-base-bionic:2021-05-04",
-            nuttx: "px4io/px4-dev-nuttx-focal:2021-09-08",
+            nuttx: "px4io/px4-dev-nuttx-focal:2021-05-04",
           ]
 
           def armhf_builds = [
@@ -38,11 +38,6 @@ pipeline {
                      "airmind_mindpx-v2_default",
                      "ark_can-flow_canbootloader",
                      "ark_can-flow_default",
-                     "ark_can-gps_canbootloader",
-                     "ark_can-gps_default",
-                     "ark_can-rtk-gps_canbootloader",
-                     "ark_can-rtk-gps_default",
-                     "atl_mantis-edu_default",
                      "av_x-v1_default",
                      "bitcraze_crazyflie_default",
                      "bitcraze_crazyflie21_default",
@@ -76,18 +71,24 @@ pipeline {
                      "nxp_fmuk66-v3_rtps",
                      "nxp_fmuk66-v3_socketcan",
                      "nxp_fmurt1062-v1_default",
-                     "nxp_ucans32k146_canbootloader",
                      "nxp_ucans32k146_default",
+                     "nxp_ucans32k146_canbootloader",
                      "omnibus_f4sd_default",
                      "px4_fmu-v2_default",
                      "px4_fmu-v2_fixedwing",
                      "px4_fmu-v2_multicopter",
                      "px4_fmu-v2_rover",
                      "px4_fmu-v3_default",
+                     "px4_fmu-v4_cannode",
                      "px4_fmu-v4_default",
                      "px4_fmu-v4pro_default",
+                     "px4_fmu-v5_ctrlalloc",
                      "px4_fmu-v5_debug",
                      "px4_fmu-v5_default",
+                     "px4_fmu-v5_fixedwing",
+                     "px4_fmu-v5_multicopter",
+                     "px4_fmu-v5_optimized",
+                     "px4_fmu-v5_rover",
                      "px4_fmu-v5_rtps",
                      "px4_fmu-v5_stackcheck",
                      "px4_fmu-v5_uavcanv0periph",
@@ -125,7 +126,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     // stage('S3 Upload') {
     //   agent {
-    //     docker { image 'px4io/px4-dev-base-focal:2021-09-08' }
+    //     docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
     //   }
     //   options {
     //         skipDefaultCheckout()
@@ -157,8 +158,6 @@ pipeline {
 def createBuildNode(Boolean archive, String docker_image, String target) {
   return {
 
-    bypass_entrypoint = ''
-
     node {
       docker.withRegistry('https://registry.hub.docker.com', 'docker_hub_dagar') {
         docker.image(docker_image).inside('-e CCACHE_BASEDIR=${WORKSPACE} -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' + bypass_entrypoint) {

.ci/Jenkinsfile-hardware

@@ -12,16 +12,20 @@ pipeline {
             stage("build cubepilot_cubeorange_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make cubepilot_cubeorange_test'
                 sh 'make cubepilot_cubeorange_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, Tools/HIL/*.py', name: 'cubepilot_cubeorange_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'cubepilot_cubeorange_test'
               }
               post {
                 always {
@@ -59,7 +63,7 @@ pipeline {
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
                     checkStatus()
                     quickCalibrate()
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
                 }
                 stage("print topics") {
@@ -67,12 +71,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/cubepilot_cubeorange_test/cubepilot_cubeorange_test.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -83,16 +82,20 @@ pipeline {
             stage("build cuav_x7pro_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make cuav_x7pro_test'
                 sh 'make cuav_x7pro_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, Tools/HIL/*.py', name: 'cuav_x7pro_test'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'cuav_x7pro_test'
               }
               post {
                 always {
@@ -136,12 +139,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/cuav_x7pro_test/cuav_x7pro_test.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -152,16 +150,20 @@ pipeline {
             stage("build px4_fmu-v3_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make px4_fmu-v3_test'
                 sh 'make px4_fmu-v3_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, 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_test'
               }
               post {
                 always {
@@ -197,7 +199,8 @@ pipeline {
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
                     checkStatus()
                     quickCalibrate()
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener px4io_status"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
                 }
                 stage("print topics") {
@@ -205,12 +208,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/px4_fmu-v3_test/px4_fmu-v3_test.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -221,16 +219,20 @@ pipeline {
             stage("build px4_fmu-v4_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make px4_fmu-v4_test'
                 sh 'make px4_fmu-v4_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, 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_test'
               }
               post {
                 always {
@@ -273,12 +275,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/px4_fmu-v4_test/px4_fmu-v4_test.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -289,16 +286,20 @@ pipeline {
             stage("build px4_fmu-v4pro_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make px4_fmu-v4pro_test'
                 sh 'make px4_fmu-v4pro_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, 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_test'
               }
               post {
                 always {
@@ -334,7 +335,7 @@ pipeline {
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
                     checkStatus()
                     quickCalibrate()
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
                 }
                 stage("print topics") {
@@ -342,12 +343,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/px4_fmu-v4pro_test/px4_fmu-v4pro_test.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -358,16 +354,20 @@ pipeline {
             stage("build px4_fmu-v5_debug") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make px4_fmu-v5_debug'
                 sh 'make px4_fmu-v5_debug bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, Tools/HIL/*.py', name: 'px4_fmu-v5_debug'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v5_debug'
               }
               post {
                 always {
@@ -392,15 +392,14 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param save" || true'
                     sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_debug/px4_fmu-v5_bootloader.elf'
                     // flash board and watch bootup
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_debug/px4_fmu-v5_debug.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600 || true'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_debug/px4_fmu-v5_debug.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
                 }
                 stage("tests") {
                   steps {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
-                    //sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_stress"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests" || true'
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
                   }
                 }
@@ -412,7 +411,6 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 200" || true' // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0" || true'       // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_1_CONFIG 0" || true'       // limit cpu usage
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SDLOG_MODE -1" || true'        // limit cpu usage
                     checkStatus()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
@@ -422,13 +420,76 @@ pipeline {
                     printTopics()
                   }
                 }
+
+              }
+            } // stage test
+          }
+        }
+
+        stage("px4_fmu-v5_optimized") {
+          stages {
+            stage("build px4_fmu-v5_optimized") {
+              agent {
+                docker {
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                }
+              }
+              steps {
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
+                sh 'make px4_fmu-v5_optimized'
+                sh 'make px4_fmu-v5_optimized bootloader_elf'
+                sh 'ccache -s'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v5_optimized'
               }
               post {
                 always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/px4_fmu-v5_debug/px4_fmu-v5_debug.elf || true'
+                    sh 'make distclean'
-                    resetBoard()
                 }
               }
+            } // stage build
+            stage("hardware") {
+              agent {
+                label 'px4_fmu-v5'
+              }
+              stages {
+                stage("flash") {
+                  steps {
+                    sh 'export'
+                    sh 'find /dev/serial'
+                    unstash 'px4_fmu-v5_optimized'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_optimized/px4_fmu-v5_bootloader.elf'
+                    // flash board and watch bootup
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/px4_fmu-v5_optimized/px4_fmu-v5_optimized.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
+                  }
+                }
+                stage("tests") {
+                  steps {
+                    runTests()
+                  }
+                }
+                stage("status") {
+                  steps {
+                    // configure
+                    resetParameters()
+                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "4001"'    // generic quadcopter
+                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
+                    checkStatus()
+                    quickCalibrate()
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
+                  }
+                }
+                stage("print topics") {
+                  steps {
+                    printTopics()
+                  }
+                }
+
+              }
             } // stage test
           }
         }
@@ -438,16 +499,20 @@ pipeline {
             stage("build px4_fmu-v5_stackcheck") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make px4_fmu-v5_stackcheck'
                 sh 'make px4_fmu-v5_stackcheck bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, Tools/HIL/*.py', name: 'px4_fmu-v5_stackcheck'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'px4_fmu-v5_stackcheck'
               }
               post {
                 always {
@@ -479,7 +544,7 @@ pipeline {
                   steps {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests" || true'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
                   }
                 }
@@ -491,7 +556,6 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 200" || true' // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0" || true'       // limit cpu usage
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_1_CONFIG 0" || true'       // limit cpu usage
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SDLOG_MODE -1" || true'        // limit cpu usage
                     checkStatus()
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io status" || true'
                   }
@@ -501,12 +565,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/px4_fmu-v5_stackcheck/px4_fmu-v5_stackcheck.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -517,16 +576,20 @@ pipeline {
             stage("build px4_fmu-v5_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make px4_fmu-v5_test'
                 sh 'make px4_fmu-v5_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, 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_test'
               }
               post {
                 always {
@@ -570,13 +633,75 @@ pipeline {
                     printTopics()
                   }
                 }
+
+              }
+            } // stage test
+          }
+        }
+
+        stage("modalai_fc-v1_test") {
+          stages {
+            stage("build modalai_fc-v1_test") {
+              agent {
+                docker {
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                }
+              }
+              steps {
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
+                sh 'make modalai_fc-v1_test'
+                sh 'make modalai_fc-v1_test bootloader_elf'
+                sh 'ccache -s'
+                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/upload_jlink_gdb.sh, Tools/HIL/*.py', name: 'modalai_fc-v1_test'
               }
               post {
                 always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/px4_fmu-v5_test/px4_fmu-v5_test.elf || true'
+                    sh 'make distclean'
-                    resetBoard()
                 }
               }
+            } // stage build
+            stage("hardware") {
+              agent {
+                label 'modalai_fc-v1'
+              }
+              stages {
+                stage("flash") {
+                  steps {
+                    sh 'export'
+                    sh 'find /dev/serial'
+                    unstash 'modalai_fc-v1_test'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/modalai_fc-v1_test/modalai_fc-v1_bootloader.elf'
+                    // 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'
+                  }
+                }
+                stage("tests") {
+                  steps {
+                    runTests()
+                  }
+                }
+                stage("status") {
+                  steps {
+                    // configure
+                    resetParameters()
+                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "4001"'    // generic quadcopter
+                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
+                    checkStatus()
+                    quickCalibrate()
+                  }
+                }
+                stage("print topics") {
+                  steps {
+                    printTopics()
+                  }
+                }
+
+              }
             } // stage test
           }
         }
@@ -586,16 +711,20 @@ pipeline {
             stage("build nxp_fmuk66-v3_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
+                  image 'px4io/px4-dev-nuttx-focal:2021-05-04'
-                  args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
+                  args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
               steps {
-                checkoutSCM()
+                checkout scm
+                sh 'export'
+                sh 'make distclean'
+                sh 'ccache -s'
+                sh 'git fetch --tags'
                 sh 'make nxp_fmuk66-v3_test'
                 //sh 'make nxp_fmuk66-v3_test bootloader_elf'
                 sh 'ccache -s'
-                stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, 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_test'
               }
               post {
                 always {
@@ -627,7 +756,6 @@ pipeline {
                   steps {
                     // configure
                     resetParameters()
-                    sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "IMU_GYRO_RATEMAX" --value "400"'
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_AUTOSTART" --value "4001"'    // generic quadcopter
                     sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "SYS_BL_UPDATE" --value "1"'       // update bootloader
                     checkStatus()
@@ -639,12 +767,7 @@ pipeline {
                     printTopics()
                   }
                 }
-              }
+
-              post {
-                always {
-                    sh './platforms/nuttx/Debug/jlink_gdb_backtrace.sh build/nxp_fmuk66-v3_test/nxp_fmuk66-v3_test.elf || true'
-                    resetBoard()
-                }
               }
             } // stage test
           }
@@ -660,54 +783,29 @@ pipeline {
   }
   options {
     buildDiscarder(logRotator(numToKeepStr: '30', artifactDaysToKeepStr: '60'))
-    timeout(time: 180, unit: 'MINUTES')
+    timeout(time: 120, unit: 'MINUTES')
     skipDefaultCheckout()
   }
 }
 
-void checkoutSCM() {
-  retry(3) {
-    checkout scm
-    sh 'export'
-    sh 'make distclean'
-    sh 'git fetch --tags'
-    sh 'ccache -z'
-  }
-}
-
 void quickCalibrate() {
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate accel quick; sleep 1; param show CAL_ACC*"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate gyro; sleep 1; param show CAL_GYRO*"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate level; sleep 1; param show SENS_BOARD*"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate mag quick; sleep 1; param show CAL_MAG*"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_*"' // parameters before
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "gyro_calibration status; param show CAL_GYRO*"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors status"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "gyro_calibration status || true"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate accel quick"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_ACC*"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate gyro"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_GYRO*"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate level"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show SENS*"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander calibrate mag quick"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_MAG*"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CAL_*"' // parameters after
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors status"'
 }
 
 void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param save"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show SYS*"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
   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 SYS*"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show"'
 
   // run logger
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger on"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sleep 1"' // sleep before continuing
   // status commands
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/meminfo"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/uptime"'
@@ -719,18 +817,17 @@ void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "free"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "gps status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener cpuload; top once; listener cpuload"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /bin"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /dev"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /etc"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /obj"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /proc"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink status streams" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink status streams"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mount"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show" || true'
+  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 "param status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "perf latency"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "perf"'
@@ -738,6 +835,7 @@ void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "pwm info -d /dev/pwm_output0"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "pwm info -d /dev/pwm_output1" || true'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "pwm_out status"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench -r 2"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uavcan status" || true'
@@ -746,7 +844,7 @@ void checkStatus() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ver all"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
   // stop logger
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "logger off"'
 }
 
 void resetParameters() {
@@ -758,21 +856,18 @@ void resetParameters() {
 void runTests() {
   resetParameters()
 
-  sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "IMU_GYRO_CAL_EN" --value "0" || true' // disable during testing
-  sh './Tools/HIL/nsh_param_set.py --device `find /dev/serial -name *usb-*` --name "IMU_GYRO_FFT_EN" --value "0" || true' // disable during testing
-
   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 "reboot" || true' // reboot to apply
 
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander_tests" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander_tests"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "controllib_test"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "lightware_laser_test"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink_tests" || true' // TODO
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test"'
 
   sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-*`'
 
@@ -782,27 +877,7 @@ void runTests() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd rwtest"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd erase"'
 
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench -u"'
-
-  //sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_stress"'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander stop"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sensors stop"' // ignore irrelevant sensor timeouts during microbenchmarks
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "microbench all"'
-
-  // test rebooting multiple times
-  resetParameters()
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001" || true'
-  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 "reboot" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CBRK*; param show SYS*"' // check that CBRK_BUZZER and SYS_AUTOSTART haven't been lost
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CBRK*; param show SYS*"' // check that CBRK_BUZZER and SYS_AUTOSTART haven't been lost
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CBRK*; param show SYS*"' // check that CBRK_BUZZER and SYS_AUTOSTART haven't been lost
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show CBRK*; param show SYS*"' // check that CBRK_BUZZER and SYS_AUTOSTART haven't been lost
 }
 
 void printTopics() {
@@ -810,127 +885,90 @@ void printTopics() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb top -1 -a"'
 
-  // these are for casually inspecting the system, output failure doesn't matter
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_armed"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_armed" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_0"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_0" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_1"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_1" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_2"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_2" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_3"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_controls_3" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_outputs"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener actuator_outputs" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener adc_report"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener adc_report" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener airspeed_validated"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener airspeed_validated" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener airspeed_wind"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener airspeed_wind" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener battery_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener battery_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener commander_state"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener commander_state" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener cpuload"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener cpuload" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener distance_sensor"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener distance_sensor" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener ekf2_timestamps"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener ekf2_timestamps" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener ekf_gps_drift"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener ekf_gps_drift" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener esc_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener esc_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_attitude"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_attitude" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_event_flags"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_baro_bias" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_global_position"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_event_flags" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovation_test_ratios"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_global_position" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovation_variances"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovation_test_ratios" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovations"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovation_variances" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_local_position"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_innovations" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_odometry"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_local_position" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_optical_flow_vel"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_odometry" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_selector_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_optical_flow_vel" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_sensor_bias"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_selector_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_states"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_sensor_bias" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_states" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_status_flags"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_wind"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_status_flags" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener event"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener estimator_wind" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener input_rc"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener event" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener led_control"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener heater_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener log_message"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener input_rc" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener logger_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener led_control" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener manual_control_setpoint"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener log_message" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener mavlink_log"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener logger_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener mission"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener manual_control_setpoint" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener multirotor_motor_limits"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener mavlink_log" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener optical_flow"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener mission" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener parameter_update"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener multirotor_motor_limits" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener position_controller_landing_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener optical_flow" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener position_setpoint_triplet"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener parameter_update" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener radio_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener position_controller_landing_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener rate_ctrl_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener position_setpoint_triplet" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener safety"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener radio_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_accel"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener rate_ctrl_status" || true'
+  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 safety" || true'
+  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_accel" || true'
+  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_accel_fifo" || true'
+  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_baro" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_gyro_fft"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_combined" || true'
+  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_gyro" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_mag"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_gyro_fft" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_preflight_mag"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_gyro_fifo" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_selection"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_mag" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensors_status_imu"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_preflight_mag" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener system_power"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensor_selection" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener task_stack_info"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener sensors_status_imu" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener telemetry_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener system_power" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener test_motor"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener task_stack_info" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener trajectory_setpoint"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener telemetry_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener tune_control"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener test_motor" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_acceleration"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener trajectory_setpoint" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_air_data"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener tune_control" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_acceleration"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_acceleration" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_velocity"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_air_data" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_acceleration" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude_setpoint"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_angular_velocity" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_command"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_command_ack"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_attitude_setpoint" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_control_mode"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_command" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_global_position"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_command_ack" || true'
+  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_control_mode" || true'
+  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_global_position" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_land_detected"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_imu" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_local_position"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_imu_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_local_position_setpoint"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_land_detected" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_magnetometer"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_local_position" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_odometry"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_local_position_setpoint" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_rates_setpoint"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_magnetometer" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_odometry" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_status_flags"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_rates_setpoint" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vtol_vehicle_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_status" || true'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener yaw_estimator_status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vehicle_status_flags" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener vtol_vehicle_status" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "listener yaw_estimator_status" || true'
-}
-
-void resetBoard() {
-  resetParameters()
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 0" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 200" || true' // limit cpu usage
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_0_CONFIG 0" || true'       // limit cpu usage
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set MAV_1_CONFIG 0" || true'       // limit cpu usage
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SDLOG_MODE -1" || true'        // limit cpu usage
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true' // reboot to apply
-
-  // check SD card
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "df -h" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /fs/microsd" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /proc/fs" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/blocks" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/mount" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/usage" || true'
-  // format
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "dataman stop" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "umount /fs/microsd" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mkfatfs -F 32 /dev/mmcsd0" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once" || true'
-
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mount -t vfat /dev/mmcsd0 /fs/microsd" || true'
-  // check SD card
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "df -h" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /fs/microsd" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "ls /proc/fs" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/blocks" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/mount" || true'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/usage" || true'
 }

.clang-tidy

@@ -74,7 +74,6 @@ Checks:          '*,
                   -modernize-deprecated-headers,
                   -modernize-loop-convert,
                   -modernize-pass-by-value,
-                  -modernize-raw-string-literal,
                   -modernize-return-braced-init-list,
                   -modernize-use-auto,
                   -modernize-use-bool-literals,
@@ -82,7 +81,6 @@ Checks:          '*,
                   -modernize-use-equals-default,
                   -modernize-use-equals-delete,
                   -modernize-use-override,
-                  -modernize-use-trailing-return-type,
                   -modernize-use-using,
                   -performance-inefficient-string-concatenation,
                   -readability-avoid-const-params-in-decls,

.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-09-08",
+	"image": "px4io/px4-dev-nuttx-focal:2021-05-04",
 
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
 

.github/ISSUE_TEMPLATE/2_Feature_request.md

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

.github/slack.svg

@@ -1,24 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20">
-  <linearGradient id="smooth" x2="0" y2="100%">
-    <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
-    <stop offset="1" stop-opacity=".1"/>
-  </linearGradient>
-
-  <mask id="round">
-    <rect width="90" height="20" rx="3" fill="#fff"/>
-  </mask>
-
-  <g mask="url(#round)">
-    <rect width="42" height="20" fill="#555"/>
-    <rect x="42" width="48" height="20" fill="#E01563"/>
-    <rect width="90" height="20" fill="url(#smooth)"/>
-  </g>
-
-  <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-    <text x="22" y="15" fill="#010101" fill-opacity=".3">slack</text>
-    <text x="22" y="14">slack</text>
-    <text x="65" y="15" fill="#010101" fill-opacity=".3">Join us!</text>
-    <text x="65" y="14">Join us!</text>
-  </g>
-</svg>
-

.github/workflows/checks.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -29,13 +30,34 @@ jobs:
           "parameters_metadata",
         ]
     container:
-      image: px4io/px4-dev-nuttx-focal:2021-09-08
+      image: px4io/px4-dev-nuttx-focal:2021-05-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: tests_${{matrix.ubuntu_release}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: tests_${{matrix.ubuntu_release}}-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

.github/workflows/clang-tidy.yml

@@ -11,11 +11,37 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-clang:2021-09-08
+    container: px4io/px4-dev-clang:2021-05-04
+    timeout-minutes: 60
     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: clang-tidy-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: clang-tidy-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: make clang-tidy-quiet
-      run: make clang-tidy-quiet
+      run: |
+        ccache -z
+        make clang-tidy-quiet
+        ccache -s

.github/workflows/compile_linux.yml

@@ -11,7 +11,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2021-09-08
+    container: px4io/px4-dev-armhf:2021-05-04
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
@@ -42,9 +43,8 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
           echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 

.github/workflows/compile_linux_arm64.yml

@@ -11,7 +11,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-aarch64:2021-09-08
+    container: px4io/px4-dev-aarch64:2021-05-04
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
@@ -39,9 +40,8 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
           echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 

.github/workflows/compile_macos.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: macos-10.15
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
@@ -43,9 +44,8 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 40M" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 

.github/workflows/compile_nuttx.yml

@@ -11,16 +11,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2021-09-08
+    container: px4io/px4-dev-nuttx-focal:2021-05-04
+    timeout-minutes: 60
     strategy:
-      fail-fast: false
       matrix:
         config: [
           airmind_mindpx-v2,
           ark_can-flow,
           ark_can-gps,
-          ark_can-rtk-gps,
-          atl_mantis-edu,
           av_x-v1,
           bitcraze_crazyflie,
           bitcraze_crazyflie21,
@@ -81,15 +79,13 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
           echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 
     - name: make all_variants_${{matrix.config}}
       run: make all_variants_${{matrix.config}}
-      timeout-minutes: 45
     - name: make ${{matrix.config}} bloaty_compileunits
       run: make ${{matrix.config}} bloaty_compileunits || true
     - name: make ${{matrix.config}} bloaty_inlines
@@ -111,6 +107,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: px4_package_${{matrix.config}}
-        path: |
+        path: build/**/*.px4
-          build/**/*.px4
-          build/**/*.bin

.github/workflows/compile_nuttx_cannode.yml

@@ -0,0 +1,63 @@
+name: NuttX UAVCAN firmware
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-nuttx-focal:2021-05-04
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        config: [
+          ark_can-flow_default,
+          cuav_can-gps-v1_default,
+          freefly_can-rtk-gps_default,
+          holybro_can-gps-v1_default,
+          #nxp_ucans32k146_default,
+          px4_fmu-v4_cannode
+          ]
+    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: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: ${{matrix.config}}-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: make ${{matrix.config}}
+      run: make ${{matrix.config}}
+
+    - name: ccache post-run
+      run: ccache -s
+
+    - name: Upload px4 package
+      uses: actions/upload-artifact@v2
+      with:
+        name: px4_cannode_${{matrix.config}}
+        path: build/${{matrix.config}}/*.uavcan.bin

.github/workflows/deploy_all.yml

@@ -10,7 +10,6 @@ on:
 jobs:
   enumerate_targets:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -24,14 +23,38 @@ jobs:
     needs: enumerate_targets
     strategy:
       matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
-    container: px4io/px4-dev-${{ matrix.container }}:2021-09-08
+    container: px4io/px4-dev-${{ matrix.container }}:2021-05-04
     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: ${{matrix.target}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: ${{matrix.target}}-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: make ${{matrix.target}}
       run: make ${{matrix.target}}
+    - name: ccache post-run
+      run: ccache -s
 
     - name: parameter & events metadata
       run: |

.github/workflows/ekf_functional_change_indicator.yml

@@ -5,7 +5,7 @@ on: pull_request
 jobs:
   unit_tests:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v2.3.1
       with:

.github/workflows/ekf_update_change_indicator.yml

@@ -5,7 +5,7 @@ on: push
 jobs:
   unit_tests:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     env:
       GIT_COMMITTER_EMAIL: bot@px4.io
       GIT_COMMITTER_NAME: PX4BuildBot

.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-09-08
+      image: px4io/px4-dev-ros-melodic:2021-05-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1
@@ -49,9 +49,8 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
           echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 
@@ -79,7 +78,6 @@ jobs:
       run: |
         export
         ./test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=${{matrix.config.mission}} vehicle:=${{matrix.config.vehicle}}
-      timeout-minutes: 45
 
     - name: Look at core files
       if: failure()

.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-09-08
+      image: px4io/px4-dev-ros-melodic:2021-05-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1
@@ -44,9 +44,8 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
           echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 
@@ -74,7 +73,6 @@ jobs:
       run: |
         export
         ./test/rostest_px4_run.sh ${{matrix.config.test_file}} vehicle:=${{matrix.config.vehicle}}
-      timeout-minutes: 45
 
     - name: Look at core files
       if: failure()

.github/workflows/metadata.yml

@@ -11,7 +11,7 @@ jobs:
 
   airframe:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -37,7 +37,7 @@ jobs:
 
   module:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -52,7 +52,7 @@ jobs:
 
   parameter:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -76,7 +76,7 @@ jobs:
 
   events:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -103,7 +103,7 @@ jobs:
 
   uorb_graph:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2021-09-08
+    container: px4io/px4-dev-nuttx-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -118,7 +118,7 @@ jobs:
 
   micrortps_agent:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -132,7 +132,7 @@ jobs:
 
   ROS_msgs:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -145,7 +145,7 @@ jobs:
 
   ROS2_bridge:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2021-05-04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -154,4 +154,4 @@ jobs:
     - name: PX4 ROS2 bridge
       run: |
         git clone https://github.com/PX4/px4_ros_com.git
-        ./msg/tools/uorb_to_ros_urtps_topics.py -i msg/tools/urtps_bridge_topics.yaml -o px4_ros_com/templates/urtps_bridge_topics.yaml
+        ./msg/tools/uorb_to_ros_rtps_ids.py -i msg/tools/uorb_rtps_message_ids.yaml -o px4_ros_com/templates/uorb_rtps_message_ids.yaml

.github/workflows/sitl_tests.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -21,7 +22,7 @@ jobs:
           - {latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage",         model: "standard_vtol" } # Zurich
 
     container:
-      image: px4io/px4-dev-simulation-focal:2021-09-08
+      image: px4io/px4-dev-simulation-focal:2021-05-04
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1
@@ -50,9 +51,8 @@ jobs:
           mkdir -p ~/.ccache
           echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
           echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
           ccache -s
           ccache -z
 
@@ -97,7 +97,6 @@ jobs:
         PX4_HOME_ALT: ${{matrix.config.altitude}}
         PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
       run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 --abort-early --model ${{matrix.config.model}} --upload test/mavsdk_tests/configs/sitl.json
-      timeout-minutes: 45
 
     - name: Look at core files
       if: failure()

.gitmodules

@@ -29,11 +29,11 @@
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-10.1.0+
+	branch = px4_firmware_nuttx-10.0.0+
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
 	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-10.1.0+
+	branch = px4_firmware_nuttx-10.0.0+
 [submodule "Tools/flightgear_bridge"]
 	path = Tools/flightgear_bridge
 	url = https://github.com/PX4/PX4-FlightGear-Bridge.git
@@ -66,11 +66,3 @@
 [submodule "Tools/simulation-ignition"]
 	path = Tools/simulation-ignition
 	url = https://github.com/Auterion/px4-simulation-ignition.git
-[submodule "src/lib/crypto/libtomcrypt"]
-	path = src/lib/crypto/libtomcrypt
-	url = https://github.com/PX4/libtomcrypt.git
-	branch = px4
-[submodule "src/lib/crypto/libtommath"]
-	path = src/lib/crypto/libtommath
-	url = https://github.com/PX4/libtommath.git
-	branch = px4

.vscode/cmake-variants.yaml

@@ -6,11 +6,6 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_default
-    px4_sitl_rtps:
-      short: px4_sitl_rtps
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_rtps
     px4_sitl_asan:
       short: px4_sitl (AddressSanitizer)
       buildType: AddressSanitizer
@@ -101,26 +96,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_can-gps_canbootloader
-    ark_can-rtk-gps_default:
-      short: ark_can-rtk-gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-rtk-gps_default
-    ark_can-rtk-gps_debug:
-      short: ark_can-rtk-gps_debug
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-rtk-gps_debug
-    ark_can-rtk-gps_canbootloader:
-      short: ark_can-rtk-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-rtk-gps_canbootloader
-    atl_mantis-edu_default:
-      short: atl_mantis-edu
-      buildType: MinSizeRel
-      settings:
-        CONFIG: atl_mantis-edu_default
     av_x-v1_default:
       short: av_x-v1
       buildType: MinSizeRel

.vscode/settings.json

@@ -31,6 +31,7 @@
                 "esc"
         ],
         "debug.toolBarLocation": "docked",
+        "editor.acceptSuggestionOnEnter": "off",
         "editor.defaultFormatter": "chiehyu.vscode-astyle",
         "editor.dragAndDrop": false,
         "editor.insertSpaces": false,

CMakeLists.txt

@@ -143,33 +143,12 @@ set(CONFIG "px4_sitl_default" CACHE STRING "desired configuration")
 include(px4_add_module)
 set(config_module_list)
 
-# Find Python
-# If using catkin, Python 2 is found since it points
-# to the Python libs installed with the ROS distro
-if (NOT CATKIN_DEVEL_PREFIX)
-	find_package(PythonInterp 3)
-	# We have a custom error message to tell users how to install python3.
-	if (NOT PYTHONINTERP_FOUND)
-		message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
-			"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
-			"    macOS: brew install python")
-	endif()
-else()
-	find_package(PythonInterp REQUIRED)
-endif()
-
-option(PYTHON_COVERAGE "Python code coverage" OFF)
-if(PYTHON_COVERAGE)
-	message(STATUS "python coverage enabled")
-	set(PYTHON_EXECUTABLE coverage run -p)
-endif()
-
 include(px4_config)
-include(kconfig)
+include(px4_add_board)
+include(${PX4_CONFIG_FILE})
 message(STATUS "PX4 config: ${PX4_CONFIG}")
 message(STATUS "PX4 platform: ${PX4_PLATFORM}")
 
-
 if(${PX4_PLATFORM} STREQUAL "posix")
 	if(ENABLE_LOCKSTEP_SCHEDULER)
 		add_definitions(-DENABLE_LOCKSTEP_SCHEDULER)
@@ -304,6 +283,27 @@ if (CATKIN_DEVEL_PREFIX)
 	endif()
 endif()
 
+# Python
+# If using catkin, Python 2 is found since it points
+# to the Python libs installed with the ROS distro
+if (NOT CATKIN_DEVEL_PREFIX)
+	find_package(PythonInterp 3)
+	# We have a custom error message to tell users how to install python3.
+	if (NOT PYTHONINTERP_FOUND)
+		message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
+			"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
+			"    macOS: brew install python")
+	endif()
+else()
+	find_package(PythonInterp REQUIRED)
+endif()
+
+option(PYTHON_COVERAGE "Python code coverage" OFF)
+if(PYTHON_COVERAGE)
+	message(STATUS "python coverage enabled")
+	set(PYTHON_EXECUTABLE coverage run -p)
+endif()
+
 #=============================================================================
 # get chip and chip manufacturer
 #
@@ -443,10 +443,8 @@ endforeach()
 
 add_custom_command(OUTPUT ${uorb_graph_config}
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/uorb_graph/create.py
-		${graph_module_list} --src-path src/lib
+		${graph_module_list}
-		--merge-depends
 		--exclude-path src/examples
-		--exclude-path src/lib/parameters # FIXME: enable & fix
 		--file ${PX4_SOURCE_DIR}/Tools/uorb_graph/graph_${uorb_graph_config}
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
 	COMMENT "Generating uORB graph"

Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
         // stage('Catkin build on ROS workspace') {
         //   agent {
         //     docker {
-        //       image 'px4io/px4-dev-ros-melodic:2021-08-18'
+        //       image 'px4io/px4-dev-ros-melodic:2021-05-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-08-18'
+              image 'px4io/px4-dev-ros2-foxy:2021-05-04'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
             }
           }
@@ -85,7 +85,7 @@ pipeline {
 
         stage('Airframe') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh 'make distclean'
@@ -105,7 +105,7 @@ pipeline {
 
         stage('Parameter') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh 'make distclean'
@@ -125,7 +125,7 @@ pipeline {
 
         stage('Module') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh 'make distclean'
@@ -143,28 +143,10 @@ pipeline {
           }
         }
 
-        stage('msg file docs') {
-          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
-          }
-          steps {
-            sh 'mkdir -p build/msg_docs; ./msg/tools/generate_msg_docs.py -d build/msg_docs'
-            dir('build') {
-              archiveArtifacts(artifacts: 'msg_docs/*.md')
-              stash includes: 'msg_docs/*.md', name: 'msg_documentation'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
         stage('uORB graphs') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-focal:2021-08-18'
+              image 'px4io/px4-dev-nuttx-focal:2021-05-04'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -174,8 +156,8 @@ pipeline {
             sh 'git fetch --all --tags'
             sh 'make uorb_graphs'
             dir('Tools/uorb_graph') {
-              archiveArtifacts(artifacts: 'graph_*.json')
+              archiveArtifacts(artifacts: 'graph_px4_sitl.json')
-              stash includes: 'graph_*.json', name: 'uorb_graph'
+              stash includes: 'graph_px4_sitl.json', name: 'uorb_graph'
             }
           }
           post {
@@ -194,22 +176,18 @@ pipeline {
 
         stage('Userguide') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh('export')
             unstash 'metadata_airframes'
             unstash 'metadata_parameters'
             unstash 'metadata_module_documentation'
-            unstash 'msg_documentation'
-            unstash 'uorb_graph'
             withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
               sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_user_guide.git')
               sh('cp airframes.md px4_user_guide/en/airframes/airframe_reference.md')
               sh('cp parameters.md px4_user_guide/en/advanced_config/parameter_reference.md')
               sh('cp -R modules/*.md px4_user_guide/en/modules/')
-              sh('cp -R graph_*.json px4_user_guide/.vuepress/public/en/middleware/')
-              sh('cp -R msg_docs/*.md px4_user_guide/en/msg_docs/')
               sh('cd px4_user_guide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
               sh('cd px4_user_guide; git push origin master || true')
               sh('rm -rf px4_user_guide')
@@ -228,7 +206,7 @@ pipeline {
 
         stage('QGroundControl') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh('export')
@@ -256,7 +234,7 @@ pipeline {
 
         stage('microRTPS agent') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh('export')
@@ -286,7 +264,7 @@ pipeline {
 
         stage('PX4 ROS msgs') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh('export')
@@ -315,7 +293,7 @@ pipeline {
 
         stage('PX4 ROS2 bridge') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh('export')
@@ -323,7 +301,7 @@ pipeline {
             withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
               sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_ros_com.git -b ${BRANCH_NAME}")
               // deploy uORB RTPS ID map
-              sh('./msg/tools/uorb_to_ros_urtps_topics.py -i msg/tools/urtps_bridge_topics.yaml -o px4_ros_com/templates/urtps_bridge_topics.yaml')
+              sh('./msg/tools/uorb_to_ros_rtps_ids.py -i msg/tools/uorb_rtps_message_ids.yaml -o px4_ros_com/templates/uorb_rtps_message_ids.yaml')
               sh('cd px4_ros_com; git status; git add .; git commit -a -m "Update uORB RTPS ID map `date`" || true')
               sh('cd px4_ros_com; git push origin ${BRANCH_NAME} || true')
               // deploy uORB RTPS required tools
@@ -358,7 +336,7 @@ pipeline {
 
         stage('S3') {
           agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
           }
           steps {
             sh('export')

Kconfig

@@ -1,188 +0,0 @@
-# PX4 Firmware Configuration
-
-
-mainmenu "PX4 Firmware Configuration"
-
-comment "Vendor: $(VENDOR)"
-comment "Model: $(MODEL)"
-comment "Label: $(LABEL)"
-
-menu "Toolchain"
-    choice
-        prompt "Platform"
-        default PLATFORM_NUTTX
-        config PLATFORM_NUTTX
-            bool "nuttx"
-        config PLATFORM_POSIX
-            bool "posix"
-        config PLATFORM_QURT
-            bool "qurt"
-    endchoice
-
-    config BOARD_PLATFORM
-        string
-        default "nuttx" if PLATFORM_NUTTX
-        default "posix" if PLATFORM_POSIX
-        default "qurt" if PLATFORM_QURT
-
-    config BOARD_LOCKSTEP
-        bool "Force enable lockstep"
-        depends on PLATFORM_POSIX
-        help
-            forces lockstep behaviour, despite REPLAY env variable
-
-    config BOARD_NOLOCKSTEP
-        bool "Force disable lockstep"
-        depends on PLATFORM_POSIX
-        help
-            forces nolockstep behaviour, despite REPLAY env variable
-
-    config BOARD_LINUX
-        bool "Linux OS"
-        depends on PLATFORM_POSIX
-        help
-            Board Platform is running the Linux operating system
-
-    config BOARD_TOOLCHAIN
-        string "Toolchain"
-        default ""
-
-    config BOARD_ARCHITECTURE
-        string "Architecture"
-        default ""
-
-    config BOARD_FULL_OPTIMIZATION
-        bool "Full optmization (O3)"
-        default n
-        help
-            Enables Cmake Release for -O3 optimization
-
-    config BOARD_ROMFSROOT
-        string "ROMFSROOT"
-        default "px4fmu_common"
-        help
-            relative path to the ROMFS root directory
-
-    config BOARD_BUILD_BOOTLOADER
-        bool "Enable bootloader"
-        help
-            flag to enable building and including the bootloader config
-
-    config BOARD_IO
-        string "IO board name"
-        help
-            name of IO board to be built and included in the ROMFS (requires a valid ROMFSROOT)
-
-    config BOARD_CONSTRAINED_FLASH
-        bool "Contrained flash"
-        help
-            flag to enable constrained flash options (eg limit init script status text)
-
-    config BOARD_NO_HELP
-        bool "No help"
-        help
-            optional condition flag to disable help text on constrained flash systems
-
-    config BOARD_CONSTRAINED_MEMORY
-        bool "Contrained memory"
-        help
-            flag to enable constrained memory options (eg limit maximum number of uORB publications)
-
-    config BOARD_EXTERNAL_METADATA
-        bool "External metadata"
-        help
-            flag to exclude metadata to reduce flash
-
-    config BOARD_LINKER_PREFIX
-        string "linker prefix"
-        help
-            optional to prefix on the Linker script.
-
-    config BOARD_COMPILE_DEFINITIONS
-        string "add custom compile definitions"
-        help
-            add custom compile defitions to this specific target
-endmenu #Toolchain
-
-config BOARD_TESTING
-    bool "Testing"
-    select SYSTEMCMDS_TESTS
-    help
-        flag to enable automatic inclusion of PX4 testing modules
-
-
-config BOARD_ETHERNET
-    bool "Ethernet"
-    help
-        flag to indicate that ethernet is enabled
-
-config BOARD_CRYPTO
-    string "Crypto"
-    help
-        Crypto implementation selection
-
-config BOARD_KEYSTORE
-    string "Keystore"
-    help
-        Keystore implememntation selection
-
-menu "Serial ports"
-
-    config BOARD_SERIAL_URT6
-        string "URT6 tty port"
-
-    config BOARD_SERIAL_GPS1
-        string "GPS1 tty port"
-
-    config BOARD_SERIAL_GPS2
-        string "GPS2 tty port"
-
-    config BOARD_SERIAL_GPS3
-        string "GPS3 tty port"
-
-    config BOARD_SERIAL_GPS4
-        string "GPS4 tty port"
-
-    config BOARD_SERIAL_GPS5
-        string "GPS5 tty port"
-
-    config BOARD_SERIAL_TEL1
-        string "TEL1 tty port"
-
-    config BOARD_SERIAL_TEL2
-        string "TEL2 tty port"
-
-    config BOARD_SERIAL_TEL3
-        string "TEL3 tty port"
-
-    config BOARD_SERIAL_TEL4
-        string "TEL4 tty port"
-
-    config BOARD_SERIAL_TEL5
-        string "TEL5 tty port"
-
-    config BOARD_SERIAL_RC
-        string "RC tty port"
-
-    config BOARD_SERIAL_WIFI
-        string "WIFI tty port"
-
-    config BOARD_SERIAL_PPB
-        string "PPB (Pixhawk Payload Bus) tty port"
-endmenu
-
-menu "drivers"
-source "src/drivers/Kconfig"
-endmenu
-
-menu "modules"
-source "src/modules/Kconfig"
-endmenu
-
-menu "systemcmds"
-source "src/systemcmds/Kconfig"
-endmenu
-
-menu "examples"
-source "src/examples/Kconfig"
-endmenu

Makefile

@@ -213,8 +213,8 @@ define colorecho
 +@echo -e '${COLOR_BLUE}${1} ${NO_COLOR}'
 endef
 
-# Get a list of all config targets boards/*/*.px4board
+# Get a list of all config targets boards/*/*.cmake
-ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 -name '*.px4board' -print | sed -e 's|boards\/||' | sed -e 's|\.px4board||' | sed -e 's|\/|_|g' | sort)
+ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 -name '*.cmake' -print | sed -e 's|boards\/||' | sed -e 's|\.cmake||' | sed -e 's|\/|_|g' | sort)
 
 # ADD CONFIGS HERE
 # --------------------------------------------------------------------
@@ -232,9 +232,6 @@ $(CONFIG_TARGETS_DEFAULT):
 all_config_targets: $(ALL_CONFIG_TARGETS)
 all_default_targets: $(CONFIG_TARGETS_DEFAULT)
 
-updateconfig:
-	@./Tools/kconfig/updateconfig.py
-
 # board reorganization deprecation warnings (2018-11-22)
 define deprecation_warning
 	$(warning $(1) has been deprecated and will be removed, please use $(2)!)
@@ -302,11 +299,9 @@ all_variants_%:
 	$(foreach a,$(filter $(subst all_variants_,,$@)_%, $(ALL_CONFIG_TARGETS)), $(call cmake-build,$(a)$(BUILD_DIR_SUFFIX)))
 
 uorb_graphs:
-	@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --exclude-path src/lib/parameters --merge-depends --file Tools/uorb_graph/graph_full
+	@./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 --exclude-path src/lib/parameters --exclude-path src/modules/mavlink --merge-depends --file Tools/uorb_graph/graph_full_no_mavlink
 	@$(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_fmu-v5_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
 
 
@@ -464,7 +459,7 @@ shellcheck_all:
 	@make px4_fmu-v5_default shellcheck
 
 validate_module_configs:
-	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f -not -path "$(SRC_DIR)/src/lib/mixer_module/*" -print0 | xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml
+	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f -print0 | xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml
 
 # Cleanup
 # --------------------------------------------------------------------
@@ -484,7 +479,6 @@ submodulesupdate:
 	@git submodule update --quiet --init --recursive --jobs 4 || true
 	@git submodule sync --recursive
 	@git submodule update --init --recursive --jobs 4
-	@git fetch --all --tags --recurse-submodules=yes --jobs=4
 
 gazeboclean:
 	@rm -rf ~/.gazebo/*
@@ -494,7 +488,7 @@ distclean: gazeboclean
 	@rm -rf "$(SRC_DIR)/build"
 	@git clean --force -X "$(SRC_DIR)/msg/" "$(SRC_DIR)/platforms/" "$(SRC_DIR)/posix-configs/" "$(SRC_DIR)/ROMFS/" "$(SRC_DIR)/src/" "$(SRC_DIR)/test/" "$(SRC_DIR)/Tools/"
 
-# Help / Error / Misc
+# Help / Error
 # --------------------------------------------------------------------
 
 # All other targets are handled by PX4_MAKE. Add a rule here to avoid printing an error.
@@ -528,18 +522,3 @@ check_px4: $(call make_list,nuttx,"px4") \
 
 check_nxp: $(call make_list,nuttx,"nxp") \
 	sizes
-
-ifneq ($(ROS2_WS_DIR),)
-  ROS2_WS_DIR := $(basename ${ROS2_WS_DIR})
-else
-  ROS2_WS_DIR := ~/colcon_ws
-endif
-
-update_ros2_bridge:
-	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --all
-
-update_px4_ros_com:
-	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --px4_ros_com
-
-update_px4_msgs:
-	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --px4_msgs

README.md

@@ -4,7 +4,7 @@
 
 [![Nuttx Targets](https://github.com/PX4/PX4-Autopilot/workflows/Nuttx%20Targets/badge.svg)](https://github.com/PX4/PX4-Autopilot/actions?query=workflow%3A%22Nuttx+Targets%22?branch=master) [![SITL Tests](https://github.com/PX4/PX4-Autopilot/workflows/SITL%20Tests/badge.svg?branch=master)](https://github.com/PX4/PX4-Autopilot/actions?query=workflow%3A%22SITL+Tests%22)
 
-[![Slack](/.github/slack.svg)](https://join.slack.com/t/px4/shared_invite/zt-si4xo5qs-R4baYFmMjlrT4rQK5yUnaA)
+[![Slack](https://px4-slack.herokuapp.com/badge.svg)](http://slack.px4.io)
 
 This repository holds the [PX4](http://px4.io) flight control solution for drones, with the main applications located in the [src/modules](https://github.com/PX4/PX4-Autopilot/tree/master/src/modules) directory. It also contains the PX4 Drone Middleware Platform, which provides drivers and middleware to run drones.
 

ROMFS/CMakeLists.txt

@@ -120,7 +120,6 @@ add_custom_command(
 	COMMAND ${CMAKE_COMMAND} -E touch ${romfs_extract_stamp}
 	WORKING_DIRECTORY ${romfs_gen_root_dir}
 	DEPENDS ${romfs_tar_file}
-	VERBATIM
 	)
 
 add_custom_command(

ROMFS/cannode/init.d/rcS

@@ -15,6 +15,15 @@ set +e
 #
 #------------------------------------------------------------------------------
 set R /
+#
+# Mount the procfs.
+#
+mount -t procfs /proc
+
+#
+# Start CDC/ACM serial driver.
+#
+sercon
 
 #
 # Print full system version.

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

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

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

@@ -8,8 +8,7 @@
 #
 
 . ${R}etc/init.d/rc.mc_defaults
-
+. ${R}etc/init.d/rc.ctrlalloc
-param set-default SYS_CTRL_ALLOC 1
 
 param set-default MPC_USE_HTE 0
 
@@ -46,10 +45,4 @@ 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-default PWM_MAIN_FUNC1 101
+set MIXER direct
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-set MIXER skip
-set MIXER_AUX none

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

@@ -7,5 +7,6 @@
 
 . ${R}etc/init.d-posix/airframes/10016_iris
 
+param set-default EKF2_RNG_AID 1
 param set-default EKF2_RNG_A_HMAX 10
 

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

@@ -8,6 +8,6 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 param set-default MC_PITCHRATE_P 0.1
-param set-default MC_ROLLRATE_P 0.05
+param set-default MC_ROLLRATE_P 0.1
 
 set MIXER quad_x

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

@@ -6,10 +6,13 @@
 . ${R}etc/init.d/rc.uuv_defaults
 
 #Set data link loss failsafe mode (0: disabled)
+param set-default NAV_DLL_ACT 0
 
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
+#param set CBRK_GPSFAIL 240024
+
 set MAV_TYPE 12
 param set MAV_TYPE ${MAV_TYPE}
 

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

@@ -6,10 +6,13 @@
 . ${R}etc/init.d/rc.uuv_defaults
 
 #Set data link loss failsafe mode (0: disabled)
+param set-default NAV_DLL_ACT 0
 
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128
 
+#param set CBRK_GPSFAIL 240024
+
 set MAV_TYPE 12
 param set MAV_TYPE ${MAV_TYPE}
 

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

@@ -6,6 +6,7 @@
 . ${R}etc/init.d/rc.uuv_defaults
 
 #Set data link loss failsafe mode (0: disabled)
+param set-default NAV_DLL_ACT 0
 
 # disable circuit breaker for airspeed sensor
 param set-default CBRK_AIRSPD_CHK 162128

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

@@ -5,6 +5,8 @@
 
 . ${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
 
@@ -16,6 +18,7 @@ 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
@@ -43,6 +46,7 @@ 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
 

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

@@ -5,6 +5,9 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+
 param set-default FW_LND_AIRSPD_SC 1.1
 param set-default FW_LND_ANG 5
 param set-default FW_THR_LND_MAX 0
@@ -16,6 +19,7 @@ param set-default FW_LND_TLALT 15
 
 param set-default 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
@@ -34,12 +38,19 @@ param set-default 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-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
 

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

@@ -5,6 +5,9 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+
 param set-default FW_LND_AIRSPD_SC 1.1
 param set-default FW_LND_ANG 5
 param set-default FW_THR_LND_MAX 0
@@ -16,6 +19,7 @@ param set-default FW_LND_TLALT 15
 
 param set-default 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
@@ -34,12 +38,19 @@ param set-default 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-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 RWTO_MAX_THR 0.6
+
 param set-default RWTO_PSP 8
 param set-default RWTO_AIRSPD_SCL 1.8
 

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

@@ -5,6 +5,8 @@
 
 . ${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
 
@@ -33,6 +35,7 @@ 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
 

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

@@ -5,6 +5,9 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+
 param set-default FW_LND_AIRSPD_SC 1.1
 param set-default FW_LND_ANG 5
 param set-default FW_THR_LND_MAX 0
@@ -16,6 +19,7 @@ param set-default FW_LND_TLALT 15
 
 param set-default 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
@@ -34,6 +38,7 @@ param set-default 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-default RWTO_TKOFF 1
 param set-default RWTO_MAX_PITCH 20

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

@@ -5,6 +5,8 @@
 
 . ${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
 
@@ -16,6 +18,7 @@ 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
@@ -43,6 +46,7 @@ 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
 

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

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

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

@@ -10,6 +10,7 @@
 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

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

@@ -10,6 +10,7 @@
 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

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

@@ -10,6 +10,7 @@
 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

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

@@ -12,12 +12,21 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+
 param set-default FW_AIRSPD_STALL 8
 
 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-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-default MIS_LTRMIN_ALT 50
@@ -33,6 +42,7 @@ param set-default 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-default FW_P_LIM_MAX 25
 param set-default FW_P_LIM_MIN -5

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

@@ -12,6 +12,7 @@
 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

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

@@ -6,17 +6,7 @@
 #
 
 . ${R}etc/init.d/rc.mc_defaults
-
+. ${R}etc/init.d/rc.ctrlalloc
-param set-default SYS_CTRL_ALLOC 1
-
-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
@@ -76,14 +66,7 @@ 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-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 106
-
 set MAV_TYPE 13
 
-set MIXER skip
+# set MIXER hexa_x
-set MIXER_AUX none
+set MIXER direct

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

@@ -61,7 +61,6 @@ px4_add_romfs_files(
 	1035_techpod
 	1036_malolo
 	1037_believer
-	1038_glider
 	1040_standard_vtol
 	1041_tailsitter
 	1042_tiltrotor
@@ -77,6 +76,6 @@ px4_add_romfs_files(
 	2507_cloudship
 	6011_typhoon_h480
 	6011_typhoon_h480.post
-	6012_typhoon_h480_ctrlalloc
+	6012_typhoon_ctrlalloc
-	6012_typhoon_h480_ctrlalloc.post
+	6012_typhoon_ctrlalloc.post
 )

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

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

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

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

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -21,6 +21,8 @@ then
 fi
 
 # initialize script variables
+set AUX_MODE                    none
+set AUX_BANK2			none
 set IO_PRESENT                  no
 set MAV_TYPE                    none
 set MIXER                       none
@@ -120,6 +122,8 @@ then
 
 	param set SENS_BOARD_X_OFF 0.000001
 	param set SENS_DPRES_OFF 0.001
+
+	param set SYS_RESTART_TYPE 2
 fi
 
 param set-default BAT1_N_CELLS 4
@@ -224,7 +228,8 @@ navigator start
 # Try to start the micrortps_client with UDP transport if module exists
 if px4-micrortps_client status > /dev/null 2>&1
 then
-	. px4-rc.rtps
+	# shellcheck disable=SC2154
+	micrortps_client start -t UDP -r $((2019+2*px4_instance)) -s $((2020+2*px4_instance))
 fi
 
 if param greater -s MNT_MODE_IN -1

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -42,6 +42,7 @@ px4_add_romfs_files(
 	rc.fw_apps
 	rc.fw_defaults
 	rc.interface
+	rc.io
 	rc.logging
 	rc.mc_apps
 	rc.mc_defaults
@@ -55,4 +56,5 @@ px4_add_romfs_files(
 	rc.vehicle_setup
 	rc.vtol_apps
 	rc.vtol_defaults
+	rc.ctrlalloc
 )

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

@@ -18,6 +18,7 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+
 param set-default BAT1_N_CELLS 3
 
 param set-default FW_AIRSPD_MAX 20
@@ -29,16 +30,22 @@ param set-default FW_L1_DAMPING 0.74
 param set-default FW_L1_PERIOD 16
 param set-default FW_LND_ANG 15
 param set-default FW_LND_FLALT 5
+param set-default FW_LND_HHDIST 15
 param set-default FW_LND_HVIRT 13
 param set-default FW_LND_TLALT 5
 param set-default FW_THR_LND_MAX 0
 param set-default FW_PR_FF 0.35
+param set-default FW_PR_I 0.1
+param set-default FW_PR_IMAX 0.4
 param set-default FW_PR_P 0.2
 param set-default FW_RR_FF 0.6
+param set-default FW_RR_I 0.1
+param set-default FW_RR_IMAX 0.2
 param set-default FW_RR_P 0.3
 
 param set-default RWTO_TKOFF 1
 
+
 param set SYS_HITL 1
 
 # disable some checks to allow to fly

ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery

@@ -25,12 +25,19 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+
+param set-default MC_ROLL_P 6.5
 param set-default MC_ROLLRATE_P 0.1
 param set-default MC_ROLLRATE_I 0.05
 param set-default MC_ROLLRATE_D 0.0017
+param set-default MC_PITCH_P 6.5
 param set-default MC_PITCHRATE_P 0.14
 param set-default MC_PITCHRATE_I 0.1
 param set-default MC_PITCHRATE_D 0.0025
+param set-default MC_YAW_P 2.8
 param set-default MC_YAWRATE_P 0.28
-
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
 set MIXER quad_w
+
+set PWM_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris

@@ -23,18 +23,24 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+
 # TODO tune roll/pitch separately
 param set-default MC_ROLL_P 7
+param set-default MC_ROLLRATE_P 0.15
 param set-default MC_ROLLRATE_I 0.05
 param set-default MC_ROLLRATE_D 0.004
 param set-default MC_PITCH_P 7
+param set-default MC_PITCHRATE_P 0.15
 param set-default MC_PITCHRATE_I 0.05
 param set-default MC_PITCHRATE_D 0.004
 param set-default MC_YAW_P 2.5
 param set-default MC_YAWRATE_P 0.25
 param set-default MC_YAWRATE_I 0.25
+param set-default MC_YAWRATE_D 0
 
 param set-default BAT1_V_DIV 12.27559
 param set-default BAT1_A_PER_V 15.39103
 
 set MIXER quad_w
+
+set PWM_OUT 1234

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

@@ -25,6 +25,7 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+
 param set-default BAT1_N_CELLS 4
 
 param set-default MC_ROLL_P 7
@@ -36,4 +37,9 @@ param set-default MC_PITCHRATE_P 0.19
 param set-default MC_PITCHRATE_I 0.05
 param set-default MC_PITCHRATE_D 0.004
 param set-default MC_YAW_P 4
+param set-default MC_YAWRATE_P 0.2
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
 set MIXER quad_w
+
+set PWM_OUT 1234

ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance

@@ -25,19 +25,27 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+
 param set-default BAT1_N_CELLS 6
 param set-default BAT1_V_EMPTY 3.5
 
 param set-default MC_ROLL_P 7
 param set-default MC_ROLLRATE_P 0.08
 param set-default MC_ROLLRATE_I 0.02
+param set-default MC_ROLLRATE_D 0.003
 param set-default MC_PITCH_P 7
 param set-default MC_PITCHRATE_P 0.13
 param set-default MC_PITCHRATE_I 0.02
 param set-default MC_PITCHRATE_D 0.005
+param set-default MC_YAW_P 2.8
+param set-default MC_YAWRATE_P 0.2
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
 
 param set-default MPC_XY_VEL_MAX 2
 
 param set-default PWM_MAIN_MIN 1080
 
 set MIXER quad_w
+
+set PWM_OUT 1234

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

@@ -12,6 +12,7 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 set MIXER quad_x
+set PWM_OUT 1234
 
 param set SYS_HITL 1
 

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

@@ -9,7 +9,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
@@ -19,8 +18,10 @@ param set-default BAT1_N_CELLS 3
 
 param set-default COM_RC_IN_MODE 1
 
+param set-default EKF2_AID_MASK 1
 param set-default EKF2_ANGERR_INIT 0.01
 param set-default EKF2_GBIAS_INIT 0.01
+param set-default EKF2_HGT_MODE 0
 param set-default EKF2_MAG_TYPE 1
 
 param set-default FW_AIRSPD_MAX 25
@@ -55,6 +56,7 @@ param set-default RTL_DESCEND_ALT 10
 param set-default RTL_RETURN_ALT 30
 
 param set-default SDLOG_DIRS_MAX 7
+param set-default SYS_RESTART_TYPE 2
 
 param set-default VT_F_TRANS_THR 0.75
 param set-default VT_MOT_ID 1234

ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox

@@ -19,7 +19,6 @@
 # @maintainer Lorenz Meier <lorenz@px4.io>
 #
 # @board bitcraze_crazyflie exclude
-# @board px4_fmu-v2 exclude
 #
 
 . ${R}etc/init.d/rc.mc_defaults

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

@@ -26,5 +26,3 @@ param set-default CBRK_SUPPLY_CHK 894281
 # - without safety switch
 param set-default COM_PREARM_MODE 0
 param set-default CBRK_IO_SAFETY 22027
-
-param set SIH_VEHICLE_TYPE 0

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

@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# @name SIH plane AERT
-#
-# @type Simulation
-# @class Plane
-#
-# @maintainer Romain Chiappinelli <romain.chiap@gmail.com>
-#
-# @board px4_fmu-v2 exclude
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-set MIXER AERT
-set PWM_OUT 1234
-
-# set SYS_HITL to 2 to start the SIH and avoid sensors startup
-param set-default SYS_HITL 2
-
-# disable some checks to allow to fly:
-# - with usb
-param set-default CBRK_USB_CHK 197848
-# - without real battery
-param set-default CBRK_SUPPLY_CHK 894281
-# - without safety switch
-param set-default COM_PREARM_MODE 0
-param set-default CBRK_IO_SAFETY 22027
-
-param set-default BAT_N_CELLS 3
-
-param set SIH_T_MAX 6.0
-param set SIH_MASS 0.3
-param set SIH_IXX 0.00402
-param set SIH_IYY 0.0144
-param set SIH_IZZ 0.0177
-param set SIH_IXZ 0.00046
-param set SIH_KDV 0.2
-
-param set SIH_VEHICLE_TYPE 1 	# sih as fixed wing

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

@@ -36,6 +36,9 @@ param set-default MC_ROLLRATE_D 0.009
 param set-default MC_ROLLRATE_MAX 180
 
 param set-default MC_YAW_P 3
+param set-default MC_YAWRATE_P 0.2
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
 
 param set-default MPC_HOLD_MAX_XY 0.25
 param set-default MPC_THR_MIN 0.15

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

@@ -19,13 +19,13 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
 
 param set-default PWM_AUX_DIS5 950
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_TYPE 2
 param set-default VT_MOT_ID 1234

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

@@ -14,7 +14,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
@@ -25,14 +24,20 @@ param set-default MAV_TYPE 19
 param set-default MC_ROLL_P 6
 param set-default MC_ROLLRATE_P 0.12
 param set-default MC_ROLLRATE_I 0.002
+param set-default MC_ROLLRATE_D 0.003
+param set-default MC_ROLLRATE_FF 0
 
 param set-default MC_PITCH_P 4.5
 param set-default MC_PITCHRATE_P 0.3
 param set-default MC_PITCHRATE_I 0.002
+param set-default MC_PITCHRATE_D 0.003
+param set-default MC_PITCHRATE_FF 0
 
 param set-default MC_YAW_P 3.8
 param set-default MC_YAWRATE_P 0.22
 param set-default MC_YAWRATE_I 0.02
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 
 param set-default VT_IDLE_PWM_MC  1080
 param set-default VT_ELEV_MC_LOCK 0

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

@@ -28,13 +28,19 @@ param set-default MC_ROLL_P 7
 param set-default MC_ROLLRATE_P 0.19
 param set-default MC_ROLLRATE_I 0.002
 param set-default MC_ROLLRATE_D 0.005
+param set-default MC_ROLLRATE_FF 0
 param set-default MC_PITCH_P 7
 param set-default MC_PITCHRATE_P 0.14
 param set-default MC_PITCHRATE_I 0.002
 param set-default MC_PITCHRATE_D 0.004
+param set-default MC_PITCHRATE_FF 0
 param set-default MC_YAW_P 4
 param set-default MC_YAWRATE_P 0.22
 param set-default MC_YAWRATE_I 0.02
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
+
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_FW_MOT_OFFID 34
 param set-default VT_IDLE_PWM_MC 1080

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

@@ -15,10 +15,12 @@
 
 
 param set-default PWM_MAIN_MAX 2000
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_MOT_ID 1234
 param set-default VT_IDLE_PWM_MC  1080
 param set-default VT_TYPE 0
+param set-default VT_ELEV_MC_LOCK 1
 set MAV_TYPE 20
 
 set MIXER quad_x_vtol

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

@@ -22,11 +22,13 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default PWM_MAIN_MAX 2000
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_IDLE_PWM_MC  1080
 param set-default VT_TYPE 0
-
+param set-default VT_ELEV_MC_LOCK 1
 set MAV_TYPE 20
 
 set MIXER quad_+_vtol

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

@@ -19,30 +19,42 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default PWM_AUX_DIS5 950
 
+param set-default PWM_MAIN_RATE 400
+
 param set-default MC_ROLL_P 6
 param set-default MC_ROLLRATE_P 0.17
 param set-default MC_ROLLRATE_I 0.002
 param set-default MC_ROLLRATE_D 0.004
+param set-default MC_ROLLRATE_FF 0
 param set-default MC_PITCH_P 6
 param set-default MC_PITCHRATE_P 0.19
 param set-default MC_PITCHRATE_I 0.002
 param set-default MC_PITCHRATE_D 0.004
+param set-default MC_PITCHRATE_FF 0
+param set-default MC_YAW_P 2.8
 param set-default MC_YAWRATE_P 0.22
 param set-default MC_YAWRATE_I 0.02
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 param set-default MC_YAWRATE_MAX 40
 
 param set-default MPC_YAWRAUTO_MAX 40
 
+param set-default FW_PR_FF 0.5
 param set-default FW_PR_I 0.02
+param set-default FW_PR_IMAX 0.4
+param set-default FW_PR_P 0.08
 param set-default FW_RR_FF 0.6
 param set-default FW_RR_I 0.01
+param set-default FW_RR_IMAX 0.2
+param set-default FW_RR_P 0.05
 param set-default FW_THR_CRUISE 0.75
 
 param set-default VT_ARSP_BLEND 6

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

@@ -17,16 +17,26 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
 
+param set-default MC_ROLL_P 6.5
+param set-default MC_ROLLRATE_P 0.15
 param set-default MC_ROLLRATE_I 0.01
+param set-default MC_ROLLRATE_D 0.003
+param set-default MC_ROLLRATE_FF 0
+param set-default MC_PITCH_P 6.5
+param set-default MC_PITCHRATE_P 0.15
 param set-default MC_PITCHRATE_I 0.01
+param set-default MC_PITCHRATE_D 0.003
+param set-default MC_PITCHRATE_FF 0
 param set-default MC_YAW_P 3.5
-
+param set-default MC_YAWRATE_P 0.2
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 param set-default MC_YAWRATE_MAX 50
 
 param set-default MPC_XY_P 0.8
@@ -35,6 +45,7 @@ param set-default MPC_ACC_HOR_MAX 2
 param set-default MPC_YAWRAUTO_MAX 20
 
 param set-default PWM_AUX_DIS3 950
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234

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

@@ -9,24 +9,32 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
 
 param set-default MC_ROLL_P 7
+param set-default MC_ROLLRATE_P 0.15
 param set-default MC_ROLLRATE_I 0.002
+param set-default MC_ROLLRATE_D 0.003
+param set-default MC_ROLLRATE_FF 0
 param set-default MC_PITCH_P 7
 param set-default MC_PITCHRATE_P 0.12
 param set-default MC_PITCHRATE_I 0.002
+param set-default MC_PITCHRATE_D 0.003
+param set-default MC_PITCHRATE_FF 0
+param set-default MC_YAW_P 2.8
 param set-default MC_YAWRATE_P 0.22
 param set-default MC_YAWRATE_I 0.02
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 param set-default MC_YAWRATE_MAX 40
 
 param set-default MPC_YAWRAUTO_MAX 40
 
 param set-default PWM_AUX_DIS5 950
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_F_TRANS_THR 0.75
 param set-default VT_MOT_ID 1234

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

@@ -15,32 +15,44 @@
 
 
 param set-default FW_THR_CRUISE 65
+param set-default FW_PR_P 0.08
+param set-default FW_PR_FF 0.5
+param set-default FW_RR_P 0.05
 param set-default FW_RR_FF 0.6
 
 param set-default MIS_YAW_TMT 10
 
 param set-default MC_ROLL_P 7
+param set-default MC_ROLLRATE_P 0.15
 param set-default MC_ROLLRATE_I 0.1
 param set-default MC_ROLLRATE_D 0.004
+param set-default MC_ROLLRATE_FF 0
 param set-default MC_PITCH_P 7
+param set-default MC_PITCHRATE_P 0.15
 param set-default MC_PITCHRATE_I 0.1
 param set-default MC_PITCHRATE_D 0.004
+param set-default MC_PITCHRATE_FF 0
 param set-default MC_YAW_P 3.5
 param set-default MC_YAWRATE_P 0.6
 param set-default MC_YAWRATE_I 0.04
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 param set-default MC_YAWRATE_MAX 40
 
 param set-default MPC_ACC_HOR_MAX 2
 param set-default MPC_Z_VEL_MAX_DN 1.5
+param set-default MPC_TKO_SPEED 1.5
 param set-default MPC_LAND_SPEED 0.8
 param set-default MPC_YAWRAUTO_MAX 40
 
 param set-default PWM_AUX_DIS5 950
 param set-default PWM_AUX_REV1 1
 param set-default PWM_AUX_REV2 1
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_ARSP_TRANS 15
 param set-default VT_ARSP_BLEND 8
+param set-default VT_B_TRANS_DUR 4
 param set-default VT_F_TRANS_THR 0.75
 param set-default VT_IDLE_PWM_MC 1080
 param set-default VT_MOT_ID 1234

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

@@ -9,11 +9,11 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default FW_AIRSPD_MAX   22
 param set-default FW_AIRSPD_MIN   14
 param set-default FW_AIRSPD_TRIM  16
@@ -68,7 +68,10 @@ param set-default PWM_AUX_REV4    1
 
 param set-default PWM_AUX_DIS5 950
 
+param set-default PWM_MAIN_RATE 400
+
 param set-default VT_ARSP_TRANS   15
+param set-default VT_B_TRANS_DUR  4
 param set-default VT_F_TRANS_THR    0.6
 param set-default VT_IDLE_PWM_MC 1180
 param set-default VT_MOT_ID 1234

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

@@ -13,12 +13,14 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default PWM_AUX_DISARM 1000
 param set-default PWM_AUX_MAX 2000
 param set-default PWM_AUX_MIN 1000
 param set-default PWM_AUX_RATE 50
 
 param set-default PWM_MAIN_MAX 2000
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 13

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

@@ -22,6 +22,7 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default CBRK_AIRSPD_CHK 162128
 
 param set-default FW_ARSP_MODE 1
@@ -31,14 +32,22 @@ param set-default FW_MAN_R_MAX 50
 param set-default FW_ACRO_X_MAX   270
 param set-default FW_ACRO_Y_MAX   270
 param set-default FW_ACRO_Z_MAX   180
+param set-default FW_PR_FF    0.5
+param set-default FW_PR_P 0.08
 param set-default FW_PSP_OFF  5
 param set-default FW_P_LIM_MAX    30
 param set-default FW_P_LIM_MIN    -30
+param set-default FW_P_RMAX_NEG   60
+param set-default FW_P_RMAX_POS   60
 param set-default FW_RR_FF    0.33
 param set-default FW_RR_P 0.11
+param set-default FW_YR_FF    0.3
+param set-default FW_YR_P 0.05
 
+param set-default MC_PITCHRATE_D  0.003
 param set-default MC_PITCHRATE_P  0.15
 param set-default MC_PITCH_P  6
+param set-default MC_ROLLRATE_D   0.003
 param set-default MC_ROLLRATE_P   0.15
 param set-default MC_ROLL_P   6
 param set-default MC_YAWRATE_MAX  120
@@ -48,6 +57,9 @@ param set-default MC_YAW_P    2.5
 param set-default MC_YAWRATE_P 0.3
 param set-default MPC_LAND_SPEED 1.2
 param set-default MPC_TKO_SPEED 2.5
+param set-default MPC_Z_VEL_MAX_UP 3
+
+param set-default PWM_MAIN_RATE 400
 
 param set-default SENS_BOARD_ROT 8
 
@@ -57,8 +69,11 @@ param set-default VT_F_TR_OL_TM   4
 param set-default VT_FW_DIFTHR_EN 1
 param set-default VT_FW_DIFTHR_SC 0.17
 param set-default VT_FW_MOT_OFFID 3
+param set-default VT_FW_PERM_STAB 0
 param set-default VT_IDLE_PWM_MC 1200
 param set-default VT_MOT_ID 123
+param set-default VT_TILT_FW  1
+param set-default VT_TILT_MC  0
 param set-default VT_TILT_TRANS   0.45
 param set-default VT_TRANS_MIN_TM 1.2
 param set-default VT_TRANS_P2_DUR 1.3

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

@@ -22,6 +22,7 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default BAT1_CAPACITY 23000
 param set-default BAT1_N_CELLS 4
 param set-default BAT1_R_INTERNAL 0.0025
@@ -68,13 +69,23 @@ param set-default LNDMC_ALT_MAX 9999
 param set-default LNDMC_XY_VEL_MAX 1
 param set-default LNDMC_Z_VEL_MAX 0.7
 
+param set-default MC_ROLL_P 6.5
 param set-default MC_ROLLRATE_P 0.16
 param set-default MC_ROLLRATE_I 0.01
+param set-default MC_ROLLRATE_D 0.003
+param set-default MC_ROLLRATE_FF 0
 param set-default MC_ROLLRATE_MAX 80
+param set-default MC_PITCH_P 6.5
+param set-default MC_PITCHRATE_P 0.15
 param set-default MC_PITCHRATE_I 0.05
+param set-default MC_PITCHRATE_D 0.003
+param set-default MC_PITCHRATE_FF 0
 param set-default MC_PITCHRATE_MAX 80
 param set-default MC_YAW_P 3.5
-
+param set-default MC_YAWRATE_P 0.2
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 param set-default MC_YAWRATE_MAX 20
 param set-default MC_AIRMODE 1
 
@@ -98,6 +109,7 @@ param set-default MPC_TILTMAX_AIR 25
 param set-default MPC_TILTMAX_LND 25
 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
@@ -107,6 +119,7 @@ param set-default PWM_MAIN_DIS6 1500
 param set-default PWM_MAIN_DIS7 900
 param set-default PWM_MAIN_DIS8 900
 
+param set-default PWM_MAIN_RATE 400
 
 param set-default SENS_BOARD_ROT 18
 
@@ -120,11 +133,13 @@ param set-default VT_TYPE 2
 param set-default VT_MOT_ID 1234
 param set-default VT_FW_MOT_OFFID 1234
 param set-default VT_F_TRANS_THR 1
-param set-default VT_PITCH_MIN 8
+param set-default VT_DWN_PITCH_MAX 8
 param set-default VT_FW_QC_P 55
 param set-default VT_FW_QC_R 55
 param set-default VT_TRANS_MIN_TM 15
 param set-default VT_B_TRANS_DUR 8
+param set-default VT_WV_LND_EN 1
+param set-default VT_WV_LTR_EN 1
 param set-default VT_FWD_THRUST_SC 4
 param set-default VT_F_TRANS_DUR 1
 param set-default VT_IDLE_PWM_MC 1025

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

@@ -18,22 +18,25 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default BAT1_N_CELLS 6
 
 param set-default FW_AIRSPD_MAX 30
 param set-default FW_AIRSPD_MIN 19
 param set-default FW_AIRSPD_TRIM 23
 param set-default FW_L1_R_SLEW_MAX 40
+param set-default FW_LND_EARLYCFG 1
 param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_I 0.1
 param set-default FW_PSP_OFF 3
 param set-default FW_P_LIM_MAX 18
 param set-default FW_P_LIM_MIN -25
 param set-default FW_RLL_TO_YAW_FF 0.1
+param set-default FW_RR_I 0.1
 param set-default FW_RR_P 0.08
 param set-default FW_R_LIM 45
 param set-default FW_R_RMAX 50
@@ -43,15 +46,22 @@ param set-default FW_THR_SLEW_MAX 0.6
 param set-default FW_T_HRATE_FF 0
 param set-default FW_T_SINK_MAX 15
 param set-default FW_T_SINK_MIN 3
+param set-default FW_YR_I 0.1
 param set-default FW_YR_P 0.15
 
+param set-default IMU_GYRO_CUTOFF 40
+
 param set-default IMU_DGYRO_CUTOFF 15
+param set-default MC_PITCHRATE_I 0.2
 param set-default MC_PITCHRATE_MAX 60
+param set-default MC_ROLLRATE_I 0.2
 param set-default MC_ROLLRATE_MAX 60
 param set-default MC_YAWRATE_I 0.15
 param set-default MC_YAWRATE_MAX 40
 param set-default MC_YAWRATE_P 0.3
 
+param set-default MIS_TAKEOFF_ALT 30
+
 param set-default MPC_ACC_DOWN_MAX 2
 param set-default MPC_ACC_HOR_MAX 2
 param set-default MPC_ACC_UP_MAX 3

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

@@ -22,11 +22,13 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
+param set-default PWM_MAIN_RATE 400
+
 param set-default VT_IDLE_PWM_MC 1100
 param set-default VT_TYPE 1
 param set-default VT_MOT_ID 1234

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

@@ -21,12 +21,13 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default PWM_AUX_DIS5 950
+param set-default PWM_MAIN_RATE 400
 
 param set-default VT_TYPE 2
 param set-default VT_MOT_ID 12345678

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

@@ -14,11 +14,11 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board holybro_kakutef7 exclude
 #
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_MOT_COUNT 2
 param set-default VT_TYPE 0

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

@@ -19,3 +19,5 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 set MIXER tri_y_yaw+
+
+set PWM_OUT 1234

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

@@ -19,3 +19,5 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 set MIXER tri_y_yaw-
+
+set PWM_OUT 1234

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

@@ -19,19 +19,29 @@
 . ${R}etc/init.d/rc.mc_defaults
 set MIXER coax
 
+
+param set-default MC_ROLL_P 6.5
 param set-default MC_ROLLRATE_P 0.17
 param set-default MC_ROLLRATE_I 0.05
 param set-default MC_ROLLRATE_D 0.005
+param set-default MC_ROLLRATE_FF 0
+param set-default MC_PITCH_P 6.5
 param set-default MC_PITCHRATE_P 0.17
 param set-default MC_PITCHRATE_I 0.05
 param set-default MC_PITCHRATE_D 0.005
+param set-default MC_PITCHRATE_FF 0
 param set-default MC_YAW_P 2
 param set-default MC_YAWRATE_P 0.1
+param set-default MC_YAWRATE_I 0.1
+param set-default MC_YAWRATE_D 0
+param set-default MC_YAWRATE_FF 0
 
 param set-default NAV_ACC_RAD 2
 
 param set-default PWM_AUX_RATE 50
 param set-default PWM_MAIN_DISARM 900
+param set-default PWM_MAIN_MIN 1075
+param set-default PWM_MAIN_MAX 1950
 param set-default PWM_MAIN_RATE 400
 
 param set-default RTL_RETURN_ALT 30
@@ -40,4 +50,5 @@ param set-default RTL_DESCEND_ALT 10
 set MIXER_AUX pass
 
 # use PWM parameters for throttle channel
+set PWM_AUX_OUT 1234
 set PWM_OUT 34

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

@@ -24,7 +24,8 @@ set MAV_TYPE 4
 
 set MIXER blade130
 
-set PWM_OUT none
+#set PWM_OUT 1234
+
 
 param set-default ATT_BIAS_MAX 0
 
@@ -35,6 +36,7 @@ param set-default MC_ROLLRATE_P 0
 param set-default MC_ROLLRATE_I 0
 param set-default MC_ROLLRATE_D 0
 param set-default MC_ROLLRATE_FF 0.15
+param set-default MC_PITCH_P 6.5
 param set-default MC_PITCHRATE_P 0
 param set-default MC_PITCHRATE_I 0
 param set-default MC_PITCHRATE_D 0
@@ -42,6 +44,7 @@ param set-default MC_PITCHRATE_FF 0.15
 param set-default MC_YAW_P 3
 param set-default MC_YAWRATE_P 0.1
 param set-default MC_YAWRATE_I 0
+param set-default MC_YAWRATE_D 0
 param set-default MC_ROLLRATE_MAX 720
 param set-default MC_PITCHRATE_MAX 720
 param set-default MC_YAWRATE_MAX 400

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

@@ -21,8 +21,8 @@
 . ${R}etc/init.d/rc.fw_defaults
 
 
-param set-default BAT1_CAPACITY 3300
+param set-default BAT_CAPACITY 3300
-param set-default BAT1_N_CELLS 3
+param set-default BAT_N_CELLS 3
 
 param set-default PWM_AUX_RATE 50
 param set-default PWM_MAIN_RATE 50

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

@@ -15,6 +15,7 @@
 
 . ${R}etc/init.d/rc.balloon_defaults
 
+
 param set-default COM_PREARM_MODE 2  # always in prearm state
 param set-default CBRK_IO_SAFETY 22027
 param set-default SDLOG_PROFILE 17
@@ -24,8 +25,9 @@ param set-default MAV_0_CONFIG 102
 param set-default GPS_UBX_DYNMODEL 8
 param set-default SER_TEL2_BAUD 9600
 
-set MAV_TYPE 8
+param set-default SENS_BOARD_ROT 0
-param set MAV_TYPE ${MAV_TYPE}
+        param set MAV_TYPE 8  # MAV_TYPE_FREE_BALLOON
+
 
 set MIXER IO_pass
 set MIXER_AUX pass

ROMFS/px4fmu_common/init.d/airframes/2105_maja

@@ -25,6 +25,10 @@
 
 . ${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

ROMFS/px4fmu_common/init.d/airframes/2106_albatross

@@ -25,6 +25,10 @@
 
 . ${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

ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon

@@ -26,6 +26,10 @@
 
 . ${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

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

@@ -23,11 +23,11 @@
 # @maintainer William Peale <develop707@gmail.com>
 #
 # @board bitcraze_crazyflie exclude
-# @board px4_fmu-v2 exclude
 #
 
 set VEHICLE_TYPE mc
 
+
 param set-default NAV_ACC_RAD 2
 
 param set-default PWM_AUX_RATE 400
@@ -35,6 +35,8 @@ param set-default PWM_AUX_DISARM 900
 param set-default PWM_AUX_MIN 1075
 param set-default PWM_AUX_MAX 1950
 
+param set-default PWM_MAIN_MIN 1075
+param set-default PWM_MAIN_MAX 1950
 param set-default PWM_MAIN_RATE 400
 
 param set-default RTL_DESCEND_ALT 10

ROMFS/px4fmu_common/init.d/airframes/2507_cloudship

@@ -18,5 +18,6 @@
 param set-default COM_PREARM_MODE 2
 param set-default CBRK_IO_SAFETY 22027
 
+
 set MIXER cloudship
 set PWM_OUT 1234

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

@@ -22,6 +22,7 @@
 . ${R}etc/init.d/rc.fw_defaults
 
 param set-default FW_AIRSPD_MAX 15
+param set-default FW_AIRSPD_MIN 10
 param set-default FW_AIRSPD_TRIM 13
 param set-default FW_R_TC 0.3
 param set-default FW_P_TC 0.3
@@ -29,11 +30,15 @@ param set-default FW_L1_DAMPING 0.74
 param set-default FW_L1_PERIOD 16
 param set-default FW_LND_ANG 15
 param set-default FW_LND_FLALT 5
+param set-default FW_LND_HHDIST 15
 param set-default FW_LND_HVIRT 13
 param set-default FW_LND_TLALT 5
 param set-default FW_THR_LND_MAX 0
 param set-default FW_PR_FF 0.35
+param set-default FW_PR_IMAX 0.4
+param set-default FW_PR_P 0.08
 param set-default FW_RR_FF 0.6
+param set-default FW_RR_IMAX 0.2
 param set-default FW_RR_P 0.04
 
 param set-default PWM_MAIN_DISARM 1000

ROMFS/px4fmu_common/init.d/airframes/3031_phantom

@@ -24,15 +24,20 @@
 . ${R}etc/init.d/rc.fw_defaults
 
 param set-default FW_AIRSPD_MIN 13
+param set-default FW_AIRSPD_TRIM 15
 param set-default FW_AIRSPD_MAX 25
 param set-default FW_R_TC 0.3
 param set-default FW_P_TC 0.3
+param set-default FW_L1_DAMPING 0.75
 param set-default FW_L1_PERIOD 15
 param set-default FW_PR_FF 0.2
 param set-default FW_PR_IMAX 0.2
 param set-default FW_PR_P 0.03
 param set-default FW_P_LIM_MAX 50
 param set-default FW_P_LIM_MIN -50
+param set-default FW_P_ROLLFF 1
+param set-default FW_RR_FF 0.5
+param set-default FW_RR_IMAX 0.2
 param set-default FW_RR_P 0.08
 param set-default FW_R_LIM 50
 param set-default FW_R_RMAX 50

ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5

@@ -30,6 +30,7 @@ param set-default FW_L1_DAMPING 0.74
 param set-default FW_L1_PERIOD 16
 param set-default FW_LND_ANG 15
 param set-default FW_LND_FLALT 5
+param set-default FW_LND_HHDIST 15
 param set-default FW_LND_HVIRT 13
 param set-default FW_LND_TLALT 5
 param set-default FW_THR_LND_MAX 0
@@ -37,4 +38,5 @@ param set-default FW_PR_FF 0.35
 param set-default FW_RR_FF 0.6
 param set-default FW_RR_P 0.04
 
+
 set MIXER fw_generic_wing

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

@@ -25,6 +25,7 @@
 
 param set-default BAT1_N_CELLS 2
 param set-default FW_AIRSPD_MAX 15
+param set-default FW_AIRSPD_MIN 10
 param set-default FW_AIRSPD_TRIM 13
 param set-default FW_R_TC 0.3
 param set-default FW_P_TC 0.3
@@ -32,6 +33,7 @@ param set-default FW_L1_DAMPING 0.74
 param set-default FW_L1_PERIOD 16
 param set-default FW_LND_ANG 15
 param set-default FW_LND_FLALT 5
+param set-default FW_LND_HHDIST 15
 param set-default FW_LND_HVIRT 13
 param set-default FW_LND_TLALT 5
 param set-default FW_THR_LND_MAX 0
@@ -41,6 +43,7 @@ param set-default FW_RR_P 0.04
 
 param set-default PWM_MAIN_DISARM 1000
 
+
 # Configure this as plane.
 set MAV_TYPE 1
 

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

@@ -23,6 +23,7 @@
 
 param set-default FW_AIRSPD_MAX 30
 param set-default FW_AIRSPD_MIN 13
+param set-default FW_AIRSPD_TRIM 15
 
 param set-default NAV_LOITER_RAD 150