WIP: afbrs50 try SPI_LOCK

drivers/distance_sensor/broadcom/afbrs50: minimize IRQ_LOCK()/IRQ_UNLOCK() calls
battery: use local instead of global member battery_status message
2026-05-24 01:57:34 +08:00 · 2021-07-01 10:59:51 -04:00 · 2021-07-01 10:47:53 -04:00 · 2021-07-01 14:24:38 +02:00 · 2021-07-01 14:24:38 +02:00 · 2021-07-01 14:24:38 +02:00
2242 changed files with 209065 additions and 51003 deletions
@@ -9,15 +9,15 @@ pipeline {
        script {
          def build_nodes = [:]
          def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2020-11-18",
-            arm64: "px4io/px4-dev-aarch64:2020-11-18",
-            base: "px4io/px4-dev-base-bionic:2020-11-18",
-            nuttx: "px4io/px4-dev-nuttx-focal:2020-11-18",
+            armhf: "px4io/px4-dev-armhf:2021-04-29",
+            arm64: "px4io/px4-dev-aarch64:2021-04-29",
+            base: "px4io/px4-dev-base-bionic:2021-04-29",
+            nuttx: "px4io/px4-dev-nuttx-focal:2021-04-29",
            snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
          ]

          def armhf_builds = [
-            target: ["aerotenna_ocpoc_default", "beaglebone_blue_default", "emlid_navio2_default", "px4_raspberrypi_default", "scumaker_pilotpi_default"],
+            target: ["beaglebone_blue_default", "emlid_navio2_default", "px4_raspberrypi_default", "scumaker_pilotpi_default"],
            image: docker_images.armhf,
            archive: false
          ]
@@ -37,51 +37,66 @@ pipeline {
          def nuttx_builds_archive = [
            target: [
                     "airmind_mindpx-v2_default",
+                     "ark_can-flow_canbootloader",
+                     "ark_can-flow_default",
                     "av_x-v1_default",
                     "bitcraze_crazyflie_default",
+                     "bitcraze_crazyflie21_default",
                     "cuav_can-gps-v1_canbootloader",
                     "cuav_can-gps-v1_default",
                     "cuav_nora_default",
                     "cuav_x7pro_default",
-                     "cubepilot_cubeorange_console",
                     "cubepilot_cubeorange_default",
-                     "cubepilot_cubeyellow_console",
                     "cubepilot_cubeyellow_default",
+                     "freefly_can-rtk-gps_canbootloader",
+                     "freefly_can-rtk-gps_default",
+                     "holybro_can-gps-v1_canbootloader",
+                     "holybro_can-gps-v1_default",
                     "holybro_durandal-v1_default",
                     "holybro_kakutef7_default",
                     "holybro_pix32v5_default",
-                     "intel_aerofc-v1_default",
                     "modalai_fc-v1_default",
+                     "modalai_fc-v1_rtps",
+                     "modalai_fc-v2_default",
                     "mro_ctrl-zero-f7_default",
+                     "mro_ctrl-zero-f7-oem_default",
+                     "mro_ctrl-zero-h7_default",
+                     "mro_ctrl-zero-h7-oem_default",
+                     "mro_pixracerpro_default",
                     "mro_x21-777_default",
                     "mro_x21_default",
+                     "nxp_fmuk66-e_default",
+                     "nxp_fmuk66-e_rtps",
+                     "nxp_fmuk66-e_socketcan",
                     "nxp_fmuk66-v3_default",
-                     "nxp_fmuk66-v3_socketcan",
                     "nxp_fmuk66-v3_rtps",
+                     "nxp_fmuk66-v3_socketcan",
                     "nxp_fmurt1062-v1_default",
                     "nxp_ucans32k146_default",
+                     "nxp_ucans32k146_canbootloader",
                     "omnibus_f4sd_default",
                     "px4_fmu-v2_default",
                     "px4_fmu-v2_fixedwing",
-                     "px4_fmu-v2_lpe",
                     "px4_fmu-v2_multicopter",
                     "px4_fmu-v2_rover",
-                     "px4_fmu-v2_test",
                     "px4_fmu-v3_default",
                     "px4_fmu-v4_cannode",
                     "px4_fmu-v4_default",
-                     "px4_fmu-v4_optimized",
                     "px4_fmu-v4pro_default",
-                     "px4_fmu-v5_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",
+                     "px4_fmu-v5_uavcanv1",
                     "px4_fmu-v5x_base_phy_DP83848C",
                     "px4_fmu-v5x_default",
+                     "px4_fmu-v6u_default",
                     "px4_fmu-v6x_default",
                     "px4_io-v2_default",
                     "spracing_h7extreme_default",
@@ -118,7 +133,7 @@ pipeline {
    // TODO: actually upload artifacts to S3
    // stage('S3 Upload') {
    //   agent {
-    //     docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+    //     docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
    //   }
    //   options {
    //         skipDefaultCheckout()
@@ -143,7 +158,7 @@ pipeline {
  }
  options {
    buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
-    timeout(time: 60, unit: 'MINUTES')
+    timeout(time: 90, unit: 'MINUTES')
  }
 }

@@ -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:2020-11-18",
+	"image": "px4io/px4-dev-nuttx-focal:2021-04-29",

 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

@@ -17,17 +17,19 @@ jobs:
        check: [
          "check_format",
          "tests",
+          "tests_coverage",
          "px4_fmu-v2_default stack_check",
          "validate_module_configs",
          "shellcheck_all",
          "NO_NINJA_BUILD=1 px4_fmu-v5_default",
          "NO_NINJA_BUILD=1 px4_sitl_default",
+          "BUILD_MICRORTPS_AGENT=1 px4_sitl_rtps",
          "airframe_metadata",
          "module_documentation",
          "parameters_metadata",
        ]
    container:
-      image: px4io/px4-dev-nuttx-focal:2020-11-18
+      image: px4io/px4-dev-nuttx-focal:2021-04-29
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -51,8 +53,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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z
    - name: check environment
@@ -61,3 +63,10 @@ jobs:
          ulimit -a
    - name: ${{matrix.check}}
      run: make ${{matrix.check}}
+    - name: upload coverage
+      if: contains(matrix.check, 'coverage')
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        flags: unittests
+        file: coverage/lcov.info
@@ -11,7 +11,7 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-clang:2020-11-18
+    container: px4io/px4-dev-clang:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -34,8 +34,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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -11,11 +11,10 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2020-11-18
+    container: px4io/px4-dev-armhf:2021-04-29
    strategy:
      matrix:
        config: [
-          aerotenna_ocpoc_default,
          beaglebone_blue_default,
          emlid_navio2_default,
          px4_raspberrypi_default,
@@ -43,8 +42,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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -11,7 +11,7 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-aarch64:2020-11-18
+    container: px4io/px4-dev-aarch64:2021-04-29
    strategy:
      matrix:
        config: [
@@ -39,8 +39,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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -15,7 +15,8 @@ jobs:
      matrix:
        config: [
          px4_fmu-v5_default,
-          tests, # includes px4_sitl
+          px4_sitl
+          #tests, # includes px4_sitl
          ]
    steps:
    - uses: actions/checkout@v1
@@ -23,7 +24,7 @@ jobs:
        token: ${{secrets.ACCESS_TOKEN}}

    - name: setup
-      run: ./Tools/setup/macos.sh
+      run: ./Tools/setup/macos.sh; ./Tools/setup/macos.sh

    - name: Prepare ccache timestamp
      id: ccache_cache_timestamp
@@ -42,8 +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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -11,47 +11,68 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2020-11-18
+    container: px4io/px4-dev-nuttx-focal:2021-04-29
    strategy:
      matrix:
        config: [
          airmind_mindpx-v2_default,
+          ark_can-flow_canbootloader,
+          ark_can-flow_debug,
+          ark_can-flow_default,
+          ark_can-gps_canbootloader,
+          ark_can-gps_debug,
+          ark_can-gps_default,
          av_x-v1_default,
+          bitcraze_crazyflie21_default,
          bitcraze_crazyflie_default,
          cuav_can-gps-v1_canbootloader,
+          cuav_can-gps-v1_debug,
          cuav_can-gps-v1_default,
          cuav_nora_default,
          cuav_x7pro_default,
-          cubepilot_cubeorange_console,
          cubepilot_cubeorange_default,
-          cubepilot_cubeyellow_console,
+          cubepilot_cubeorange_test,
          cubepilot_cubeyellow_default,
+          cubepilot_cubeyellow_test,
+          cubepilot_io-v2_default,
+          freefly_can-rtk-gps_canbootloader,
+          freefly_can-rtk-gps_default,
+          holybro_can-gps-v1_canbootloader,
+          holybro_can-gps-v1_debug,
+          holybro_can-gps-v1_default,
          holybro_durandal-v1_default,
          holybro_kakutef7_default,
          holybro_pix32v5_default,
-          intel_aerofc-v1_default,
          modalai_fc-v1_default,
+          modalai_fc-v1_rtps,
+          modalai_fc-v2_default,
+          mro_ctrl-zero-f7-oem_default,
          mro_ctrl-zero-f7_default,
+          mro_ctrl-zero-h7-oem_default,
+          mro_ctrl-zero-h7_default,
+          mro_pixracerpro_default,
          mro_x21-777_default,
          mro_x21_default,
-          nxp_fmuk66-v3_default,
          nxp_fmuk66-e_default,
-          nxp_fmuk66-v3_socketcan,
+          nxp_fmuk66-e_rtps,
+          nxp_fmuk66-e_socketcan,
+          nxp_fmuk66-v3_default,
          nxp_fmuk66-v3_rtps,
+          nxp_fmuk66-v3_socketcan,
          nxp_fmurt1062-v1_default,
+          nxp_ucans32k146_canbootloader,
          nxp_ucans32k146_default,
          omnibus_f4sd_default,
          px4_fmu-v2_default,
          px4_fmu-v2_fixedwing,
-          px4_fmu-v2_lpe,
          px4_fmu-v2_multicopter,
          px4_fmu-v2_rover,
-          px4_fmu-v2_test,
          px4_fmu-v3_default,
          px4_fmu-v4_cannode,
          px4_fmu-v4_default,
-          px4_fmu-v4_optimized,
          px4_fmu-v4pro_default,
+          px4_fmu-v5_ctrlalloc,
+          px4_fmu-v5_debug,
          px4_fmu-v5_default,
          px4_fmu-v5_fixedwing,
          px4_fmu-v5_multicopter,
@@ -59,8 +80,11 @@ jobs:
          px4_fmu-v5_rover,
          px4_fmu-v5_rtps,
          px4_fmu-v5_stackcheck,
+          px4_fmu-v5_uavcanv0periph,
+          px4_fmu-v5_uavcanv1,
          px4_fmu-v5x_base_phy_DP83848C,
          px4_fmu-v5x_default,
+          px4_fmu-v6u_default,
          px4_fmu-v6x_default,
          px4_io-v2_default,
          spracing_h7extreme_default,
@@ -88,8 +112,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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -105,6 +129,8 @@ jobs:
      run: make ${{matrix.config}} bloaty_symbols || true
    - name: make ${{matrix.config}} bloaty_templates
      run: make ${{matrix.config}} bloaty_templates || true
+    - name: make ${{matrix.config}} bloaty_ram
+      run: make ${{matrix.config}} bloaty_ram || true
    - name: make ${{matrix.config}} bloaty_compare_master
      run: make ${{matrix.config}} bloaty_compare_master || true
    - name: ccache post-run
@@ -0,0 +1,62 @@
+name: NuttX UAVCAN firmware
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-nuttx-focal:2021-04-29
+    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
@@ -1,69 +0,0 @@
-name: Coverage
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: px4io/px4-dev-base-focal:2020-11-18
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    strategy:
-      matrix:
-        config: [
-          tests,
-          #python_coverage,
-          ]
-    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: coverage_${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: coverage_${{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 = 6" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.config}}
-      env:
-        PX4_CMAKE_BUILD_TYPE: "Coverage"
-      run: make ${{matrix.config}}
-
-    # Report test coverage
-    - name: Upload coverage
-      run: |
-          git config --global credential.helper "" # disable the keychain credential helper
-          git config --global --add credential.helper store # enable the local store credential helper
-          echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
-          git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
-          mkdir -p coverage
-          lcov --directory build/px4_sitl_test --base-directory build/px4_sitl_test --gcov-tool gcov --capture -o coverage/lcov.info
-    - name: Upload coverage information to Codecov
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: ${{matrix.config}}
-        file: coverage/lcov.info
@@ -0,0 +1,77 @@
+name: Deploy metadata for all targets
+
+on:
+  push:
+    branches:
+    - 'master'
+    - 'release/*'
+    - 'pr-metadata-test'
+
+jobs:
+  enumerate_targets:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{secrets.ACCESS_TOKEN}}
+    - id: set-matrix
+      run: echo "::set-output name=matrix::$(./Tools/generate_board_targets_json.py)"
+  build:
+    runs-on: ubuntu-latest
+    needs: enumerate_targets
+    strategy:
+      matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
+    container: px4io/px4-dev-${{ matrix.container }}:2021-04-29
+    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 metadata
+      run: |
+        make ${{matrix.target}} ver_gen
+        ./src/lib/version/get_git_tag_or_branch_version.sh build/${{ matrix.target }} >> $GITHUB_ENV
+        cd build/${{ matrix.target }}
+        mkdir _metadata || true
+        cp parameters.* _metadata
+
+    - uses: jakejarvis/s3-sync-action@master
+      with:
+        args: --acl public-read
+      env:
+        AWS_S3_BUCKET: 'px4-travis'
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_REGION: 'us-west-1'
+        SOURCE_DIR: 'build/${{ matrix.target }}/_metadata/'
+        DEST_DIR: 'Firmware/${{ env.version }}/${{ matrix.target }}/'
+
@@ -1,131 +0,0 @@
-name: MAVROS Avoidance Tests
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {test_file: "mavros_posix_test_avoidance.test",    vehicle: "iris_obs_avoid", mission: "avoidance",       build_type: "RelWithDebInfo"}
-          - {test_file: "mavros_posix_test_safe_landing.test", vehicle: "iris_obs_avoid", mission: "MC_safe_landing", build_type: "RelWithDebInfo"}
-
-    container:
-      image: px4io/px4-dev-ros-melodic:2020-11-18
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: sitl_tests-${{matrix.config.build_type}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: sitl_tests-${{matrix.config.build_type}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 6" >> ~/.ccache/ccache.conf
-          echo "max_size = 400M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: check environment
-      run: |
-          export
-          ulimit -a
-    - name: Build PX4 and sitl_gazebo
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-        ccache -z
-        make px4_sitl_default
-        make px4_sitl_default sitl_gazebo
-        ccache -s
-
-    - name: Core dump settings
-      run: |
-          ulimit -c unlimited
-          echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
-
-    - name: Run SITL tests
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-        export
-        ./test/rostest_avoidance_run.sh ${{matrix.config.test_file}} mission:=${{matrix.config.mission}} vehicle:=${{matrix.config.vehicle}} || true
-
-    - name: Look at core files
-      if: failure()
-      run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
-    - name: Upload px4 coredump
-      if: failure()
-      uses: actions/upload-artifact@v2-preview
-      with:
-        name: coredump
-        path: px4.core
-
-    # - name: ecl EKF analysis
-    #   if: always()
-    #   run: ./Tools/ecl_ekf/process_logdata_ekf.py ~/.ros/log/*/*.ulg
-
-    - name: Upload logs to flight review
-      if: always()
-      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ~/.ros/log/*/*.ulg
-
-    - name: Upload px4 binary
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: binary
-        path: build/px4_sitl_default/bin/px4
-
-    - name: Store PX4 log
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: px4_log
-        path: ~/.ros/log/*/*.ulg
-
-    - name: Store ROS log
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: ros_log
-        path: ~/.ros/**/rostest-*.log
-
-    # Report test coverage
-    - name: Upload coverage
-      if: contains(matrix.config.build_type, 'Coverage')
-      run: |
-          git config --global credential.helper "" # disable the keychain credential helper
-          git config --global --add credential.helper store # enable the local store credential helper
-          echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
-          git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
-          mkdir -p coverage
-          lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
-    - name: Upload coverage information to Codecov
-      if: contains(matrix.config.build_type, 'Coverage')
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: mavros_avoidance
-        file: coverage/lcov.info
@@ -17,15 +17,15 @@ jobs:
        config:
          - {vehicle: "iris",          mission: "MC_mission_box",  build_type: "RelWithDebInfo"}
          - {vehicle: "rover",         mission: "rover_mission_1", build_type: "RelWithDebInfo"}
-          - {vehicle: "plane",         mission: "FW_mission_1",    build_type: "RelWithDebInfo"}
-          - {vehicle: "plane_catapult",mission: "FW_mission_1",    build_type: "RelWithDebInfo"}
-          - {vehicle: "standard_vtol", mission: "VTOL_mission_1",  build_type: "Coverage"}
-          - {vehicle: "standard_vtol", mission: "VTOL_mission_1",  build_type: "AddressSanitizer"}
+          #- {vehicle: "plane",         mission: "FW_mission_1",    build_type: "RelWithDebInfo"}
+          #- {vehicle: "plane_catapult",mission: "FW_mission_1",    build_type: "RelWithDebInfo"}
+          #- {vehicle: "standard_vtol", mission: "VTOL_mission_1",  build_type: "Coverage"}
+          #- {vehicle: "standard_vtol", mission: "VTOL_mission_1",  build_type: "AddressSanitizer"}
          #- {vehicle: "tailsitter",    mission: "VTOL_mission_1",  build_type: "RelWithDebInfo"}
-          - {vehicle: "tiltrotor",     mission: "VTOL_mission_1",  build_type: "RelWithDebInfo"}
+          #- {vehicle: "tiltrotor",     mission: "VTOL_mission_1",  build_type: "RelWithDebInfo"}

    container:
-      image: px4io/px4-dev-ros-melodic:2020-11-18
+      image: px4io/px4-dev-ros-melodic:2021-04-29
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -49,8 +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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -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:2020-11-18
+      image: px4io/px4-dev-ros-melodic:2021-04-29
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -44,8 +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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -4,15 +4,14 @@ on:
  push:
    branches:
    - 'master'
-  pull_request:
-    branches:
-    - '*'
+    - 'release/*'
+    - 'pr-metadata-test'

 jobs:

  airframe:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-11-18
+    container: px4io/px4-dev-base-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -23,11 +22,11 @@ jobs:
        make airframe_metadata
        cd build/px4_sitl_default/docs
        ls -ls *
-      # TODO: deploy to devguide gitbook and s3
+      # TODO: deploy to userguide gitbook and s3

  module:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-11-18
+    container: px4io/px4-dev-base-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -38,11 +37,11 @@ jobs:
        make module_documentation
        cd build/px4_sitl_default/docs
        ls -ls *
-      # TODO: deploy to devguide gitbook and s3
+      # TODO: deploy to userguide gitbook and s3

  parameter:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-11-18
+    container: px4io/px4-dev-base-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -51,13 +50,22 @@ jobs:
    - name: parameter metadata
      run: |
        make parameters_metadata
-        cd build/px4_sitl_default/docs
-        ls -ls *
-      # TODO: deploy 'parameters.md, parameters.xml to S3 px4-travis:Firmware/master/
+        ./src/lib/version/get_git_tag_or_branch_version.sh build/px4_sitl_default >> $GITHUB_ENV
+
+    - uses: jakejarvis/s3-sync-action@master
+      with:
+        args: --acl public-read
+      env:
+        AWS_S3_BUCKET: 'px4-travis'
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_REGION: 'us-west-1'
+        SOURCE_DIR: 'build/px4_sitl_default/docs/'
+        DEST_DIR: 'Firmware/${{ env.version }}/_general/'

  uorb_graph:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2020-11-18
+    container: px4io/px4-dev-nuttx-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -72,7 +80,7 @@ jobs:

  micrortps_agent:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-11-18
+    container: px4io/px4-dev-base-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -86,7 +94,7 @@ jobs:

  ROS_msgs:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-11-18
+    container: px4io/px4-dev-base-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -99,7 +107,7 @@ jobs:

  ROS2_bridge:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-11-18
+    container: px4io/px4-dev-base-focal:2021-04-29
    steps:
    - uses: actions/checkout@v1
      with:
@@ -18,7 +18,7 @@ jobs:
    - name: Install Python3
      run: sudo apt-get install python3 python3-setuptools python3-pip -y
    - name: Install tools
-      run: pip3 install --user mypy flake8
+      run: pip3 install --user mypy types-requests flake8
    - name: Check MAVSDK test scripts with mypy
      run: $HOME/.local/bin/mypy --strict test/mavsdk_tests/*.py
    - name: Check MAVSDK test scripts with flake8
@@ -15,12 +15,13 @@ jobs:
      fail-fast: false
      matrix:
        config:
-          - {latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo", model: "iris"          } # Alaska
-          - {latitude: "-38.071235", longitude:  "145.281220", altitude:  "31", build_type: "RelWithDebInfo", model: "standard_vtol" } # Australia
-          - {latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo", model: "tailsitter"    } # Florida
-          - {latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage",       model: "standard_vtol" } # Zurich
+          - {latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo",   model: "iris"          } # Alaska
+          - {latitude: "-38.071235", longitude:  "145.281220", altitude:  "31", build_type: "AddressSanitizer", model: "standard_vtol" } # Australia
+          - {latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo",   model: "tailsitter"    } # Florida
+          - {latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage",         model: "standard_vtol" } # Zurich
+
    container:
-      image: px4io/px4-dev-simulation-focal:2020-11-18
+      image: px4io/px4-dev-simulation-focal:2021-04-29
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -28,9 +29,9 @@ jobs:
        token: ${{ secrets.ACCESS_TOKEN }}

    - name: Download MAVSDK
-      run: wget https://github.com/mavlink/MAVSDK/releases/download/v0.33.1/mavsdk_0.33.1_ubuntu20.04_amd64.deb
+      run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
    - name: Install MAVSDK
-      run: dpkg -i mavsdk_0.33.1_ubuntu20.04_amd64.deb
+      run: dpkg -i "mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"

    - name: Prepare ccache timestamp
      id: ccache_cache_timestamp
@@ -49,8 +50,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 "max_size = 400M" >> ~/.ccache/ccache.conf
+          echo "compression_level = 5" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -94,7 +95,7 @@ jobs:
        PX4_HOME_LON: ${{matrix.config.longitude}}
        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}} test/mavsdk_tests/configs/sitl.json
+      run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 --abort-early --model ${{matrix.config.model}} --upload test/mavsdk_tests/configs/sitl.json

    - name: Look at core files
      if: failure()
@@ -106,10 +107,6 @@ jobs:
        name: coredump
        path: px4.core

-    - name: Upload logs to flight review
-      if: failure()
-      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ${GITHUB_WORKSPACE}/build/px4_sitl_default/tmp_mavsdk_tests/rootfs/log/*/*.ulg
-
    - name: Upload px4 binary
      if: failure()
      uses: actions/upload-artifact@v2-preview
@@ -101,11 +101,6 @@ msg/tmp/
 msg/topics_sources/
 platforms/posix/apps.cpp
 platforms/posix/apps.h
-src/lib/flight_tasks/FlightTasks_generated.cpp
-src/lib/flight_tasks/FlightTasks_generated.hpp
-src/lib/parameters/px4_parameters.c
-src/lib/parameters/px4_parameters.h
-src/lib/parameters/px4_parameters_public.h
 src/lib/version/build_git_version.h
 src/modules/simulator/simulator_config.h
 src/systemcmds/topic_listener/listener_generated.cpp
@@ -113,3 +108,5 @@ src/systemcmds/topic_listener/listener_generated.cpp
 # SITL
 dataman
 eeprom/
+
+!src/drivers/distance_sensor/broadcom/afbrs50/Lib/*
@@ -4,7 +4,7 @@
 	branch = master
 [submodule "src/drivers/uavcan/libuavcan"]
 	path = src/drivers/uavcan/libuavcan
-	url = https://github.com/PX4/uavcan.git
+	url = https://github.com/PX4/libuavcan.git
 	branch = px4
 [submodule "Tools/jMAVSim"]
 	path = Tools/jMAVSim
@@ -16,11 +16,11 @@
 	branch = master
 [submodule "src/lib/matrix"]
 	path = src/lib/matrix
-	url = https://github.com/PX4/PX4-Matrix
+	url = https://github.com/PX4/PX4-Matrix.git
 	branch = master
 [submodule "src/lib/ecl"]
 	path = src/lib/ecl
-	url = https://github.com/PX4/PX4-ECL
+	url = https://github.com/PX4/PX4-ECL.git
 	branch = master
 [submodule "boards/atlflight/cmake_hexagon"]
 	path = boards/atlflight/cmake_hexagon
@@ -28,12 +28,12 @@
 	branch = px4
 [submodule "src/drivers/gps/devices"]
 	path = src/drivers/gps/devices
-	url = https://github.com/PX4/PX4-GPSDrivers
+	url = https://github.com/PX4/PX4-GPSDrivers.git
 	branch = master
 [submodule "src/modules/micrortps_bridge/micro-CDR"]
 	path = src/modules/micrortps_bridge/micro-CDR
-	url = https://github.com/PX4/micro-CDR.git
-	branch = px4
+	url = https://github.com/PX4/Micro-CDR.git
+	branch = master
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
@@ -51,6 +51,22 @@
 [submodule "Tools/jsbsim_bridge"]
 	path = Tools/jsbsim_bridge
 	url = https://github.com/PX4/px4-jsbsim-bridge.git
-[submodule "src/examples/gyro_fft/CMSIS_5"]
-	path = src/examples/gyro_fft/CMSIS_5
-	url = https://github.com/ARM-software/CMSIS_5.git
+[submodule "src/drivers/uavcan_v1/libcanard"]
+	path = src/drivers/uavcan_v1/libcanard
+	url = https://github.com/UAVCAN/libcanard.git
+[submodule "src/drivers/uavcan_v1/public_regulated_data_types"]
+	path = src/drivers/uavcan_v1/public_regulated_data_types
+	url = https://github.com/UAVCAN/public_regulated_data_types.git
+[submodule "src/drivers/uavcannode_gps_demo/public_regulated_data_types"]
+	path = src/drivers/uavcannode_gps_demo/public_regulated_data_types
+	url = https://github.com/UAVCAN/public_regulated_data_types.git
+[submodule "src/drivers/uavcannode_gps_demo/libcanard"]
+	path = src/drivers/uavcannode_gps_demo/libcanard
+	url = https://github.com/UAVCAN/libcanard.git
+[submodule "src/drivers/uavcan_v1/legacy_data_types"]
+	path = src/drivers/uavcan_v1/legacy_data_types
+	url = https://github.com/PX4/public_regulated_data_types.git
+	branch = legacy
+[submodule "src/lib/crypto/monocypher"]
+	path = src/lib/crypto/monocypher
+	url = https://github.com/PX4/Monocypher.git
@@ -56,16 +56,46 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: airmind_mindpx-v2_default
+    ark_can-flow_default:
+      short: ark_can-flow_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_can-flow_default
+    ark_can-flow_canbootloader:
+      short: ark_can-flow_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_can-flow_canbootloader
+    ark_can-gps_default:
+      short: ark_can-gps_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_can-gps_default
+    ark_can-gps_canbootloader:
+      short: ark_can-gps_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: ark_can-gps_canbootloader
    av_x-v1_default:
      short: av_x-v1
      buildType: MinSizeRel
      settings:
        CONFIG: av_x-v1_default
+    bitcraze_crazyflie_default:
+      short: bitcraze_crazyflie
+      buildType: MinSizeRel
+      settings:
+        CONFIG: bitcraze_crazyflie_default
    cuav_can-gps-v1_default:
      short: cuav_can-gps-v1_default
      buildType: MinSizeRel
      settings:
        CONFIG: cuav_can-gps-v1_default
+    cuav_can-gps-v1_canbootloader:
+      short: cuav_can-gps-v1_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: cuav_can-gps-v1_canbootloader
    cuav_nora_default:
      short: cuav_nora
      buildType: MinSizeRel
@@ -76,41 +106,66 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: cuav_x7pro_default
-    cubepilot_cubeorange_default:
+    cubepilot_cubeorange_test:
      short: cubepilot_cubeorange
      buildType: MinSizeRel
      settings:
-        CONFIG: cubepilot_orange_default
-    cubepilot_cubeyellow_default:
-      short: cubepilot_cubeyellow
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cubepilot_cubeyellow_default
+        CONFIG: cubepilot_orange_test
    emlid_navio2_default:
      short: emlid_navio2
      buildType: MinSizeRel
      settings:
        CONFIG: emlid_navio2_default
+    freefly_can-rtk-gps_default:
+      short: freefly_can-rtk-gps_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: freefly_can-rtk-gps_default
+    freefly_can-rtk-gps_canbootloader:
+      short: freefly_can-rtk-gps_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: freefly_can-rtk-gps_canbootloader
+    holybro_can-gps-v1_canbootloader:
+      short: holybro_can-gps-v1_canbootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: holybro_can-gps-v1_canbootloader
+    holybro_can-gps-v1_default:
+      short: holybro_can-gps-v1_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: holybro_can-gps-v1_default
    holybro_durandal-v1_default:
      short: holybro_durandal-v1
      buildType: MinSizeRel
      settings:
        CONFIG: holybro_durandal-v1_default
-    intel_aerofc-v1_default:
-      short: intel_aerofc-v1
-      buildType: MinSizeRel
-      settings:
-        CONFIG: intel_aerofc-v1_default
    modalai_fc-v1_default:
      short: modalai_fc-v1
      buildType: MinSizeRel
      settings:
        CONFIG: modalai_fc-v1_default
+    modalai_fc-v2_default:
+      short: modalai_fc-v2
+      buildType: MinSizeRel
+      settings:
+        CONFIG: modalai_fc-v2_default
    mro_ctrl-zero-f7_default:
      short: mro_ctrl-zero-f7
      buildType: MinSizeRel
      settings:
        CONFIG: mro_ctrl-zero-f7_default
+    mro_pixracerpro_bootloader:
+      short: mro_pixracerpro_bootloader
+      buildType: MinSizeRel
+      settings:
+        CONFIG: mro_pixracerpro_bootloader
+    mro_pixracerpro_default:
+      short: mro_pixracerpro_default
+      buildType: MinSizeRel
+      settings:
+        CONFIG: mro_pixracerpro_default
    mro_x21-777_default:
      short: mro_x2.1-777
      buildType: MinSizeRel
@@ -27,7 +27,6 @@
        "cSpell.showStatus": false,
        "cSpell.words": [
                "acro",
-                "rattitude",
                "nuttx",
                "esc"
        ],
@@ -128,7 +127,6 @@
                "${workspaceFolder}/build": true
        },
        "search.showLineNumbers": true,
-        "search.smartCase": true,
        "telemetry.enableTelemetry": false,
        "terminal.integrated.copyOnSelection": true,
        "terminal.integrated.rightClickBehavior": "paste",
@@ -113,7 +113,7 @@ include(px4_parse_function_args)
 include(px4_git)

 execute_process(
-	COMMAND git describe --always --tags
+	COMMAND git describe --exclude ext/* --always --tags
 	OUTPUT_VARIABLE PX4_GIT_TAG
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
@@ -185,6 +185,8 @@ if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "Coverage")
 	set(MAX_CUSTOM_OPT_LEVEL -O0)
 elseif(CMAKE_BUILD_TYPE MATCHES "Sanitizer")
 	set(MAX_CUSTOM_OPT_LEVEL -O1)
+elseif(CMAKE_BUILD_TYPE MATCHES "Release")
+	set(MAX_CUSTOM_OPT_LEVEL -O3)
 else()
 	if(px4_constrained_flash_build)
 		set(MAX_CUSTOM_OPT_LEVEL -Os)
@@ -406,7 +408,6 @@ add_subdirectory(src/lib EXCLUDE_FROM_ALL)

 add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
 add_subdirectory(platforms EXCLUDE_FROM_ALL)
-add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer

 if(EXISTS "${PX4_BOARD_DIR}/CMakeLists.txt")
 	add_subdirectory(${PX4_BOARD_DIR})
@@ -455,3 +456,10 @@ add_custom_target(size
 	WORKING_DIRECTORY ${PX4_BINARY_DIR}
 	USES_TERMINAL
 	)
+
+# install python requirements using configured python
+add_custom_target(install_python_requirements
+	COMMAND ${PYTHON_EXECUTABLE} -m pip install --requirement ${PX4_SOURCE_DIR}/Tools/setup/requirements.txt
+	DEPENDS ${PX4_SOURCE_DIR}/Tools/setup/requirements.txt
+	USES_TERMINAL
+)
@@ -15,7 +15,7 @@ pipeline {
        // stage('Catkin build on ROS workspace') {
        //   agent {
        //     docker {
-        //       image 'px4io/px4-dev-ros-melodic:2020-11-18'
+        //       image 'px4io/px4-dev-ros-melodic:2021-04-29'
        //       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:2020-11-18'
+              image 'px4io/px4-dev-ros2-foxy:2021-04-29'
              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
            }
          }
@@ -67,11 +67,9 @@ pipeline {
              unset ROS_DISTRO;
              mkdir -p colcon_ws/src;
              cd colcon_ws;
-              git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo
-              git clone --recursive ${WORKSPACE}/colcon_ws/src/Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo;
+              git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo;
              git -C ${WORKSPACE}/colcon_ws/src/Firmware fetch --tags;
-              source /opt/ros/bouncy/setup.sh;
-              source /opt/ros/melodic/setup.sh;
+              source /opt/ros/foxy/setup.sh;
              colcon build --event-handlers console_direct+ --symlink-install;
            '''
          }
@@ -87,10 +85,11 @@ pipeline {

        stage('Airframe') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh 'make distclean'
+            sh 'git fetch --all --tags'
            sh 'make airframe_metadata'
            dir('build/px4_sitl_default/docs') {
              archiveArtifacts(artifacts: 'airframes.md, airframes.xml')
@@ -106,14 +105,15 @@ pipeline {

        stage('Parameter') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh 'make distclean'
+            sh 'git fetch --all --tags'
            sh 'make parameters_metadata'
            dir('build/px4_sitl_default/docs') {
-              archiveArtifacts(artifacts: 'parameters.md, parameters.xml')
-              stash includes: 'parameters.md, parameters.xml', name: 'metadata_parameters'
+              archiveArtifacts(artifacts: 'parameters.md, parameters.xml, parameters.json.xz')
+              stash includes: 'parameters.md, parameters.xml, parameters.json.xz', name: 'metadata_parameters'
            }
          }
          post {
@@ -125,10 +125,11 @@ pipeline {

        stage('Module') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh 'make distclean'
+            sh 'git fetch --all --tags'
            sh 'make module_documentation'
            dir('build/px4_sitl_default/docs') {
              archiveArtifacts(artifacts: 'modules/*.md')
@@ -145,13 +146,14 @@ pipeline {
        stage('uORB graphs') {
          agent {
            docker {
-              image 'px4io/px4-dev-nuttx-focal:2020-11-18'
+              image 'px4io/px4-dev-nuttx-focal:2021-04-29'
              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
            }
          }
          steps {
            sh 'export'
            sh 'make distclean'
+            sh 'git fetch --all --tags'
            sh 'make uorb_graphs'
            dir('Tools/uorb_graph') {
              archiveArtifacts(artifacts: 'graph_px4_sitl.json')
@@ -172,39 +174,9 @@ pipeline {

      parallel {

-        stage('Devguide') {
-          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
-          }
-          steps {
-            sh('export')
-            unstash 'metadata_airframes'
-            unstash 'metadata_parameters'
-            unstash 'metadata_module_documentation'
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/Devguide.git')
-              sh('cp airframes.md Devguide/en/airframes/airframe_reference.md')
-              sh('cp parameters.md Devguide/en/advanced/parameter_reference.md')
-              sh('cp -R modules/*.md Devguide/en/middleware/')
-              sh('cd Devguide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
-              sh('cd Devguide; git push origin master || true')
-              sh('rm -rf Devguide')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-          options {
-            skipDefaultCheckout()
-          }
-        }
-
        stage('Userguide') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh('export')
@@ -234,7 +206,7 @@ pipeline {

        stage('QGroundControl') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh('export')
@@ -262,7 +234,7 @@ pipeline {

        stage('microRTPS agent') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh('export')
@@ -292,7 +264,7 @@ pipeline {

        stage('PX4 ROS msgs') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh('export')
@@ -321,7 +293,7 @@ pipeline {

        stage('PX4 ROS2 bridge') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh('export')
@@ -364,7 +336,7 @@ pipeline {

        stage('S3') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2020-11-18' }
+            docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
          }
          steps {
            sh('export')
@@ -374,6 +346,7 @@ pipeline {
            withAWS(credentials: 'px4_aws_s3_key', region: 'us-east-1') {
              s3Upload(acl: 'PublicRead', bucket: 'px4-travis', file: 'airframes.xml', path: 'Firmware/master/')
              s3Upload(acl: 'PublicRead', bucket: 'px4-travis', file: 'parameters.xml', path: 'Firmware/master/')
+              s3Upload(acl: 'PublicRead', bucket: 'px4-travis', file: 'parameters.json.xz', path: 'Firmware/master/')
            }
          }
          when {
@@ -401,7 +374,7 @@ pipeline {
    GIT_COMMITTER_NAME = "PX4BuildBot"
  }
  options {
-    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '20'))
-    timeout(time: 60, unit: 'MINUTES')
+    buildDiscarder(logRotator(numToKeepStr: '20', artifactDaysToKeepStr: '30'))
+    timeout(time: 90, unit: 'MINUTES')
  }
 }
@@ -1,6 +1,6 @@
 BSD 3-Clause License

-Copyright (c) 2012 - 2020, PX4 Development Team
+Copyright (c) 2012 - 2021, PX4 Development Team
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ all: px4_sitl_default
 space := $(subst ,, )

 define make_list
-     $(shell cat .github/workflows/compile_${1}.yml | sed -E 's|[[:space:]]+(.*),|check_\1|g' | grep check_${2})
+     $(shell [ -f .github/workflows/compile_${1}.yml ] && cat .github/workflows/compile_${1}.yml | sed -E 's|[[:space:]]+(.*),|check_\1|g' | grep check_${2})
 endef

 # Parsing
@@ -165,6 +165,11 @@ ifdef PYTHON_EXECUTABLE
 	CMAKE_ARGS += -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
 endif

+# Check if the microRTPS agent is to be built
+ifdef BUILD_MICRORTPS_AGENT
+  CMAKE_ARGS += -DBUILD_MICRORTPS_AGENT=ON
+endif
+
 # Functions
 # --------------------------------------------------------------------
 # describe how to build a cmake config
@@ -174,6 +179,8 @@ define cmake-build
 	@$(call cmake-cache-check)
 	@# make sure to start from scratch when switching from GNU Make to Ninja
 	@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(BUILD_DIR)/Makefile ]; then rm -rf $(BUILD_DIR); fi
+	@# make sure to start from scratch if ninja build file is missing
+	@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ ! -f $(BUILD_DIR)/build.ninja ]; then rm -rf $(BUILD_DIR); fi
 	@# only excplicitly configure the first build, if cache file already exists the makefile will rerun cmake automatically if necessary
 	@if [ ! -e $(BUILD_DIR)/CMakeCache.txt ] || [ $(CMAKE_CACHE_CHECK) ]; then \
 		mkdir -p $(BUILD_DIR) \
@@ -268,9 +275,9 @@ px4fmu_firmware: \
 misc_qgc_extra_firmware: \
 	check_nxp_fmuk66-v3_default \
 	check_nxp_fmurt1062-v1_default \
-	check_intel_aerofc-v1_default \
 	check_mro_x21_default \
 	check_bitcraze_crazyflie_default \
+	check_bitcraze_crazyflie21_default \
 	check_airmind_mindpx-v2_default \
 	check_px4_fmu-v2_lpe \
 	sizes
@@ -301,8 +308,7 @@ check_%:
 	@echo

 uorb_graphs:
-	@./Tools/uorb_graph/create_from_startupscript.sh
-	@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --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
 	@$(MAKE) --no-print-directory px4_fmu-v2_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v4_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
@@ -317,7 +323,7 @@ coverity_scan: px4_sitl_default
 .PHONY: parameters_metadata airframe_metadata module_documentation px4_metadata doxygen

 parameters_metadata:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters
+	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters ver_gen

 airframe_metadata:
 	@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes
@@ -361,8 +367,10 @@ tests:

 tests_coverage:
 	@$(MAKE) clean
-	@$(MAKE) --no-print-directory px4_sitl_default test_coverage_genhtml PX4_CMAKE_BUILD_TYPE=Coverage
-	@echo "Open "$(SRC_DIR)"/build/px4_sitl_default/coverage-html/index.html to see coverage"
+	@$(MAKE) --no-print-directory tests PX4_CMAKE_BUILD_TYPE=Coverage
+	@mkdir -p coverage
+	@lcov --directory build/px4_sitl_test --base-directory build/px4_sitl_test --gcov-tool gcov --capture -o coverage/lcov.info
+

 rostest: px4_sitl_default
 	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
@@ -465,25 +473,27 @@ validate_module_configs:
 .PHONY: clean submodulesclean submodulesupdate gazeboclean distclean

 clean:
-	@rm -rf "$(SRC_DIR)"/build
+	@[ ! -d "$(SRC_DIR)/build" ] || find "$(SRC_DIR)/build" -mindepth 1 -maxdepth 1 -type d -exec sh -c "echo {}; cmake --build {} -- clean || rm -rf {}" \; # use generated build system to clean, wipe build directory if it fails
+	@git submodule foreach git clean -dX --force # some submodules generate build artifacts in source

 submodulesclean:
 	@git submodule foreach --quiet --recursive git clean -ff -x -d
 	@git submodule update --quiet --init --recursive --force || true
 	@git submodule sync --recursive
-	@git submodule update --init --recursive --force
+	@git submodule update --init --recursive --force --jobs 4

 submodulesupdate:
-	@git submodule update --quiet --init --recursive || true
+	@git submodule update --quiet --init --recursive --jobs 4 || true
 	@git submodule sync --recursive
-	@git submodule update --init --recursive
+	@git submodule update --init --recursive --jobs 4

 gazeboclean:
 	@rm -rf ~/.gazebo/*

 distclean: gazeboclean
-	@git submodule deinit -f .
-	@git clean -ff -x -d -e ".project" -e ".cproject" -e ".idea" -e ".settings" -e ".vscode"
+	@git submodule deinit --force $(SRC_DIR)
+	@rm -rf "$(SRC_DIR)/build"
+	@git clean --force -X "$(SRC_DIR)/msg/" "$(SRC_DIR)/platforms/" "$(SRC_DIR)/posix-configs/" "$(SRC_DIR)/ROMFS/" "$(SRC_DIR)/src/" "$(SRC_DIR)/test/" "$(SRC_DIR)/Tools/"

 # Help / Error
 # --------------------------------------------------------------------
@@ -8,26 +8,30 @@

 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.

+PX4 is highly portable, OS-independent and supports Linux, NuttX and QuRT out of the box.
+
 * Official Website: http://px4.io (License: BSD 3-clause, [LICENSE](https://github.com/PX4/PX4-Autopilot/blob/master/LICENSE))
 * [Supported airframes](https://docs.px4.io/master/en/airframes/airframe_reference.html) ([portfolio](http://px4.io/#airframes)):
-  * [Multicopters](https://docs.px4.io/master/en/airframes/airframe_reference.html#copter)
-  * [Fixed wing](https://docs.px4.io/master/en/airframes/airframe_reference.html#plane)
-  * [VTOL](https://docs.px4.io/master/en/airframes/airframe_reference.html#vtol)
-  * many more experimental types (Rovers, Blimps, Boats, Submarines, Autogyros, etc)
+  * [Multicopters](https://docs.px4.io/master/en/frames_multicopter/)
+  * [Fixed wing](https://docs.px4.io/master/en/frames_plane/)
+  * [VTOL](https://docs.px4.io/master/en/frames_vtol/)
+  * [Autogyro](https://docs.px4.io/master/en/frames_autogyro/)
+  * [Rover](https://docs.px4.io/master/en/frames_rover/)
+  * many more experimental types (Blimps, Boats, Submarines, High altitude balloons, etc)
 * Releases: [Downloads](https://github.com/PX4/PX4-Autopilot/releases)


-## PX4 Users
+## Building a PX4 based drone, rover, boat or robot

 The [PX4 User Guide](https://docs.px4.io/master/en/) explains how to assemble [supported vehicles](https://docs.px4.io/master/en/airframes/airframe_reference.html) and fly drones with PX4.
 See the [forum and chat](https://docs.px4.io/master/en/#support) if you need help!


-## PX4 Developers
+## Changing code and contributing

-This [Developer Guide](https://dev.px4.io/) is for software developers who want to modify the flight stack and middleware (e.g. to add new flight modes), hardware integrators who want to support new flight controller boards and peripherals, and anyone who wants to get PX4 working on a new (unsupported) airframe/vehicle.
+This [Developer Guide](https://docs.px4.io/master/en/development/development.html) is for software developers who want to modify the flight stack and middleware (e.g. to add new flight modes), hardware integrators who want to support new flight controller boards and peripherals, and anyone who wants to get PX4 working on a new (unsupported) airframe/vehicle.

-Developers should read the [Guide for Contributions](https://dev.px4.io/master/en/contribute/).
+Developers should read the [Guide for Contributions](https://docs.px4.io/master/en/contribute/).
 See the [forum and chat](https://dev.px4.io/master/en/#support) if you need help!


@@ -69,10 +73,8 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://dev.px4.io/master/en/co
    * [Daniel Agar](https://github.com/dagar)
  * [State Estimation](https://github.com/PX4/PX4-Autopilot/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22)
    * [Paul Riseborough](https://github.com/priseborough)
-  * Vision based navigation
-    * [Julian Kent](https://github.com/jkflying)
-  * Obstacle Avoidance
-    * [Martina Rivizzigno](https://github.com/mrivi)
+  * Vision based navigation and Obstacle Avoidance
+    * [Markus Achtelik](https://github.com/markusachtelik)
  * RTPS/ROS2 Interface
    * [Nuno Marques](https://github.com/TSC21)

@@ -80,27 +82,36 @@ See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and

 ## Supported Hardware

-This repository contains code supporting these boards:
-  * FMUv2
-    * [Pixhawk](https://docs.px4.io/master/en/flight_controller/pixhawk.html)
-    * [Pixfalcon](https://docs.px4.io/master/en/flight_controller/pixfalcon.html)
-  * FMUv3
+This repository contains code supporting Pixhawk standard boards (best supported, best tested, recommended choice) and proprietary boards.
+
+### Pixhawk Standard Boards
+  * FMUv6X and FMUv6U (STM32H7, 2021)
+    * Various vendors will provide FMUv6X and FMUv6U based designs Q3/2021
+  * FMUv5 and FMUv5X (STM32F7, 2019/20)
+    * [Pixhawk 4 (FMUv5)](https://docs.px4.io/master/en/flight_controller/pixhawk4.html)
+    * [Pixhawk 4 mini (FMUv5)](https://docs.px4.io/master/en/flight_controller/pixhawk4_mini.html)
+    * [CUAV V5+ (FMUv5)](https://docs.px4.io/master/en/flight_controller/cuav_v5_plus.html)
+    * [CUAV V5 nano (FMUv5)](https://docs.px4.io/master/en/flight_controller/cuav_v5_nano.html)
+    * [Auterion Skynode (FMUv5X)](https://docs.px4.io/master/en/flight_controller/auterion_skynode.html)
+  * FMUv4 (STM32F4, 2015)
+    * [Pixracer](https://docs.px4.io/master/en/flight_controller/pixracer.html)
+    * [Pixhawk 3 Pro](https://docs.px4.io/master/en/flight_controller/pixhawk3_pro.html)
+  * FMUv3 (STM32F4, 2014)
    * [Pixhawk 2](https://docs.px4.io/master/en/flight_controller/pixhawk-2.html)
    * [Pixhawk Mini](https://docs.px4.io/master/en/flight_controller/pixhawk_mini.html)
    * [CUAV Pixhack v3](https://docs.px4.io/master/en/flight_controller/pixhack_v3.html)
-  * FMUv4
-    * [Pixracer](https://docs.px4.io/master/en/flight_controller/pixracer.html)
-    * [Pixhawk 3 Pro](https://docs.px4.io/master/en/flight_controller/pixhawk3_pro.html)
-  * FMUv5 (ARM Cortex M7)
-    * [Pixhawk 4](https://docs.px4.io/master/en/flight_controller/pixhawk4.html)
-    * [Pixhawk 4 mini](https://docs.px4.io/master/en/flight_controller/pixhawk4_mini.html)
-    * [CUAV V5+](https://docs.px4.io/master/en/flight_controller/cuav_v5_plus.html)
-    * [CUAV V5 nano](https://docs.px4.io/master/en/flight_controller/cuav_v5_nano.html)
+  * FMUv2 (STM32F4, 2013)
+    * [Pixhawk](https://docs.px4.io/master/en/flight_controller/pixhawk.html)
+    * [Pixfalcon](https://docs.px4.io/master/en/flight_controller/pixfalcon.html)
+
+### Manufacturer and Community supported
+  * [Holybro Durandal](https://docs.px4.io/master/en/flight_controller/durandal.html)
+  * [Hex Cube Orange](https://docs.px4.io/master/en/flight_controller/cubepilot_cube_orange.html)
+  * [Hex Cube Yellow](https://docs.px4.io/master/en/flight_controller/cubepilot_cube_yellow.html)
  * [Airmind MindPX V2.8](http://www.mindpx.net/assets/accessories/UserGuide_MindPX.pdf)
  * [Airmind MindRacer V1.2](http://mindpx.net/assets/accessories/mindracer_user_guide_v1.2.pdf)
  * [Bitcraze Crazyflie 2.0](https://docs.px4.io/master/en/flight_controller/crazyflie2.html)
  * [Omnibus F4 SD](https://docs.px4.io/master/en/flight_controller/omnibus_f4_sd.html)
-  * [Holybro Durandal](https://docs.px4.io/master/en/flight_controller/durandal.html)
  * [Holybro Kakute F7](https://docs.px4.io/master/en/flight_controller/kakutef7.html)
  * [Raspberry PI with Navio 2](https://docs.px4.io/master/en/flight_controller/raspberry_pi_navio2.html)

@@ -108,4 +119,4 @@ Additional information about supported hardware can be found in [PX4 user Guide

 ## Project Roadmap

-A high level project roadmap is available [here](https://www.dronecode.org/roadmap/).
+A high level project roadmap is available [here](https://github.com/orgs/PX4/projects/25).
@@ -31,11 +31,12 @@
 #
 ############################################################################

-message(STATUS "ROMFS: ${config_romfs_root}")
-
 set(romfs_src_dir ${PX4_SOURCE_DIR}/ROMFS/${config_romfs_root})
 set(romfs_gen_root_dir ${PX4_BINARY_DIR}/etc)

+file(RELATIVE_PATH romfs_path_relative ${PX4_SOURCE_DIR} ${romfs_src_dir})
+message(STATUS "ROMFS: ${romfs_path_relative}")
+
 set_property(GLOBAL PROPERTY PX4_ROMFS_FILES)
 set_property(GLOBAL PROPERTY PX4_ROMFS_CMAKE_FILES)

@@ -81,6 +82,9 @@ file(GLOB jinja_templates ${PX4_SOURCE_DIR}/Tools/serial/*.jinja)
 if (px4_constrained_flash_build)
 	set(added_arguments --constrained-flash)
 endif()
+if(PX4_ETHERNET)
+	set(added_arguments ${added_arguments} --ethernet)
+endif()
 # create list of relative romfs file names
 set(romfs_copy_files_relative)
 foreach(romfs_file IN LISTS romfs_copy_files)
@@ -111,6 +115,7 @@ add_custom_command(
 set(romfs_extract_stamp ${CMAKE_CURRENT_BINARY_DIR}/romfs_extract.stamp)
 add_custom_command(
 	OUTPUT ${romfs_extract_stamp}
+	COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}/*
 	COMMAND ${CMAKE_COMMAND} -E tar xf ${romfs_tar_file}
 	COMMAND ${CMAKE_COMMAND} -E touch ${romfs_extract_stamp}
 	WORKING_DIRECTORY ${romfs_gen_root_dir}
@@ -146,15 +151,53 @@ if(config_io_board)
 		copy_px4io_bin
 		${fw_io_bin}
 	)
+	file(RELATIVE_PATH iofw_file_relative ${PX4_SOURCE_DIR} ${fw_io_bin})
+	message(STATUS "ROMFS:  Adding ${iofw_file_relative} -> /etc/extras/${config_io_board}.bin")
 endif()

-if(config_build_bootloader)
+
+# board bootloader (built or included)
+if(TARGET copy_bootloader_bin)
+
+	if(board_bootloader_firmware)
+		file(RELATIVE_PATH bl_file_relative ${PX4_SOURCE_DIR} ${board_bootloader_firmware})
+		message(STATUS "ROMFS:  Adding ${bl_file_relative} -> /etc/extras/bootloader.bin")
+	else()
+		file(RELATIVE_PATH bl_file_relative ${PX4_SOURCE_DIR} ${bootloader_bin})
+		message(STATUS "ROMFS:  Adding ${bl_file_relative} -> /etc/extras/bootloader.bin")
+	endif()
+
 	list(APPEND extras_dependencies
 		copy_bootloader_bin
 		${bootloader_bin}
 	)
 endif()

+
+# optional board architecture defaults
+set(board_arch_rc_file "rc.board_arch_defaults")
+if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/init/${CONFIG_ARCH_CHIP}/${board_arch_rc_file}")
+	file(RELATIVE_PATH rc_file_relative ${PX4_SOURCE_DIR} ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/init/${CONFIG_ARCH_CHIP}/${board_arch_rc_file})
+	message(STATUS "ROMFS:  Adding ${rc_file_relative} -> /etc/init.d/${board_arch_rc_file}")
+
+	add_custom_command(
+		OUTPUT
+			${romfs_gen_root_dir}/init.d/${board_arch_rc_file}
+			${board_arch_rc_file}.stamp
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/init/${CONFIG_ARCH_CHIP}/${board_arch_rc_file} ${romfs_gen_root_dir}/init.d/${board_arch_rc_file}
+		COMMAND ${CMAKE_COMMAND} -E touch ${board_arch_rc_file}.stamp
+		DEPENDS
+			${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/init/${CONFIG_ARCH_CHIP}/${board_arch_rc_file}
+			romfs_copy.stamp
+		COMMENT "ROMFS: copying ${board_arch_rc_file}"
+	)
+
+	list(APPEND extras_dependencies
+		${board_arch_rc_file}.stamp
+	)
+endif()
+
+
 set(OPTIONAL_BOARD_RC)
 list(APPEND OPTIONAL_BOARD_RC
 	rc.board_defaults
@@ -166,7 +209,8 @@ list(APPEND OPTIONAL_BOARD_RC
 foreach(board_rc_file ${OPTIONAL_BOARD_RC})

 	if(EXISTS "${PX4_BOARD_DIR}/init/${board_rc_file}")
-		message(STATUS "ROMFS: Adding ${board_rc_file}")
+		file(RELATIVE_PATH rc_file_relative ${PX4_SOURCE_DIR} ${PX4_BOARD_DIR}/init/${board_rc_file})
+		message(STATUS "ROMFS:  Adding ${rc_file_relative} -> /etc/init.d/${board_rc_file}")

 		add_custom_command(
 			OUTPUT
@@ -187,6 +231,46 @@ foreach(board_rc_file ${OPTIONAL_BOARD_RC})

 endforeach()

+
+if(config_uavcan_peripheral_firmware)
+
+	include(ExternalProject)
+
+	foreach(uavcan_peripheral_config ${config_uavcan_peripheral_firmware})
+		# include the px4io binary in ROMFS
+		message(STATUS "ROMFS:  Adding UAVCAN peripheral ${uavcan_peripheral_config} -> /etc/uavcan/fw/")
+		ExternalProject_Add(build_${uavcan_peripheral_config}
+			SOURCE_DIR ${CMAKE_SOURCE_DIR}
+			DOWNLOAD_COMMAND ""
+			UPDATE_COMMAND ""
+			CMAKE_ARGS -DCONFIG=${uavcan_peripheral_config}
+			INSTALL_COMMAND ""
+			USES_TERMINAL_BUILD true
+			DEPENDS git_nuttx git_nuttx_apps
+			BUILD_ALWAYS 1
+		)
+
+		ExternalProject_Get_Property(build_${uavcan_peripheral_config} BINARY_DIR)
+
+		add_custom_command(
+			OUTPUT
+				${romfs_gen_root_dir}/uavcan/fw/_${uavcan_board_id}.bin
+				${uavcan_peripheral_config}.stamp
+			COMMAND ${CMAKE_COMMAND} -E make_directory ${romfs_gen_root_dir}/uavcan/fw/
+			COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/deploy/*.bin ${romfs_gen_root_dir}/uavcan/fw/
+			COMMAND ls -lsa ${romfs_gen_root_dir}/uavcan/fw/
+			COMMAND ${CMAKE_COMMAND} -E touch ${uavcan_peripheral_config}.stamp
+			DEPENDS
+				build_${uavcan_peripheral_config}
+			COMMENT "ROMFS: copying ${uavcan_peripheral_config}"
+		)
+
+		list(APPEND extras_dependencies
+			${uavcan_peripheral_config}.stamp
+		)
+	endforeach()
+endif()
+
 list(APPEND extras_dependencies
 	${config_romfs_extra_dependencies}
 	)
@@ -30,21 +30,16 @@ sercon
 #
 ver all

-#
-# Start the ORB (first app to start)
-# tone_alarm and tune_control
-# is dependent.
-#
-uorb start
-
-#
-# Set the parameter file if mtd starts successfully.
-#
-if mtd start
+if mft query -q -k MTD -s MTD_PARAMETERS -v /fs/mtd_params
 then
 	set PARAM_FILE /fs/mtd_params
 fi

+if mft query -q -k MTD -s MTD_PARAMETERS -v /dev/eeeprom0
+then
+	set PARAM_FILE /dev/eeeprom0
+fi
+
 #
 # Load parameters.
 #
@@ -54,6 +49,17 @@ then
 	param reset_all
 fi

+#
+# Optional board architecture defaults: rc.board_arch_defaults
+#
+set BOARD_ARCH_RC_DEFAULTS ${R}etc/init.d/rc.board_arch_defaults
+if [ -f $BOARD_ARCH_RC_DEFAULTS ]
+then
+	echo "Board architecture defaults: ${BOARD_ARCH_RC_DEFAULTS}"
+	. $BOARD_ARCH_RC_DEFAULTS
+fi
+unset BOARD_ARCH_RC_DEFAULTS
+
 #
 # Optional board defaults: rc.board_defaults
 #
@@ -70,15 +76,6 @@ unset BOARD_RC_DEFAULTS
 #
 rgbled start -X -q
 rgbled_ncp5623c start -X -q
-rgbled_pwm start
-
-if param greater -s LIGHT_EN_BLINKM 0
-then
-	if blinkm start -X
-	then
-		blinkm systemstate
-	fi
-fi

 #
 # board sensors: rc.sensors
@@ -1,5 +0,0 @@
-px4fmuv3_bl.bin: Bootloader binary of the PX4 Bootloader
-  (https://github.com/PX4/Bootloader)
-  based on commit 184b813699a9cfd6f43a5a21556a06b4372baf5f
-  for the target px4fmuv3_bl
-
@@ -34,6 +34,9 @@
 add_subdirectory(airframes)

 px4_add_romfs_files(
+	px4-rc.params
+	px4-rc.simulator
+	px4-rc.mavlink
 	rc.replay
 	rcS
 )
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL
+#
+# @type Quadrotor Wide
+#
+# @maintainer Julian Oes <julian@oes.ch>
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc
+
+param set-default MPC_USE_HTE 0
+
+param set-default VM_MASS 1.5
+param set-default VM_INERTIA_XX 0.03
+param set-default VM_INERTIA_YY 0.03
+param set-default VM_INERTIA_ZZ 0.05
+
+param set-default CA_AIRFRAME 0
+param set-default CA_METHOD 1
+param set-default CA_ACT0_MIN 0.0
+param set-default CA_ACT1_MIN 0.0
+param set-default CA_ACT2_MIN 0.0
+param set-default CA_ACT3_MIN 0.0
+param set-default CA_ACT0_MAX 1.0
+param set-default CA_ACT1_MAX 1.0
+param set-default CA_ACT2_MAX 1.0
+param set-default CA_ACT3_MAX 1.0
+
+param set-default CA_MC_R0_PX 0.1515
+param set-default CA_MC_R0_PY 0.245
+param set-default CA_MC_R0_CT 6.5
+param set-default CA_MC_R0_KM 0.05
+param set-default CA_MC_R1_PX -0.1515
+param set-default CA_MC_R1_PY -0.1875
+param set-default CA_MC_R1_CT 6.5
+param set-default CA_MC_R1_KM 0.05
+param set-default CA_MC_R2_PX 0.1515
+param set-default CA_MC_R2_PY -0.245
+param set-default CA_MC_R2_CT 6.5
+param set-default CA_MC_R2_KM -0.05
+param set-default CA_MC_R3_PX -0.1515
+param set-default CA_MC_R3_PY 0.1875
+param set-default CA_MC_R3_CT 6.5
+param set-default CA_MC_R3_KM -0.05
+
+set MIXER direct
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (foggy_lidar)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d-posix/airframes/10016_iris
+
+param set-default EKF2_RNG_AID 1
+param set-default EKF2_RNG_A_HMAX 10
+
@@ -8,10 +8,12 @@

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	# EKF2: Multi GPS blending (as the model has 2 GPS's)
-	param set EKF2_GPS_MASK 7 # Uses speed, hpos and vpos accuracy
-fi
+# EKF2: Multi GPS blending (as the model has 2 GPS's)
+param set-default SENS_GPS_MASK 7
+param set-default TRIG_INTERFACE 3
+param set-default TRIG_MODE 4
+param set-default MNT_MODE_IN 4
+param set-default MNT_MODE_OUT 2
+param set-default MNT_DO_STAB 2

 set MIXER quad_x
@@ -7,16 +7,14 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	# EKF2
-	param set EKF2_AID_MASK 2
-	param set EKF2_EVP_NOISE 0.05
-	param set EKF2_EVA_NOISE 0.05
+# EKF2
+param set-default EKF2_AID_MASK 2
+param set-default EKF2_EVP_NOISE 0.05
+param set-default EKF2_EVA_NOISE 0.05

-	# LPE: Flow-only mode
-	param set LPE_FUSION 242
-	param set LPE_FAKE_ORIGIN 1
+# LPE: Flow-only mode
+param set-default LPE_FUSION 242
+param set-default LPE_FAKE_ORIGIN 1
+
+param set-default MPC_ALT_MODE 2

-	param set MPC_ALT_MODE 2
-fi
@@ -7,12 +7,9 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	# enable fusion of landing target velocity
-	param set LTEST_MODE 1
-	param set PLD_HACC_RAD 0.1
-fi
+# enable fusion of landing target velocity
+param set-default LTEST_MODE 1
+param set-default PLD_HACC_RAD 0.1

 # Start up Landing Target Estimator module
 landing_target_estimator start
@@ -7,7 +7,5 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	param set LPE_FUSION 242
-fi
+param set-default LPE_FUSION 242
+
@@ -7,15 +7,13 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	# EKF2: Vision position and heading
-	param set EKF2_AID_MASK 24
-	param set EKF2_EV_DELAY 5
+# EKF2: Vision position and heading
+param set-default EKF2_AID_MASK 24
+param set-default EKF2_EV_DELAY 5

-	# LPE: Vision + baro
-	param set LPE_FUSION 132
+# LPE: Vision + baro
+param set-default LPE_FUSION 132
+
+# AEQ: External heading set to use vision input
+param set-default ATT_EXT_HDG_M 1

-	# AEQ: External heading set to use vision input
-	param set ATT_EXT_HDG_M 1
-fi
@@ -7,10 +7,7 @@

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_PITCHRATE_P 0.1
-	param set MC_ROLLRATE_P 0.1
-fi
+param set-default MC_PITCHRATE_P 0.1
+param set-default MC_ROLLRATE_P 0.1

 set MIXER quad_x
@@ -7,8 +7,6 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	param set COM_OBS_AVOID 1
-	param set MPC_XY_CRUISE 5.0
-fi
+param set-default COM_OBS_AVOID 1
+param set-default MPC_XY_CRUISE 5.0
+
@@ -1,2 +1,2 @@
 # shellcheck disable=SC2154
-mavlink start -x -u 14558 -r 4000000 -m onboard -o 14541 # add mavlink stream for SDK
+mavlink start -x -u 14558 -r 4000000 -m onboard -o 14541 -p # add mavlink stream for SDK
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (RTPS)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
@@ -1,4 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-micrortps_client start -t UDP -r $((2019+2*px4_instance)) -s $((2020+2*px4_instance))
@@ -7,15 +7,12 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	# EKF2
-	param set EKF2_AID_MASK 2
-	param set SENS_FLOW_ROT 0
+# EKF2
+param set-default EKF2_AID_MASK 2
+param set-default SENS_FLOW_ROT 0

-	# LPE: Flow-only mode
-	param set LPE_FUSION 242
-	param set LPE_FAKE_ORIGIN 1
+# LPE: Flow-only mode
+param set-default LPE_FUSION 242
+param set-default LPE_FAKE_ORIGIN 1

-	param set MPC_ALT_MODE 2
-fi
+param set-default MPC_ALT_MODE 2
@@ -7,9 +7,6 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	# EKF2: Vision velocity and heading
-	param set EKF2_AID_MASK 272
-	param set EKF2_EV_DELAY 5
-fi
+# EKF2: Vision velocity and heading
+param set-default EKF2_AID_MASK 272
+param set-default EKF2_EV_DELAY 5
@@ -7,8 +7,5 @@

 . ${R}etc/init.d-posix/airframes/10016_iris

-if [ $AUTOCNF = yes ]
-then
-	# EKF2: Multi GPS blending
-	param set EKF2_GPS_MASK 7 # Uses speed, hpos and vpos accuracy
-fi
+# EKF2: Multi GPS blending
+param set-default SENS_GPS_MASK 7
@@ -5,16 +5,13 @@

 . ${R}etc/init.d/rc.uuv_defaults

-if [ $AUTOCNF = yes ]
-then
-	#Set data link loss failsafe mode (0: disabled)
-	param set NAV_DLL_ACT 0
+#Set data link loss failsafe mode (0: disabled)
+param set-default NAV_DLL_ACT 0

-	# disable circuit breaker for airspeed sensor
-	param set CBRK_AIRSPD_CHK 162128
+# disable circuit breaker for airspeed sensor
+param set-default CBRK_AIRSPD_CHK 162128

-	#param set CBRK_GPSFAIL 240024
-fi
+#param set CBRK_GPSFAIL 240024

 set MAV_TYPE 12
 param set MAV_TYPE ${MAV_TYPE}
@@ -5,16 +5,13 @@

 . ${R}etc/init.d/rc.uuv_defaults

-if [ $AUTOCNF = yes ]
-then
-	#Set data link loss failsafe mode (0: disabled)
-	param set NAV_DLL_ACT 0
+#Set data link loss failsafe mode (0: disabled)
+param set-default NAV_DLL_ACT 0

-	# disable circuit breaker for airspeed sensor
-	param set CBRK_AIRSPD_CHK 162128
+# disable circuit breaker for airspeed sensor
+param set-default CBRK_AIRSPD_CHK 162128

-	#param set CBRK_GPSFAIL 240024
-fi
+#param set CBRK_GPSFAIL 240024

 set MAV_TYPE 12
 param set MAV_TYPE ${MAV_TYPE}
@@ -5,15 +5,11 @@

 . ${R}etc/init.d/rc.uuv_defaults

-if [ $AUTOCNF = yes ]
-then
-	#Set data link loss failsafe mode (0: disabled)
-	param set NAV_DLL_ACT 0
+#Set data link loss failsafe mode (0: disabled)
+param set-default NAV_DLL_ACT 0

-	# disable circuit breaker for airspeed sensor
-	param set CBRK_AIRSPD_CHK 162128
-
-fi
+# disable circuit breaker for airspeed sensor
+param set-default CBRK_AIRSPD_CHK 162128

 set PWM_OUT 12345678
 set MIXER_FILE etc/mixers-sitl/vectored6dof_sitl.main.mix
@@ -5,43 +5,50 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set EKF2_ARSP_THR 8
-	param set EKF2_FUSE_BETA 1
-	param set EKF2_MAG_ACCLIM 0
-	param set EKF2_MAG_YAWLIM 0
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+param set-default EKF2_MAG_ACCLIM 0
+param set-default EKF2_MAG_YAWLIM 0

-	param set FW_LND_AIRSPD_SC 1
-	param set FW_LND_ANG 8
-	param set FW_THR_LND_MAX 0
+param set-default FW_LND_AIRSPD_SC 1
+param set-default FW_LND_ANG 8
+param set-default FW_THR_LND_MAX 0

-	param set FW_L1_PERIOD 15
+param set-default FW_L1_PERIOD 12

-	param set FW_P_TC 0.5
-	param set FW_PR_FF 0.40
-	param set FW_PR_I 0.05
-	param set FW_PR_P 0.05
+param set-default FW_MAN_P_MAX 30

-	param set FW_R_TC 0.7
-	param set FW_RR_FF 0.20
-	param set FW_RR_I 0.02
-	param set FW_RR_P 0.22
+param set-default FW_PR_I 0.4
+param set-default FW_PR_P 0.9
+param set-default FW_PR_FF 0.2
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+param set-default FW_P_LIM_MIN -15

-	param set FW_L1_PERIOD 12
+param set-default FW_RR_FF 0.1
+param set-default FW_RR_P 0.3

-	param set FW_W_EN 1
+param set-default FW_THR_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_THR_CRUISE 0.25

-	param set MIS_LTRMIN_ALT 30
-	param set MIS_TAKEOFF_ALT 30
+param set-default FW_T_ALT_TC 2
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_HRATE_FF 0.5
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+param set-default FW_T_TAS_TC 2

-	param set NAV_ACC_RAD 15
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 50
+param set-default FW_W_EN 1

-	param set RWTO_TKOFF 1
+param set-default MIS_LTRMIN_ALT 30
+param set-default MIS_TAKEOFF_ALT 30

-fi
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 50
+
+param set-default RWTO_TKOFF 1

 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom
@@ -5,10 +5,8 @@

 . ${R}etc/init.d-posix/airframes/1030_plane

-if [ $AUTOCNF = yes ]
-then
-	# Camera trigger interface is MAVLink
-	param set TRIG_INTERFACE 3
-	# Distance trigger mode enabled
-	param set TRIG_MODE 4
-fi
+# Camera trigger interface is MAVLink
+param set-default TRIG_INTERFACE 3
+
+# Distance trigger mode enabled
+param set-default TRIG_MODE 4
@@ -5,8 +5,5 @@

 . ${R}etc/init.d-posix/airframes/1030_plane

-if [ $AUTOCNF = yes ]
-then
-	param set RWTO_TKOFF 0
+param set-default RWTO_TKOFF 0

-fi
@@ -5,8 +5,5 @@

 . ${R}etc/init.d-posix/airframes/1030_plane

-if [ $AUTOCNF = yes ]
-then
-	param set FW_LND_USETER 1
+param set-default FW_LND_USETER 1

-fi
@@ -5,54 +5,55 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set EKF2_ARSP_THR 8
-	param set EKF2_FUSE_BETA 1
-	#param set EKF2_MAG_ACCLIM 0
-	#param set EKF2_MAG_YAWLIM 0
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1

-	param set FW_LND_AIRSPD_SC 1.1
-	param set FW_LND_ANG 5
-	param set FW_THR_LND_MAX 0
-	param set FW_LND_HHDIST 30
-	param set FW_LND_FL_PMIN 9.5
-	param set FW_LND_FL_PMAX 20
-	param set FW_LND_FLALT 5
-	param set FW_LND_TLALT 15
+param set-default FW_LND_AIRSPD_SC 1.1
+param set-default FW_LND_ANG 5
+param set-default FW_THR_LND_MAX 0
+param set-default FW_LND_HHDIST 30
+param set-default FW_LND_FL_PMIN 9.5
+param set-default FW_LND_FL_PMAX 20
+param set-default FW_LND_FLALT 5
+param set-default FW_LND_TLALT 15

-	param set FW_L1_PERIOD 25
+param set-default FW_L1_PERIOD 25

-	param set FW_P_TC 0.4
-	param set FW_PR_FF 0.40
-	param set FW_PR_I 0.05
-	param set FW_PR_P 0.05
+param set-default FW_P_TC 0.4
+param set-default FW_PR_FF 0.40
+param set-default FW_PR_I 0.05
+param set-default FW_PR_P 0.05

-	param set FW_R_TC 0.45
-	param set FW_RR_FF 0.40
-	param set FW_RR_I 0.132
-	param set FW_RR_P 0.085
+param set-default FW_R_TC 0.45
+param set-default FW_RR_FF 0.40
+param set-default FW_RR_I 0.132
+param set-default FW_RR_P 0.085

-	param set FW_W_EN 1
+param set-default FW_W_EN 1

-	param set MIS_LTRMIN_ALT 30
-	param set MIS_TAKEOFF_ALT 20
-	param set MIS_DIST_1WP 2500
-	param set MIS_DIST_WPS 10000
+param set-default MIS_LTRMIN_ALT 30
+param set-default MIS_TAKEOFF_ALT 20
+param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000

-	param set NAV_ACC_RAD 15
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 50
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 50

-	param set RWTO_TKOFF 1
-	#param set FW_THR_SLEW_MAX 0.3 # fix takeoff failure for JSBsim in autonomous mission mode.
-	param set RWTO_MAX_PITCH 20
-	param set RWTO_MAX_ROLL 10
-	#param set RWTO_MAX_THR 0.6		# fix takeoff failure for JSBsim in autonomous mission mode.
-	param set RWTO_PSP 8
-	param set RWTO_AIRSPD_SCL 1.8
+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

-fi

 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom
@@ -5,54 +5,54 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set EKF2_ARSP_THR 8
-	param set EKF2_FUSE_BETA 1
-	#param set EKF2_MAG_ACCLIM 0
-	#param set EKF2_MAG_YAWLIM 0
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1

-	param set FW_LND_AIRSPD_SC 1.1
-	param set FW_LND_ANG 5
-	param set FW_THR_LND_MAX 0
-	param set FW_LND_HHDIST 30
-	param set FW_LND_FL_PMIN 9.5
-	param set FW_LND_FL_PMAX 20
-	param set FW_LND_FLALT 5
-	param set FW_LND_TLALT 15
+param set-default FW_LND_AIRSPD_SC 1.1
+param set-default FW_LND_ANG 5
+param set-default FW_THR_LND_MAX 0
+param set-default FW_LND_HHDIST 30
+param set-default FW_LND_FL_PMIN 9.5
+param set-default FW_LND_FL_PMAX 20
+param set-default FW_LND_FLALT 5
+param set-default FW_LND_TLALT 15

-	param set FW_L1_PERIOD 25
+param set-default FW_L1_PERIOD 25

-	param set FW_P_TC 0.4
-	param set FW_PR_FF 0.40
-	param set FW_PR_I 0.05
-	param set FW_PR_P 0.05
+param set-default FW_P_TC 0.4
+param set-default FW_PR_FF 0.40
+param set-default FW_PR_I 0.05
+param set-default FW_PR_P 0.05

-	param set FW_R_TC 0.45
-	param set FW_RR_FF 0.40
-	param set FW_RR_I 0.132
-	param set FW_RR_P 0.085
+param set-default FW_R_TC 0.45
+param set-default FW_RR_FF 0.40
+param set-default FW_RR_I 0.132
+param set-default FW_RR_P 0.085

-	param set FW_W_EN 1
+param set-default FW_W_EN 1

-	param set MIS_LTRMIN_ALT 30
-	param set MIS_TAKEOFF_ALT 20
-	param set MIS_DIST_1WP 2500
-	param set MIS_DIST_WPS 10000
+param set-default MIS_LTRMIN_ALT 30
+param set-default MIS_TAKEOFF_ALT 20
+param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000

-	param set NAV_ACC_RAD 15
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 50
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 50

-	param set RWTO_TKOFF 1
-	#param set FW_THR_SLEW_MAX 0.3 # fix takeoff failure for JSBsim in autonomous mission mode.
-	param set RWTO_MAX_PITCH 20
-	param set RWTO_MAX_ROLL 10
-	#param set RWTO_MAX_THR 0.6		# fix takeoff failure for JSBsim in autonomous mission mode.
-	param set RWTO_PSP 8
-	param set RWTO_AIRSPD_SCL 1.8
+param set-default RWTO_TKOFF 1

-fi
+# 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

 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom
@@ -5,43 +5,39 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set EKF2_ARSP_THR 8
-	param set EKF2_FUSE_BETA 1
-	param set EKF2_MAG_ACCLIM 0
-	param set EKF2_MAG_YAWLIM 0
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1
+param set-default EKF2_MAG_ACCLIM 0
+param set-default EKF2_MAG_YAWLIM 0

-	param set FW_LND_AIRSPD_SC 1
-	param set FW_LND_ANG 8
-	param set FW_THR_LND_MAX 0
+param set-default FW_LND_AIRSPD_SC 1
+param set-default FW_LND_ANG 8
+param set-default FW_THR_LND_MAX 0

-	param set FW_L1_PERIOD 15
+param set-default FW_L1_PERIOD 15

-	param set FW_P_TC 0.5
-	param set FW_PR_FF 0.40
-	param set FW_PR_I 0.05
-	param set FW_PR_P 0.05
+param set-default FW_P_TC 0.5
+param set-default FW_PR_FF 0.40
+param set-default FW_PR_I 0.05
+param set-default FW_PR_P 0.05

-	param set FW_R_TC 0.7
-	param set FW_RR_FF 0.20
-	param set FW_RR_I 0.02
-	param set FW_RR_P 0.22
+param set-default FW_R_TC 0.7
+param set-default FW_RR_FF 0.20
+param set-default FW_RR_I 0.02
+param set-default FW_RR_P 0.22

-	param set FW_L1_PERIOD 12
+param set-default FW_L1_PERIOD 12

-	param set FW_W_EN 1
+param set-default FW_W_EN 1

-	param set MIS_LTRMIN_ALT 30
-	param set MIS_TAKEOFF_ALT 30
+param set-default MIS_LTRMIN_ALT 30
+param set-default MIS_TAKEOFF_ALT 30

-	param set NAV_ACC_RAD 15
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 50
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 50

-	param set RWTO_TKOFF 1
-
-fi
+param set-default RWTO_TKOFF 1

 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom
@@ -5,52 +5,46 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set EKF2_ARSP_THR 8
-	param set EKF2_FUSE_BETA 1
-	#param set EKF2_MAG_ACCLIM 0
-	#param set EKF2_MAG_YAWLIM 0
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1

-	param set FW_LND_AIRSPD_SC 1.1
-	param set FW_LND_ANG 5
-	param set FW_THR_LND_MAX 0
-	param set FW_LND_HHDIST 30
-	param set FW_LND_FL_PMIN 9.5
-	param set FW_LND_FL_PMAX 20
-	param set FW_LND_FLALT 5
-	param set FW_LND_TLALT 15
+param set-default FW_LND_AIRSPD_SC 1.1
+param set-default FW_LND_ANG 5
+param set-default FW_THR_LND_MAX 0
+param set-default FW_LND_HHDIST 30
+param set-default FW_LND_FL_PMIN 9.5
+param set-default FW_LND_FL_PMAX 20
+param set-default FW_LND_FLALT 5
+param set-default FW_LND_TLALT 15

-	param set FW_L1_PERIOD 25
+param set-default FW_L1_PERIOD 25

-	param set FW_P_TC 0.4
-	param set FW_PR_FF 0.40
-	param set FW_PR_I 0.05
-	param set FW_PR_P 0.05
+param set-default FW_P_TC 0.4
+param set-default FW_PR_FF 0.40
+param set-default FW_PR_I 0.05
+param set-default FW_PR_P 0.05

-	param set FW_R_TC 0.45
-	param set FW_RR_FF 0.40
-	param set FW_RR_I 0.132
-	param set FW_RR_P 0.085
+param set-default FW_R_TC 0.45
+param set-default FW_RR_FF 0.40
+param set-default FW_RR_I 0.132
+param set-default FW_RR_P 0.085

-	param set FW_W_EN 1
+param set-default FW_W_EN 1

-	param set MIS_LTRMIN_ALT 30
-	param set MIS_TAKEOFF_ALT 20
-	param set MIS_DIST_1WP 2500
-	param set MIS_DIST_WPS 10000
+param set-default MIS_LTRMIN_ALT 30
+param set-default MIS_TAKEOFF_ALT 20
+param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000

-	param set NAV_ACC_RAD 15
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 50
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 50

-	param set RWTO_TKOFF 1
-	param set RWTO_MAX_PITCH 20
-	param set RWTO_MAX_ROLL 10
-	param set RWTO_PSP 8
-	param set RWTO_AIRSPD_SCL 1.8
-
-fi
+param set-default RWTO_TKOFF 1
+param set-default RWTO_MAX_PITCH 20
+param set-default RWTO_MAX_ROLL 10
+param set-default RWTO_PSP 8
+param set-default RWTO_AIRSPD_SCL 1.8

 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom
@@ -7,44 +7,46 @@

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set FW_AIRSPD_MAX 25
-	param set FW_AIRSPD_MIN 14
-	param set FW_AIRSPD_TRIM 16
-	param set FW_L1_PERIOD 12
+param set-default FW_L1_PERIOD 12
+param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_FF 0.2
+param set-default FW_PR_I 0.4
+param set-default FW_PR_P 0.9
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+param set-default FW_P_LIM_MIN -15
+param set-default FW_RR_FF 0.1
+param set-default FW_RR_P 0.3
+param set-default FW_THR_CRUISE 0.25
+param set-default FW_THR_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_T_ALT_TC 2
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_HRATE_FF 0.5
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+param set-default FW_T_TAS_TC 2

-	param set FW_RR_FF 0.1
-	param set FW_RR_P 0.01
+param set-default MC_ROLLRATE_P 0.3
+param set-default MC_YAW_P 1.6

-	param set MC_ROLLRATE_P 0.3
+param set-default MIS_TAKEOFF_ALT 10

-	param set MIS_LTRMIN_ALT 10
-	param set MIS_TAKEOFF_ALT 10
-	param set MIS_YAW_TMT 10
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_XY_P 0.8
+param set-default MPC_XY_VEL_P_ACC 3
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_D_ACC 0.1

-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_THR_HOVER 0.58
-	param set MPC_TKO_SPEED 1
-	param set MPC_XY_P 0.8
-	param set MPC_XY_VEL_P_ACC 3
-	param set MPC_XY_VEL_I_ACC 4
-	param set MPC_XY_VEL_D_ACC 0.1
-	param set MPC_Z_VEL_MAX_DN 1.5
+param set-default NAV_ACC_RAD 5
+param set-default NAV_LOITER_RAD 80

-	param set NAV_ACC_RAD 5
-	param set NAV_LOITER_RAD 80
-
-	param set VT_F_TRANS_DUR 5
-	param set VT_F_TRANS_THR 0.75
-	param set VT_ARSP_TRANS 16
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_TYPE 2
-	param set VT_B_TRANS_DUR 8
-
-fi
+param set-default VT_FWD_THRUST_EN 4
+param set-default VT_F_TRANS_THR 0.75
+param set-default VT_MOT_ID 1234
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_B_TRANS_DUR 8
+param set-default VT_TYPE 2

 set MAV_TYPE 22

@@ -7,36 +7,40 @@

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set FW_AIRSPD_MAX 25
-	param set FW_AIRSPD_MIN 14
-	param set FW_AIRSPD_TRIM 16
-	param set FW_L1_PERIOD 12
+param set-default FW_L1_PERIOD 12
+param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_I 0.2
+param set-default FW_PR_P 0.3
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+param set-default FW_P_LIM_MIN -15
+param set-default FW_RR_P 0.3
+param set-default FW_THR_CRUISE 0.33
+param set-default FW_THR_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_T_ALT_TC 2
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_HRATE_FF 0.5
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+param set-default FW_T_TAS_TC 2

-	param set MC_ROLLRATE_P 0.3
+param set-default MC_ROLLRATE_P 0.3

-	param set MIS_YAW_TMT 10
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_XY_P 0.8
+param set-default MPC_XY_VEL_P_ACC 3
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_D_ACC 0.1

-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_THR_MIN 0.3
-	param set MPC_XY_P 0.15
-	param set MPC_XY_VEL_D_ACC 0.1
-	param set MPC_XY_VEL_P_ACC 1
-	param set MPC_Z_VEL_MAX_DN 1.5
-	param set MPC_Z_VEL_P_ACC 16
+param set-default NAV_ACC_RAD 5
+param set-default NAV_LOITER_RAD 80

-	param set NAV_ACC_RAD 5
-	param set NAV_LOITER_RAD 80
+param set-default VT_F_TRANS_DUR 1.5
+param set-default VT_F_TRANS_THR 0.7
+param set-default VT_TYPE 0

-	param set VT_F_TRANS_DUR 1.5
-	param set VT_F_TRANS_THR 0.7
-	param set VT_TYPE 0
-
-	param set WV_EN 0
-
-fi
+param set-default WV_EN 0

 set MAV_TYPE 20

@@ -7,37 +7,44 @@

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set FW_L1_PERIOD 12
-	param set FW_MAN_P_MAX 30
-	param set FW_PR_FF 0.2
-	param set FW_PR_I 0.4
-	param set FW_PR_P 0.9
-	param set FW_PSP_OFF 3
-	param set FW_RR_FF 0.1
-	param set FW_RR_P 0.3
+param set-default FW_L1_PERIOD 12
+param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_FF 0.2
+param set-default FW_PR_I 0.4
+param set-default FW_PR_P 0.9
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+param set-default FW_P_LIM_MIN -15
+param set-default FW_RR_FF 0.1
+param set-default FW_RR_P 0.3
+param set-default FW_THR_CRUISE 0.38
+param set-default FW_THR_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_T_ALT_TC 2
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_HRATE_FF 0.5
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+param set-default FW_T_TAS_TC 2

-	param set MC_YAW_P 1.6
+param set-default MC_YAW_P 1.6

-	param set MIS_TAKEOFF_ALT 10
+param set-default MIS_TAKEOFF_ALT 10

-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_XY_P 0.8
-	param set MPC_XY_VEL_P_ACC 3
-	param set MPC_XY_VEL_I_ACC 4
-	param set MPC_XY_VEL_D_ACC 0.1
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_XY_P 0.8
+param set-default MPC_XY_VEL_P_ACC 3
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_D_ACC 0.1

-	param set NAV_LOITER_RAD 100
+param set-default NAV_ACC_RAD 5
+param set-default NAV_LOITER_RAD 80

-	param set VT_B_TRANS_DUR 8
-	param set VT_ELEV_MC_LOCK 0
-	param set VT_FWD_THRUST_EN 4
-	param set VT_MOT_ID 1234
-	param set VT_TILT_TRANS 0.6
-	param set VT_TYPE 1
-
-fi
+param set-default VT_B_TRANS_DUR 8
+param set-default VT_FWD_THRUST_EN 4
+param set-default VT_MOT_ID 1234
+param set-default VT_TILT_TRANS 0.6
+param set-default VT_TYPE 1

 set MAV_TYPE 21

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# @name Standard VTOL
+#
+# @type Standard VTOL
+#
+
+. ${R}etc/init.d/rc.vtol_defaults
+
+param set-default FW_L1_PERIOD 12
+param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_FF 0.2
+param set-default FW_PR_I 0.4
+param set-default FW_PR_P 0.9
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+param set-default FW_P_LIM_MIN -15
+param set-default FW_RR_FF 0.1
+param set-default FW_RR_P 0.3
+param set-default FW_THR_CRUISE 0.25
+param set-default FW_THR_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_T_ALT_TC 2
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_HRATE_FF 0.5
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+param set-default FW_T_TAS_TC 2
+
+param set-default MC_ROLLRATE_P 0.3
+param set-default MC_YAW_P 1.6
+
+param set-default MIS_TAKEOFF_ALT 10
+
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_XY_P 0.8
+param set-default MPC_XY_VEL_P_ACC 3
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_D_ACC 0.1
+
+param set-default NAV_ACC_RAD 5
+param set-default NAV_LOITER_RAD 80
+
+param set-default VT_FWD_THRUST_EN 4
+param set-default VT_F_TRANS_THR 0.75
+param set-default VT_MOT_ID 1234
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_B_TRANS_DUR 8
+param set-default VT_TYPE 2
+
+param set-default RC_MAP_AUX1 8
+param set-default RC_MAP_AUX2 9
+param set-default RC_MAP_AUX3 10
+
+set MAV_TYPE 22
+
+set MIXER_FILE etc/mixers-sitl/standard_vtol_sitl.main.mix
+set MIXER custom
@@ -0,0 +1 @@
+mixer append /dev/pwm_output0 etc/mixers-sitl/package_drop.aux.mix
@@ -5,32 +5,28 @@

 . ${R}etc/init.d/rc.rover_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set GND_L1_DIST 5
-	param set GND_SP_CTRL_MODE 1
-	param set GND_SPEED_D 0.001
-	param set GND_SPEED_I 3
-	param set GND_SPEED_IMAX 0.125
-	param set GND_SPEED_P 0.25
-	param set GND_SPEED_THR_SC 1
-	param set GND_SPEED_TRIM 4
-	param set GND_THR_CRUISE 0.3
-	param set GND_THR_IDLE 0
-	param set GND_THR_MAX 0.5
-	param set GND_THR_MIN 0
+param set-default GND_L1_DIST 5
+param set-default GND_L1_PERIOD 10
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_D 0.001
+param set-default GND_SPEED_I 3
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_THR_SC 1
+param set-default GND_SPEED_TRIM 4
+param set-default GND_THR_CRUISE 0.3
+param set-default GND_THR_MAX 0.5
+param set-default GND_THR_MIN 0

-	param set MIS_LTRMIN_ALT 0.01
-	param set MIS_TAKEOFF_ALT 0.01
-	param set NAV_ACC_RAD 0.5
-	param set NAV_LOITER_RAD 2
+param set-default MIS_LTRMIN_ALT 0.01
+param set-default MIS_TAKEOFF_ALT 0.01
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2

-	param set CBRK_AIRSPD_CHK 162128
+param set-default CBRK_AIRSPD_CHK 162128

-	param set GND_MAX_ANG 0.6
-	param set GND_WHEEL_BASE 2.0
-
-fi
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 2.0

 set MAV_TYPE 10

@@ -6,32 +6,27 @@

 . ${R}etc/init.d/rc.rover_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set GND_L1_DIST 5
-	param set GND_SP_CTRL_MODE 1
-	param set GND_SPEED_D 3
-	param set GND_SPEED_I 0.001
-	param set GND_SPEED_IMAX 0.125
-	param set GND_SPEED_P 0.25
-	param set GND_SPEED_THR_SC 1
-	param set GND_SPEED_TRIM 4
-	param set GND_THR_CRUISE 0.3
-	param set GND_THR_IDLE 0
-	param set GND_THR_MAX 0.5
-	param set GND_THR_MIN 0
+param set-default GND_L1_DIST 5
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_D 3
+param set-default GND_SPEED_I 0.001
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_THR_SC 1
+param set-default GND_SPEED_TRIM 4
+param set-default GND_THR_CRUISE 0.3
+param set-default GND_THR_MAX 0.5
+param set-default GND_THR_MIN 0

-	param set MIS_LTRMIN_ALT 0.01
-	param set MIS_TAKEOFF_ALT 0.01
-	param set NAV_ACC_RAD 0.5
-	param set NAV_LOITER_RAD 2
+param set-default MIS_LTRMIN_ALT 0.01
+param set-default MIS_TAKEOFF_ALT 0.01
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2

-	param set CBRK_AIRSPD_CHK 162128
+param set-default CBRK_AIRSPD_CHK 162128

-	param set GND_MAX_ANG 0.6
-	param set GND_WHEEL_BASE 2.0
-
-fi
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 2.0

 set MAV_TYPE 10

@@ -10,33 +10,28 @@

 . ${R}etc/init.d/rc.rover_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set GND_L1_DIST 5
-	param set GND_SP_CTRL_MODE 1
-	param set GND_SPEED_D 3
-	param set GND_SPEED_I 0.001
-	param set GND_SPEED_IMAX 0.125
-	param set GND_SPEED_P 0.25
-	param set GND_SPEED_THR_SC 1
-	param set GND_SPEED_TRIM 15
-	param set GND_SPEED_MAX 25
-	param set GND_THR_CRUISE 0.3
-	param set GND_THR_IDLE 0
-	param set GND_THR_MAX 0.5
-	param set GND_THR_MIN 0
+param set-default GND_L1_DIST 5
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_D 3
+param set-default GND_SPEED_I 0.001
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_THR_SC 1
+param set-default GND_SPEED_TRIM 15
+param set-default GND_SPEED_MAX 25
+param set-default GND_THR_CRUISE 0.3
+param set-default GND_THR_MAX 0.5
+param set-default GND_THR_MIN 0

-	param set MIS_LTRMIN_ALT 0.01
-	param set MIS_TAKEOFF_ALT 0.01
-	param set NAV_ACC_RAD 0.5
-	param set NAV_LOITER_RAD 2
+param set-default MIS_LTRMIN_ALT 0.01
+param set-default MIS_TAKEOFF_ALT 0.01
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2

-	param set CBRK_AIRSPD_CHK 162128
+param set-default CBRK_AIRSPD_CHK 162128

-	param set GND_MAX_ANG 0.6
-	param set GND_WHEEL_BASE 3.0
-
-fi
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 3.0

 set MAV_TYPE 10

@@ -5,32 +5,28 @@

 . ${R}etc/init.d/rc.boat_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set GND_L1_DIST 5
-	param set GND_SP_CTRL_MODE 1
-	param set GND_SPEED_D 0.001
-	param set GND_SPEED_I 3
-	param set GND_SPEED_IMAX 0.125
-	param set GND_SPEED_P 0.25
-	param set GND_SPEED_THR_SC 1
-	param set GND_SPEED_TRIM 4
-	param set GND_THR_CRUISE 0.3
-	param set GND_THR_IDLE 0
-	param set GND_THR_MAX 0.5
-	param set GND_THR_MIN 0
+param set-default GND_L1_DIST 5
+param set-default GND_L1_PERIOD 100
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_D 0.001
+param set-default GND_SPEED_I 8
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_P 2
+param set-default GND_SPEED_THR_SC 1
+param set-default GND_SPEED_TRIM 1
+param set-default GND_THR_CRUISE 0.85
+param set-default GND_THR_MAX 1
+param set-default GND_THR_MIN 0

-	param set MIS_LTRMIN_ALT 0.01
-	param set MIS_TAKEOFF_ALT 0.01
-	param set NAV_ACC_RAD 0.5
-	param set NAV_LOITER_RAD 2
+param set-default MIS_LTRMIN_ALT 0.01
+param set-default MIS_TAKEOFF_ALT 0.01
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2

-	param set CBRK_AIRSPD_CHK 162128
+param set-default CBRK_AIRSPD_CHK 162128

-	param set GND_MAX_ANG 0.6
-	param set GND_WHEEL_BASE 2.0
-
-fi
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 2.0

 set MAV_TYPE 11

@@ -12,53 +12,48 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set EKF2_ARSP_THR 8
-	param set EKF2_FUSE_BETA 1
-	param set ASPD_STALL 10.0
+param set-default EKF2_ARSP_THR 8
+param set-default EKF2_FUSE_BETA 1

-	param set FW_P_RMAX_NEG 20.0
-	param set FW_P_RMAX_POS 60.0
-	param set FW_W_RMAX 10
-	param set FW_W_EN 1
+param set-default FW_AIRSPD_STALL 8

-	param set FW_PR_IMAX 0.4
-	param set FW_R_TC 0.4
-	param set FW_RR_FF 0.5
-	param set FW_RR_I 0.1
-	param set FW_RR_IMAX 0.2
-	param set FW_RR_P 0.08
+param set-default 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 MIS_LTRMIN_ALT 50
-	param set MIS_TAKEOFF_ALT 3
+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 NAV_ACC_RAD 20
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 100
+param set-default MIS_LTRMIN_ALT 50
+param set-default MIS_TAKEOFF_ALT 3

-	param set RWTO_TKOFF 1
-	param set MAV_BROADCAST 1
+param set-default NAV_ACC_RAD 20
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 100

-	param set FW_ARSP_SCALE_EN 0
+param set-default RWTO_TKOFF 1

-	param set FW_AIRSPD_MAX 35
-	param set FW_AIRSPD_MIN 7
-	param set FW_AIRSPD_TRIM 15
+param set-default FW_ARSP_SCALE_EN 0

-	param set FW_P_LIM_MAX 25
-	param set FW_P_LIM_MIN -5
-	param set FW_R_LIM 30
+param set-default FW_AIRSPD_MAX 35
+param set-default FW_AIRSPD_MIN 7
+param set-default FW_AIRSPD_TRIM 15

-	param set FW_MAN_P_MAX 30.0
-	param set FW_MAN_R_MAX 30.0
+param set-default FW_P_LIM_MAX 25
+param set-default FW_P_LIM_MIN -5
+param set-default FW_R_LIM 30

-	param set FW_THR_CRUISE 0.8
-	param set FW_THR_IDLE 0
-	param set COM_DISARM_PRFLT 0
-
-fi
+param set-default FW_MAN_P_MAX 30.0
+param set-default FW_MAN_R_MAX 30.0

+param set-default FW_THR_CRUISE 0.8
+param set-default FW_THR_IDLE 0
+param set-default COM_DISARM_PRFLT 0

 set MIXER_FILE etc/mixers-sitl/autogyro_sitl.main.mix
 set MIXER custom
@@ -9,26 +9,21 @@

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_PITCHRATE_P 0.1
-	param set MC_PITCHRATE_I 0.05
-	param set MC_PITCH_P 6.0
-	param set MC_ROLLRATE_P 0.15
-	param set MC_ROLLRATE_I 0.1
-	param set MC_ROLL_P 6.0
-	param set MPC_XY_VEL_I_ACC 4
-	param set MPC_XY_VEL_P_ACC 3
+param set-default MC_PITCHRATE_P 0.1
+param set-default MC_PITCHRATE_I 0.05
+param set-default MC_PITCH_P 6.0
+param set-default MC_ROLLRATE_P 0.15
+param set-default MC_ROLLRATE_I 0.1
+param set-default MC_ROLL_P 6.0
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_P_ACC 3

-	param set RTL_DESCEND_ALT 10
-	param set RTL_LAND_DELAY 0
+param set-default RTL_DESCEND_ALT 10

-	param set TRIG_INTERFACE 3
-	param set TRIG_MODE 4
-	param set MNT_MODE_IN 4
-	param set MNT_DO_STAB 2
-	param set MAV_PROTO_VER 2
-fi
+param set-default TRIG_INTERFACE 3
+param set-default TRIG_MODE 4
+param set-default MNT_MODE_IN 4
+param set-default MNT_DO_STAB 2

 set MAV_TYPE 13

@@ -7,25 +7,24 @@

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_PITCHRATE_P 0.1
-	param set MC_PITCHRATE_I 0.05
-	param set MC_PITCH_P 6.0
-	param set MC_ROLLRATE_P 0.15
-	param set MC_ROLLRATE_I 0.1
-	param set MC_ROLL_P 6.0
-	param set MPC_XY_VEL_I_ACC 4
-	param set MPC_XY_VEL_P_ACC 3
+param set-default 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

-	param set RTL_DESCEND_ALT 10
-	param set RTL_LAND_DELAY 0
+param set-default RTL_DESCEND_ALT 10

-	param set TRIG_INTERFACE 3
-	param set TRIG_MODE 4
-	param set MNT_MODE_IN 0
-	param set MAV_PROTO_VER 2
-fi
+param set-default TRIG_INTERFACE 3
+param set-default TRIG_MODE 4
+param set-default MNT_MODE_IN 4
+param set-default MNT_MODE_OUT 2
+param set-default MAV_PROTO_VER 2

 set MAV_TYPE 13

@@ -1,7 +1,7 @@

 mixer append /dev/pwm_output0 etc/mixers/mount_legs.aux.mix

-mavlink start -x -u 14558 -r 4000 -f -m onboard -o 14530
+mavlink start -x -u 14558 -r 4000 -f -m onboard -o 14530 -p

 # shellcheck disable=SC2154
 mavlink stream -r 10 -s MOUNT_ORIENTATION -u $udp_gcs_port_local
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# @name Typhoon H480 SITL
+#
+# @type Hexarotor x
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc
+
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_P_ACC 3
+
+param set-default RTL_DESCEND_ALT 10
+param set-default RTL_LAND_DELAY 0
+
+param set-default TRIG_INTERFACE 3
+param set-default TRIG_MODE 4
+param set-default MNT_MODE_IN 0
+param set-default MAV_PROTO_VER 2
+
+param set-default MPC_USE_HTE 0
+
+param set-default VM_MASS 2.66
+param set-default VM_INERTIA_XX 0.06
+param set-default VM_INERTIA_YY 0.06
+param set-default VM_INERTIA_ZZ 0.10
+
+param set-default CA_AIRFRAME 0
+param set-default CA_METHOD 1
+param set-default CA_ACT0_MIN 0.0
+param set-default CA_ACT1_MIN 0.0
+param set-default CA_ACT2_MIN 0.0
+param set-default CA_ACT3_MIN 0.0
+param set-default CA_ACT4_MIN 0.0
+param set-default CA_ACT5_MIN 0.0
+param set-default CA_ACT0_MAX 1.0
+param set-default CA_ACT1_MAX 1.0
+param set-default CA_ACT2_MAX 1.0
+param set-default CA_ACT3_MAX 1.0
+param set-default CA_ACT4_MAX 1.0
+param set-default CA_ACT5_MAX 1.0
+
+param set-default CA_MC_R0_PX 0.0
+param set-default CA_MC_R0_PY 1.0
+param set-default CA_MC_R0_CT 9.5
+param set-default CA_MC_R0_KM -0.05
+param set-default CA_MC_R1_PX 0.0
+param set-default CA_MC_R1_PY -1.0
+param set-default CA_MC_R1_CT 9.5
+param set-default CA_MC_R1_KM 0.05
+param set-default CA_MC_R2_PX 0.866025
+param set-default CA_MC_R2_PY -0.5
+param set-default CA_MC_R2_CT 9.5
+param set-default CA_MC_R2_KM -0.05
+param set-default CA_MC_R3_PX -0.866025
+param set-default CA_MC_R3_PY 0.5
+param set-default CA_MC_R3_CT 9.5
+param set-default CA_MC_R3_KM 0.05
+param set-default CA_MC_R4_PX 0.866025
+param set-default CA_MC_R4_PY 0.5
+param set-default CA_MC_R4_CT 9.5
+param set-default CA_MC_R4_KM 0.05
+param set-default CA_MC_R5_PX -0.866025
+param set-default CA_MC_R5_PY -0.5
+param set-default CA_MC_R5_CT 9.5
+param set-default CA_MC_R5_KM -0.05
+
+set MAV_TYPE 13
+
+# set MIXER hexa_x
+set MIXER direct
@@ -0,0 +1,10 @@
+
+mixer append /dev/pwm_output0 etc/mixers/mount_legs.aux.mix
+
+mavlink start -x -u 14558 -r 4000 -f -m onboard -o 14530 -p
+
+# shellcheck disable=SC2154
+mavlink stream -r 10 -s MOUNT_ORIENTATION -u $udp_gcs_port_local
+# shellcheck disable=SC2154
+mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_offboard_port_local
+mavlink stream -r 10 -s MOUNT_ORIENTATION -u $udp_offboard_port_local
@@ -33,6 +33,8 @@

 px4_add_romfs_files(
 	10016_iris
+	10017_iris_ctrlalloc
+	10018_iris_foggy_lidar
 	10020_if750a
 	10030_px4vision
 	1010_iris_opt_flow
@@ -44,8 +46,6 @@ px4_add_romfs_files(
 	1014_solo
 	1015_iris_obs_avoid
 	1015_iris_obs_avoid.post
-	1016_iris_rtps
-	1016_iris_rtps.post
 	1017_iris_opt_flow_mockup
 	1018_iris_vision_velocity
 	1019_iris_dual_gps
@@ -63,6 +63,8 @@ px4_add_romfs_files(
 	1040_standard_vtol
 	1041_tailsitter
 	1042_tiltrotor
+	1043_standard_vtol_drop
+	1043_standard_vtol_drop.post
 	1060_rover
 	1061_r1_rover
 	1062_tf-r1
@@ -73,4 +75,6 @@ px4_add_romfs_files(
 	2507_cloudship
 	6011_typhoon_h480
 	6011_typhoon_h480.post
+	6012_typhoon_ctrlalloc
+	6012_typhoon_ctrlalloc.post
 )
@@ -0,0 +1,32 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+udp_offboard_port_local=$((14580+px4_instance))
+udp_offboard_port_remote=$((14540+px4_instance))
+[ $px4_instance -gt 9 ] && udp_offboard_port_remote=14549 # use the same ports for more than 10 instances to avoid port overlaps
+udp_onboard_payload_port_local=$((14280+px4_instance))
+udp_onboard_payload_port_remote=$((14030+px4_instance))
+udp_onboard_gimbal_port_local=$((13030+px4_instance))
+udp_onboard_gimbal_port_remote=$((13280+px4_instance))
+udp_gcs_port_local=$((18570+px4_instance))
+
+# GCS link
+mavlink start -x -u $udp_gcs_port_local -r 4000000 -f
+mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u $udp_gcs_port_local
+mavlink stream -r 50 -s LOCAL_POSITION_NED -u $udp_gcs_port_local
+mavlink stream -r 50 -s GLOBAL_POSITION_INT -u $udp_gcs_port_local
+mavlink stream -r 50 -s ATTITUDE -u $udp_gcs_port_local
+mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_gcs_port_local
+mavlink stream -r 50 -s ATTITUDE_TARGET -u $udp_gcs_port_local
+mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u $udp_gcs_port_local
+mavlink stream -r 20 -s RC_CHANNELS -u $udp_gcs_port_local
+mavlink stream -r 10 -s OPTICAL_FLOW_RAD -u $udp_gcs_port_local
+
+# API/Offboard link
+mavlink start -x -u $udp_offboard_port_local -r 4000000 -f -m onboard -o $udp_offboard_port_remote
+
+# Onboard link to camera
+mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $udp_onboard_payload_port_remote
+
+# Onboard link to gimbal
+mavlink start -x -u $udp_onboard_gimbal_port_local -r 400000 -m gimbal -o $udp_onboard_gimbal_port_remote
@@ -0,0 +1,5 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+#param set MAV_SYS_ID $((px4_instance+1))
+#param set IMU_INTEG_RATE 250
@@ -0,0 +1,20 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+simulator_tcp_port=$((4560+px4_instance))
+
+# Check if PX4_SIM_HOSTNAME environment variable is empty
+# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
+# If both are empty use localhost for simulator
+if [ -z "${PX4_SIM_HOSTNAME}" ]; then
+  if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
+    echo "PX4 SIM HOST: localhost"
+    simulator start -c $simulator_tcp_port
+  else
+    echo "PX4 SIM HOST: $PX4_SIM_HOST_ADDR"
+    simulator start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port
+  fi
+else
+  echo "PX4 SIM HOST: $PX4_SIM_HOSTNAME"
+  simulator start -h $PX4_SIM_HOSTNAME $simulator_tcp_port
+fi
@@ -20,7 +20,6 @@ module: replay
 ignore_others: false
 EOF

-uorb start
 param set SDLOG_DIRS_MAX 7

 # apply all params before ekf starts, as some params cannot be changed after startup
@@ -5,7 +5,8 @@
 # shellcheck disable=SC1091
 . px4-alias.sh

-SCRIPT_DIR="$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)"
+#search path for sourcing px4-rc.*
+PATH="$PATH:${R}etc/init.d-posix"

 #
 # Main SITL startup script
@@ -21,12 +22,14 @@ fi

 # initialize script variables
 set AUX_MODE                    none
+set AUX_BANK2			none
 set IO_PRESENT                  no
 set MAV_TYPE                    none
 set MIXER                       none
 set MIXER_AUX                   none
 set MIXER_FILE                  none
 set OUTPUT_MODE                 sim
+set EXTRA_MIXER_MODE            none
 set PWM_OUT                     none
 set SDCARD_MIXERS_PATH          etc/mixers
 set USE_IO                      no
@@ -43,17 +46,15 @@ else
 	# Find the matching Autostart ID (file name has the form: [0-9]+_${PX4_SIM_MODEL})
 	# TODO: unify with rc.autostart generation
 	# shellcheck disable=SC2012
-	REQUESTED_AUTOSTART=$(ls "$SCRIPT_DIR/airframes" | sed -n 's/^\([0-9][0-9]*\)_'${PX4_SIM_MODEL}'$/\1/p')
+	REQUESTED_AUTOSTART=$(ls "${R}etc/init.d-posix/airframes" | sed -n 's/^\([0-9][0-9]*\)_'${PX4_SIM_MODEL}'$/\1/p')
 	if [ -z "$REQUESTED_AUTOSTART" ]; then
-		echo "Error: Unknown model $PX4_SIM_MODEL (not found by name on $SCRIPT_DIR/airframes)"
+		echo "Error: Unknown model $PX4_SIM_MODEL (not found by name on ${R}etc/init.d-posix/airframes)"
 		exit 1
 	else
 		echo "Info: found model autostart file as SYS_AUTOSTART=$REQUESTED_AUTOSTART"
 	fi
 fi

-uorb start
-
 # Load parameters
 set PARAM_FILE eeprom/parameters_"$REQUESTED_AUTOSTART"
 param select $PARAM_FILE
@@ -98,67 +99,62 @@ then
 	set AUTOCNF yes

 	# Wipe out params except RC*, flight modes, total flight time, accel cal, gyro cal, next flight UUID
-	param reset_all SYS_AUTOSTART SYS_AUTOCONFIG RC* COM_FLTMODE* LND_FLIGHT_T_* TC_* CAL_ACC* CAL_GYRO* COM_FLIGHT_UUID
+	param reset_all SYS_AUTO* RC* COM_FLTMODE* LND_FLIGHT* TC_* CAL_ACC* CAL_GYRO* COM_FLIGHT*
 fi

 # multi-instance setup
 # shellcheck disable=SC2154
 param set MAV_SYS_ID $((px4_instance+1))
-simulator_tcp_port=$((4560+px4_instance))
-udp_offboard_port_local=$((14580+px4_instance))
-udp_offboard_port_remote=$((14540+px4_instance))
-[ $px4_instance -gt 9 ] && udp_offboard_port_remote=14549 # use the same ports for more than 10 instances to avoid port overlaps
-udp_onboard_payload_port_local=$((14280+px4_instance))
-udp_onboard_payload_port_remote=$((14030+px4_instance))
-udp_gcs_port_local=$((18570+px4_instance))

 if [ $AUTOCNF = yes ]
 then
 	param set SYS_AUTOSTART $REQUESTED_AUTOSTART

-	param set BAT_N_CELLS 4
-
-	param set CAL_ACC0_ID 1310988 # 1310988: DRV_IMU_DEVTYPE_SIM, BUS: 1, ADDR: 1, TYPE: SIMULATION
-	param set CAL_ACC1_ID 1310996 # 1310996: DRV_IMU_DEVTYPE_SIM, BUS: 2, ADDR: 1, TYPE: SIMULATION
-	param set CAL_ACC2_ID 1311004 # 1311004: DRV_IMU_DEVTYPE_SIM, BUS: 3, ADDR: 1, TYPE: SIMULATION
+	param set CAL_ACC0_ID  1310988 # 1310988: DRV_IMU_DEVTYPE_SIM, BUS: 1, ADDR: 1, TYPE: SIMULATION
 	param set CAL_GYRO0_ID 1310988 # 1310988: DRV_IMU_DEVTYPE_SIM, BUS: 1, ADDR: 1, TYPE: SIMULATION
+	param set CAL_ACC1_ID  1310996 # 1310996: DRV_IMU_DEVTYPE_SIM, BUS: 2, ADDR: 1, TYPE: SIMULATION
 	param set CAL_GYRO1_ID 1310996 # 1310996: DRV_IMU_DEVTYPE_SIM, BUS: 2, ADDR: 1, TYPE: SIMULATION
+	param set CAL_ACC2_ID  1311004 # 1311004: DRV_IMU_DEVTYPE_SIM, BUS: 3, ADDR: 1, TYPE: SIMULATION
 	param set CAL_GYRO2_ID 1311004 # 1311004: DRV_IMU_DEVTYPE_SIM, BUS: 3, ADDR: 1, TYPE: SIMULATION
+
 	param set CAL_MAG0_ID 197388
 	param set CAL_MAG1_ID 197644

-	param set CBRK_AIRSPD_CHK 0
-	param set CBRK_SUPPLY_CHK 894281
-
-	# Don't require RC calibration and configuration
-	param set COM_RC_IN_MODE 1
-
-	# Speedup SITL startup
-	param set EKF2_REQ_GPS_H 0.5
-
-	# Multi-EKF
-	param set EKF2_MULTI_IMU 3
-	param set SENS_IMU_MODE 0
-	param set EKF2_MULTI_MAG 2
-	param set SENS_MAG_MODE 0
-
-	# By default log from boot until first disarm.
-	param set SDLOG_MODE 1
-	# enable default, estimator replay and vision/avoidance logging profiles
-	param set SDLOG_PROFILE 131
-	param set SDLOG_DIRS_MAX 7
-	param set SENS_BOARD_ROT 0
 	param set SENS_BOARD_X_OFF 0.000001
 	param set SENS_DPRES_OFF 0.001
-	param set SYS_RESTART_TYPE 2

-	param set TRIG_INTERFACE 3
+	param set SYS_RESTART_TYPE 2
 fi

-param set COM_CPU_MAX -1 # disable check, no CPU load reported on posix yet
+param set-default BAT_N_CELLS 4

-# Simulator IMU data provided at 250 Hz
-param set IMU_INTEG_RATE 250
+param set-default CBRK_AIRSPD_CHK 0
+param set-default CBRK_SUPPLY_CHK 894281
+
+# disable check, no CPU load reported on posix yet
+param set-default COM_CPU_MAX -1
+
+# Don't require RC calibration and configuration
+param set-default COM_RC_IN_MODE 1
+
+# Speedup SITL startup
+param set-default EKF2_REQ_GPS_H 0.5
+
+# Multi-EKF
+param set-default EKF2_MULTI_IMU 3
+param set-default SENS_IMU_MODE 0
+param set-default EKF2_MULTI_MAG 2
+param set-default SENS_MAG_MODE 0
+
+param set-default IMU_GYRO_FFT_EN 1
+
+# By default log from boot until first disarm.
+param set-default SDLOG_MODE 1
+# enable default, estimator replay and vision/avoidance logging profiles
+param set-default SDLOG_PROFILE 131
+param set-default SDLOG_DIRS_MAX 7
+
+param set-default TRIG_INTERFACE 3

 # Adapt timeout parameters if simulation runs faster or slower than realtime.
 if [ -n "$PX4_SIM_SPEED_FACTOR" ]; then
@@ -173,6 +169,10 @@ if [ -n "$PX4_SIM_SPEED_FACTOR" ]; then
 	COM_OF_LOSS_T_LONGER=$(echo "$PX4_SIM_SPEED_FACTOR * 0.5" | bc)
 	echo "COM_OF_LOSS_T set to $COM_OF_LOSS_T_LONGER"
 	param set COM_OF_LOSS_T $COM_OF_LOSS_T_LONGER
+
+	COM_OBC_LOSS_T_LONGER=$(echo "$PX4_SIM_SPEED_FACTOR * 5.0" | bc)
+	echo "COM_OBC_LOSS_T set to $COM_OBC_LOSS_T_LONGER"
+	param set COM_OBC_LOSS_T $COM_OBC_LOSS_T_LONGER
 fi

 # Autostart ID
@@ -205,11 +205,17 @@ then
 	param set SYS_AUTOCONFIG 0
 fi

+# Simulator IMU data provided at 250 Hz
+param set IMU_INTEG_RATE 250
+
+#user defined params for instances can be in PATH
+. px4-rc.params
+
 dataman start
 # only start the simulator if not in replay mode, as both control the lockstep time
 if ! replay tryapplyparams
 then
-	simulator start -c $simulator_tcp_port
+  . px4-rc.simulator
 fi
 load_mon start
 battery_simulator start
@@ -219,6 +225,12 @@ sensors start
 commander start
 navigator start

+# Try to start the micrortps_client with UDP transport if module exists
+if px4-micrortps_client status > /dev/null 2>&1
+then
+	# shellcheck disable=SC2154
+	micrortps_client start -t UDP $((2019+2*px4_instance)) -s $((2020+2*px4_instance))
+fi

 if param greater -s MNT_MODE_IN -1
 then
@@ -231,29 +243,24 @@ then
 	camera_feedback start
 fi

+if param compare -s IMU_GYRO_FFT_EN 1
+then
+	gyro_fft start
+fi
+
+if param compare -s IMU_GYRO_CAL_EN 1
+then
+	gyro_calibration start
+fi
+
 # Configure vehicle type specific parameters.
 # Note: rc.vehicle_setup is the entry point for rc.interface,
 #       rc.fw_apps, rc.mc_apps, rc.rover_apps, and rc.vtol_apps.
 #
 . ${R}etc/init.d/rc.vehicle_setup

-# GCS link
-mavlink start -x -u $udp_gcs_port_local -r 4000000
-mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u $udp_gcs_port_local
-mavlink stream -r 50 -s LOCAL_POSITION_NED -u $udp_gcs_port_local
-mavlink stream -r 50 -s GLOBAL_POSITION_INT -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE_TARGET -u $udp_gcs_port_local
-mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u $udp_gcs_port_local
-mavlink stream -r 20 -s RC_CHANNELS -u $udp_gcs_port_local
-mavlink stream -r 10 -s OPTICAL_FLOW_RAD -u $udp_gcs_port_local
-
-# API/Offboard link
-mavlink start -x -u $udp_offboard_port_local -r 4000000 -m onboard -o $udp_offboard_port_remote
-
-# Onboard link to camera
-mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $udp_onboard_payload_port_remote
+#user defined mavlink streams for instances can be in PATH
+. px4-rc.mavlink

 # execute autostart post script if any
 [ -e "$autostart_file".post ] && . "$autostart_file".post
@@ -36,6 +36,8 @@ add_subdirectory(airframes)
 px4_add_romfs_files(
 	rc.airship_apps
 	rc.airship_defaults
+	rc.balloon_apps
+	rc.balloon_defaults
 	rc.boat_defaults
 	rc.fw_apps
 	rc.fw_defaults
@@ -54,4 +56,5 @@ px4_add_romfs_files(
 	rc.vehicle_setup
 	rc.vtol_apps
 	rc.vtol_defaults
+	rc.ctrlalloc
 )
@@ -17,35 +17,43 @@

 . ${R}etc/init.d/rc.fw_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set BAT_N_CELLS 3

-	param set FW_AIRSPD_MAX 20
-	param set FW_AIRSPD_MIN 12
-	param set FW_AIRSPD_TRIM 14
-	param set FW_R_TC 0.3
-	param set FW_P_TC 0.3
-	param set FW_L1_DAMPING 0.74
-	param set FW_L1_PERIOD 16
-	param set FW_LND_ANG 15
-	param set FW_LND_FLALT 5
-	param set FW_LND_HHDIST 15
-	param set FW_LND_HVIRT 13
-	param set FW_LND_TLALT 5
-	param set FW_THR_LND_MAX 0
-	param set FW_PR_FF 0.35
-	param set FW_PR_I 0.1
-	param set FW_PR_IMAX 0.4
-	param set FW_PR_P 0.2
-	param set FW_RR_FF 0.6
-	param set FW_RR_I 0.1
-	param set FW_RR_IMAX 0.2
-	param set FW_RR_P 0.3
+param set-default BAT_N_CELLS 3
+
+param set-default FW_AIRSPD_MAX 20
+param set-default FW_AIRSPD_MIN 12
+param set-default FW_AIRSPD_TRIM 14
+param set-default FW_R_TC 0.3
+param set-default FW_P_TC 0.3
+param set-default FW_L1_DAMPING 0.74
+param set-default FW_L1_PERIOD 16
+param set-default FW_LND_ANG 15
+param set-default FW_LND_FLALT 5
+param set-default FW_LND_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 RWTO_TKOFF 1
-fi

 param set SYS_HITL 1

+# 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
+
 set MIXER AERT
@@ -19,28 +19,25 @@
 #
 # @maintainer Lorenz Meier <lorenz@px4.io>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_ROLL_P 6.5
-	param set MC_ROLLRATE_P 0.1
-	param set MC_ROLLRATE_I 0.05
-	param set MC_ROLLRATE_D 0.0017
-	param set MC_PITCH_P 6.5
-	param set MC_PITCHRATE_P 0.14
-	param set MC_PITCHRATE_I 0.1
-	param set MC_PITCHRATE_D 0.0025
-	param set MC_YAW_P 2.8
-	param set MC_YAWRATE_P 0.28
-	param set MC_YAWRATE_I 0.1
-	param set MC_YAWRATE_D 0
-fi

+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
@@ -17,32 +17,29 @@
 #
 # @maintainer Lorenz Meier <lorenz@px4.io>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	# TODO tune roll/pitch separately
-	param set MC_ROLL_P 7
-	param set MC_ROLLRATE_P 0.15
-	param set MC_ROLLRATE_I 0.05
-	param set MC_ROLLRATE_D 0.004
-	param set MC_PITCH_P 7
-	param set MC_PITCHRATE_P 0.15
-	param set MC_PITCHRATE_I 0.05
-	param set MC_PITCHRATE_D 0.004
-	param set MC_YAW_P 2.5
-	param set MC_YAWRATE_P 0.25
-	param set MC_YAWRATE_I 0.25
-	param set MC_YAWRATE_D 0

-	param set BAT_V_DIV 12.27559
-	param set BAT_A_PER_V 15.39103
-fi
+# 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 BAT_V_DIV 12.27559
+param set-default BAT_A_PER_V 15.39103
 set MIXER quad_w

 set PWM_OUT 1234
@@ -19,30 +19,27 @@
 #
 # @maintainer Lorenz Meier <lorenz@px4.io>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set BAT_N_CELLS 4

-	param set MC_ROLL_P 7
-	param set MC_ROLLRATE_P 0.13
-	param set MC_ROLLRATE_I 0.05
-	param set MC_ROLLRATE_D 0.004
-	param set MC_PITCH_P 7
-	param set MC_PITCHRATE_P 0.19
-	param set MC_PITCHRATE_I 0.05
-	param set MC_PITCHRATE_D 0.004
-	param set MC_YAW_P 4
-	param set MC_YAWRATE_P 0.2
-	param set MC_YAWRATE_I 0.1
-	param set MC_YAWRATE_D 0
-fi
+param set-default BAT_N_CELLS 4

+param set-default MC_ROLL_P 7
+param set-default MC_ROLLRATE_P 0.13
+param set-default MC_ROLLRATE_I 0.05
+param set-default MC_ROLLRATE_D 0.004
+param set-default MC_PITCH_P 7
+param set-default MC_PITCHRATE_P 0.19
+param set-default MC_PITCHRATE_I 0.05
+param set-default MC_PITCHRATE_D 0.004
+param set-default MC_YAW_P 4
+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
@@ -19,35 +19,32 @@
 #
 # @maintainer Simon Wilks <simon@uaventure.com>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set BAT_N_CELLS 6
-	param set BAT_V_EMPTY 3.5

-	param set MC_ROLL_P 7
-	param set MC_ROLLRATE_P 0.08
-	param set MC_ROLLRATE_I 0.02
-	param set MC_ROLLRATE_D 0.003
-	param set MC_PITCH_P 7
-	param set MC_PITCHRATE_P 0.13
-	param set MC_PITCHRATE_I 0.02
-	param set MC_PITCHRATE_D 0.005
-	param set MC_YAW_P 2.8
-	param set MC_YAWRATE_P 0.2
-	param set MC_YAWRATE_I 0.1
-	param set MC_YAWRATE_D 0
+param set-default BAT_N_CELLS 6
+param set-default BAT_V_EMPTY 3.5

-	param set MPC_XY_VEL_MAX 2
+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 PWM_MIN 1080
-fi
+param set-default MPC_XY_VEL_MAX 2

+param set-default PWM_MAIN_MIN 1080
 set MIXER quad_w

 set PWM_OUT 1234
@@ -14,3 +14,12 @@ set MIXER quad_x
 set PWM_OUT 1234

 param set SYS_HITL 1
+
+# 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
@@ -7,64 +7,74 @@
 #
 # @maintainer Roman Bapst <roman@auterion.com>
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set BAT_N_CELLS 3

-	param set COM_RC_IN_MODE 1
+param set-default BAT_N_CELLS 3

-	param set EKF2_AID_MASK 1
-	param set EKF2_ANGERR_INIT 0.01
-	param set EKF2_GBIAS_INIT 0.01
-	param set EKF2_HGT_MODE 0
-	param set EKF2_MAG_TYPE 1
+param set-default COM_RC_IN_MODE 1

-	param set FW_AIRSPD_MAX 25
-	param set FW_AIRSPD_MIN 14
-	param set FW_AIRSPD_TRIM 16
+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 MC_PITCH_P 6
-	param set MC_PITCHRATE_P 0.2
-	param set MC_ROLL_P 6
-	param set MC_ROLLRATE_P 0.3
-	param set MIS_LTRMIN_ALT 10
-	param set MIS_TAKEOFF_ALT 10
-	param set MIS_YAW_TMT 10
+param set-default FW_AIRSPD_MAX 25
+param set-default FW_AIRSPD_MIN 14
+param set-default FW_AIRSPD_TRIM 16

-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_THR_MIN 0.1
-	param set MPC_TKO_SPEED 1
-	param set MPC_XY_P 0.8
-	param set MPC_XY_VEL_D_ACC 0.1
-	param set MPC_XY_VEL_I_ACC 4
-	param set MPC_XY_VEL_P_ACC 3
-	param set MPC_Z_VEL_P_ACC 12
-	param set MPC_Z_VEL_I_ACC 3
-	param set MPC_Z_VEL_MAX_DN 1.5
+param set-default MC_PITCH_P 6
+param set-default MC_PITCHRATE_P 0.2
+param set-default MC_ROLL_P 6
+param set-default MC_ROLLRATE_P 0.3
+param set-default MIS_LTRMIN_ALT 10
+param set-default MIS_TAKEOFF_ALT 10
+param set-default MIS_YAW_TMT 10

-	param set NAV_ACC_RAD 5
-	param set NAV_DLL_ACT 2
-	param set NAV_LOITER_RAD 80
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_THR_MIN 0.1
+param set-default MPC_TKO_SPEED 1
+param set-default MPC_XY_P 0.8
+param set-default MPC_XY_VEL_D_ACC 0.1
+param set-default MPC_XY_VEL_I_ACC 4
+param set-default MPC_XY_VEL_P_ACC 3
+param set-default MPC_Z_VEL_P_ACC 12
+param set-default MPC_Z_VEL_I_ACC 3
+param set-default MPC_Z_VEL_MAX_DN 1.5

-	param set RTL_DESCEND_ALT 10
-	param set RTL_LAND_DELAY 0
-	param set RTL_RETURN_ALT 30
+param set-default NAV_ACC_RAD 5
+param set-default NAV_DLL_ACT 2
+param set-default NAV_LOITER_RAD 80

-	param set SDLOG_DIRS_MAX 7
-	param set SYS_RESTART_TYPE 2
+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
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_TYPE 2

-	param set VT_F_TRANS_THR 0.75
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_TYPE 2
-fi

 param set SYS_HITL 1

+# 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
+
 set MAV_TYPE 22

 set MIXER standard_vtol_hitl
@@ -18,7 +18,6 @@
 #
 # @maintainer Lorenz Meier <lorenz@px4.io>
 #
-# @board intel_aerofc-v1 exclude
 # @board bitcraze_crazyflie exclude
 #

@@ -7,6 +7,8 @@
 #
 # @maintainer Romain Chiappinelli <romain.chiap@gmail.com>
 #
+# @board px4_fmu-v2 exclude
+#

 . ${R}etc/init.d/rc.mc_defaults

@@ -15,3 +17,12 @@ set PWM_OUT 1234

 # set SYS_HITL to 2 to start the SIH and avoid sensors startup
 param set 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
@@ -16,7 +16,6 @@
 #
 # @maintainer Lorenz Meier <lorenz@px4.io>
 #
-# @board intel_aerofc-v1 exclude
 # @board bitcraze_crazyflie exclude
 #

@@ -16,38 +16,35 @@
 #
 # @maintainer Simon Wilks <simon@uaventure.com>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.mc_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_PITCH_P 4
-	param set MC_PITCHRATE_P 0.24
-	param set MC_PITCHRATE_I 0.09
-	param set MC_PITCHRATE_D 0.013
-	param set MC_PITCHRATE_MAX 180

-	param set MC_ROLL_P 4
-	param set MC_ROLLRATE_P 0.16
-	param set MC_ROLLRATE_I 0.07
-	param set MC_ROLLRATE_D 0.009
-	param set MC_ROLLRATE_MAX 180
+param set-default MC_PITCH_P 4
+param set-default MC_PITCHRATE_P 0.24
+param set-default MC_PITCHRATE_I 0.09
+param set-default MC_PITCHRATE_D 0.013
+param set-default MC_PITCHRATE_MAX 180

-	param set MC_YAW_P 3
-	param set MC_YAWRATE_P 0.2
-	param set MC_YAWRATE_I 0.1
-	param set MC_YAWRATE_D 0
+param set-default MC_ROLL_P 4
+param set-default MC_ROLLRATE_P 0.16
+param set-default MC_ROLLRATE_I 0.07
+param set-default MC_ROLLRATE_D 0.009
+param set-default MC_ROLLRATE_MAX 180

-	param set MPC_HOLD_MAX_XY 0.25
-	param set MPC_THR_MIN 0.15
-	param set MPC_Z_VEL_MAX_DN 2
+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 BAT_N_CELLS 4
-fi
+param set-default MPC_HOLD_MAX_XY 0.25
+param set-default MPC_THR_MIN 0.15
+param set-default MPC_Z_VEL_MAX_DN 2

+param set-default BAT_N_CELLS 4
 set MIXER octo_cox_w

 set PWM_OUT 12345678
@@ -17,19 +17,19 @@
 # @output AUX4 Rudder
 # @output AUX5 Throttle
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set PWM_AUX_DIS5 950
-	param set PWM_RATE 400

-	param set VT_TYPE 2
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-fi
+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
+param set-default VT_FW_MOT_OFFID 1234
 set MAV_TYPE 22

 set MIXER quad_x
@@ -12,39 +12,39 @@
 #
 # @maintainer Roman Bapst <roman@px4.io>
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MAV_TYPE 19

-	param set MC_ROLL_P 6
-	param set MC_ROLLRATE_P 0.12
-	param set MC_ROLLRATE_I 0.002
-	param set MC_ROLLRATE_D 0.003
-	param set MC_ROLLRATE_FF 0
+param set-default MAV_TYPE 19

-	param set MC_PITCH_P 4.5
-	param set MC_PITCHRATE_P 0.3
-	param set MC_PITCHRATE_I 0.002
-	param set MC_PITCHRATE_D 0.003
-	param set MC_PITCHRATE_FF 0
+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 MC_YAW_P 3.8
-	param set MC_YAWRATE_P 0.22
-	param set MC_YAWRATE_I 0.02
-	param set MC_YAWRATE_D 0
-	param set MC_YAWRATE_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 VT_IDLE_PWM_MC  1080
-	param set VT_ELEV_MC_LOCK 0
-	param set VT_MOT_ID 12
-	param set VT_TYPE 0
-fi
+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
+param set-default VT_MOT_ID 12
+param set-default VT_TYPE 0
 set MAV_TYPE 19

 set MIXER vtol_tailsitter_duo

-set PWM_OUT 1234
+set PWM_OUT 123456
@@ -18,43 +18,39 @@
 # @output AUX4 Gear
 #
 # @board px4_fmu-v2 exclude
-# @board intel_aerofc-v1 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_ROLL_P 7
-	param set MC_ROLLRATE_P 0.19
-	param set MC_ROLLRATE_I 0.002
-	param set MC_ROLLRATE_D 0.005
-	param set MC_ROLLRATE_FF 0
-	param set MC_PITCH_P 7
-	param set MC_PITCHRATE_P 0.14
-	param set MC_PITCHRATE_I 0.002
-	param set MC_PITCHRATE_D 0.004
-	param set MC_PITCHRATE_FF 0
-	param set MC_YAW_P 4
-	param set MC_YAWRATE_P 0.22
-	param set MC_YAWRATE_I 0.02
-	param set MC_YAWRATE_D 0
-	param set MC_YAWRATE_FF 0

-	param set PWM_RATE 400
+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 VT_FW_MOT_OFFID 34
-	param set VT_IDLE_PWM_MC 1080
-	param set VT_MOT_ID 123456
-	param set VT_FW_MOT_OFFID 56
-	param set VT_TILT_MC 0.08
-	param set VT_TILT_TRANS 0.5
-	param set VT_TILT_FW 0.9
-	param set VT_ELEV_MC_LOCK 0
-	param set VT_TYPE 1
-fi
+param set-default PWM_MAIN_RATE 400

+param set-default VT_FW_MOT_OFFID 34
+param set-default VT_IDLE_PWM_MC 1080
+param set-default VT_MOT_ID 123456
+param set-default VT_FW_MOT_OFFID 56
+param set-default VT_TILT_MC 0.08
+param set-default VT_TILT_TRANS 0.5
+param set-default VT_TILT_FW 0.9
+param set-default VT_ELEV_MC_LOCK 0
+param set-default VT_TYPE 1
 set MAV_TYPE 21

 set MIXER firefly6
@@ -7,22 +7,22 @@
 #
 # @maintainer Roman Bapst <roman@px4.io>
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set PWM_MAX 2000
-	param set PWM_RATE 400

-	param set VT_MOT_ID 1234
-	param set VT_IDLE_PWM_MC  1080
-	param set VT_TYPE 0
-	param set VT_ELEV_MC_LOCK 1
-fi
+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

-set PWM_OUT 1234
+set PWM_OUT 1234
@@ -17,22 +17,18 @@
 # @maintainer Roman Bapst <roman@px4.io>
 #
 # @board px4_fmu-v2 exclude
-# @board intel_aerofc-v1 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set PWM_MAX 2000
-	param set PWM_RATE 400

-	param set VT_IDLE_PWM_MC  1080
-	param set VT_TYPE 0
-	param set VT_ELEV_MC_LOCK 1
-fi
+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
@@ -17,56 +17,53 @@
 # @output AUX4 Rudder
 # @output AUX5 Throttle
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set PWM_AUX_DIS5 950

-	param set PWM_RATE 400
+param set-default PWM_AUX_DIS5 950

-	param set MC_ROLL_P 6
-	param set MC_ROLLRATE_P 0.17
-	param set MC_ROLLRATE_I 0.002
-	param set MC_ROLLRATE_D 0.004
-	param set MC_ROLLRATE_FF 0
-	param set MC_PITCH_P 6
-	param set MC_PITCHRATE_P 0.19
-	param set MC_PITCHRATE_I 0.002
-	param set MC_PITCHRATE_D 0.004
-	param set MC_PITCHRATE_FF 0
-	param set MC_YAW_P 2.8
-	param set MC_YAWRATE_P 0.22
-	param set MC_YAWRATE_I 0.02
-	param set MC_YAWRATE_D 0
-	param set MC_YAWRATE_FF 0
-	param set MC_YAWRATE_MAX 40
+param set-default PWM_MAIN_RATE 400

-	param set MPC_YAWRAUTO_MAX 40
+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 FW_PR_FF 0.5
-	param set FW_PR_I 0.02
-	param set FW_PR_IMAX 0.4
-	param set FW_PR_P 0.08
-	param set FW_RR_FF 0.6
-	param set FW_RR_I 0.01
-	param set FW_RR_IMAX 0.2
-	param set FW_RR_P 0.05
-	param set FW_THR_CRUISE 0.75
+param set-default MPC_YAWRAUTO_MAX 40

-	param set VT_ARSP_BLEND 6
-	param set VT_ARSP_TRANS 12
-	param set VT_F_TRANS_THR 0.75
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_IDLE_PWM_MC 1080
-	param set VT_TYPE 2
-fi
+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
+param set-default VT_ARSP_TRANS 12
+param set-default VT_F_TRANS_THR 0.75
+param set-default VT_MOT_ID 1234
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_IDLE_PWM_MC 1080
+param set-default VT_TYPE 2
 set MAV_TYPE 22

 set MIXER quad_x
@@ -15,46 +15,43 @@
 # @output AUX2 Left elevon
 # @output AUX3 Motor
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_ROLL_P 6.5
-	param set MC_ROLLRATE_P 0.15
-	param set MC_ROLLRATE_I 0.01
-	param set MC_ROLLRATE_D 0.003
-	param set MC_ROLLRATE_FF 0
-	param set MC_PITCH_P 6.5
-	param set MC_PITCHRATE_P 0.15
-	param set MC_PITCHRATE_I 0.01
-	param set MC_PITCHRATE_D 0.003
-	param set MC_PITCHRATE_FF 0
-	param set MC_YAW_P 3.5
-	param set MC_YAWRATE_P 0.2
-	param set MC_YAWRATE_I 0.1
-	param set MC_YAWRATE_D 0
-	param set MC_YAWRATE_FF 0
-	param set MC_YAWRATE_MAX 50

-	param set MPC_XY_P 0.8
-	param set MPC_XY_VEL_P_ACC 2
-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_YAWRAUTO_MAX 20
+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 PWM_AUX_DIS3 950
-	param set PWM_RATE 400
+param set-default MPC_XY_P 0.8
+param set-default MPC_XY_VEL_P_ACC 2
+param set-default MPC_ACC_HOR_MAX 2
+param set-default MPC_YAWRAUTO_MAX 20

-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_F_TRANS_THR 0.75
-	param set VT_IDLE_PWM_MC 1080
-	param set VT_TYPE 2
-fi
+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
+param set-default VT_F_TRANS_THR 0.75
+param set-default VT_IDLE_PWM_MC 1080
+param set-default VT_TYPE 2
 set MAV_TYPE 22

 set MIXER quad_x
@@ -7,43 +7,40 @@
 #
 # @maintainer Sander Smeets <sander@droneslab.com>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set MC_ROLL_P 7
-	param set MC_ROLLRATE_P 0.15
-	param set MC_ROLLRATE_I 0.002
-	param set MC_ROLLRATE_D 0.003
-	param set MC_ROLLRATE_FF 0
-	param set MC_PITCH_P 7
-	param set MC_PITCHRATE_P 0.12
-	param set MC_PITCHRATE_I 0.002
-	param set MC_PITCHRATE_D 0.003
-	param set MC_PITCHRATE_FF 0
-	param set MC_YAW_P 2.8
-	param set MC_YAWRATE_P 0.22
-	param set MC_YAWRATE_I 0.02
-	param set MC_YAWRATE_D 0
-	param set MC_YAWRATE_FF 0
-	param set MC_YAWRATE_MAX 40

-	param set MPC_YAWRAUTO_MAX 40
+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 PWM_AUX_DIS5 950
-	param set PWM_RATE 400
+param set-default MPC_YAWRAUTO_MAX 40

-	param set VT_F_TRANS_THR 0.75
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_IDLE_PWM_MC 1080
-	param set VT_TYPE 2
-fi
+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
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_IDLE_PWM_MC 1080
+param set-default VT_TYPE 2
 set MAV_TYPE 22

 set MIXER quad_x
@@ -7,60 +7,57 @@
 #
 # @maintainer Sander Smeets <sander@droneslab.com>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set FW_THR_CRUISE 65
-	param set FW_PR_P 0.08
-	param set FW_PR_FF 0.5
-	param set FW_RR_P 0.05
-	param set FW_RR_FF 0.6

-	param set MIS_YAW_TMT 10
+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 MC_ROLL_P 7
-	param set MC_ROLLRATE_P 0.15
-	param set MC_ROLLRATE_I 0.1
-	param set MC_ROLLRATE_D 0.004
-	param set MC_ROLLRATE_FF 0
-	param set MC_PITCH_P 7
-	param set MC_PITCHRATE_P 0.15
-	param set MC_PITCHRATE_I 0.1
-	param set MC_PITCHRATE_D 0.004
-	param set MC_PITCHRATE_FF 0
-	param set MC_YAW_P 3.5
-	param set MC_YAWRATE_P 0.6
-	param set MC_YAWRATE_I 0.04
-	param set MC_YAWRATE_D 0
-	param set MC_YAWRATE_FF 0
-	param set MC_YAWRATE_MAX 40
+param set-default MIS_YAW_TMT 10

-	param set MPC_ACC_HOR_MAX 2
-	param set MPC_Z_VEL_MAX_DN 1.5
-	param set MPC_TKO_SPEED 1.5
-	param set MPC_LAND_SPEED 0.8
-	param set MPC_YAWRAUTO_MAX 40
+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 PWM_AUX_DIS5 950
-	param set PWM_AUX_REV1 1
-	param set PWM_AUX_REV2 1
-	param set PWM_RATE 400
+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 VT_ARSP_TRANS 15
-	param set VT_ARSP_BLEND 8
-	param set VT_B_TRANS_DUR 4
-	param set VT_F_TRANS_THR 0.75
-	param set VT_IDLE_PWM_MC 1080
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_TYPE 2
-fi
+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
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_TYPE 2
 set MAV_TYPE 22

 set MIXER quad_x
@@ -7,81 +7,78 @@
 #
 # @maintainer Andreas Antener <andreas@uaventure.com>
 #
-# @board intel_aerofc-v1 exclude
+# @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 #

 . ${R}etc/init.d/rc.vtol_defaults

-if [ $AUTOCNF = yes ]
-then
-	param set FW_AIRSPD_MAX   22
-	param set FW_AIRSPD_MIN   14
-	param set FW_AIRSPD_TRIM  16
-	param set FW_L1_PERIOD    25
-	param set FW_PR_P 0.060
-	param set FW_P_RMAX_NEG   40
-	param set FW_P_RMAX_POS   40
-	param set FW_RR_FF    0.4
-	param set FW_RR_P 0.04
-	param set FW_R_RMAX   40

-	param set MC_PITCHRATE_D 0.004
-	param set MC_PITCHRATE_I 0
-	param set MC_PITCHRATE_MAX 60
-	param set MC_PITCHRATE_P 0.21
-	param set MC_PITCH_P 4
-	param set MC_ROLLRATE_D 0.004
-	param set MC_ROLLRATE_I 0.002
-	param set MC_ROLLRATE_MAX 60
-	param set MC_ROLLRATE_P 0.24
-	param set MC_ROLL_P 4
-	param set MC_YAWRATE_I 0.02
-	param set MC_YAWRATE_MAX 40
-	param set MC_YAWRATE_P 0.18
+param set-default FW_AIRSPD_MAX   22
+param set-default FW_AIRSPD_MIN   14
+param set-default FW_AIRSPD_TRIM  16
+param set-default FW_L1_PERIOD    25
+param set-default FW_PR_P 0.060
+param set-default FW_P_RMAX_NEG   40
+param set-default FW_P_RMAX_POS   40
+param set-default FW_RR_FF    0.4
+param set-default FW_RR_P 0.04
+param set-default FW_R_RMAX   40

-	param set MIS_TAKEOFF_ALT 2.5
-	param set MIS_YAW_TMT 20
+param set-default MC_PITCHRATE_D 0.004
+param set-default MC_PITCHRATE_I 0
+param set-default MC_PITCHRATE_MAX 60
+param set-default MC_PITCHRATE_P 0.21
+param set-default MC_PITCH_P 4
+param set-default MC_ROLLRATE_D 0.004
+param set-default MC_ROLLRATE_I 0.002
+param set-default MC_ROLLRATE_MAX 60
+param set-default MC_ROLLRATE_P 0.24
+param set-default MC_ROLL_P 4
+param set-default MC_YAWRATE_I 0.02
+param set-default MC_YAWRATE_MAX 40
+param set-default MC_YAWRATE_P 0.18

-	param set MPC_ACC_HOR_MAX 1
-	param set MPC_HOLD_MAX_XY 0.5
-	param set MPC_HOLD_MAX_Z  0.5
-	param set MPC_LAND_SPEED  1
-	param set MPC_MANTHR_MIN  0.05
-	param set MPC_MAN_Y_MAX   120
-	param set MPC_THR_MIN 0.07
-	param set MPC_TILTMAX_AIR 35
-	param set MPC_TILTMAX_LND 20
-	param set MPC_TKO_SPEED   1
-	param set MPC_XY_P    0.3
-	param set MPC_XY_VEL_MAX  3
-	param set MPC_XY_VEL_P_ACC 1
-	param set MPC_Z_P 0.5
-	param set MPC_Z_VEL_P_ACC 2
-	param set MPC_YAWRAUTO_MAX 40
+param set-default MIS_TAKEOFF_ALT 2.5
+param set-default MIS_YAW_TMT 20

-	param set NAV_ACC_RAD 3
+param set-default MPC_ACC_HOR_MAX 1
+param set-default MPC_HOLD_MAX_XY 0.5
+param set-default MPC_HOLD_MAX_Z  0.5
+param set-default MPC_LAND_SPEED  1
+param set-default MPC_MANTHR_MIN  0.05
+param set-default MPC_MAN_Y_MAX   120
+param set-default MPC_THR_MIN 0.07
+param set-default MPC_TILTMAX_AIR 35
+param set-default MPC_TILTMAX_LND 20
+param set-default MPC_TKO_SPEED   1
+param set-default MPC_XY_P    0.3
+param set-default MPC_XY_VEL_MAX  3
+param set-default MPC_XY_VEL_P_ACC 1
+param set-default MPC_Z_P 0.5
+param set-default MPC_Z_VEL_P_ACC 2
+param set-default MPC_YAWRAUTO_MAX 40

-	param set PWM_AUX_REV1    1
-	param set PWM_AUX_REV2    1
-	param set PWM_AUX_REV3    1
-	param set PWM_AUX_REV4    1
+param set-default NAV_ACC_RAD 3

-	param set PWM_AUX_DIS5 950
+param set-default PWM_AUX_REV1    1
+param set-default PWM_AUX_REV2    1
+param set-default PWM_AUX_REV3    1
+param set-default PWM_AUX_REV4    1

-	param set PWM_RATE 400
+param set-default PWM_AUX_DIS5 950

-	param set VT_ARSP_TRANS   15
-	param set VT_B_TRANS_DUR  4
-	param set VT_F_TRANS_THR    0.6
-	param set VT_IDLE_PWM_MC 1180
-	param set VT_MOT_ID 1234
-	param set VT_FW_MOT_OFFID 1234
-	param set VT_TRANS_MIN_TM 5
-	param set VT_TRANS_TIMEOUT    30
-	param set VT_TYPE 2
+param set-default PWM_MAIN_RATE 400

-fi
+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
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_TRANS_MIN_TM 5
+param set-default VT_TRANS_TIMEOUT    30
+param set-default VT_TYPE 2

 set MAV_TYPE 22

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`mixer append /dev/pwm_output0 etc/mixers-sitl/package_drop.aux.mix`