ModuleBase add common base type and cleanup

2026-05-23 19:57:34 +08:00 · 2020-11-10 14:03:58 -05:00
4479 changed files with 131025 additions and 490938 deletions
@@ -9,14 +9,15 @@ pipeline {
        script {
          def build_nodes = [:]
          def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2021-09-08",
-            arm64: "px4io/px4-dev-aarch64:2021-09-08",
-            base: "px4io/px4-dev-base-bionic:2021-09-08",
-            nuttx: "px4io/px4-dev-nuttx-focal:2021-09-08",
+            armhf: "px4io/px4-dev-armhf:2020-04-01",
+            arm64: "px4io/px4-dev-aarch64:latest",
+            base: "px4io/px4-dev-base-bionic:2020-04-01",
+            nuttx: "px4io/px4-dev-nuttx-focal:2020-09-14",
+            snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
          ]

          def armhf_builds = [
-            target: ["beaglebone_blue_default", "emlid_navio2_default", "px4_raspberrypi_default", "scumaker_pilotpi_default"],
+            target: ["aerotenna_ocpoc_default", "beaglebone_blue_default", "emlid_navio2_default", "px4_raspberrypi_default", "scumaker_pilotpi_default"],
            image: docker_images.armhf,
            archive: false
          ]
@@ -28,7 +29,7 @@ pipeline {
          ]

          def base_builds = [
-            target: ["px4_sitl_default"],
+            target: ["px4_sitl_rtps"],
            image: docker_images.base,
            archive: false
          ]
@@ -36,81 +37,53 @@ pipeline {
          def nuttx_builds_archive = [
            target: [
                     "airmind_mindpx-v2_default",
-                     "ark_can-flow_canbootloader",
-                     "ark_can-flow_default",
-                     "ark_can-gps_canbootloader",
-                     "ark_can-gps_default",
-                     "ark_can-rtk-gps_canbootloader",
-                     "ark_can-rtk-gps_default",
-                     "atl_mantis-edu_default",
                     "av_x-v1_default",
                     "bitcraze_crazyflie_default",
-                     "bitcraze_crazyflie21_default",
                     "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",
-                     "diatone_mamba-f405-mk2_default",
-                     "freefly_can-rtk-gps_canbootloader",
-                     "freefly_can-rtk-gps_default",
-                     "holybro_can-gps-v1_canbootloader",
-                     "holybro_can-gps-v1_default",
                     "holybro_durandal-v1_default",
                     "holybro_kakutef7_default",
-                     "holybro_kakuteh7_default",
                     "holybro_pix32v5_default",
-                     "matek_gnss-m9n-f4_canbootloader",
-                     "matek_gnss-m9n-f4_default",
-                     "matek_h743-mini_default",
-                     "matek_h743-slim_default",
-                     "matek_h743_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-oem_default",
-                     "mro_ctrl-zero-h7-oem_rtps",
-                     "mro_ctrl-zero-h7_default",
-                     "mro_ctrl-zero-h7_rtps",
-                     "mro_pixracerpro_default",
-                     "mro_pixracerpro_rtps",
                     "mro_x21-777_default",
                     "mro_x21_default",
-                     "nxp_fmuk66-e_default",
-                     "nxp_fmuk66-e_rtps",
-                     "nxp_fmuk66-e_socketcan",
                     "nxp_fmuk66-v3_default",
-                     "nxp_fmuk66-v3_rtps",
                     "nxp_fmuk66-v3_socketcan",
+                     "nxp_fmuk66-v3_rtps",
                     "nxp_fmurt1062-v1_default",
-                     "nxp_ucans32k146_canbootloader",
                     "nxp_ucans32k146_default",
                     "omnibus_f4sd_default",
                     "px4_fmu-v2_default",
                     "px4_fmu-v2_fixedwing",
-                     "px4_fmu-v2_lto",
+                     "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_cyphal",
-                     "px4_fmu-v5_debug",
                     "px4_fmu-v5_default",
-                     "px4_fmu-v5_lto",
+                     "px4_fmu-v5_debug",
+                     "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-v5x_base_phy_DP83848C",
                     "px4_fmu-v5x_default",
-                     "px4_fmu-v6c_default",
-                     "px4_fmu-v6u_default",
                     "px4_fmu-v6x_default",
                     "px4_io-v2_default",
-                     "raspberrypi_pico_default",
-                     "sky-drones_smartap-airlink_default",
                     "spracing_h7extreme_default",
                     "uvify_core_default"
            ],
@@ -118,8 +91,14 @@ pipeline {
            archive: true
          ]

+          def snapdragon_builds = [
+            target: ["atlflight_eagle_qurt", "atlflight_eagle_default"],
+            image: docker_images.snapdragon,
+            archive: false
+          ]
+
          def docker_builds = [
-            armhf_builds, base_builds, nuttx_builds_archive
+            armhf_builds, base_builds, nuttx_builds_archive//, snapdragon_builds
          ]

          for (def build_type = 0; build_type < docker_builds.size(); build_type++) {
@@ -139,7 +118,7 @@ pipeline {
    // TODO: actually upload artifacts to S3
    // stage('S3 Upload') {
    //   agent {
-    //     docker { image 'px4io/px4-dev-base-focal:2021-09-08' }
+    //     docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
    //   }
    //   options {
    //         skipDefaultCheckout()
@@ -164,14 +143,18 @@ pipeline {
  }
  options {
    buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
-    timeout(time: 90, unit: 'MINUTES')
+    timeout(time: 60, unit: 'MINUTES')
  }
 }

 def createBuildNode(Boolean archive, String docker_image, String target) {
  return {

+    // TODO: fix the snapdragon image
    bypass_entrypoint = ''
+    if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-04-01') {
+      bypass_entrypoint = ' --entrypoint=""'
+    }

    node {
      docker.withRegistry('https://registry.hub.docker.com', 'docker_hub_dagar') {
@@ -180,7 +163,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) {
            try {
              sh('export')
              checkout(scm)
-              sh('make distclean; git clean -ff -x -d .')
+              sh('make distclean')
              sh('git fetch --tags')
              sh('ccache -s')
              sh('make ' + target)
@@ -197,7 +180,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) {
              throw (exc)
            }
            finally {
-              sh('make distclean; git clean -ff -x -d .')
+              sh('make distclean')
            }
          }
        }
@@ -74,7 +74,6 @@ Checks:          '*,
                  -modernize-deprecated-headers,
                  -modernize-loop-convert,
                  -modernize-pass-by-value,
-                  -modernize-raw-string-literal,
                  -modernize-return-braced-init-list,
                  -modernize-use-auto,
                  -modernize-use-bool-literals,
@@ -82,7 +81,6 @@ Checks:          '*,
                  -modernize-use-equals-default,
                  -modernize-use-equals-delete,
                  -modernize-use-override,
-                  -modernize-use-trailing-return-type,
                  -modernize-use-using,
                  -performance-inefficient-string-concatenation,
                  -readability-avoid-const-params-in-decls,
@@ -1,7 +0,0 @@
-FROM gcr.io/oss-fuzz-base/base-builder:v1
-COPY . $SRC/PX4-Autopilot
-RUN apt-get install -y libjpeg8-dev zlib1g-dev
-RUN pip3 install --upgrade pip
-RUN python3 -m pip install -r $SRC/PX4-Autopilot/Tools/setup/requirements.txt
-WORKDIR $SRC/PX4-Autopilot
-COPY ./.clusterfuzzlite/build.sh $SRC/
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash -eu
-
-PX4_FUZZ=1 make px4_sitl
-cp build/px4_sitl_default/bin/px4 $OUT/px4
@@ -1 +0,0 @@
-language: c++
@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
 {
 	"name": "px4-dev-nuttx",
-	"image": "px4io/px4-dev-nuttx-focal:2021-09-08",
+	"image": "px4io/px4-dev-nuttx-focal:2020-09-14",

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

@@ -1,34 +1,32 @@
 ---
-name: 🐛 Bug report
+name: Bug report
 about: Create a report to help us improve
-labels: bug-report

 ---

-## Describe the bug
+**Describe the bug**
 A clear and concise description of the bug.

-## To Reproduce
+**To Reproduce**
 Steps to reproduce the behavior:
 1. Drone switched on '...'
 2. Uploaded mission '....' (attach QGC mission file)
 3. Took off '....'
 4. See error

-## Expected behavior
+**Expected behavior**
 A clear and concise description of what you expected to happen.

-## Log Files and Screenshots
+**Log Files and Screenshots**
 *Always* provide a link to the flight log file:
 - Download the flight log file from the vehicle ([tutorial](https://docs.px4.io/master/en/getting_started/flight_reporting.html)).
- Upload the log to the [PX4 Flight Review](http://logs.px4.io/)
- Share the link to the log (Copy and paste the URL of the log)
+- Share the link to a log showing the problem on [PX4 Flight Review](http://logs.px4.io/).

 Add screenshots to help explain your problem.

-## Drone (please complete the following information):
+**Drone (please complete the following information):**
 - Describe the type of drone.
 - Photo of the IMU / autopilot setup if possible.

-## Additional context
+**Additional context**
 Add any other context about the problem here.
@@ -1,20 +1,19 @@
 ---
 name: 🚀 Feature Request
 about: Suggest an idea for this project
-labels: feature-request

 ---

-For general questions please use [PX4 Discuss](http://discuss.px4.io/) or Slack (you can find an invite link on this project README).
+For general questions please use [PX4 Discuss](http://discuss.px4.io/) or [Slack](http://slack.px4.io/).

-## Describe problem solved by the proposed feature
+**Describe problem solved by the proposed feature**
 A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...

-## Describe your preferred solution
+**Describe your preferred solution**
 A clear and concise description of what you want to happen.

-## Describe possible alternatives
+**Describe possible alternatives**
 A clear and concise description of alternative solutions or features you've considered.

-## Additional context
+**Additional context**
 Add any other context or screenshots for the feature request here.
@@ -1,13 +1,10 @@
 ---
 name: ⛔ Support Question
-about: See http://discuss.px4.io/ for questions about using PX4.
+about: See [PX4 Discuss](http://discuss.px4.io/) for questions about using PX4.

 ---

-## Attention! Please read the note below
-
-We use GitHub issues only to discuss PX4 bugs and new features.
-
-**For questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).**
+We use GitHub issues only to discuss PX4 bugs and new features. For
+questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).

 Thanks!
@@ -1,11 +1,9 @@
 ---
 name: ⛔ Documentation Issue
-about: See https://github.com/PX4/px4_user_guide for documentation issues
+about: See https://github.com/PX4/Devguide for documentation issues

 ---

-## Attention! Please read the note below
-
-**Please submit the documentation issue to the [User Guide](https://github.com/PX4/px4_user_guide) repository.**
+PX4 has dedicated repositories for developer documentation (https://github.com/PX4/Devguide) and user documentation (https://github.com/PX4/px4_user_guide).

 Thanks!
@@ -1,24 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20">
-  <linearGradient id="smooth" x2="0" y2="100%">
-    <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
-    <stop offset="1" stop-opacity=".1"/>
-  </linearGradient>
-
-  <mask id="round">
-    <rect width="90" height="20" rx="3" fill="#fff"/>
-  </mask>
-
-  <g mask="url(#round)">
-    <rect width="42" height="20" fill="#555"/>
-    <rect x="42" width="48" height="20" fill="#E01563"/>
-    <rect width="90" height="20" fill="url(#smooth)"/>
-  </g>
-
-  <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-    <text x="22" y="15" fill="#010101" fill-opacity=".3">slack</text>
-    <text x="22" y="14">slack</text>
-    <text x="65" y="15" fill="#010101" fill-opacity=".3">Join us!</text>
-    <text x="65" y="14">Join us!</text>
-  </g>
-</svg>
-
@@ -1,34 +0,0 @@
-name: ClusterFuzzLite batch fuzzing
-on:
-  schedule:
-    - cron: '0 6 * * *'  # UTC 6am every day.
-permissions: read-all
-jobs:
-  BatchFuzzing:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer:
-        - address
-        - undefined
-        - memory
-    steps:
-    - name: Build Fuzzers (${{ matrix.sanitizer }})
-      id: build
-      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
-      with:
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Run Fuzzers (${{ matrix.sanitizer }})
-      id: run
-      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        fuzz-seconds: 1800 # 30 mins
-        mode: 'batch'
-        sanitizer: ${{ matrix.sanitizer }}
-        # Optional but recommended: For storing certain artifacts from fuzzing.
-        # See later section on "Git repo for storage".
-        # storage-repo: https://${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/OWNER/STORAGE-REPO-NAME.git
-        # storage-repo-branch: main   # Optional. Defaults to "main"
-        # storage-repo-branch-coverage: gh-pages  # Optional. Defaults to "gh-pages".
@@ -17,35 +17,42 @@ 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:2021-09-08
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    container: px4io/px4-dev-nuttx-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
        token: ${{ secrets.ACCESS_TOKEN }}

-    - name: check environment
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
      run: |
-          export
-          ulimit -a
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: tests_${{matrix.ubuntu_release}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: tests_${{matrix.ubuntu_release}}-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
    - 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,11 +11,36 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-clang:2021-09-08
+    container: px4io/px4-dev-clang:2020-08-14
    steps:
    - uses: actions/checkout@v1
      with:
        token: ${{secrets.ACCESS_TOKEN}}

+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: clang-tidy-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: clang-tidy-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
    - name: make clang-tidy-quiet
-      run: make clang-tidy-quiet
+      run: |
+        ccache -z
+        make clang-tidy-quiet
+        ccache -s
@@ -11,10 +11,11 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2021-09-08
+    container: px4io/px4-dev-armhf:2020-08-14
    strategy:
      matrix:
        config: [
+          aerotenna_ocpoc_default,
          beaglebone_blue_default,
          emlid_navio2_default,
          px4_raspberrypi_default,
@@ -43,8 +44,7 @@ jobs:
          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
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -11,7 +11,7 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-aarch64:2021-09-08
+    container: px4io/px4-dev-aarch64:latest
    strategy:
      matrix:
        config: [
@@ -40,8 +40,7 @@ jobs:
          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
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -15,7 +15,7 @@ jobs:
      matrix:
        config: [
          px4_fmu-v5_default,
-          px4_sitl
+          px4_sitl_default,
          #tests, # includes px4_sitl
          ]
    steps:
@@ -24,7 +24,7 @@ jobs:
        token: ${{secrets.ACCESS_TOKEN}}

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

    - name: Prepare ccache timestamp
      id: ccache_cache_timestamp
@@ -44,8 +44,7 @@ jobs:
          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
          echo "compression = true" >> ~/.ccache/ccache.conf
          echo "compression_level = 6" >> ~/.ccache/ccache.conf
-          echo "max_size = 40M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

@@ -11,63 +11,60 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2021-09-08
+    container: px4io/px4-dev-nuttx-focal:2020-09-14
    strategy:
-      fail-fast: false
      matrix:
        config: [
-          airmind_mindpx-v2,
-          ark_can-flow,
-          ark_can-gps,
-          ark_can-rtk-gps,
-          ark_cannode,
-          atl_mantis-edu,
-          av_x-v1,
-          bitcraze_crazyflie,
-          bitcraze_crazyflie21,
-          cuav_can-gps-v1,
-          cuav_nora,
-          cuav_x7pro,
-          cubepilot_cubeorange,
-          cubepilot_cubeyellow,
-          diatone_mamba-f405-mk2,
-          freefly_can-rtk-gps,
-          holybro_can-gps-v1,
-          holybro_durandal-v1,
-          holybro_kakutef7,
-          holybro_kakuteh7,
-          holybro_pix32v5,
-          matek_gnss-m9n-f4,
-          matek_h743,
-          matek_h743-mini,
-          matek_h743-slim,
-          modalai_fc-v1,
-          modalai_fc-v2,
-          mro_ctrl-zero-f7,
-          mro_ctrl-zero-f7-oem,
-          mro_ctrl-zero-h7,
-          mro_ctrl-zero-h7-oem,
-          mro_pixracerpro,
-          mro_x21,
-          mro_x21-777,
-          nxp_fmuk66-e,
-          nxp_fmuk66-v3,
-          nxp_fmurt1062-v1,
-          nxp_ucans32k146,
-          omnibus_f4sd,
-          px4_fmu-v2,
-          px4_fmu-v3,
-          px4_fmu-v4,
-          px4_fmu-v4pro,
-          px4_fmu-v5,
-          px4_fmu-v5x,
-          px4_fmu-v6c,
-          px4_fmu-v6u,
-          px4_fmu-v6x,
-          raspberrypi_pico,
-          sky-drones_smartap-airlink,
-          spracing_h7extreme,
-          uvify_core
+          airmind_mindpx-v2_default,
+          av_x-v1_default,
+          bitcraze_crazyflie_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,
+          holybro_durandal-v1_default,
+          holybro_kakutef7_default,
+          holybro_pix32v5_default,
+          intel_aerofc-v1_default,
+          modalai_fc-v1_default,
+          mro_ctrl-zero-f7_default,
+          mro_x21-777_default,
+          mro_x21_default,
+          nxp_fmuk66-v3_default,
+          nxp_fmuk66-e_default,
+          nxp_fmuk66-v3_socketcan,
+          nxp_fmuk66-v3_rtps,
+          nxp_fmurt1062-v1_default,
+          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_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-v5x_base_phy_DP83848C,
+          px4_fmu-v5x_default,
+          px4_fmu-v6x_default,
+          px4_io-v2_default,
+          spracing_h7extreme_default,
+          uvify_core_default
          ]
    steps:
    - uses: actions/checkout@v1
@@ -92,14 +89,12 @@ jobs:
          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
          echo "compression = true" >> ~/.ccache/ccache.conf
          echo "compression_level = 6" >> ~/.ccache/ccache.conf
-          echo "max_size = 120M" >> ~/.ccache/ccache.conf
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

-    - name: make all_variants_${{matrix.config}}
-      run: make all_variants_${{matrix.config}}
-      timeout-minutes: 45
+    - name: make ${{matrix.config}}
+      run: make ${{matrix.config}}
    - name: make ${{matrix.config}} bloaty_compileunits
      run: make ${{matrix.config}} bloaty_compileunits || true
    - name: make ${{matrix.config}} bloaty_inlines
@@ -110,17 +105,13 @@ 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
      run: ccache -s

    - name: Upload px4 package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v1
      with:
        name: px4_package_${{matrix.config}}
-        path: |
-          build/**/*.px4
-          build/**/*.bin
+        path: build/${{matrix.config}}/${{matrix.config}}.px4
@@ -0,0 +1,67 @@
+name: Coverage
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2020-09-14
+    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
@@ -1,54 +0,0 @@
-name: Deploy metadata for all targets
-
-on:
-  push:
-    branches:
-    - 'master'
-    - 'release/*'
-    - 'pr-metadata-test'
-
-jobs:
-  enumerate_targets:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
-    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-09-08
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: make ${{matrix.target}}
-      run: make ${{matrix.target}}
-
-    - name: parameter & events metadata
-      run: |
-        make ${{matrix.target}} ver_gen events_json actuators_json
-        ./src/lib/version/get_git_tag_or_branch_version.sh build/${{ matrix.target }} >> $GITHUB_ENV
-        cd build/${{ matrix.target }}
-        mkdir _metadata || true
-        cp parameters.* events/*.xz actuators.json* _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,21 +0,0 @@
-name: EKF Change Indicator
-
-on: pull_request
-
-jobs:
-  unit_tests:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
-    steps:
-    - uses: actions/checkout@v2.3.1
-      with:
-        fetch-depth: 0
-    - name: checkout newest version of branch
-      run: |
-        git fetch origin pull/${{github.event.pull_request.number}}/head:${{github.head_ref}}
-        git checkout ${GITHUB_HEAD_REF}
-    - name: main test
-      run: make tests TESTFILTER=EKF
-    - name: Check if there is a functional change
-      run: git diff --exit-code
-      working-directory: src/modules/ekf2/test/change_indication
@@ -1,29 +0,0 @@
-name: EKF Update Change Indicator
-
-on: push
-
-jobs:
-  unit_tests:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
-    env:
-      GIT_COMMITTER_EMAIL: bot@px4.io
-      GIT_COMMITTER_NAME: PX4BuildBot
-    steps:
-    - uses: actions/checkout@v2.3.1
-      with:
-        fetch-depth: 0
-    - name: main test updates change indication files
-      run: make tests TESTFILTER=EKF
-    - name: Check if there exists diff and save result in variable
-      run: echo "CHANGE_INDICATED=$(git diff --exit-code --output=/dev/null || echo $?)" >> $GITHUB_ENV
-      working-directory: src/modules/ekf2/test/change_indication
-    - name: auto-commit any changes to change indication
-      uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        commit_message: '[AUTO COMMIT] update change indication'
-        commit_user_name: ${GIT_COMMITTER_NAME}
-        commit_user_email: ${GIT_COMMITTER_EMAIL}
-    - if: ${{env.CHANGE_INDICATED}}
-      name: if there is a functional change, fail check
-      run: exit 1
@@ -0,0 +1,129 @@
+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-08-14
+      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
+    - 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:2021-09-08
+      image: px4io/px4-dev-ros-melodic:2020-08-14
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -50,15 +50,12 @@ jobs:
          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
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

    - name: check environment
-      run: |
-          export
-          ulimit -a
+      run: export
    - name: Build PX4 and sitl_gazebo
      env:
        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
@@ -79,7 +76,6 @@ jobs:
      run: |
        export
        ./test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=${{matrix.config.mission}} vehicle:=${{matrix.config.vehicle}}
-      timeout-minutes: 45

    - name: Look at core files
      if: failure()
@@ -20,7 +20,7 @@ jobs:
          #- {test_file: "mavros_posix_tests_offboard_rpyrt_ctl.test", vehicle: "iris", build_type: "RelWithDebInfo"}

    container:
-      image: px4io/px4-dev-ros-melodic:2021-09-08
+      image: px4io/px4-dev-ros-melodic:2020-08-14
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -45,15 +45,12 @@ jobs:
          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
-          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          echo "max_size = 400M" >> ~/.ccache/ccache.conf
          ccache -s
          ccache -z

    - name: check environment
-      run: |
-          export
-          ulimit -a
+      run: export
    - name: Build PX4 and sitl_gazebo
      env:
        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
@@ -74,7 +71,6 @@ jobs:
      run: |
        export
        ./test/rostest_px4_run.sh ${{matrix.config.test_file}} vehicle:=${{matrix.config.vehicle}}
-      timeout-minutes: 45

    - name: Look at core files
      if: failure()
@@ -4,14 +4,15 @@ on:
  push:
    branches:
    - 'master'
-    - 'release/*'
-    - 'pr-metadata-test'
+  pull_request:
+    branches:
+    - '*'

 jobs:

  airframe:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
@@ -20,24 +21,13 @@ jobs:
    - name: airframe metadata
      run: |
        make airframe_metadata
-        ./src/lib/version/get_git_tag_or_branch_version.sh build/px4_sitl_default >> $GITHUB_ENV
        cd build/px4_sitl_default/docs
-      # TODO: deploy to userguide gitbook
-
-    - 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/'
+        ls -ls *
+      # TODO: deploy to devguide gitbook and s3

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

  parameter:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
@@ -61,49 +51,13 @@ jobs:
    - name: parameter metadata
      run: |
        make parameters_metadata
-        ./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/'
-
-  events:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: events metadata
-      run: |
-        make extract_events
-        ./src/lib/version/get_git_tag_or_branch_version.sh build/px4_sitl_default >> $GITHUB_ENV
-        cd build/px4_sitl_default
-        mkdir _events_full || true
-        cp events/all_events_full.json.xz _events_full/all_events.json.xz
-
-    - 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/_events_full/'
-        DEST_DIR: 'Firmware/${{ env.version }}/_general/'
+        cd build/px4_sitl_default/docs
+        ls -ls *
+      # TODO: deploy 'parameters.md, parameters.xml to S3 px4-travis:Firmware/master/

  uorb_graph:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2021-09-08
+    container: px4io/px4-dev-nuttx-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
@@ -118,7 +72,7 @@ jobs:

  micrortps_agent:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
@@ -132,7 +86,7 @@ jobs:

  ROS_msgs:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
@@ -145,7 +99,7 @@ jobs:

  ROS2_bridge:
    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
+    container: px4io/px4-dev-base-focal:2020-09-14
    steps:
    - uses: actions/checkout@v1
      with:
@@ -154,4 +108,4 @@ jobs:
    - name: PX4 ROS2 bridge
      run: |
        git clone https://github.com/PX4/px4_ros_com.git
-        ./msg/tools/uorb_to_ros_urtps_topics.py -i msg/tools/urtps_bridge_topics.yaml -o px4_ros_com/templates/urtps_bridge_topics.yaml
+        ./msg/tools/uorb_to_ros_rtps_ids.py -i msg/tools/uorb_rtps_message_ids.yaml -o px4_ros_com/templates/uorb_rtps_message_ids.yaml
@@ -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 types-requests flake8
+      run: pip3 install --user mypy 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,13 +15,12 @@ jobs:
      fail-fast: false
      matrix:
        config:
-          - {model: "iris",          latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo" } # Alaska
-          - {model: "standard_vtol", latitude: "-38.071235", longitude:  "145.281220", altitude:  "31", build_type: "AddressSanitizer" } # Australia
-          - {model: "tailsitter" ,   latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo" } # Florida
-          - {model: "standard_vtol", latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage" } # Zurich
-
+          - {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
    container:
-      image: px4io/px4-dev-simulation-focal:2021-09-08
+      image: px4io/px4-dev-simulation-focal:2020-08-14
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
    - uses: actions/checkout@v1
@@ -29,9 +28,9 @@ jobs:
        token: ${{ secrets.ACCESS_TOKEN }}

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

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

@@ -62,9 +60,7 @@ jobs:
        PX4_HOME_LON: ${{matrix.config.longitude}}
        PX4_HOME_ALT: ${{matrix.config.altitude}}
        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-          export
-          ulimit -a
+      run: export
    - name: Build PX4
      env:
        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
@@ -96,8 +92,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}} --upload test/mavsdk_tests/configs/sitl.json --verbose
-      timeout-minutes: 45
+      run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 --abort-early --model ${{matrix.config.model}} test/mavsdk_tests/configs/sitl.json

    - name: Look at core files
      if: failure()
@@ -109,6 +104,10 @@ 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,8 +101,15 @@ 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

-!src/drivers/distance_sensor/broadcom/afbrs50/Lib/*
+# SITL
+dataman
+eeprom/
@@ -1,11 +1,11 @@
-[submodule "src/modules/mavlink/mavlink"]
-	path = src/modules/mavlink/mavlink
-	url = https://github.com/mavlink/mavlink.git
+[submodule "mavlink/include/mavlink/v2.0"]
+	path = mavlink/include/mavlink/v2.0
+	url = https://github.com/mavlink/c_library_v2.git
 	branch = master
 [submodule "src/drivers/uavcan/libuavcan"]
 	path = src/drivers/uavcan/libuavcan
-	url = https://github.com/dronecan/libuavcan.git
-	branch = main
+	url = https://github.com/PX4/uavcan.git
+	branch = px4
 [submodule "Tools/jMAVSim"]
 	path = Tools/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
@@ -14,56 +14,43 @@
 	path = Tools/sitl_gazebo
 	url = https://github.com/PX4/PX4-SITL_gazebo.git
 	branch = master
+[submodule "src/lib/matrix"]
+	path = src/lib/matrix
+	url = https://github.com/PX4/PX4-Matrix
+	branch = master
+[submodule "src/lib/ecl"]
+	path = src/lib/ecl
+	url = https://github.com/PX4/PX4-ECL
+	branch = master
+[submodule "boards/atlflight/cmake_hexagon"]
+	path = boards/atlflight/cmake_hexagon
+	url = https://github.com/PX4/cmake_hexagon.git
+	branch = px4
 [submodule "src/drivers/gps/devices"]
 	path = src/drivers/gps/devices
-	url = https://github.com/PX4/PX4-GPSDrivers.git
+	url = https://github.com/PX4/PX4-GPSDrivers
 	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 = master
+	url = https://github.com/PX4/micro-CDR.git
+	branch = px4
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-10.1.0+
+	branch = px4_firmware_nuttx-10.0.0+
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
 	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-10.1.0+
+	branch = px4_firmware_nuttx-10.0.0+
+[submodule "platforms/qurt/dspal"]
+	path = platforms/qurt/dspal
+	url = https://github.com/ATLFlight/dspal.git
 [submodule "Tools/flightgear_bridge"]
 	path = Tools/flightgear_bridge
 	url = https://github.com/PX4/PX4-FlightGear-Bridge.git
 [submodule "Tools/jsbsim_bridge"]
 	path = Tools/jsbsim_bridge
 	url = https://github.com/PX4/px4-jsbsim-bridge.git
-[submodule "src/drivers/cyphal/libcanard"]
-	path = src/drivers/cyphal/libcanard
-	url = https://github.com/opencyphal/libcanard.git
-[submodule "src/drivers/cyphal/public_regulated_data_types"]
-	path = src/drivers/cyphal/public_regulated_data_types
-	url = https://github.com/opencyphal/public_regulated_data_types.git
-[submodule "src/drivers/cyphal/legacy_data_types"]
-	path = src/drivers/cyphal/legacy_data_types
-	url = https://github.com/PX4/public_regulated_data_types.git
-	branch = legacy
-[submodule "src/lib/crypto/monocypher"]
-	path = src/lib/crypto/monocypher
-	url = https://github.com/PX4/Monocypher.git
-	branch = px4
-[submodule "src/lib/events/libevents"]
-	path = src/lib/events/libevents
-	url = https://github.com/mavlink/libevents.git
-[submodule "Tools/simulation-ignition"]
-	path = Tools/simulation-ignition
-	url = https://github.com/PX4/px4-simulation-ignition.git
-[submodule "src/lib/crypto/libtomcrypt"]
-	path = src/lib/crypto/libtomcrypt
-	url = https://github.com/PX4/libtomcrypt.git
-	branch = px4
-[submodule "src/lib/crypto/libtommath"]
-	path = src/lib/crypto/libtommath
-	url = https://github.com/PX4/libtommath.git
-	branch = px4
-[submodule "src/modules/microdds_client/Micro-XRCE-DDS-Client"]
-	path = src/modules/microdds_client/Micro-XRCE-DDS-Client
-	url = https://github.com/eProsima/Micro-XRCE-DDS-Client.git
+[submodule "src/examples/gyro_fft/CMSIS_5"]
+	path = src/examples/gyro_fft/CMSIS_5
+	url = https://github.com/ARM-software/CMSIS_5.git
@@ -9,5 +9,3 @@ launch.json
 ipch/

 browse.vc.db*
-
-*.log
@@ -6,21 +6,6 @@ CONFIG:
      buildType: RelWithDebInfo
      settings:
        CONFIG: px4_sitl_default
-    px4_sitl_rtps:
-      short: px4_sitl_rtps
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_rtps
-    px4_sitl_asan:
-      short: px4_sitl (AddressSanitizer)
-      buildType: AddressSanitizer
-      settings:
-        CONFIG: px4_sitl_default
-    px4_sitl_ubsan:
-      short: px4_sitl (UndefinedBehaviorSanitizer)
-      buildType: UndefinedBehaviorSanitizer
-      settings:
-        CONFIG: px4_sitl_default
    px4_sitl_replay:
      short: px4_sitl_replay
      buildType: RelWithDebInfo
@@ -61,101 +46,26 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: px4_fmu-v5_default
-    px4_fmu-v5_debug:
-      short: px4_fmu-v5_debug
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v5_debug
    px4_fmu-v5x_default:
      short: px4_fmu-v5x
      buildType: MinSizeRel
      settings:
        CONFIG: px4_fmu-v5x_default
-    px4_fmu-v6x_default:
-      short: px4_fmu-v6x
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6x_default
-    px4_fmu-v6x_bootloader:
-      short: px4_fmu-v6x_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6x_bootloader
    airmind_mindpx-v2_default:
      short: airmind_mindpx-v2
      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
-    ark_can-rtk-gps_default:
-      short: ark_can-rtk-gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-rtk-gps_default
-    ark_can-rtk-gps_debug:
-      short: ark_can-rtk-gps_debug
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-rtk-gps_debug
-    ark_can-rtk-gps_canbootloader:
-      short: ark_can-rtk-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-rtk-gps_canbootloader
-    ark_cannode_default:
-      short: ark_cannode_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_cannode_default
-    ark_cannode_canbootloader:
-      short: ark_cannode_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_cannode_canbootloader
-    atl_mantis-edu_default:
-      short: atl_mantis-edu
-      buildType: MinSizeRel
-      settings:
-        CONFIG: atl_mantis-edu_default
    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
@@ -166,81 +76,41 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: cuav_x7pro_default
-    cubepilot_cubeorange_test:
+    cubepilot_cubeorange_default:
      short: cubepilot_cubeorange
      buildType: MinSizeRel
      settings:
-        CONFIG: cubepilot_orange_test
+        CONFIG: cubepilot_orange_default
+    cubepilot_cubeyellow_default:
+      short: cubepilot_cubeyellow
+      buildType: MinSizeRel
+      settings:
+        CONFIG: cubepilot_cubeyellow_default
    emlid_navio2_default:
      short: emlid_navio2
      buildType: MinSizeRel
      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
-    matek_h743-slim_default:
-      short: matek_h743-slim
+    intel_aerofc-v1_default:
+      short: intel_aerofc-v1
      buildType: MinSizeRel
      settings:
-        CONFIG: matek_h743-slim_default
-    matek_gnss-m9n-f4_canbootloader:
-      short: matek_gnss-m9n-f4_canbootloader
-      buildType: MiniSizeRel
-      settings:
-        CONFIG: matek_m9nf4can_canbootloader
-    matek_gnss-m9n-f4_default:
-      short: matek_gnss-m9n-f4_default
-      buildType: MiniSizeRel
-      settings:
-        CONFIG: matek_gnss-m9n-f4_default
+        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
@@ -251,8 +121,3 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: nxp_fmuk66-v3_default
-    raspberrypi_pico_default:
-      short: raspberrypi_pico
-      buildType: MinSizeRel
-      settings:
-        CONFIG: raspberrypi_pico_default
@@ -14,6 +14,7 @@
        "C_Cpp.workspaceParsingPriority": "low",
        "cmake.buildBeforeRun": true,
        "cmake.buildDirectory": "${workspaceFolder}/build/${variant:CONFIG}",
+        "cmake.buildTask": true,
        "cmake.configureOnOpen": true,
        "cmake.ctest.parallelJobs": 1,
        "cmake.skipConfigureIfCachePresent": true,
@@ -26,10 +27,12 @@
        "cSpell.showStatus": false,
        "cSpell.words": [
                "acro",
+                "rattitude",
                "nuttx",
                "esc"
        ],
        "debug.toolBarLocation": "docked",
+        "editor.acceptSuggestionOnEnter": "off",
        "editor.defaultFormatter": "chiehyu.vscode-astyle",
        "editor.dragAndDrop": false,
        "editor.insertSpaces": false,
@@ -125,6 +128,7 @@
                "${workspaceFolder}/build": true
        },
        "search.showLineNumbers": true,
+        "search.smartCase": true,
        "telemetry.enableTelemetry": false,
        "terminal.integrated.copyOnSelection": true,
        "terminal.integrated.rightClickBehavior": "paste",
@@ -135,6 +139,5 @@
        "workbench.settings.enableNaturalLanguageSearch": false,
        "yaml.schemas": {
                "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
-        },
-        "cortex-debug.openocdPath": "${env:PICO_SDK_PATH}/../openocd/src/openocd"       // Added for rp2040
+        }
 }
@@ -40,7 +40,7 @@
 # * Common functions should be included in px_base.cmake.
 #
 # * OS/ board specific fucntions should be include in
-#	px_impl_${PX4_PLATFORM}.cmake
+#	px_impl_${PX4_PLATFORM}.cmake or px4_impl_${PX4_PLATFORM}_${PX4_BOARD}.cmake.
 #
 # Formatting
 # ---------------------------------------------------------------------------
@@ -99,10 +99,10 @@
 #
 #=============================================================================

-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.2 FATAL_ERROR)

-set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE FILEPATH "PX4 source directory" FORCE)
-set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE FILEPATH "PX4 binary directory" FORCE)
+set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")

 list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake)
 include(px4_parse_function_args)
@@ -113,7 +113,7 @@ include(px4_parse_function_args)
 include(px4_git)

 execute_process(
-	COMMAND git describe --exclude ext/* --always --tags
+	COMMAND git describe --always --tags
 	OUTPUT_VARIABLE PX4_GIT_TAG
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
@@ -125,19 +125,10 @@ define_property(GLOBAL PROPERTY PX4_MODULE_LIBRARIES
                 FULL_DOCS "List of all PX4 module libraries"
                 )

-define_property(GLOBAL PROPERTY PX4_KERNEL_MODULE_LIBRARIES
-                 BRIEF_DOCS "PX4 kernel side module libs"
-                 FULL_DOCS "List of all PX4 kernel module libraries"
-                 )
-
 define_property(GLOBAL PROPERTY PX4_MODULE_PATHS
                 BRIEF_DOCS "PX4 module paths"
                 FULL_DOCS "List of paths to all PX4 modules"
                 )
-define_property(GLOBAL PROPERTY PX4_SRC_FILES
-                 BRIEF_DOCS "src files from all PX4 modules & libs"
-                 FULL_DOCS "SRC files from px4_add_{module,library}"
-                 )

 #=============================================================================
 # configuration
@@ -147,35 +138,13 @@ set(CONFIG "px4_sitl_default" CACHE STRING "desired configuration")

 include(px4_add_module)
 set(config_module_list)
-set(config_kernel_list)
-
-# Find Python
-# If using catkin, Python 2 is found since it points
-# to the Python libs installed with the ROS distro
-if (NOT CATKIN_DEVEL_PREFIX)
-	find_package(PythonInterp 3)
-	# We have a custom error message to tell users how to install python3.
-	if (NOT PYTHONINTERP_FOUND)
-		message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
-			"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
-			"    macOS: brew install python")
-	endif()
-else()
-	find_package(PythonInterp REQUIRED)
-endif()
-
-option(PYTHON_COVERAGE "Python code coverage" OFF)
-if(PYTHON_COVERAGE)
-	message(STATUS "python coverage enabled")
-	set(PYTHON_EXECUTABLE coverage run -p)
-endif()

 include(px4_config)
-include(kconfig)
+include(px4_add_board)
+include(${PX4_CONFIG_FILE})
 message(STATUS "PX4 config: ${PX4_CONFIG}")
 message(STATUS "PX4 platform: ${PX4_PLATFORM}")

-
 if(${PX4_PLATFORM} STREQUAL "posix")
 	if(ENABLE_LOCKSTEP_SCHEDULER)
 		add_definitions(-DENABLE_LOCKSTEP_SCHEDULER)
@@ -216,8 +185,6 @@ if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "Coverage")
 	set(MAX_CUSTOM_OPT_LEVEL -O0)
 elseif(CMAKE_BUILD_TYPE MATCHES "Sanitizer")
 	set(MAX_CUSTOM_OPT_LEVEL -O1)
-elseif(CMAKE_BUILD_TYPE MATCHES "Release")
-	set(MAX_CUSTOM_OPT_LEVEL -O3)
 else()
 	if(px4_constrained_flash_build)
 		set(MAX_CUSTOM_OPT_LEVEL -Os)
@@ -234,14 +201,6 @@ message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
 #
 project(px4 CXX C ASM)

-# Check if LTO option and check if toolchain supports it
-if(LTO)
-    include(CheckIPOSupported)
-    check_ipo_supported()
-    message(AUTHOR_WARNING "LTO enabled: LTO is highly experimental and should not be used in production")
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
-
 set(package-contact "px4users@googlegroups.com")

 set(CMAKE_CXX_STANDARD 14)
@@ -318,6 +277,27 @@ if (CATKIN_DEVEL_PREFIX)
 	endif()
 endif()

+# Python
+# If using catkin, Python 2 is found since it points
+# to the Python libs installed with the ROS distro
+if (NOT CATKIN_DEVEL_PREFIX)
+	find_package(PythonInterp 3)
+	# We have a custom error message to tell users how to install python3.
+	if (NOT PYTHONINTERP_FOUND)
+		message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
+			"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
+			"    macOS: brew install python")
+	endif()
+else()
+	find_package(PythonInterp REQUIRED)
+endif()
+
+option(PYTHON_COVERAGE "Python code coverage" OFF)
+if(PYTHON_COVERAGE)
+	message(STATUS "python coverage enabled")
+	set(PYTHON_EXECUTABLE coverage run -p)
+endif()
+
 #=============================================================================
 # get chip and chip manufacturer
 #
@@ -420,13 +400,13 @@ endif()
 # subdirectories
 #
 add_library(parameters_interface INTERFACE)
-add_library(kernel_parameters_interface INTERFACE)

 include(px4_add_library)
 add_subdirectory(src/lib EXCLUDE_FROM_ALL)

 add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
 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})
@@ -436,20 +416,9 @@ foreach(module ${config_module_list})
 	add_subdirectory(src/${module})
 endforeach()

-# add events lib after modules and libs as it needs to know all source files (PX4_SRC_FILES)
-add_subdirectory(src/lib/events EXCLUDE_FROM_ALL)
-# metadata needs PX4_MODULE_CONFIG_FILES
-add_subdirectory(src/lib/metadata EXCLUDE_FROM_ALL)
-
 # must be the last module before firmware
 add_subdirectory(src/lib/parameters EXCLUDE_FROM_ALL)
-
-if(${PX4_PLATFORM} STREQUAL "nuttx" AND NOT CONFIG_BUILD_FLAT)
-target_link_libraries(parameters_interface INTERFACE usr_parameters)
-target_link_libraries(kernel_parameters_interface INTERFACE parameters)
-else()
 target_link_libraries(parameters_interface INTERFACE parameters)
-endif()

 # firmware added last to generate the builtin for included modules
 add_subdirectory(platforms/${PX4_PLATFORM})
@@ -466,10 +435,8 @@ endforeach()

 add_custom_command(OUTPUT ${uorb_graph_config}
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/uorb_graph/create.py
-		${graph_module_list} --src-path src/lib
-		--merge-depends
+		${graph_module_list}
 		--exclude-path src/examples
-		--exclude-path src/lib/parameters # FIXME: enable & fix
 		--file ${PX4_SOURCE_DIR}/Tools/uorb_graph/graph_${uorb_graph_config}
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
 	COMMENT "Generating uORB graph"
@@ -488,10 +455,3 @@ 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:2021-08-18'
+        //       image 'px4io/px4-dev-ros-melodic:2020-08-20'
        //       args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
        //     }
        //   }
@@ -56,7 +56,7 @@ pipeline {
        stage('Colcon build on ROS2 workspace') {
          agent {
            docker {
-              image 'px4io/px4-dev-ros2-foxy:2021-08-18'
+              image 'px4io/px4-dev-ros2-foxy:2020-08-20'
              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
            }
          }
@@ -67,9 +67,11 @@ 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 -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 fetch --tags;
-              source /opt/ros/foxy/setup.sh;
+              source /opt/ros/bouncy/setup.sh;
+              source /opt/ros/melodic/setup.sh;
              colcon build --event-handlers console_direct+ --symlink-install;
            '''
          }
@@ -85,11 +87,10 @@ pipeline {

        stage('Airframe') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
-            sh 'make distclean; git clean -ff -x -d .'
-            sh 'git fetch --all --tags'
+            sh 'make distclean'
            sh 'make airframe_metadata'
            dir('build/px4_sitl_default/docs') {
              archiveArtifacts(artifacts: 'airframes.md, airframes.xml')
@@ -98,38 +99,36 @@ pipeline {
          }
          post {
            always {
-              sh 'make distclean; git clean -ff -x -d .'
+              sh 'make distclean'
            }
          }
        }

        stage('Parameter') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
-            sh 'make distclean; git clean -ff -x -d .'
-            sh 'git fetch --all --tags'
+            sh 'make distclean'
            sh 'make parameters_metadata'
            dir('build/px4_sitl_default/docs') {
-              archiveArtifacts(artifacts: 'parameters.md, parameters.xml, parameters.json.xz')
-              stash includes: 'parameters.md, parameters.xml, parameters.json.xz', name: 'metadata_parameters'
+              archiveArtifacts(artifacts: 'parameters.md, parameters.xml')
+              stash includes: 'parameters.md, parameters.xml', name: 'metadata_parameters'
            }
          }
          post {
            always {
-              sh 'make distclean; git clean -ff -x -d .'
+              sh 'make distclean'
            }
          }
        }

        stage('Module') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
-            sh 'make distclean; git clean -ff -x -d .'
-            sh 'git fetch --all --tags'
+            sh 'make distclean'
            sh 'make module_documentation'
            dir('build/px4_sitl_default/docs') {
              archiveArtifacts(artifacts: 'modules/*.md')
@@ -138,25 +137,7 @@ pipeline {
          }
          post {
            always {
-              sh 'make distclean; git clean -ff -x -d .'
-            }
-          }
-        }
-
-        stage('msg file docs') {
-          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
-          }
-          steps {
-            sh 'mkdir -p build/msg_docs; ./msg/tools/generate_msg_docs.py -d build/msg_docs'
-            dir('build') {
-              archiveArtifacts(artifacts: 'msg_docs/*.md')
-              stash includes: 'msg_docs/*.md', name: 'msg_documentation'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean; git clean -ff -x -d .'
+              sh 'make distclean'
            }
          }
        }
@@ -164,23 +145,22 @@ pipeline {
        stage('uORB graphs') {
          agent {
            docker {
-              image 'px4io/px4-dev-nuttx-focal:2021-08-18'
+              image 'px4io/px4-dev-nuttx-focal:2020-09-14'
              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
            }
          }
          steps {
            sh 'export'
-            sh 'make distclean; git clean -ff -x -d .'
-            sh 'git fetch --all --tags'
+            sh 'make distclean'
            sh 'make uorb_graphs'
            dir('Tools/uorb_graph') {
-              archiveArtifacts(artifacts: 'graph_*.json')
-              stash includes: 'graph_*.json', name: 'uorb_graph'
+              archiveArtifacts(artifacts: 'graph_px4_sitl.json')
+              stash includes: 'graph_px4_sitl.json', name: 'uorb_graph'
            }
          }
          post {
            always {
-              sh 'make distclean; git clean -ff -x -d .'
+              sh 'make distclean'
            }
          }
        }
@@ -192,24 +172,50 @@ pipeline {

      parallel {

-        stage('Userguide') {
+        stage('Devguide') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
+          }
+          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-09-14' }
          }
          steps {
            sh('export')
            unstash 'metadata_airframes'
            unstash 'metadata_parameters'
            unstash 'metadata_module_documentation'
-            unstash 'msg_documentation'
-            unstash 'uorb_graph'
            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
              sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_user_guide.git')
              sh('cp airframes.md px4_user_guide/en/airframes/airframe_reference.md')
              sh('cp parameters.md px4_user_guide/en/advanced_config/parameter_reference.md')
              sh('cp -R modules/*.md px4_user_guide/en/modules/')
-              sh('cp -R graph_*.json px4_user_guide/.vuepress/public/en/middleware/')
-              sh('cp -R msg_docs/*.md px4_user_guide/en/msg_docs/')
              sh('cd px4_user_guide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
              sh('cd px4_user_guide; git push origin master || true')
              sh('rm -rf px4_user_guide')
@@ -228,7 +234,7 @@ pipeline {

        stage('QGroundControl') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
            sh('export')
@@ -256,12 +262,12 @@ pipeline {

        stage('microRTPS agent') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
            sh('export')
            sh('git fetch --all --tags')
-            sh('make distclean; git clean -ff -x -d .')
+            sh('make distclean')
            sh('make px4_sitl_rtps')
            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/micrortps_agent.git -b ${BRANCH_NAME}")
@@ -286,11 +292,11 @@ pipeline {

        stage('PX4 ROS msgs') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
            sh('export')
-            sh('make distclean; git clean -ff -x -d .')
+            sh('make distclean')
            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
              // 'master' branch
@@ -315,15 +321,15 @@ pipeline {

        stage('PX4 ROS2 bridge') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
            sh('export')
-            sh('make distclean; git clean -ff -x -d .')
+            sh('make distclean')
            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_ros_com.git -b ${BRANCH_NAME}")
              // deploy uORB RTPS ID map
-              sh('./msg/tools/uorb_to_ros_urtps_topics.py -i msg/tools/urtps_bridge_topics.yaml -o px4_ros_com/templates/urtps_bridge_topics.yaml')
+              sh('./msg/tools/uorb_to_ros_rtps_ids.py -i msg/tools/uorb_rtps_message_ids.yaml -o px4_ros_com/templates/uorb_rtps_message_ids.yaml')
              sh('cd px4_ros_com; git status; git add .; git commit -a -m "Update uORB RTPS ID map `date`" || true')
              sh('cd px4_ros_com; git push origin ${BRANCH_NAME} || true')
              // deploy uORB RTPS required tools
@@ -358,7 +364,7 @@ pipeline {

        stage('S3') {
          agent {
-            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+            docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
          }
          steps {
            sh('export')
@@ -368,7 +374,6 @@ 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 {
@@ -396,7 +401,7 @@ pipeline {
    GIT_COMMITTER_NAME = "PX4BuildBot"
  }
  options {
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactDaysToKeepStr: '30'))
-    timeout(time: 90, unit: 'MINUTES')
+    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '20'))
+    timeout(time: 60, unit: 'MINUTES')
  }
 }
@@ -1,192 +0,0 @@
-# PX4 Firmware Configuration
-
-
-mainmenu "PX4 Firmware Configuration"
-
-comment "Vendor: $(VENDOR)"
-comment "Model: $(MODEL)"
-comment "Label: $(LABEL)"
-
-menu "Toolchain"
-    choice
-        prompt "Platform"
-        default PLATFORM_NUTTX
-        config PLATFORM_NUTTX
-            bool "nuttx"
-        config PLATFORM_POSIX
-            bool "posix"
-        config PLATFORM_QURT
-            bool "qurt"
-    endchoice
-
-    config BOARD_PLATFORM
-        string
-        default "nuttx" if PLATFORM_NUTTX
-        default "posix" if PLATFORM_POSIX
-        default "qurt" if PLATFORM_QURT
-
-    config BOARD_LOCKSTEP
-        bool "Force enable lockstep"
-        depends on PLATFORM_POSIX
-        help
-            forces lockstep behaviour, despite REPLAY env variable
-
-    config BOARD_NOLOCKSTEP
-        bool "Force disable lockstep"
-        depends on PLATFORM_POSIX
-        help
-            forces nolockstep behaviour, despite REPLAY env variable
-
-    config BOARD_LINUX
-        bool "Linux OS"
-        depends on PLATFORM_POSIX
-        help
-            Board Platform is running the Linux operating system
-
-    config BOARD_TOOLCHAIN
-        string "Toolchain"
-        default ""
-
-    config BOARD_ARCHITECTURE
-        string "Architecture"
-        default ""
-
-    config BOARD_LTO
-        bool "(EXPERIMENTAL) Link Time Optimization (LTO)"
-        default n
-        help
-            Enables LTO flag in linker
-            Note: Highly EXPERIMENTAL, furthermore make sure you're using a modern compiler GCC 9 or later
-
-    config BOARD_FULL_OPTIMIZATION
-        bool "Full optmization (O3)"
-        default n
-        help
-            Enables Cmake Release for -O3 optimization
-
-    config BOARD_ROMFSROOT
-        string "ROMFSROOT"
-        default "px4fmu_common"
-        help
-            relative path to the ROMFS root directory
-
-    config BOARD_IO
-        string "IO board name"
-        default "px4_io-v2_default"
-        depends on DRIVERS_PX4IO
-        help
-            name of IO board to be built and included in the ROMFS (requires a valid ROMFSROOT)
-
-    config BOARD_CONSTRAINED_FLASH
-        bool "Contrained flash"
-        help
-            flag to enable constrained flash options (eg limit init script status text)
-
-    config BOARD_NO_HELP
-        bool "No help"
-        help
-            optional condition flag to disable help text on constrained flash systems
-
-    config BOARD_CONSTRAINED_MEMORY
-        bool "Contrained memory"
-        help
-            flag to enable constrained memory options (eg limit maximum number of uORB publications)
-
-    config BOARD_EXTERNAL_METADATA
-        bool "External metadata"
-        help
-            flag to exclude metadata to reduce flash
-
-    config BOARD_LINKER_PREFIX
-        string "linker prefix"
-        help
-            optional to prefix on the Linker script.
-
-    config BOARD_COMPILE_DEFINITIONS
-        string "add custom compile definitions"
-        help
-            add custom compile defitions to this specific target
-endmenu #Toolchain
-
-config BOARD_TESTING
-    bool "Testing"
-    select SYSTEMCMDS_TESTS
-    help
-        flag to enable automatic inclusion of PX4 testing modules
-
-
-config BOARD_ETHERNET
-    bool "Ethernet"
-    help
-        flag to indicate that ethernet is enabled
-
-config BOARD_CRYPTO
-    bool "Crypto support"
-    help
-        Enable PX4 Crypto Support. Select the implementation under drivers
-
-config BOARD_PROTECTED
-    bool "Memory protection"
-    help
-        Enable memory protection via MPU/MMU
-
-menu "Serial ports"
-
-    config BOARD_SERIAL_URT6
-        string "URT6 tty port"
-
-    config BOARD_SERIAL_GPS1
-        string "GPS1 tty port"
-
-    config BOARD_SERIAL_GPS2
-        string "GPS2 tty port"
-
-    config BOARD_SERIAL_GPS3
-        string "GPS3 tty port"
-
-    config BOARD_SERIAL_GPS4
-        string "GPS4 tty port"
-
-    config BOARD_SERIAL_GPS5
-        string "GPS5 tty port"
-
-    config BOARD_SERIAL_TEL1
-        string "TEL1 tty port"
-
-    config BOARD_SERIAL_TEL2
-        string "TEL2 tty port"
-
-    config BOARD_SERIAL_TEL3
-        string "TEL3 tty port"
-
-    config BOARD_SERIAL_TEL4
-        string "TEL4 tty port"
-
-    config BOARD_SERIAL_TEL5
-        string "TEL5 tty port"
-
-    config BOARD_SERIAL_RC
-        string "RC tty port"
-
-    config BOARD_SERIAL_WIFI
-        string "WIFI tty port"
-
-    config BOARD_SERIAL_PPB
-        string "PPB (Pixhawk Payload Bus) tty port"
-endmenu
-
-menu "drivers"
-source "src/drivers/Kconfig"
-endmenu
-
-menu "modules"
-source "src/modules/Kconfig"
-endmenu
-
-menu "systemcmds"
-source "src/systemcmds/Kconfig"
-endmenu
-
-menu "examples"
-source "src/examples/Kconfig"
-endmenu
@@ -1,6 +1,6 @@
 BSD 3-Clause License

-Copyright (c) 2012 - 2022, PX4 Development Team
+Copyright (c) 2012 - 2020, 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 [ -f .github/workflows/compile_${1}.yml ] && cat .github/workflows/compile_${1}.yml | sed -E 's|[[:space:]]+(.*),|check_\1|g' | grep check_${2})
+     $(shell cat .github/workflows/compile_${1}.yml | sed -E 's|[[:space:]]+(.*),|check_\1|g' | grep check_${2})
 endef

 # Parsing
@@ -158,11 +158,6 @@ else
 		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=UndefinedBehaviorSanitizer
 	endif

-	# Fuzz Testing
-	ifdef PX4_FUZZ
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=FuzzTesting
-	endif
-
 endif

 # Pick up specific Python path if set
@@ -170,23 +165,15 @@ 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
 define cmake-build
-	$(eval CMAKE_ARGS += -DCONFIG=$(1))
 	@$(eval BUILD_DIR = "$(SRC_DIR)/build/$(1)")
 	@# check if the desired cmake configuration matches the cache then CMAKE_CACHE_CHECK stays empty
 	@$(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) \
@@ -218,8 +205,8 @@ define colorecho
 +@echo -e '${COLOR_BLUE}${1} ${NO_COLOR}'
 endef

-# Get a list of all config targets boards/*/*.px4board
-ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 -name '*.px4board' -print | sed -e 's|boards\/||' | sed -e 's|\.px4board||' | sed -e 's|\/|_|g' | sort)
+# Get a list of all config targets boards/*/*.cmake
+ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 ! -name '*common*' ! -name '*sdflight*' -name '*.cmake' -print | sed -e 's|boards\/||' | sed -e 's|\.cmake||' | sed -e 's|\/|_|g' | sort)

 # ADD CONFIGS HERE
 # --------------------------------------------------------------------
@@ -227,19 +214,20 @@ ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 -name '*.px4bo

 # All targets.
 $(ALL_CONFIG_TARGETS):
-	@$(call cmake-build,$@$(BUILD_DIR_SUFFIX))
+	@$(eval PX4_CONFIG = $@)
+	@$(eval CMAKE_ARGS += -DCONFIG=$(PX4_CONFIG))
+	@$(call cmake-build,$(PX4_CONFIG)$(BUILD_DIR_SUFFIX))

 # Filter for only default targets to allow omiting the "_default" postfix
 CONFIG_TARGETS_DEFAULT := $(patsubst %_default,%,$(filter %_default,$(ALL_CONFIG_TARGETS)))
 $(CONFIG_TARGETS_DEFAULT):
-	@$(call cmake-build,$@_default$(BUILD_DIR_SUFFIX))
+	@$(eval PX4_CONFIG = $@_default)
+	@$(eval CMAKE_ARGS += -DCONFIG=$(PX4_CONFIG))
+	@$(call cmake-build,$(PX4_CONFIG)$(BUILD_DIR_SUFFIX))

 all_config_targets: $(ALL_CONFIG_TARGETS)
 all_default_targets: $(CONFIG_TARGETS_DEFAULT)

-updateconfig:
-	@./Tools/kconfig/updateconfig.py
-
 # board reorganization deprecation warnings (2018-11-22)
 define deprecation_warning
 	$(warning $(1) has been deprecated and will be removed, please use $(2)!)
@@ -248,6 +236,16 @@ endef
 # All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
 .PHONY: all px4_sitl_default all_config_targets all_default_targets

+# Multi- config targets.
+eagle_default: atlflight_eagle_default atlflight_eagle_qurt
+eagle_rtps: atlflight_eagle_rtps atlflight_eagle_qurt-rtps
+
+excelsior_default: atlflight_excelsior_default atlflight_excelsior_qurt
+excelsior_rtps: atlflight_excelsior_rtps atlflight_excelsior_qurt-rtps
+
+.PHONY: eagle_default eagle_rtps
+.PHONY: excelsior_default excelsior_rtps
+
 # Other targets
 # --------------------------------------------------------------------

@@ -270,10 +268,11 @@ 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

 # builds with RTPS
@@ -301,38 +300,13 @@ check_%:
 	@$(MAKE) --no-print-directory $(subst check_,,$@)
 	@echo

-all_variants_%:
-	@echo 'Building all $(subst all_variants_,,$@) variants:'  $(filter $(subst all_variants_,,$@)_%, $(ALL_CONFIG_TARGETS))
-	@echo
-	$(foreach a,$(filter $(subst all_variants_,,$@)_%, $(ALL_CONFIG_TARGETS)), $(call cmake-build,$(a)$(BUILD_DIR_SUFFIX)))
-
 uorb_graphs:
-	@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --exclude-path src/lib/parameters --merge-depends --file Tools/uorb_graph/graph_full
-	@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --exclude-path src/lib/parameters --exclude-path src/modules/mavlink --merge-depends --file Tools/uorb_graph/graph_full_no_mavlink
+	@./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
 	@$(MAKE) --no-print-directory px4_fmu-v2_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v4_default uorb_graph
-	@$(MAKE) --no-print-directory px4_fmu-v5_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph

-px4io_update: px4_io-v2_default cubepilot_io-v2_default
-	# px4_io-v2_default
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/durandal-v1/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/pix32v5/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/mro/x21-777/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v2/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v3/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v4pro/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5x/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6x/extras/px4_io-v2_default.bin
-	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6c/extras/px4_io-v2_default.bin
-	# cubepilot_io-v2_default
-	cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeorange/extras/cubepilot_io-v2_default.bin
-	cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeyellow/extras/cubepilot_io-v2_default.bin
-	git status
-
-bootloaders_update: cuav_nora_bootloader cuav_x7pro_bootloader cubepilot_cubeorange_bootloader holybro_durandal-v1_bootloader matek_h743_bootloader matek_h743-mini_bootloader matek_h743-slim_bootloader modalai_fc-v2_bootloader mro_ctrl-zero-classic_bootloader mro_ctrl-zero-h7_bootloader mro_ctrl-zero-h7-oem_bootloader mro_pixracerpro_bootloader px4_fmu-v6u_bootloader px4_fmu-v6x_bootloader
-	git status

 .PHONY: coverity_scan

@@ -340,21 +314,18 @@ coverity_scan: px4_sitl_default

 # Documentation
 # --------------------------------------------------------------------
-.PHONY: parameters_metadata airframe_metadata module_documentation extract_events px4_metadata doxygen
+.PHONY: parameters_metadata airframe_metadata module_documentation px4_metadata doxygen

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

 airframe_metadata:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes ver_gen
+	@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes

 module_documentation:
 	@$(MAKE) --no-print-directory px4_sitl_default metadata_module_documentation

-extract_events:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_extract_events ver_gen
-
-px4_metadata: parameters_metadata airframe_metadata module_documentation extract_events
+px4_metadata: parameters_metadata airframe_metadata module_documentation

 doxygen:
 	@mkdir -p "$(SRC_DIR)"/build/doxygen
@@ -381,6 +352,7 @@ format:
 .PHONY: rostest python_coverage

 tests:
+	$(eval CMAKE_ARGS += -DCONFIG=px4_sitl_test)
 	$(eval CMAKE_ARGS += -DTESTFILTER=$(TESTFILTER))
 	$(eval ARGS += test_results)
 	$(eval ASAN_OPTIONS += color=always:check_initialization_order=1:detect_stack_use_after_return=1)
@@ -389,10 +361,8 @@ tests:

 tests_coverage:
 	@$(MAKE) clean
-	@$(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
-
+	@$(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"

 rostest: px4_sitl_default
 	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
@@ -488,39 +458,34 @@ shellcheck_all:
 	@make px4_fmu-v5_default shellcheck

 validate_module_configs:
-	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f \
-	-not -path "$(SRC_DIR)/src/lib/mixer_module/*" -not -path "$(SRC_DIR)/src/lib/crypto/libtommath/*" -print0 | \
-	xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml
+	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f -print0 | xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml

 # Cleanup
 # --------------------------------------------------------------------
 .PHONY: clean submodulesclean submodulesupdate gazeboclean distclean

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

 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 --jobs 4
+	@git submodule update --init --recursive --force

 submodulesupdate:
-	@git submodule update --quiet --init --recursive --jobs 4 || true
+	@git submodule update --quiet --init --recursive || true
 	@git submodule sync --recursive
-	@git submodule update --init --recursive --jobs 4
-	@git fetch --all --tags --recurse-submodules=yes --jobs=4
+	@git submodule update --init --recursive

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

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

-# Help / Error / Misc
+# Help / Error
 # --------------------------------------------------------------------

 # All other targets are handled by PX4_MAKE. Add a rule here to avoid printing an error.
@@ -534,7 +499,7 @@ help:
 	@echo "Where <target> is one of:"
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | \
 		awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | \
-		egrep -v -e '^[^[:alnum:]]' -e '^($(subst $(space),|,$(ALL_CONFIG_TARGETS)))$$' -e '_default$$' -e '^(Makefile)'
+		egrep -v -e '^[^[:alnum:]]' -e '^($(subst $(space),|,$(ALL_CONFIG_TARGETS)))$$' -e '_default$$' -e '^(posix|eagle|Makefile)'
 	@echo
 	@echo "Or, $(MAKE) <config_target> [<make_target(s)>]"
 	@echo "Use '$(MAKE) list_config_targets' for a list of configuration targets."
@@ -554,18 +519,3 @@ check_px4: $(call make_list,nuttx,"px4") \

 check_nxp: $(call make_list,nuttx,"nxp") \
 	sizes
-
-ifneq ($(ROS2_WS_DIR),)
-  ROS2_WS_DIR := $(basename ${ROS2_WS_DIR})
-else
-  ROS2_WS_DIR := ~/colcon_ws
-endif
-
-update_ros2_bridge:
-	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --all
-
-update_px4_ros_com:
-	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --px4_ros_com
-
-update_px4_msgs:
-	@Tools/update_px4_ros2_bridge.sh --ws_dir ${ROS2_WS_DIR} --px4_msgs
@@ -1,17 +1,17 @@
 Please use [PX4 Discuss](http://discuss.px4.io/) or [Slack](http://slack.px4.io/) to align on pull requests if necessary. You can then open draft pull requests to get early feedback.

-## Describe problem solved by this pull request
-A clear and concise description of the problem this proposed change will solve. Or, what it will improve.
+**Describe problem solved by this pull request**
+A clear and concise description of the problem this proposed change will solve.
 E.g. For this use case I ran into...

-## Describe your solution
+**Describe your solution**
 A clear and concise description of what you have implemented.

-## Describe possible alternatives
+**Describe possible alternatives**
 A clear and concise description of alternative solutions or features you've considered.

-## Test data / coverage
+**Test data / coverage**
 How was it tested? What cases were covered? Logs uploaded to https://review.px4.io/ and screenshots of the important plot parts.

-## Additional context
+**Additional context**
 Add any other related context or media.
@@ -1,37 +1,33 @@
 # PX4 Drone Autopilot

-[![Releases](https://img.shields.io/github/release/PX4/PX4-Autopilot.svg)](https://github.com/PX4/PX4-Autopilot/releases) [![DOI](https://zenodo.org/badge/22634/PX4/PX4-Autopilot.svg)](https://zenodo.org/badge/latestdoi/22634/PX4/PX4-Autopilot)
+[![Releases](https://img.shields.io/github/release/PX4/Firmware.svg)](https://github.com/PX4/Firmware/releases) [![DOI](https://zenodo.org/badge/22634/PX4/Firmware.svg)](https://zenodo.org/badge/latestdoi/22634/PX4/Firmware)

-[![Nuttx Targets](https://github.com/PX4/PX4-Autopilot/workflows/Nuttx%20Targets/badge.svg)](https://github.com/PX4/PX4-Autopilot/actions?query=workflow%3A%22Nuttx+Targets%22?branch=master) [![SITL Tests](https://github.com/PX4/PX4-Autopilot/workflows/SITL%20Tests/badge.svg?branch=master)](https://github.com/PX4/PX4-Autopilot/actions?query=workflow%3A%22SITL+Tests%22)
+[![Nuttx Targets](https://github.com/PX4/Firmware/workflows/Nuttx%20Targets/badge.svg)](https://github.com/PX4/Firmware/actions?query=workflow%3A%22Nuttx+Targets%22?branch=master) [![SITL Tests](https://github.com/PX4/Firmware/workflows/SITL%20Tests/badge.svg?branch=master)](https://github.com/PX4/Firmware/actions?query=workflow%3A%22SITL+Tests%22)

-[![Slack](/.github/slack.svg)](https://join.slack.com/t/px4/shared_invite/zt-si4xo5qs-R4baYFmMjlrT4rQK5yUnaA)
+[![Slack](https://px4-slack.herokuapp.com/badge.svg)](http://slack.px4.io)

-This repository holds the [PX4](http://px4.io) flight control solution for drones, with the main applications located in the [src/modules](https://github.com/PX4/PX4-Autopilot/tree/master/src/modules) directory. It also contains the PX4 Drone Middleware Platform, which provides drivers and middleware to run drones.
+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/Firmware/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 MacOS out of the box.
-
-* Official Website: http://px4.io (License: BSD 3-clause, [LICENSE](https://github.com/PX4/PX4-Autopilot/blob/master/LICENSE))
+* Official Website: http://px4.io (License: BSD 3-clause, [LICENSE](https://github.com/PX4/Firmware/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/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)
+  * [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)
+* Releases: [Downloads](https://github.com/PX4/Firmware/releases)


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

 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!


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

-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.
+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.

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


@@ -48,20 +44,20 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://dev.px4.io/master/en/co
    * [Lorenz Meier](https://github.com/LorenzMeier)
  * Architecture
    * [Daniel Agar](https://github.com/dagar)
-  * [Dev Call](https://github.com/PX4/PX4-Autopilot/labels/devcall)
+  * [Dev Call](https://github.com/PX4/Firmware/labels/devcall)
    * [Ramon Roche](https://github.com/mrpollo)
  * Communication Architecture
    * [Beat Kueng](https://github.com/bkueng)
    * [Julian Oes](https://github.com/JulianOes)
  * UI in QGroundControl
    * [Gus Grubba](https://github.com/dogmaphobic)
-  * [Multicopter Flight Control](https://github.com/PX4/PX4-Autopilot/labels/multicopter)
+  * [Multicopter Flight Control](https://github.com/PX4/Firmware/labels/multicopter)
    * [Mathieu Bresciani](https://github.com/bresch)
-  * [Multicopter Software Architecture](https://github.com/PX4/PX4-Autopilot/labels/multicopter)
+  * [Multicopter Software Architecture](https://github.com/PX4/Firmware/labels/multicopter)
    * [Matthias Grob](https://github.com/MaEtUgR)
-  * [VTOL Flight Control](https://github.com/PX4/PX4-Autopilot/labels/vtol)
+  * [VTOL Flight Control](https://github.com/PX4/Firmware/labels/vtol)
    * [Roman Bapst](https://github.com/RomanBapst)
-  * [Fixed Wing Flight Control](https://github.com/PX4/PX4-Autopilot/labels/fixedwing)
+  * [Fixed Wing Flight Control](https://github.com/PX4/Firmware/labels/fixedwing)
    * [Roman Bapst](https://github.com/RomanBapst)
  * OS / NuttX
    * [David Sidrane](https://github.com/davids5)
@@ -69,49 +65,42 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://dev.px4.io/master/en/co
    * [Daniel Agar](https://github.com/dagar)
  * Commander Architecture
    * [Julian Oes](https://github.com/julianoes)
-  * [UAVCAN](https://github.com/PX4/PX4-Autopilot/labels/uavcan)
+  * [UAVCAN](https://github.com/PX4/Firmware/labels/uavcan)
    * [Daniel Agar](https://github.com/dagar)
-  * [State Estimation](https://github.com/PX4/PX4-Autopilot/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22)
+  * [State Estimation](https://github.com/PX4/Firmware/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22)
    * [Paul Riseborough](https://github.com/priseborough)
-  * Vision based navigation and Obstacle Avoidance
-    * [Markus Achtelik](https://github.com/markusachtelik)
+  * Vision based navigation
+    * [Julian Kent](https://github.com/jkflying)
+  * Obstacle Avoidance
+    * [Martina Rivizzigno](https://github.com/mrivi)
  * RTPS/ROS2 Interface
    * [Nuno Marques](https://github.com/TSC21)

-See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/PX4-Autopilot/graphs/contributors) (Github).
+See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/Firmware/graphs/contributors) (Github).

 ## Supported Hardware

-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)
+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
    * [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)
-  * 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)
+  * 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)
  * [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/complete_vehicles/crazyflie2.html)
+  * [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)

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

 ## Project Roadmap

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

+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)

@@ -82,9 +81,6 @@ 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)
@@ -115,12 +111,10 @@ 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}
 	DEPENDS ${romfs_tar_file}
-	VERBATIM
 	)

 add_custom_command(
@@ -143,39 +137,24 @@ add_custom_command(
 	COMMENT "ROMFS: copying, generating airframes"
 	)

-if(EXISTS ${PX4_BOARD_DIR}/extras/${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin)
-	set(BOARD_FIRMWARE_BIN "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
-	configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade @ONLY)
-endif()
-
 # copy extras into ROMFS
 set(extras_dependencies)

-# 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}"
-	)
-
+# copy px4io binary if configured
+if(config_io_board)
 	list(APPEND extras_dependencies
-		${board_arch_rc_file}.stamp
+		copy_px4io_bin
+		${fw_io_bin}
 	)
 endif()

+if(config_build_bootloader)
+	list(APPEND extras_dependencies
+		copy_bootloader_bin
+		${bootloader_bin}
+	)
+endif()

-# board custom init files
 set(OPTIONAL_BOARD_RC)
 list(APPEND OPTIONAL_BOARD_RC
 	rc.board_defaults
@@ -187,8 +166,7 @@ list(APPEND OPTIONAL_BOARD_RC
 foreach(board_rc_file ${OPTIONAL_BOARD_RC})

 	if(EXISTS "${PX4_BOARD_DIR}/init/${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}")
+		message(STATUS "ROMFS: Adding ${board_rc_file}")

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

 endforeach()

-
-# board extras
-set(OPTIONAL_BOARD_EXTRAS)
-file(GLOB OPTIONAL_BOARD_EXTRAS ${PX4_BOARD_DIR}/extras/*)
-
-foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
-
-	if(EXISTS "${board_extra_file}")
-		file(RELATIVE_PATH extra_file_base_name ${PX4_BOARD_DIR}/extras/ ${board_extra_file})
-		file(RELATIVE_PATH extra_file_relative_source ${PX4_SOURCE_DIR} ${board_extra_file})
-		message(STATUS "ROMFS:  Adding ${extra_file_relative_source} -> /etc/extras/${extra_file_base_name}")
-
-		add_custom_command(
-			OUTPUT
-				${romfs_gen_root_dir}/extras/${extra_file_base_name}
-				${extra_file_base_name}.stamp
-			COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PX4_BOARD_DIR}/extras/${extra_file_base_name} ${romfs_gen_root_dir}/extras/${extra_file_base_name}
-			COMMAND ${CMAKE_COMMAND} -E touch ${extra_file_base_name}.stamp
-			DEPENDS
-				${board_extra_file}
-				romfs_copy.stamp
-			COMMENT "ROMFS: copying ${board_extra_file}"
-		)
-
-		list(APPEND extras_dependencies
-			${extra_file_base_name}.stamp
-		)
-	endif()
-
-endforeach()
-
-
-
-if(config_uavcan_peripheral_firmware)
-
-	include(ExternalProject)
-
-	foreach(uavcan_peripheral_config ${config_uavcan_peripheral_firmware})
-		# include the UAVCAN peripheral binaries in ROMFS
-		message(STATUS "ROMFS:  Adding UAVCAN peripheral ${uavcan_peripheral_config} -> /etc/uavcan/fw/")
-
-		# ExternalProject_Add() with GIT_SUBMODULES "" initializes no submodules.
-		cmake_policy(SET CMP0097 NEW)
-
-		include(ExternalProject)
-
-		ExternalProject_Add(build_${uavcan_peripheral_config}
-			GIT_REPOSITORY ${CMAKE_SOURCE_DIR}
-			GIT_TAG ${PX4_GIT_TAG}
-			GIT_SUBMODULES ""
-			DOWNLOAD_NO_PROGRESS true
-			CMAKE_ARGS -DCONFIG=${uavcan_peripheral_config}
-			INSTALL_COMMAND ""
-			USES_TERMINAL_BUILD true
-			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}
 	)
@@ -32,4 +32,3 @@
 ############################################################################

 add_subdirectory(init.d)
-add_subdirectory(mixers)
@@ -33,5 +33,4 @@

 px4_add_romfs_files(
 	rcS
-	rc.output_defaults
 )
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# UGV default parameters.
-#
-# NOTE: Script variables are declared/initialized/unset in the rcS script.
-#
-
-#
-# Enable servo output on pins 3 and 4 (steering and thrust)
-# but also include 1+2 as they form together one output group
-# and need to be set together.
-#
-set PWM_OUT 12
-
-#
-# PWM Hz - 50 Hz is the normal rate in RC cars, higher rates
-# may damage analog servos.
-#
-set PWM_MAIN_RATE 50
-
-#
-# This is the gimbal pass mixer.
-#
-set MIXER_AUX pass
-set PWM_AUX_OUT 12
-
-param set-default PWM_MAIN_DISARM 1500
-param set-default PWM_MAIN_MAX 2000
-param set-default PWM_MAIN_MIN 1000
-
-# Set mixer
-set MIXER IO_pass_ucan
@@ -15,22 +15,36 @@ set +e
 #
 #------------------------------------------------------------------------------
 set R /
+#
+# Mount the procfs.
+#
+mount -t procfs /proc
+
+#
+# Start CDC/ACM serial driver.
+#
+sercon

 #
 # Print full system version.
 #
 ver all

-if mft query -q -k MTD -s MTD_PARAMETERS -v /fs/mtd_params
+#
+# 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
 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.
 #
@@ -40,17 +54,6 @@ 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
 #
@@ -65,8 +68,17 @@ unset BOARD_RC_DEFAULTS
 #
 # Start system state indicator.
 #
-#rgbled start -X -q
-#rgbled_ncp5623c start -X -q
+rgbled start -X -q
+rgbled_ncp5623c start -X -q
+rgbled_pwm start
+
+if param greater LIGHT_EN_BLINKM 0
+then
+	if blinkm start -X
+	then
+		blinkm systemstate
+	fi
+fi

 #
 # board sensors: rc.sensors
@@ -86,10 +98,10 @@ unset BOARD_RC_SENSORS
 . ${R}etc/init.d/rc.serial

 # Check for flow sensor
-#if param compare SENS_EN_PX4FLOW 1
-#then
-#	px4flow start -X &
-#fi
+if param compare SENS_EN_PX4FLOW 1
+then
+	px4flow start -X
+fi

-#uavcannode start
+uavcannode start
 unset R
@@ -1,36 +0,0 @@
-############################################################################
-#
-#   Copyright (c) 2018 PX4 Development Team. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name PX4 nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-px4_add_romfs_files(
-	IO_pass_ucan.main.mix
-)
@@ -1,12 +0,0 @@
-Passthrough mixer for PX4IO
-============================
-
-This file defines passthrough mixers suitable for testing.
-
-Channel group 0, channels 0-7 are passed directly through to the outputs.
-
-M: 1
-S: 0 0  10000  10000      0 -10000  10000
-
-M: 1
-S: 0 1  10000  10000      0 -10000  10000
@@ -0,0 +1,5 @@
+px4fmuv3_bl.bin: Bootloader binary of the PX4 Bootloader
+  (https://github.com/PX4/Bootloader)
+  based on commit 184b813699a9cfd6f43a5a21556a06b4372baf5f
+  for the target px4fmuv3_bl
+
@@ -34,10 +34,6 @@
 add_subdirectory(airframes)

 px4_add_romfs_files(
-	px4-rc.mavlink
-	px4-rc.params
-	px4-rc.rtps
-	px4-rc.simulator
 	rc.replay
 	rcS
 )
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL
-#
-# @type Quadrotor Wide
-#
-# @maintainer Julian Oes <julian@oes.ch>
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default SYS_CTRL_ALLOC 1
-
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
-set MIXER skip
-set MIXER_AUX none
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (foggy_lidar)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-param set-default EKF2_RNG_A_HMAX 10
-
@@ -8,12 +8,10 @@

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-# disable circuit breaker for airspeed sensor
-param set-default CBRK_AIRSPD_CHK 162128
+if [ $AUTOCNF = yes ]
+then
+	#Set data link loss failsafe mode (0: disabled)
+	param set NAV_DLL_ACT 0
+
+	# disable circuit breaker for airspeed sensor
+	param set CBRK_AIRSPD_CHK 162128
+
+	#param set CBRK_GPSFAIL 240024
+fi
+
+set MAV_TYPE 12
+param set MAV_TYPE ${MAV_TYPE}

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

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

-# disable circuit breaker for airspeed sensor
-param set-default CBRK_AIRSPD_CHK 162128
+if [ $AUTOCNF = yes ]
+then
+	#Set data link loss failsafe mode (0: disabled)
+	param set NAV_DLL_ACT 0
+
+	# disable circuit breaker for airspeed sensor
+	param set CBRK_AIRSPD_CHK 162128
+
+	#param set CBRK_GPSFAIL 240024
+fi
+
+set MAV_TYPE 12
+param set MAV_TYPE ${MAV_TYPE}

 set MIXER_FILE etc/mixers-sitl/uuv_x_sitl.main.mix
 set MIXER custom
@@ -5,65 +5,16 @@

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

-# disable circuit breaker for airspeed sensor
-param set-default CBRK_AIRSPD_CHK 162128
+if [ $AUTOCNF = yes ]
+then
+	#Set data link loss failsafe mode (0: disabled)
+	param set NAV_DLL_ACT 0

-param set-default SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 7
+	# disable circuit breaker for airspeed sensor
+	param set CBRK_AIRSPD_CHK 162128

-param set-default CA_ROTOR_COUNT 8
-param set-default CA_R_REV 255
-param set-default CA_ROTOR0_AX 1.0000
-param set-default CA_ROTOR0_AY -1.0000
-param set-default CA_ROTOR0_AZ 0.0000
-param set-default CA_ROTOR0_KM 0.0000
-param set-default CA_ROTOR0_PX 0.5000
-param set-default CA_ROTOR0_PY 0.3000
-param set-default CA_ROTOR0_PZ 0.2000
-param set-default CA_ROTOR1_AX 1.0000
-param set-default CA_ROTOR1_AY 1.0000
-param set-default CA_ROTOR1_AZ 0.0000
-param set-default CA_ROTOR1_KM 0.0000
-param set-default CA_ROTOR1_PX 0.5000
-param set-default CA_ROTOR1_PY -0.3000
-param set-default CA_ROTOR1_PZ 0.2000
-param set-default CA_ROTOR2_AX 1.0000
-param set-default CA_ROTOR2_AY 1.0000
-param set-default CA_ROTOR2_AZ 0.0000
-param set-default CA_ROTOR2_KM 0.0000
-param set-default CA_ROTOR2_PX -0.5000
-param set-default CA_ROTOR2_PY 0.3000
-param set-default CA_ROTOR2_PZ 0.2000
-param set-default CA_ROTOR3_AX 1.0000
-param set-default CA_ROTOR3_AY -1.0000
-param set-default CA_ROTOR3_AZ 0.0000
-param set-default CA_ROTOR3_KM 0.0000
-param set-default CA_ROTOR3_PX -0.5000
-param set-default CA_ROTOR3_PY -0.3000
-param set-default CA_ROTOR3_PZ 0.2000
-param set-default CA_ROTOR4_AZ -1.0000
-param set-default CA_ROTOR4_KM 0.0000
-param set-default CA_ROTOR4_PX 0.5000
-param set-default CA_ROTOR4_PY 0.5000
-param set-default CA_ROTOR5_AZ 1.0000
-param set-default CA_ROTOR5_KM 0.0000
-param set-default CA_ROTOR5_PX 0.5000
-param set-default CA_ROTOR5_PY -0.5000
-param set-default CA_ROTOR6_AZ 1.0000
-param set-default CA_ROTOR6_KM 0.0000
-param set-default CA_ROTOR6_PX -0.5000
-param set-default CA_ROTOR6_PY 0.5000
-param set-default CA_ROTOR7_KM 0.0000
-param set-default CA_ROTOR7_PX -0.5000
-param set-default CA_ROTOR7_PY -0.5000
+fi

-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 106
-param set-default PWM_MAIN_FUNC7 107
-param set-default PWM_MAIN_FUNC8 108
-
-set MIXER skip
+set PWM_OUT 12345678
+set MIXER_FILE etc/mixers-sitl/vectored6dof_sitl.main.mix
+set MIXER custom
@@ -5,72 +5,43 @@

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

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

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

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

-param set-default FW_MAN_P_MAX 30
+	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_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_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_RR_FF 0.1
-param set-default FW_RR_P 0.3
+	param set FW_L1_PERIOD 12

-param set-default FW_SPOILERS_LND 0.4
+	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_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.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-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-#param set-default SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1.0
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-param set-default PWM_MAIN_FUNC3 204
-param set-default PWM_MAIN_FUNC4 205
-param set-default PWM_MAIN_FUNC5 101
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
-param set-default PWM_MAIN_FUNC9 206
-param set-default PWM_MAIN_REV 256
+	param set RWTO_TKOFF 1

+fi

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

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

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

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

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

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

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

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

+fi
@@ -5,44 +5,54 @@

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

-param set-default FW_LND_AIRSPD_SC 1.1
-param set-default FW_LND_ANG 5
-param set-default FW_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
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	#param set EKF2_MAG_ACCLIM 0
+	#param set EKF2_MAG_YAWLIM 0

-param set-default FW_L1_PERIOD 25
+	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_PR_FF 0.40
-param set-default FW_PR_I 0.05
-param set-default FW_PR_P 0.05
+	param set FW_L1_PERIOD 25

-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_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_W_EN 1
+	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 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 FW_W_EN 1

-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
+	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 RWTO_TKOFF 1
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50

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

+fi

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

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

-param set-default FW_LND_AIRSPD_SC 1.1
-param set-default FW_LND_ANG 5
-param set-default FW_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
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	#param set EKF2_MAG_ACCLIM 0
+	#param set EKF2_MAG_YAWLIM 0

-param set-default FW_L1_PERIOD 25
+	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_PR_FF 0.40
-param set-default FW_PR_I 0.05
-param set-default FW_PR_P 0.05
+	param set FW_L1_PERIOD 25

-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_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_W_EN 1
+	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 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 FW_W_EN 1

-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
+	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 RWTO_TKOFF 1
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 50

-param set-default RWTO_MAX_PITCH 20
-param set-default RWTO_MAX_ROLL 10
+	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_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,36 +5,43 @@

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

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

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

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

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

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

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

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

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

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

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

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

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

-param set-default FW_LND_AIRSPD_SC 1.1
-param set-default FW_LND_ANG 5
-param set-default FW_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
+if [ $AUTOCNF = yes ]
+then
+	param set EKF2_ARSP_THR 8
+	param set EKF2_FUSE_BETA 1
+	#param set EKF2_MAG_ACCLIM 0
+	#param set EKF2_MAG_YAWLIM 0

-param set-default FW_L1_PERIOD 25
+	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_PR_FF 0.40
-param set-default FW_PR_I 0.05
-param set-default FW_PR_P 0.05
+	param set FW_L1_PERIOD 25

-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_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_W_EN 1
+	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 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 FW_W_EN 1

-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
+	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 RWTO_TKOFF 1
-param set-default RWTO_MAX_PITCH 20
-param set-default RWTO_MAX_ROLL 10
-param set-default RWTO_PSP 8
-param set-default RWTO_AIRSPD_SCL 1.8
+	param set NAV_ACC_RAD 15
+	param set NAV_DLL_ACT 2
+	param set 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

 set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
 set MIXER custom
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-param set-default EKF2_MAG_ACCLIM 0
-param set-default EKF2_MAG_YAWLIM 0
-
-param set-default FW_LND_AIRSPD_SC 1
-param set-default FW_LND_ANG 8
-param set-default FW_THR_LND_MAX 0
-
-param set-default FW_L1_PERIOD 12
-
-param set-default FW_MAN_P_MAX 30
-
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.2
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.1
-param set-default FW_RR_P 0.3
-
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_CRUISE 0.25
-
-param set-default FW_T_ALT_TC 2
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_HRATE_FF 0.5
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-param set-default FW_T_TAS_TC 2
-
-param set-default FW_W_EN 1
-
-param set-default MIS_LTRMIN_ALT 30
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default FW_USE_NPFG 1
-
-param set-default RWTO_TKOFF 1
-
-set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
-set MIXER custom
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with catapult
-#
-
-. ${R}etc/init.d-posix/airframes/1030_plane
-
-param set-default FW_THR_CRUISE 0.0
-param set-default RWTO_TKOFF 0
@@ -7,82 +7,46 @@

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

-# TODO: Enable motor failure detection when the
-# VTOL no longer reports 0A for all ESCs in SITL
-param set-default FD_ACT_EN 0
-param set-default FD_ACT_MOT_TOUT 500
+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 SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 2
+	param set FW_RR_FF 0.1
+	param set FW_RR_P 0.01

-param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-param set-default CA_ROTOR4_AX 1.0
-param set-default CA_ROTOR4_AZ 0.0
-param set-default CA_ROTOR4_PX 0.2
+	param set MC_ROLLRATE_P 0.3

-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_FUNC8 203
+	param set MIS_LTRMIN_ALT 10
+	param set MIS_TAKEOFF_ALT 10
+	param set MIS_YAW_TMT 10

-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_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_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
+	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 MC_ROLLRATE_P 0.3
-param set-default MC_YAW_P 1.6
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80

-param set-default MIS_TAKEOFF_ALT 10
+	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

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

-param set-default NAV_ACC_RAD 5
-
-param set-default VT_FWD_THRUST_EN 4
-param set-default VT_F_TRANS_THR 0.75
-param set-default VT_MOT_ID 1234
-param set-default VT_FW_MOT_OFFID 1234
-param set-default VT_B_TRANS_DUR 8
-param set-default VT_TYPE 2
+set MAV_TYPE 22

 set MIXER_FILE etc/mixers-sitl/standard_vtol_sitl.main.mix
 set MIXER custom
@@ -7,77 +7,38 @@

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

-param set-default MAV_TYPE 20
+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 SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 4
+	param set MC_ROLLRATE_P 0.3

-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 2
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
-param set-default CA_ROTOR3_KM -0.05
+	param set MIS_YAW_TMT 10

-param set-default CA_SV_CS_COUNT 2
-param set-default CA_SV_CS0_TYPE 5
-param set-default CA_SV_CS0_TRQ_P 0.5
-param set-default CA_SV_CS0_TRQ_Y -0.5
-param set-default CA_SV_CS1_TYPE 6
-param set-default CA_SV_CS1_TRQ_P 0.5
-param set-default CA_SV_CS1_TRQ_Y 0.5
+	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 PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 0
-param set-default PWM_MAIN_FUNC6 201
-param set-default PWM_MAIN_FUNC7 202
-param set-default PWM_MAIN_REV 96 # invert both elevons
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80

-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.2
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-param set-default FW_P_LIM_MIN -15
-param set-default FW_RR_P 0.2
-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 VT_F_TRANS_DUR 1.5
+	param set VT_F_TRANS_THR 0.7
+	param set VT_TYPE 0

-param set-default MC_ROLLRATE_P 0.3
+	param set WV_EN 0

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

-param set-default NAV_ACC_RAD 5
-
-param set-default VT_FW_DIFTHR_EN 1
-param set-default VT_FW_DIFTHR_SC 0.5
-param set-default VT_F_TRANS_DUR 1.5
-param set-default VT_F_TRANS_THR 0.7
-param set-default VT_TYPE 0
-
-param set-default WV_EN 0
+set MAV_TYPE 20

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

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

-param set-default MAV_TYPE 21
+if [ $AUTOCNF = yes ]
+then
+	param set FW_ARSP_MODE 1
+	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 SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 3
+	param set MC_ROLLRATE_P 0.3

-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
+	param set MIS_LTRMIN_ALT 10
+	param set MIS_TAKEOFF_ALT 10
+	param set MIS_YAW_TMT 10

-param set-default CA_ROTOR0_TILT 1
-param set-default CA_ROTOR2_TILT 3
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1.0
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_TL0_CT 0
-param set-default CA_SV_TL1_CT 0
-param set-default CA_SV_TL2_CT 0
-param set-default CA_SV_TL3_CT 0
-param set-default CA_SV_TL_COUNT 4
+	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.15
+	param set MPC_XY_VEL_D_ACC 0.1
+	param set MPC_XY_VEL_I_ACC 4
+	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 PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 204
-param set-default PWM_MAIN_FUNC6 205
-param set-default PWM_MAIN_FUNC7 206
-param set-default PWM_MAIN_FUNC8 207
-param set-default PWM_MAIN_FUNC9 201
-param set-default PWM_MAIN_FUNC10 202
-param set-default PWM_MAIN_FUNC11 203
+	param set NAV_ACC_RAD 5
+	param set NAV_LOITER_RAD 80

-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_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_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
+	param set VT_F_TRANS_DUR 5.0
+	param set VT_F_TRANS_THR 0.75
+	param set VT_FWD_THRUST_SC 1.1
+	param set VT_TILT_FW 1
+	param set VT_TILT_TRANS 0.6
+	param set VT_ELEV_MC_LOCK 0
+	param set VT_TYPE 1
+	param set VT_B_TRANS_DUR 8

-param set-default MC_YAW_P 1.6
+fi

-param set-default MIS_TAKEOFF_ALT 10
-
-param set-default MPC_ACC_HOR_MAX 2
-param set-default MPC_XY_P 0.8
-param set-default MPC_XY_VEL_P_ACC 3
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_D_ACC 0.1
-
-param set-default NAV_ACC_RAD 5
-
-param set-default VT_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

 set MIXER_FILE etc/mixers-sitl/tiltrotor_sitl.main.mix
 set MIXER custom
@@ -1,54 +0,0 @@
-#!/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_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 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 MIXER_FILE etc/mixers-sitl/standard_vtol_sitl.main.mix
-set MIXER custom
@@ -1 +0,0 @@
-mixer append /dev/pwm_output0 etc/mixers-sitl/package_drop.aux.mix
@@ -5,36 +5,33 @@

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

-param set-default GND_L1_DIST 5
-param set-default GND_L1_PERIOD 10
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 0.001
-param set-default GND_SPEED_I 3
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 0.25
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 4
-param set-default GND_THR_CRUISE 0.3
-param set-default GND_THR_MAX 0.5
-param set-default GND_THR_MIN 0
+if [ $AUTOCNF = yes ]
+then
+	param set GND_L1_DIST 5
+	param set GND_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 MIS_LTRMIN_ALT 0.01
-param set-default MIS_TAKEOFF_ALT 0.01
-param set-default NAV_ACC_RAD 0.5
-param set-default NAV_LOITER_RAD 2
+	param set MIS_LTRMIN_ALT 0.01
+	param set MIS_TAKEOFF_ALT 0.01
+	param set NAV_ACC_RAD 0.5
+	param set NAV_LOITER_RAD 2

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

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

-param set-default SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 5
+fi

-param set-default CA_R_REV 1
-param set-default PWM_MAIN_FUNC1 201
-param set-default PWM_MAIN_FUNC2 201
-param set-default PWM_MAIN_FUNC6 101
-param set-default PWM_MAIN_FUNC7 101
+set MAV_TYPE 10

-set MIXER_FILE skip
+set MIXER_FILE etc/mixers-sitl/rover_ackermann_sitl.main.mix
@@ -6,35 +6,33 @@

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

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

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

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

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

-param set-default SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 6
+fi

-param set-default CA_R_REV 3
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 101
-param set-default PWM_MAIN_FUNC6 102
-param set-default PWM_MAIN_FUNC7 102
+set MAV_TYPE 10

-set MIXER_FILE skip
+set MIXER_FILE etc/mixers-sitl/rover_diff_sitl.main.mix
@@ -10,29 +10,34 @@

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

-param set-default MAV_TYPE 10
+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

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

 set MIXER_FILE etc/mixers-sitl/rover_ackermann_sitl.main.mix
@@ -5,46 +5,33 @@

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

-param set-default GND_L1_DIST 5
-param set-default GND_L1_PERIOD 100
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 0.001
-param set-default GND_SPEED_I 8
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 2
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 1
-param set-default GND_THR_CRUISE 0.85
-param set-default GND_THR_MAX 1
-param set-default GND_THR_MIN 0
+if [ $AUTOCNF = yes ]
+then
+	param set GND_L1_DIST 5
+	param set GND_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 MIS_LTRMIN_ALT 0.01
-param set-default MIS_TAKEOFF_ALT 0.01
-param set-default NAV_ACC_RAD 0.5
-param set-default NAV_LOITER_RAD 2
+	param set MIS_LTRMIN_ALT 0.01
+	param set MIS_TAKEOFF_ALT 0.01
+	param set NAV_ACC_RAD 0.5
+	param set NAV_LOITER_RAD 2

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

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

-param set-default SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 9
+fi

-param set-default CA_ROTOR_COUNT 2
-param set-default CA_ROTOR0_AX 1
-param set-default CA_ROTOR0_AZ 0
-param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PX -2
-param set-default CA_ROTOR0_PY -1
-param set-default CA_ROTOR1_AX 1
-param set-default CA_ROTOR1_AZ 0
-param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PX -2
-param set-default CA_ROTOR1_PY 1
-param set-default CA_R_REV 3
+set MAV_TYPE 11

-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-
-set MIXER skip
+set MIXER_FILE etc/mixers-sitl/boat_sitl.main.mix
@@ -12,38 +12,53 @@

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

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

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

-param set-default FW_RR_P 0.08
+	param set FW_PR_IMAX 0.4
+	param set FW_R_TC 0.4
+	param set FW_RR_FF 0.5
+	param set FW_RR_I 0.1
+	param set FW_RR_IMAX 0.2
+	param set FW_RR_P 0.08

-param set-default MIS_LTRMIN_ALT 50
-param set-default MIS_TAKEOFF_ALT 3
+	param set MIS_LTRMIN_ALT 50
+	param set MIS_TAKEOFF_ALT 3

-param set-default NAV_ACC_RAD 20
-param set-default NAV_DLL_ACT 2
-param set-default NAV_LOITER_RAD 100
+	param set NAV_ACC_RAD 20
+	param set NAV_DLL_ACT 2
+	param set NAV_LOITER_RAD 100

-param set-default RWTO_TKOFF 1
+	param set RWTO_TKOFF 1
+	param set MAV_BROADCAST 1

-param set-default FW_ARSP_SCALE_EN 0
+	param set FW_ARSP_SCALE_EN 0

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

-param set-default FW_P_LIM_MAX 25
-param set-default FW_P_LIM_MIN -5
-param set-default FW_R_LIM 30
+	param set FW_P_LIM_MAX 25
+	param set FW_P_LIM_MIN -5
+	param set FW_R_LIM 30

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

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

 set MIXER_FILE etc/mixers-sitl/autogyro_sitl.main.mix
 set MIXER custom
@@ -11,31 +11,5 @@

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

-param set-default SYS_CTRL_ALLOC 1
-param set-default CA_AIRFRAME 9
-
-param set-default CA_ROTOR_COUNT 3
-param set-default CA_ROTOR0_AX 1.0000
-param set-default CA_ROTOR0_AZ 0.0000
-param set-default CA_ROTOR0_KM 0.0000
-param set-default CA_ROTOR0_PY 2.0000
-param set-default CA_ROTOR1_AX 1.0000
-param set-default CA_ROTOR1_AZ 0.0000
-param set-default CA_ROTOR1_KM 0.0000
-param set-default CA_ROTOR1_PY -2.0000
-param set-default CA_ROTOR2_AY -1.0000
-param set-default CA_ROTOR2_AZ 0.0000
-param set-default CA_ROTOR2_KM 0.0000
-param set-default CA_ROTOR2_PX -10.0000
-
-param set-default CA_SV_CS_COUNT 1
-param set-default CA_SV_CS0_TRQ_P 1.0000
-
-param set-default CA_R_REV 7
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 201
-param set-default PWM_MAIN_FUNC4 103
-
-set MIXER skip
+set MIXER cloudship
+set PWM_OUT 1234
@@ -9,21 +9,27 @@

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

-param set-default MAV_TYPE 13
+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_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

 set MIXER hexa_x
@@ -7,25 +7,26 @@

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

-param set-default MAV_TYPE 13
+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

 set MIXER hexa_x
@@ -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 -p
+mavlink start -x -u 14558 -r 4000 -f -m onboard -o 14530

 # shellcheck disable=SC2154
 mavlink stream -r 10 -s MOUNT_ORIENTATION -u $udp_gcs_port_local
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# @name Typhoon H480 SITL
-#
-# @type Hexarotor x
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-param set-default MAV_TYPE 13
-
-param set-default SYS_CTRL_ALLOC 1
-
-param set-default MC_PITCHRATE_P 0.0800
-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-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 CA_AIRFRAME 0
-param set-default CA_ROTOR_COUNT 6
-
-param set-default CA_ROTOR0_PX 0.0
-param set-default CA_ROTOR0_PY 1.0
-param set-default CA_ROTOR0_KM -0.05
-param set-default CA_ROTOR1_PX 0.0
-param set-default CA_ROTOR1_PY -1.0
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.866025
-param set-default CA_ROTOR2_PY -0.5
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.866025
-param set-default CA_ROTOR3_PY 0.5
-param set-default CA_ROTOR3_KM 0.05
-param set-default CA_ROTOR4_PX 0.866025
-param set-default CA_ROTOR4_PY 0.5
-param set-default CA_ROTOR4_KM 0.05
-param set-default CA_ROTOR5_PX -0.866025
-param set-default CA_ROTOR5_PY -0.5
-param set-default CA_ROTOR5_KM -0.05
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 106
-
-set MIXER skip
-set MIXER_AUX none
@@ -1,8 +0,0 @@
-
-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,8 +33,6 @@

 px4_add_romfs_files(
 	10016_iris
-	10017_iris_ctrlalloc
-	10018_iris_foggy_lidar
 	10020_if750a
 	10030_px4vision
 	1010_iris_opt_flow
@@ -46,6 +44,8 @@ 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
@@ -60,13 +60,9 @@ px4_add_romfs_files(
 	1034_rascal-electric
 	1035_techpod
 	1036_malolo
-	1037_believer
-	1038_glider
 	1040_standard_vtol
 	1041_tailsitter
 	1042_tiltrotor
-	1043_standard_vtol_drop
-	1043_standard_vtol_drop.post
 	1060_rover
 	1061_r1_rover
 	1062_tf-r1
@@ -77,6 +73,4 @@ px4_add_romfs_files(
 	2507_cloudship
 	6011_typhoon_h480
 	6011_typhoon_h480.post
-	6012_typhoon_h480_ctrlalloc
-	6012_typhoon_h480_ctrlalloc.post
 )
@@ -1,32 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-udp_offboard_port_local=$((14580+px4_instance))
-udp_offboard_port_remote=$((14540+px4_instance))
-[ $px4_instance -gt 9 ] && udp_offboard_port_remote=14549 # use the same ports for more than 10 instances to avoid port overlaps
-udp_onboard_payload_port_local=$((14280+px4_instance))
-udp_onboard_payload_port_remote=$((14030+px4_instance))
-udp_onboard_gimbal_port_local=$((13030+px4_instance))
-udp_onboard_gimbal_port_remote=$((13280+px4_instance))
-udp_gcs_port_local=$((18570+px4_instance))
-
-# GCS link
-mavlink start -x -u $udp_gcs_port_local -r 4000000 -f
-mavlink stream -r 50 -s POSITION_TARGET_LOCAL_NED -u $udp_gcs_port_local
-mavlink stream -r 50 -s LOCAL_POSITION_NED -u $udp_gcs_port_local
-mavlink stream -r 50 -s GLOBAL_POSITION_INT -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE_QUATERNION -u $udp_gcs_port_local
-mavlink stream -r 50 -s ATTITUDE_TARGET -u $udp_gcs_port_local
-mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u $udp_gcs_port_local
-mavlink stream -r 20 -s RC_CHANNELS -u $udp_gcs_port_local
-mavlink stream -r 10 -s OPTICAL_FLOW_RAD -u $udp_gcs_port_local
-
-# API/Offboard link
-mavlink start -x -u $udp_offboard_port_local -r 4000000 -f -m onboard -o $udp_offboard_port_remote
-
-# Onboard link to camera
-mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $udp_onboard_payload_port_remote
-
-# Onboard link to gimbal
-mavlink start -x -u $udp_onboard_gimbal_port_local -r 400000 -m gimbal -o $udp_onboard_gimbal_port_remote
@@ -1,5 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-#param set-default MAV_SYS_ID $((px4_instance+1))
-#param set-default IMU_INTEG_RATE 250
@@ -1,20 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-simulator_tcp_port=$((4560+px4_instance))
-
-# Check if PX4_SIM_HOSTNAME environment variable is empty
-# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
-# If both are empty use localhost for simulator
-if [ -z "${PX4_SIM_HOSTNAME}" ]; then
-  if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
-    echo "PX4 SIM HOST: localhost"
-    simulator start -c $simulator_tcp_port
-  else
-    echo "PX4 SIM HOST: $PX4_SIM_HOST_ADDR"
-    simulator start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port
-  fi
-else
-  echo "PX4 SIM HOST: $PX4_SIM_HOSTNAME"
-  simulator start -h $PX4_SIM_HOSTNAME $simulator_tcp_port
-fi
@@ -10,7 +10,7 @@ fi

 if [ ! -f replay_params.txt ]; then
 	echo "Creating $(pwd)/replay_params.txt"
-	ulog_params -i "${replay}" -l ' ' | grep -e '^EKF2' > replay_params.txt
+	ulog_params -i "${replay}" -d ' ' | grep -e '^EKF2' > replay_params.txt
 fi

 publisher_rules_file="orb_publisher.rules"
@@ -20,8 +20,8 @@ module: replay
 ignore_others: false
 EOF

+uorb start
 param set SDLOG_DIRS_MAX 7
-param set SDLOG_PROFILE 3

 # apply all params before ekf starts, as some params cannot be changed after startup
 replay tryapplyparams
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`mixer append /dev/pwm_output0 etc/mixers-sitl/package_drop.aux.mix`