module.h fix trivial whitespace astyle failure

.ci/Jenkinsfile-compile

@@ -35,7 +35,6 @@ pipeline {
 
           def nuttx_builds_archive = [
             target: [
-                     "3dr_ctrl-zero-h7-oem-revg_default",
                      "airmind_mindpx-v2_default",
                      "ark_can-flow_canbootloader",
                      "ark_can-flow_default",
@@ -47,15 +46,12 @@ pipeline {
                      "ark_cannode_default",
                      "ark_fmu-v6x_bootloader",
                      "ark_fmu-v6x_default",
-                     "ark_fpv_bootloader",
-                     "ark_fpv_default",
                      "ark_pi6x_bootloader",
                      "ark_pi6x_default",
                      "atl_mantis-edu_default",
                      "av_x-v1_default",
                      "bitcraze_crazyflie21_default",
                      "bitcraze_crazyflie_default",
-                     "cuav_7-nano_default",
                      "cuav_can-gps-v1_canbootloader",
                      "cuav_can-gps-v1_default",
                      "cuav_nora_default",
@@ -80,7 +76,6 @@ pipeline {
                      "matek_h743-mini_default",
                      "matek_h743-slim_default",
                      "matek_h743_default",
-                     "micoair_h743_default",
                      "modalai_fc-v1_default",
                      "modalai_fc-v2_default",
                      "mro_ctrl-zero-classic_default",
@@ -133,9 +128,6 @@ pipeline {
                      "thepeach_k1_default",
                      "thepeach_r1_default",
                      "uvify_core_default",
-                     "x-mav_ap-h743v2_default",
-                     "zeroone_x6_bootloader",
-                     "zeroone_x6_default",
             ],
             image: docker_images.nuttx,
             archive: true

.editorconfig

@@ -9,6 +9,6 @@ tab_width = 8
 # Not in the official standard, but supported by many editors
 max_line_length = 120
 
-[*.yaml, *.yml]
+[*.yaml]
 indent_style = space
 indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -20,14 +20,14 @@ body:
           3. Took off '....'
           4. See error
     validations:
-      required: false
+      required: true
 
   - type: textarea
     attributes:
       label: Expected behavior
       description: A clear and concise description of what you expected to happen.
     validations:
-      required: false
+      required: true
 
   - type: textarea
     attributes:
@@ -45,7 +45,7 @@ body:
       placeholder: |
           # PASTE HERE THE LINK TO THE LOG
     validations:
-      required: false
+      required: true
 
   - type: markdown
     attributes:
@@ -60,14 +60,14 @@ body:
       placeholder: |
           # If you don't know the version, paste the output of `ver all` in the MAVLink Shell of QGC
     validations:
-      required: false
+      required: true
 
   - type: input
     attributes:
       label: Flight controller
       description: Specify your flight controller model (what type is it, where was it bought from, ...).
     validations:
-      required: false
+      required: true
 
   - type: dropdown
     attributes:

.github/workflows/build_all_targets.yml

@@ -1,173 +0,0 @@
-# NOTE: this workflow is now running on Dronecode / PX4 AWS account.
-# - If you want to keep the tests running in GitHub Actions you need to uncomment the "runs-on: ubuntu-latest" lines
-#   and comment the "runs-on: [runs-on,runner=..." lines.
-# - If you would like to duplicate this setup try setting up "RunsOn" on your own AWS account try https://runs-on.com
-
-name: Build all targets
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        required: true
-        description: release version
-  push:
-    tags:
-      - 'v*'
-    branches:
-      - 'main'
-      - 'stable'
-      - 'beta'
-      - 'release/**'
-  pull_request:
-    branches:
-      - '*'
-
-jobs:
-  group_targets:
-    name: Scan for Board Targets
-    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}"]
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-      timestamp: ${{ steps.set-timestamp.outputs.timestamp }}
-      tagname: ${{ steps.set-tag.outputs.tagname }}
-      branchname: ${{ steps.set-branch.outputs.branchname }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Python Dependencies
-        uses: py-actions/py-dependency-install@v4
-        with:
-          path: "./Tools/setup/requirements.txt"
-
-      - id: set-matrix
-        run: echo "::set-output name=matrix::$(./Tools/ci/generate_board_targets_json.py --group)"
-
-      - id: set-timestamp
-        run: echo "::set-output name=timestamp::$(date +"%Y%m%d%H%M%S")"
-
-      # This job is also triggered with versioned tags
-      #   Creating a and pushing a tag starting with "v" just as "v1.0.0"
-      #   will trigger this workflow and when all builds are done create a Github Release
-      #   then it will upload all binaries built as assets
-      # Additionally, we can also trigger this step manually
-      #   From the Github Actions tab for this repository:
-      #   https://github.com/PX4/PX4-Autopilot/actions/workflows/build_all_targets.yml
-      #   You can now click a "Run Workflow" button that will prompt you for a tag name
-      #   This tag name has to match an existing tag otherwise the new release will be detached
-      #   Note: Only developers with "write" permission to the repository can use this feature
-      - id: set-tag
-        if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
-        run: echo "::set-output name=tagname::${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}"
-
-      - id: set-branch
-        run: echo "::set-output name=branchname::${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
-
-      - name: Debug Matrix Output
-        if: runner.debug == '1'
-        run: echo "$(./Tools/ci/generate_board_targets_json.py --group --verbose)"
-
-  setup:
-    name: Build Group [${{ matrix.group }}]
-    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}"]
-    needs: group_targets
-    strategy:
-      matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }}
-    container:
-      image: ${{ matrix.container }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Git ownership workaround
-        run: git config --system --add safe.directory '*'
-
-      - name: Setup ccache
-        uses: actions/cache@v4
-        with:
-          path: ~/.ccache
-          key: ${{ matrix.group }}-ccache-${{ needs.group_targets.outputs.timestamp }}
-          restore-keys: ${{ matrix.group }}-ccache-${{ needs.group_targets.outputs.timestamp }}
-
-      - name: Configure 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 = 120M" >> ~/.ccache/ccache.conf
-            echo "hash_dir = false" >> ~/.ccache/ccache.conf
-            ccache -s
-            ccache -z
-
-      - name: Building [${{ matrix.group }}]
-        run: |
-            ./Tools/ci/build_all_runner.sh ${{matrix.targets}}
-
-      - name: Arrange Build Artifacts
-        run: |
-          ./Tools/ci/package_build_artifacts.sh
-
-      - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: px4_${{matrix.group}}_build_artifacts
-          path: artifacts/
-
-      - name: Cache Save
-        run: ccache -s
-
-  artifacts:
-    name: Upload Artifacts to S3
-    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}"]
-    needs: [setup, group_targets]
-    if: contains(fromJSON('["main", "stable", "beta"]'), needs.group_targets.outputs.branchname)
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts/
-          merge-multiple: true
-
-      - name: Branch Name
-        run: |
-          echo "${{ needs.group_targets.outputs.branchname }}"
-
-      - name: Uploading Artifacts to S3 [${{ needs.group_targets.outputs.branchname == 'main' && 'master' || needs.group_targets.outputs.branchname }}]
-        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: artifacts/
-          DEST_DIR: Firmware/${{ needs.group_targets.outputs.branchname == 'main' && 'master' || needs.group_targets.outputs.branchname }}/
-
-  release:
-    name: Create Release and Upload Artifacts
-    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}"]
-    needs: [setup, group_targets]
-    if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Arrange Binaries
-        run: |
-          mkdir artifacts
-          cp **/**/*.px4 artifacts/
-
-      - name: Upload Binaries to Release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: ${{ needs.group_targets.outputs.tagname }}
-          tag_name: ${{ needs.group_targets.outputs.tagname }}
-          draft: true
-          files: artifacts/*.px4

.github/workflows/checks.yml

@@ -16,7 +16,6 @@ jobs:
       matrix:
         check: [
           "check_format",
-          "check_newlines",
           "tests",
           "tests_coverage",
           "px4_fmu-v2_default stack_check",

.github/workflows/compile_linux.yml

@@ -0,0 +1,58 @@
+name: Compile Linux Targets
+
+on:
+  push:
+    branches:
+    - 'main'
+    - 'stable'
+    - 'beta'
+    - 'release/*'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-armhf:2023-06-26
+    strategy:
+      matrix:
+        config: [
+          beaglebone_blue_default,
+          emlid_navio2_default,
+          px4_raspberrypi_default,
+          scumaker_pilotpi_default,
+          ]
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{secrets.ACCESS_TOKEN}}
+    - name: ownership workaround
+      run: git config --system --add safe.directory '*'
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: ${{matrix.config}}-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
+          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
+    - name: make ${{matrix.config}}
+      run: make ${{matrix.config}}
+    - name: ccache post-run
+      run: ccache -s

.github/workflows/compile_linux_arm64.yml

@@ -0,0 +1,54 @@
+name: Compile Linux ARM64 Targets
+
+on:
+  push:
+    branches:
+    - 'main'
+    - 'stable'
+    - 'beta'
+    - 'release/*'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-aarch64:2022-08-12
+    strategy:
+      matrix:
+        config: [
+          scumaker_pilotpi_arm64,
+          ]
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{secrets.ACCESS_TOKEN}}
+
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: ${{matrix.config}}-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "max_size = 100M" >> ~/.ccache/ccache.conf
+          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
+    - name: make ${{matrix.config}}
+      run: make ${{matrix.config}}
+    - name: ccache post-run
+      run: ccache -s

.github/workflows/compile_nuttx.yml

@@ -0,0 +1,136 @@
+name: Compile Nuttx Targets
+
+on:
+  push:
+    branches:
+    - 'main'
+    - 'stable'
+    - 'beta'
+    - 'release/*'
+  pull_request:
+    branches:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-nuttx-focal:2022-08-12
+    strategy:
+      fail-fast: false
+      matrix:
+        config: [
+          airmind_mindpx-v2,
+          ark_can-flow,
+          ark_can-gps,
+          ark_can-rtk-gps,
+          ark_cannode,
+          ark_fmu-v6x,
+          ark_pi6x,
+          ark_septentrio-gps,
+          atl_mantis-edu,
+          av_x-v1,
+          bitcraze_crazyflie,
+          bitcraze_crazyflie21,
+          cuav_can-gps-v1,
+          cuav_nora,
+          cuav_x7pro,
+          cubepilot_cubeorange,
+          cubepilot_cubeorangeplus,
+          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-classic,
+          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_mr-canhubk3,
+          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,
+          px4_fmu-v6xrt,
+          raspberrypi_pico,
+          sky-drones_smartap-airlink,
+          spracing_h7extreme,
+          uvify_core,
+          siyi_n7
+          ]
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{secrets.ACCESS_TOKEN}}
+
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: ${{matrix.config}}-ccache-
+    - name: setup ccache
+      run: |
+          mkdir -p ~/.ccache
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "max_size = 120M" >> ~/.ccache/ccache.conf
+          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
+    - name: make all_variants_${{matrix.config}}
+      run: make all_variants_${{matrix.config}}
+      timeout-minutes: 45
+    - name: make ${{matrix.config}} bloaty_compileunits
+      run: make ${{matrix.config}} bloaty_compileunits || true
+    - name: make ${{matrix.config}} bloaty_inlines
+      run: make ${{matrix.config}} bloaty_inlines || true
+    - name: make ${{matrix.config}} bloaty_segments
+      run: make ${{matrix.config}} bloaty_segments || true
+    - name: make ${{matrix.config}} bloaty_symbols
+      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
+      with:
+        name: px4_package_${{matrix.config}}
+        path: |
+          build/**/*.px4
+          build/**/*.bin

.github/workflows/deploy_all.yml

@@ -0,0 +1,57 @@
+name: Deploy metadata for all targets
+
+on:
+  push:
+    branches:
+    - 'main'
+    - '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: ${{ matrix.container }}
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{secrets.ACCESS_TOKEN}}
+
+    - name: ownership workaround
+      run: git config --system --add safe.directory '*'
+
+    - 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 }}/'
+

.github/workflows/mavros_mission_tests.yml

@@ -11,8 +11,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     strategy:
       fail-fast: false
       matrix:
@@ -88,7 +86,7 @@ jobs:
       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@v3
+      uses: actions/upload-artifact@v2-preview
       with:
         name: coredump
         path: px4.core
@@ -103,21 +101,21 @@ jobs:
 
     - name: Upload px4 binary
       if: failure()
-      uses: actions/upload-artifact@v3
+      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@v3
+      uses: actions/upload-artifact@v2
       with:
         name: px4_log
         path: ~/.ros/log/*/*.ulg
 
     - name: Store ROS log
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: ros_log
         path: ~/.ros/**/rostest-*.log

.github/workflows/mavros_offboard_tests.yml

@@ -11,8 +11,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     strategy:
       fail-fast: false
       matrix:
@@ -83,7 +81,7 @@ jobs:
       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@v3
+      uses: actions/upload-artifact@v2-preview
       with:
         name: coredump
         path: px4.core
@@ -98,21 +96,21 @@ jobs:
 
     - name: Upload px4 binary
       if: failure()
-      uses: actions/upload-artifact@v3
+      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@v3
+      uses: actions/upload-artifact@v2
       with:
         name: px4_log
         path: ~/.ros/log/*/*.ulg
 
     - name: Store ROS log
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: ros_log
         path: ~/.ros/**/rostest-*.log

.github/workflows/metadata.yml

@@ -0,0 +1,133 @@
+name: Metadata
+
+on:
+  push:
+    branches:
+    - 'main'
+    - 'release/*'
+    - 'pr-metadata-test'
+
+jobs:
+
+  airframe:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2021-09-08
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - 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/'
+
+  module:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2021-09-08
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: module documentation
+      run: |
+        make module_documentation
+        cd build/px4_sitl_default/docs
+        ls -ls *
+      # TODO: deploy to userguide gitbook and s3
+
+  parameter:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2021-09-08
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - 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/'
+
+  uorb_graph:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-nuttx-focal:2022-08-12
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: uORB graph
+      run: |
+        make uorb_graphs
+        cd Tools/uorb_graph
+        ls -ls *
+      # TODO: deploy graph_px4_sitl.json to S3 px4-travis:Firmware/master/
+
+  ROS2_msgs:
+    runs-on: ubuntu-latest
+    container: px4io/px4-dev-base-focal:2021-09-08
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: PX4 ROS2 msgs
+      run: |
+        git clone https://github.com/PX4/px4_msgs.git
+        rm px4_msgs/msg/*.msg
+        rm px4_msgs/srv/*.srv
+        cp msg/*.msg px4_msgs/msg/
+        cp srv/*.srv px4_msgs/srv/

.github/workflows/python_checks.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
       with:
@@ -18,7 +18,7 @@ jobs:
     - name: Install Python3
       run: sudo apt-get install python3 python3-setuptools python3-pip -y
     - name: Install tools
-      run: python3 -m pip install mypy types-requests flake8 --break-system-packages
+      run: pip3 install --user mypy types-requests flake8
     - name: Check MAVSDK test scripts with mypy
       run: $HOME/.local/bin/mypy --strict test/mavsdk_tests/*.py
     - name: Check MAVSDK test scripts with flake8

.github/workflows/sitl_tests.yml

@@ -1,8 +1,3 @@
-# NOTE: this workflow is now running on Dronecode / PX4 AWS account.
-# - If you want to keep the tests running in GitHub Actions you need to uncomment the "runs-on: ubuntu-latest" lines
-#   and comment the "runs-on: [runs-on,runner=..." lines.
-# - If you would like to duplicate this setup try setting up "RunsOn" on your own AWS account try https://runs-on.com
-
 name: SITL Tests
 
 on:
@@ -15,139 +10,126 @@ on:
 
 jobs:
   build:
-    name: Testing PX4 ${{ matrix.config.model }}
-    runs-on: [runs-on,runner=16cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}"]
-    container:
-      image: px4io/px4-dev-simulation-focal:2021-09-08
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    runs-on: ubuntu-latest
     strategy:
       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
 
+    container:
+      image: px4io/px4-dev-simulation-focal:2021-09-08
+      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.ACCESS_TOKEN }}
 
-      - name: Git Ownership Workaround
-        run: git config --system --add safe.directory '*'
+    - 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"
+    - name: Install MAVSDK
+      run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
 
-      - id: set-timestamp
-        name: Set timestamp for cache
-        run: echo "::set-output name=timestamp::$(date +"%Y%m%d%H%M%S")"
+    - 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 = 100M" >> ~/.ccache/ccache.conf
+          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
 
-      - name: Cache Key Config
-        uses: actions/cache@v4
-        with:
-          path: ~/.ccache
-          key: sitl-ccache-${{ steps.set-timestamp.outputs.timestamp }}
-          restore-keys: sitl-ccache-${{ steps.set-timestamp.outputs.timestamp }}
+    - name: check environment
+      env:
+        PX4_HOME_LAT: ${{matrix.config.latitude}}
+        PX4_HOME_LON: ${{matrix.config.longitude}}
+        PX4_HOME_ALT: ${{matrix.config.altitude}}
+        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+      run: |
+          export
+          ulimit -a
+    - name: Build PX4
+      env:
+        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+      run: make px4_sitl_default
+    - name: ccache post-run px4/firmware
+      run: ccache -s
+    - name: Build SITL Gazebo
+      env:
+        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+      run: make px4_sitl_default sitl_gazebo-classic
+    - name: ccache post-run sitl_gazebo-classic
+      run: ccache -s
+    - name: Build MAVSDK tests
+      env:
+        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+        DONT_RUN: 1
+      run: make px4_sitl_default sitl_gazebo-classic mavsdk_tests
+    - name: ccache post-run mavsdk_tests
+      run: ccache -s
 
-      - name: Cache Conf Config
-        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 = 120M" >> ~/.ccache/ccache.conf
-            echo "hash_dir = false" >> ~/.ccache/ccache.conf
-            ccache -s
-            ccache -z
+    - name: Core dump settings
+      run: |
+          ulimit -c unlimited
+          echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
 
-      - name: Build PX4
-        env:
-          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        run: make px4_sitl_default
+    - name: Run SITL tests
+      env:
+        PX4_HOME_LAT: ${{matrix.config.latitude}}
+        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
 
-      - name: Cache Post-Run [px4_sitl_default]
-        run: ccache -s
+    - 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: Build SITL Gazebo
-        env:
-          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        run: make px4_sitl_default sitl_gazebo-classic
+    - name: Upload px4 binary
+      if: failure()
+      uses: actions/upload-artifact@v2-preview
+      with:
+        name: binary
+        path: build/px4_sitl_default/bin/px4
 
-      - name: Cache Post-Run [sitl_gazebo-classic]
-        run: ccache -s
-
-      - 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"
-
-      - name: Install MAVSDK
-        run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
-
-      - name: Check PX4 Environment Variables
-        env:
-          PX4_HOME_LAT: ${{matrix.config.latitude}}
-          PX4_HOME_LON: ${{matrix.config.longitude}}
-          PX4_HOME_ALT: ${{matrix.config.altitude}}
-          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        run: |
-            export
-            ulimit -a
-
-      - name: Build PX4 / MAVSDK tests
-        env:
-          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-          DONT_RUN: 1
-        run: make px4_sitl_default sitl_gazebo-classic mavsdk_tests
-
-      - name: Cache Post-Run [px4_sitl_default sitl_gazebo-classic mavsdk_tests]
-        run: ccache -s
-
-      - name: Core Dump Settings
-        run: |
-            ulimit -c unlimited
-            echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
-
-      - name: Run SITL / MAVSDK Tests
-        env:
-          PX4_HOME_LAT: ${{matrix.config.latitude}}
-          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 10 --abort-early --model ${{matrix.config.model}} --upload test/mavsdk_tests/configs/sitl.json --verbose
-        timeout-minutes: 45
-
-      - name: Upload failed logs
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: failed-${{matrix.config.model}}-logs.zip
-          path: |
-            logs/**/**/**/*.log
-            logs/**/**/**/*.ulg
-            build/px4_sitl_default/tmp_mavsdk_tests/rootfs/*.ulg
-
-      - name: Look at Core files
-        if: failure() && ${{ hashFiles('px4.core') != '' }}
-        run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
-
-      - name: Upload PX4 coredump
-        if: failure() && ${{ hashFiles('px4.core') != '' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coredump
-          path: px4.core
-
-      - name: Setup & Generate Coverage Report
-        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@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          flags: mavsdk
-          file: coverage/lcov.info
+    # 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: mavsdk
+        file: coverage/lcov.info

.gitmodules

@@ -2,6 +2,10 @@
 	path = src/modules/mavlink/mavlink
 	url = https://github.com/mavlink/mavlink.git
 	branch = master
+[submodule "src/drivers/uavcan/libuavcan"]
+	path = src/drivers/uavcan/libuavcan
+	url = https://github.com/dronecan/libuavcan.git
+	branch = main
 [submodule "Tools/simulation/jmavsim/jMAVSim"]
 	path = Tools/simulation/jmavsim/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
@@ -67,7 +71,7 @@
 [submodule "src/modules/zenoh/zenoh-pico"]
 	path = src/modules/zenoh/zenoh-pico
 	url = https://github.com/px4/zenoh-pico
-	branch = dev/1.0.0-px4
+	branch = pr-zubf-werror-fix
 [submodule "src/lib/heatshrink/heatshrink"]
 	path = src/lib/heatshrink/heatshrink
 	url = https://github.com/PX4/heatshrink.git
@@ -79,13 +83,3 @@
 [submodule "boards/modalai/voxl2/libfc-sensor-api"]
 	path = boards/modalai/voxl2/libfc-sensor-api
 	url = https://gitlab.com/voxl-public/voxl-sdk/core-libs/libfc-sensor-api.git
-[submodule "src/drivers/actuators/vertiq_io/iq-module-communication-cpp"]
-	path = src/drivers/actuators/vertiq_io/iq-module-communication-cpp
-	url = https://github.com/PX4/iq-module-communication-cpp.git
-	branch = master
-[submodule "src/drivers/uavcan/libdronecan/dsdl"]
-	path = src/drivers/uavcan/libdronecan/dsdl
-	url = https://github.com/PX4/DSDL.git
-[submodule "src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan"]
-	path = src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan
-	url = https://github.com/dronecan/pydronecan

.vscode/cmake-kits.json

@@ -2,4 +2,4 @@
 	{
 		"name": "PX4 detect"
 	}
-]
+]

.vscode/cmake-variants.yaml

@@ -111,11 +111,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: px4_fmu-v6xrt_bootloader
-    3dr_ctrl-zero-h7-oem-revg_default:
-      short: 3dr_ctrl-zero-h7-oem-revg
-      buildType: MinSizeRel
-      settings:
-        CONFIG: 3dr_ctrl-zero-h7-oem-revg_default
     airmind_mindpx-v2_default:
       short: airmind_mindpx-v2
       buildType: MinSizeRel
@@ -186,16 +181,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_fmu-v6x_default
-    ark_fpv_bootloader:
-      short: ark_fpv_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_fpv_bootloader
-    ark_fpv_default:
-      short: ark_fpv_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_fpv_default
     ark_pi6x_bootloader:
       short: ark_pi6x_bootloader
       buildType: MinSizeRel
@@ -241,11 +226,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: cuav_x7pro_default
-    cuav_7-nano_default:
-      short: cuav_7-nano
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_7-nano_default
     cubepilot_cubeorange_test:
       short: cubepilot_cubeorange
       buildType: MinSizeRel
@@ -301,11 +281,6 @@ CONFIG:
       buildType: MiniSizeRel
       settings:
         CONFIG: matek_gnss-m9n-f4_default
-    micoair_h743_default:
-      short: micoair_h743
-      buildType: MinSizeRel
-      settings:
-        CONFIG: micoair_h743_default
     modalai_fc-v1_default:
       short: modalai_fc-v1
       buildType: MinSizeRel
@@ -361,23 +336,3 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: raspberrypi_pico_default
-    zeroone_x6_default:
-      short: zeroone_x6
-      buildType: MinSizeRel
-      settings:
-        CONFIG: zeroone_x6_default
-    zeroone_x6_bootloader:
-      short: zeroone_x6_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: zeroone_x6_bootloader
-    x-mav_ap-h743v2_bootloader:
-      short: x-mav_ap-h743v2-boot
-      buildType: MinSizeRel
-      settings:
-        CONFIG: x-mav_ap-h743v2_bootloader
-    x-mav_ap-h743v2_default:
-      short: x-mav_ap-h743v2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: x-mav_ap-h743v2_default

CMakeLists.txt

@@ -113,20 +113,12 @@ include(px4_parse_function_args)
 include(px4_git)
 
 execute_process(
-	COMMAND git describe --exclude ext/* --tags --match "v[0-9]*"
+	COMMAND git describe --exclude ext/* --always --tags
 	OUTPUT_VARIABLE PX4_GIT_TAG
 	OUTPUT_STRIP_TRAILING_WHITESPACE
-	RESULTS_VARIABLE GIT_DESCRIBE_RESULT
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
 	)
 
-# if proper git tag unavilable default to v0.0.0
-if(NOT ${GIT_DESCRIBE_RESULT} MATCHES "0")
-	set(PX4_GIT_TAG "v0.0.0")
-endif()
-
-message(STATUS "PX4_GIT_TAG: ${PX4_GIT_TAG}")
-
 # git describe to X.Y.Z version
 string(REPLACE "." ";" VERSION_LIST ${PX4_GIT_TAG})
 

Documentation/Doxyfile.in

@@ -828,7 +828,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @CMAKE_SOURCE_DIR@/src/modules/uavcan/libdronecan \
+EXCLUDE                = @CMAKE_SOURCE_DIR@/src/modules/uavcan/libuavcan \
                          @CMAKE_SOURCE_DIR@/src/examples \
                          @CMAKE_SOURCE_DIR@/src/templates
 

Kconfig

@@ -185,17 +185,6 @@ menu "Serial ports"
         string "EXT2 tty port"
 endmenu
 
-menu "File paths"
-
-    config BOARD_ROOT_PATH
-        string "PX4 Root file path"
-        default "/fs/microsd"
-
-    config BOARD_PARAM_FILE
-        string "Parameter file"
-        default "/fs/mtd_params"
-endmenu
-
 menu "drivers"
 source "src/drivers/Kconfig"
 endmenu

Makefile

@@ -324,13 +324,10 @@ px4io_update:
 	git status
 
 bootloaders_update: \
-	3dr_ctrl-zero-h7-oem-revg_bootloader \
 	ark_fmu-v6x_bootloader \
-	ark_fpv_bootloader \
 	ark_pi6x_bootloader \
 	cuav_nora_bootloader \
 	cuav_x7pro_bootloader \
-	cuav_7-nano_bootloader \
 	cubepilot_cubeorange_bootloader \
 	cubepilot_cubeorangeplus_bootloader \
 	hkust_nxt-dual_bootloader \
@@ -342,7 +339,6 @@ bootloaders_update: \
 	matek_h743_bootloader \
 	matek_h743-mini_bootloader \
 	matek_h743-slim_bootloader \
-        micoair_h743_bootloader \
 	modalai_fc-v2_bootloader \
 	mro_ctrl-zero-classic_bootloader \
 	mro_ctrl-zero-h7_bootloader \
@@ -383,9 +379,9 @@ doxygen:
 	@$(PX4_MAKE) -C "$(SRC_DIR)"/build/doxygen
 	@touch "$(SRC_DIR)"/build/doxygen/Documentation/.nojekyll
 
-# Style
+# Astyle
 # --------------------------------------------------------------------
-.PHONY: check_format format check_newlines
+.PHONY: check_format format
 
 check_format:
 	$(call colorecho,'Checking formatting with astyle')
@@ -396,10 +392,6 @@ format:
 	$(call colorecho,'Formatting with astyle')
 	@"$(SRC_DIR)"/Tools/astyle/check_code_style_all.sh --fix
 
-check_newlines:
-	$(call colorecho,'Checking for missing or duplicate newlines at the end of files')
-	@"$(SRC_DIR)"/Tools/astyle/check_newlines.sh
-
 # Testing
 # --------------------------------------------------------------------
 .PHONY: tests tests_coverage tests_mission tests_mission_coverage tests_offboard tests_avoidance
@@ -553,14 +545,14 @@ distclean:
 # All other targets are handled by PX4_MAKE. Add a rule here to avoid printing an error.
 %:
 	$(if $(filter $(FIRST_ARG),$@), \
-		$(error "Make target $@ not found. It either does not exist or $@ cannot be the first argument. Use '$(MAKE) list_config_targets' to get a list of all possible [configuration] targets."),@#)
+		$(error "Make target $@ not found. It either does not exist or $@ cannot be the first argument. Use '$(MAKE) help|list_config_targets' to get a list of all possible [configuration] targets."),@#)
 
 # Print a list of non-config targets (based on http://stackoverflow.com/a/26339924/1487069)
 help:
 	@echo "Usage: $(MAKE) <target>"
 	@echo "Where <target> is one of:"
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | \
-		awk -v RS= -F: '/(^|\n)# Files(\n|$$)/,/(^|\n)# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | \
+		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)'
 	@echo
 	@echo "Or, $(MAKE) <config_target> [<make_target(s)>]"

README.md

@@ -63,9 +63,8 @@ Note: This is the source of truth for the active maintainers of PX4 ecosystem.
 | Multirotor | [Matthias Grob](https://github.com/MaEtUgR) |
 | Fixed Wing | [Thomas Stastny](https://github.com/tstastny) |
 | Hybrid VTOL | [Silvan Fuhrer](https://github.com/sfuhrer) |
-| Rover | [Christian Friedrich](https://github.com/chfriedrich98) |
 | Boat | x |
-
+| Rover | x |
 
 See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/PX4-Autopilot/graphs/contributors) (Github). However it may be not up to date.
 
@@ -119,7 +118,7 @@ These boards don't fully comply industry standards, and thus is solely maintaine
 
 ### Experimental
 
-These boards are not maintained by PX4 team nor Manufacturer, and is not guaranteed to be compatible with up to date PX4 releases.
+These boards are nor maintained by PX4 team nor Manufacturer, and is not guaranteed to be compatible with up to date PX4 releases.
 
 * [Raspberry PI with Navio 2](https://docs.px4.io/main/en/flight_controller/raspberry_pi_navio2.html)
 * [Bitcraze Crazyflie 2.0](https://docs.px4.io/main/en/complete_vehicles/crazyflie2.html)

ROMFS/CMakeLists.txt

@@ -120,7 +120,6 @@ add_custom_command(
 		${romfs_gen_root_dir}/init.d/rc.serial
 		${romfs_gen_root_dir}/init.d/rc.autostart
 		${romfs_gen_root_dir}/init.d/rc.autostart.post
-		${romfs_gen_root_dir}/init.d/rc.filepaths
 		${romfs_copy_stamp}
 	COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}/*
 	COMMAND ${CMAKE_COMMAND} -E tar xf ${romfs_tar_file}
@@ -132,9 +131,6 @@ add_custom_command(
 		--rc-dir ${romfs_gen_root_dir}/init.d
 		--serial-ports ${board_serial_ports} ${added_arguments}
 		--config-files ${module_config_files} #--verbose
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/filepaths/generate_config.py
-		--rc-dir ${romfs_gen_root_dir}/init.d
-		--params-file ${CONFIG_BOARD_PARAM_FILE}
 	COMMAND ${CMAKE_COMMAND} -E touch ${romfs_copy_stamp}
 	WORKING_DIRECTORY ${romfs_gen_root_dir}
 	DEPENDS ${romfs_tar_file}
@@ -324,7 +320,6 @@ add_custom_target(romfs_gen_files_target
 	DEPENDS
 		${romfs_copy_stamp}
 		${romfs_gen_root_dir}/init.d/rc.serial
-		${romfs_gen_root_dir}/init.d/rc.filepaths
 		romfs_extras.stamp
 	)
 

ROMFS/cannode/init.d/rcS

@@ -21,14 +21,25 @@ set R /
 #
 ver all
 
-# Load param file location from kconfig
-. ${R}etc/init.d/rc.filepaths
+if mft query -q -k MTD -s MTD_PARAMETERS -v /fs/mtd_params
+then
+	set PARAM_FILE /fs/mtd_params
+fi
+
+if mft query -q -k MTD -s MTD_PARAMETERS -v /dev/eeeprom0
+then
+	set PARAM_FILE /dev/eeeprom0
+fi
+
+if mft query -q -k MTD -s MTD_PARAMETERS -v /mnt/qspi/params
+then
+	set PARAM_FILE /mnt/qspi/params
+fi
 
 #
 # Load parameters.
 #
 param select $PARAM_FILE
-
 if ! param load
 then
 	param reset_all

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

@@ -29,3 +29,4 @@ param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
 param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
+

ROMFS/px4fmu_common/init.d-posix/airframes/10018_gazebo-classic_iris_foggy_lidar

@@ -30,3 +30,4 @@ param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
 
 param set-default EKF2_RNG_A_HMAX 10
+

ROMFS/px4fmu_common/init.d-posix/airframes/10019_gazebo-classic_omnicopter

@@ -94,3 +94,4 @@ param set-default CA_METHOD 0
 # disable attitude failure detection
 param set-default FD_FAIL_P 0
 param set-default FD_FAIL_R 0
+

ROMFS/px4fmu_common/init.d-posix/airframes/10030_gazebo-classic_px4vision

@@ -12,3 +12,4 @@ param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
 param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
+

ROMFS/px4fmu_common/init.d-posix/airframes/10040_sihsim_quadx

@@ -19,6 +19,8 @@ param set-default SENS_EN_MAGSIM 1
 # disable some checks to allow to fly:
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 # Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4

ROMFS/px4fmu_common/init.d-posix/airframes/10041_sihsim_airplane

@@ -21,6 +21,8 @@ param set-default SENS_EN_ARSPDSIM 1
 param set-default CBRK_USB_CHK 197848
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 param set-default SIH_T_MAX 6
 param set-default SIH_MASS 0.3

ROMFS/px4fmu_common/init.d-posix/airframes/10042_sihsim_xvert

@@ -30,6 +30,8 @@ param set-default MAV_TYPE 19
 # disable some checks to allow to fly:
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 param set-default SIH_T_MAX 2
 param set-default SIH_Q_MAX 0.0165

ROMFS/px4fmu_common/init.d-posix/airframes/1010_gazebo-classic_iris_opt_flow

@@ -47,5 +47,5 @@ param set-default MPC_ALT_MODE 2
 
 param set-default SENS_FLOW_ROT 6
 param set-default SENS_FLOW_MINHGT 0.7
-param set-default SENS_FLOW_MAXHGT 15
+param set-default SENS_FLOW_MAXHGT 3
 param set-default SENS_FLOW_MAXR 2.5

ROMFS/px4fmu_common/init.d-posix/airframes/1012_gazebo-classic_iris_rplidar

@@ -30,3 +30,4 @@ param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
 
 param set-default LPE_FUSION 242
+

ROMFS/px4fmu_common/init.d-posix/airframes/1013_gazebo-classic_iris_vision

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-. ${R}etc/init.d-posix/airframes/10015_gazebo-classic_iris
+. ${R}etc/init.d-posix/airframes/10016_gazebo-classic_iris
 
 # EKF2: Vision position and heading, no GPS
 param set-default EKF2_EV_DELAY 5
@@ -18,3 +18,4 @@ param set-default LPE_FUSION 132
 
 # AEQ: External heading set to use vision input
 param set-default ATT_EXT_HDG_M 1
+

ROMFS/px4fmu_common/init.d-posix/airframes/1021_gazebo-classic_uuv_hippocampus

@@ -41,3 +41,4 @@ param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
 param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
+

ROMFS/px4fmu_common/init.d-posix/airframes/1022_gazebo-classic_uuv_bluerov2_heavy

@@ -61,3 +61,4 @@ 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
+

ROMFS/px4fmu_common/init.d-posix/airframes/1030_gazebo-classic_plane

@@ -68,3 +68,5 @@ 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
+
+

ROMFS/px4fmu_common/init.d-posix/airframes/1031_gazebo-classic_plane_cam

@@ -39,6 +39,7 @@ param set-default FW_T_SINK_MIN 2.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

ROMFS/px4fmu_common/init.d-posix/airframes/1032_gazebo-classic_plane_catapult

@@ -41,6 +41,7 @@ param set-default FW_T_SINK_MIN 2.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
@@ -70,3 +71,4 @@ 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
+

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

@@ -55,3 +55,4 @@ 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
+

ROMFS/px4fmu_common/init.d-posix/airframes/1035_gazebo-classic_techpod

@@ -54,3 +54,4 @@ 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
+

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

@@ -55,3 +55,4 @@ 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
+

ROMFS/px4fmu_common/init.d-posix/airframes/1037_gazebo-classic_believer

@@ -62,3 +62,4 @@ 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
+

ROMFS/px4fmu_common/init.d-posix/airframes/1038_gazebo-classic_glider

@@ -39,6 +39,7 @@ param set-default FW_T_SINK_MIN 2.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

ROMFS/px4fmu_common/init.d-posix/airframes/1039_flightgear_rascal

@@ -23,6 +23,7 @@ param set-default FW_RR_P 0.085
 
 param set-default FW_W_EN 1
 
+param set-default MIS_LTRMIN_ALT 30
 param set-default MIS_TAKEOFF_ALT 20
 
 param set-default NAV_ACC_RAD 15

ROMFS/px4fmu_common/init.d-posix/airframes/1040_gazebo-classic_standard_vtol

@@ -78,3 +78,4 @@ param set-default VT_FWD_THRUST_EN 4
 param set-default VT_FWD_THRUST_SC 1
 param set-default VT_F_TRANS_THR 0.75
 param set-default VT_TYPE 2
+

ROMFS/px4fmu_common/init.d-posix/airframes/1041_gazebo-classic_tailsitter

@@ -75,3 +75,4 @@ param set-default VT_F_TRANS_DUR 1.5
 param set-default VT_TYPE 0
 
 param set-default WV_EN 0
+

ROMFS/px4fmu_common/init.d-posix/airframes/1043_gazebo-classic_standard_vtol_drop

@@ -88,3 +88,4 @@ param set-default PWM_MAIN_FUNC11 422
 param set-default RC_MAP_AUX1 8
 param set-default RC_MAP_AUX2 9
 param set-default RC_MAP_AUX3 10
+

ROMFS/px4fmu_common/init.d-posix/airframes/1044_gazebo-classic_plane_lidar

@@ -39,6 +39,7 @@ param set-default FW_T_SINK_MIN 2.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

ROMFS/px4fmu_common/init.d-posix/airframes/1045_gazebo-classic_quadtailsitter

@@ -33,7 +33,7 @@ param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
 param set-default PWM_MAIN_FUNC5 0
 
-param set-default FD_FAIL_R 70
+parm set-default FD_FAIL_R 70
 
 param set-default FW_P_TC 0.6
 

ROMFS/px4fmu_common/init.d-posix/airframes/1060_gazebo-classic_rover

@@ -31,3 +31,4 @@ 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
+

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

@@ -38,3 +38,4 @@ 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
+

ROMFS/px4fmu_common/init.d-posix/airframes/1070_gazebo-classic_boat

@@ -41,3 +41,4 @@ param set-default CA_R_REV 3
 
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
+

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

@@ -64,3 +64,4 @@ param set-default PWM_MAIN_FUNC4 203
 param set-default PWM_MAIN_FUNC5 407
 param set-default PWM_MAIN_FUNC6 408
 param set-default PWM_MAIN_FUNC7 409
+

ROMFS/px4fmu_common/init.d-posix/airframes/17002_flightgear_tf-g2

@@ -69,3 +69,4 @@ param set-default PWM_MAIN_FUNC4 203
 param set-default PWM_MAIN_FUNC5 407
 param set-default PWM_MAIN_FUNC6 408
 param set-default PWM_MAIN_FUNC7 409
+

ROMFS/px4fmu_common/init.d-posix/airframes/2507_gazebo-classic_cloudship

@@ -36,3 +36,4 @@ 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
+

ROMFS/px4fmu_common/init.d-posix/airframes/4006_gz_px4vision

@@ -97,6 +97,11 @@ param set-default IMU_GYRO_CUTOFF 100
 
 # Power Parameters
 param set-default BAT1_N_CELLS 4
+# param set-default BAT1_A_PER_V 36.364		Not found
+# param set-default BAT1_V_DIV 18.182		Not found
+
+# Circuit breakers
+param set-default CBRK_IO_SAFETY 22027
 
 param set-default THR_MDL_FAC 0.3
 

ROMFS/px4fmu_common/init.d-posix/airframes/4008_gz_advanced_plane

@@ -16,36 +16,39 @@ param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1
 
 param set-default FW_LND_ANG 8
+param set-default NPFG_PERIOD 12
 
-param set-default FW_PR_FF 0.08
-param set-default FW_PR_I 0.3
-param set-default FW_PR_P 0.08
-
-param set-default FW_RR_FF 0.05
-param set-default FW_RR_I 0.2
-param set-default FW_RR_P 0.03
-
-param set-default FW_YR_FF 0.3
-param set-default FW_YR_I 0.4
-param set-default FW_YR_P 0.2
+param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_P 0.9
+param set-default FW_PR_FF 0.5
+param set-default FW_PR_I 0.5
 
 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.5
+param set-default FW_RR_P 0.3
+param set-default FW_RR_I 0.5
+
+param set-default FW_YR_FF 0.5
+param set-default FW_YR_P 0.6
+param set-default FW_YR_I 0.5
+
 param set-default FW_SPOILERS_LND 0.4
 
 param set-default FW_THR_MIN 0.05
 param set-default FW_THR_TRIM 0.25
-param set-default FW_THR_MAX 0.6
 
-param set-default FW_T_CLMB_R_SP 5
-param set-default FW_T_CLMB_MAX 6
+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-default FW_W_EN 1
 
+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
@@ -53,6 +56,7 @@ param set-default RWTO_TKOFF 1
 param set-default CA_AIRFRAME 1
 
 param set-default CA_ROTOR_COUNT 1
+param set-default CA_ROTOR0_PX 0.3
 
 param set-default CA_SV_CS_COUNT 6
 param set-default CA_SV_CS0_TRQ_R -0.5

ROMFS/px4fmu_common/init.d-posix/airframes/4009_gz_r1_rover

@@ -6,40 +6,16 @@
 . ${R}etc/init.d/rc.rover_differential_defaults
 
 PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=rover}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover}
 
 param set-default SIM_GZ_EN 1 # Gazebo bridge
 
-# Rover parameters
-param set-default RD_WHEEL_TRACK 0.3
-param set-default RD_MAN_YAW_SCALE 0.1
-param set-default RD_MAX_ACCEL 6
-param set-default RD_MAX_JERK 30
-param set-default RD_MAX_THR_YAW_R 5
-param set-default RD_YAW_RATE_P 0.1
-param set-default RD_YAW_RATE_I 0
-param set-default RD_YAW_P 5
-param set-default RD_YAW_I 0
-param set-default RD_MAX_SPEED 5
-param set-default RD_MAX_THR_SPD 7
-param set-default RD_SPEED_P 1
-param set-default RD_SPEED_I 0
-param set-default RD_MAX_YAW_RATE 180
-param set-default RD_MISS_SPD_DEF 5
-param set-default RD_TRANS_DRV_TRN 0.349066
-param set-default RD_TRANS_TRN_DRV 0.174533
-
-# Pure pursuit parameters
-param set-default PP_LOOKAHD_MAX 30
-param set-default PP_LOOKAHD_MIN 2
-param set-default PP_LOOKAHD_GAIN 1
-
 # Simulated sensors
 param set-default SENS_EN_GPSSIM 1
 param set-default SENS_EN_BAROSIM 0
 param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
+param set-default SENS_EN_ARSPDSIM 1
 
 # Actuator mapping
 param set-default SIM_GZ_WH_FUNC1 101 # right wheel

ROMFS/px4fmu_common/init.d-posix/airframes/4011_gz_lawnmower

@@ -15,29 +15,14 @@ param set-default SIM_GZ_EN 1 # Gazebo bridge
 param set-default SENS_EN_GPSSIM 1
 param set-default SENS_EN_BAROSIM 0
 param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
+param set-default SENS_EN_ARSPDSIM 1
 # We can arm and drive in manual mode when it slides and GPS check fails:
 param set-default COM_ARM_WO_GPS 1
 
-# Rover parameters
-param set-default RD_WHEEL_TRACK 0.9
-param set-default RD_MAN_YAW_SCALE 0.1
-param set-default RD_YAW_RATE_I 0.1
-param set-default RD_YAW_RATE_P 5
-param set-default RD_MAX_ACCEL 1
-param set-default RD_MAX_JERK 3
-param set-default RD_MAX_SPEED 8
-param set-default RD_YAW_P 5
-param set-default RD_YAW_I 0.1
-param set-default RD_MAX_YAW_RATE 30
-param set-default RD_MISS_SPD_DEF 8
-param set-default RD_TRANS_DRV_TRN 0.349066
-param set-default RD_TRANS_TRN_DRV 0.174533
-
-# Pure pursuit parameters
-param set-default PP_LOOKAHD_MAX 30
-param set-default PP_LOOKAHD_MIN 2
-param set-default PP_LOOKAHD_GAIN 1
+# Set Differential Drive Kinematics Library parameters:
+param set RDD_WHEEL_BASE 0.9
+param set RDD_WHEEL_RADIUS 0.22
+param set RDD_WHEEL_SPEED 10.0	# Maximum wheel speed rad/s, approx 8 km/h
 
 # Actuator mapping - set SITL motors/servos output parameters:
 
@@ -51,14 +36,14 @@ param set-default SIM_GZ_WH_FUNC1 101 # right wheel
 param set-default SIM_GZ_WH_FUNC2 102 # left wheel
 #param set-default SIM_GZ_WH_MIN2 0
 #param set-default SIM_GZ_WH_MAX2 200
-#param set-default SIM_GZ_WH_DIS2 100
+#aram set-default SIM_GZ_WH_DIS2 100
 #param set-default SIM_GZ_WH_FAIL2 100
 
 param set-default SIM_GZ_WH_REV 0 # no need to reverse any wheels
 
-# Note: The servo configurations ( SIM_GZ_SV_FUNC*) outlined below are intended for educational purposes in this simulation.
-# They do not have physical effects in the simulated environment, except for actuating the joints. Their definitions are meant to demonstrate
-# how actuators could be mapped and configured in a real-world application, providing a foundation for understanding and implementing actuator
+# Note: The servo configurations ( SIM_GZ_SV_FUNC*) outlined below are intended for educational purposes in this simulation. 
+# They do not have physical effects in the simulated environment, except for actuating the joints. Their definitions are meant to demonstrate 
+# how actuators could be mapped and configured in a real-world application, providing a foundation for understanding and implementing actuator 
 # controls in practical scenarios.
 
 # Cutter deck blades clutch, PCA9685 servo channel 3,  "RC FLAPS" (406) - leftmost switch, or "Servo 3" (203):

ROMFS/px4fmu_common/init.d-posix/airframes/4012_gz_rover_ackermann

@@ -1,49 +0,0 @@
-#!/bin/sh
-# @name Rover Ackermann
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_ackermann_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=rover}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_ackermann}
-
-param set-default SIM_GZ_EN 1 # Gazebo bridge
-
-# Rover parameters
-param set-default NAV_ACC_RAD 0.5
-param set-default RA_ACC_RAD_GAIN 2
-param set-default RA_ACC_RAD_MAX 3
-param set-default RA_MAX_ACCEL 1.5
-param set-default RA_MAX_JERK 15
-param set-default RA_MAX_SPEED 3
-param set-default RA_MAX_STR_ANG 0.5236
-param set-default RA_MAX_STR_RATE 360
-param set-default RA_MISS_VEL_DEF 3
-param set-default RA_MISS_VEL_GAIN 5
-param set-default RA_MISS_VEL_MIN 1
-param set-default RA_SPEED_I 0.01
-param set-default RA_SPEED_P 2
-param set-default RA_WHEEL_BASE 0.321
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-
-# Simulated sensors
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
-
-# Wheels
-param set-default SIM_GZ_WH_FUNC1 101
-param set-default SIM_GZ_WH_MIN1 0
-param set-default SIM_GZ_WH_MAX1 200
-param set-default SIM_GZ_WH_DIS1 100
-
-# Steering
-param set-default SIM_GZ_SV_FUNC1 201
-param set-default SIM_GZ_SV_REV 1

ROMFS/px4fmu_common/init.d-posix/airframes/4013_gz_x500_lidar

@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo x500 lidar
-#
-# @type Quadrotor
-#
-
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_lidar}
-
-. ${R}etc/init.d-posix/airframes/4001_gz_x500

ROMFS/px4fmu_common/init.d-posix/airframes/4014_gz_x500_mono_cam_down

@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo x500 mono cam
-#
-# @type Quadrotor
-#
-
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_mono_cam_down}
-
-. ${R}etc/init.d-posix/airframes/4001_gz_x500

ROMFS/px4fmu_common/init.d-posix/airframes/4015_gz_r1_rover_mecanum

@@ -1,64 +0,0 @@
-#!/bin/sh
-# @name Aion Robotics R1 Rover
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_mecanum_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=rover}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover_mecanum}
-
-param set-default SIM_GZ_EN 1 # Gazebo bridge
-
-# Rover parameters
-param set-default RM_WHEEL_TRACK 0.3
-param set-default RM_MAN_YAW_SCALE 0.1
-param set-default RM_YAW_RATE_I 0
-param set-default RM_YAW_RATE_P 0.01
-param set-default RM_MAX_ACCEL 3
-param set-default RM_MAX_JERK 5
-param set-default RM_MAX_SPEED 4
-param set-default RM_MAX_THR_SPD 7
-param set-default RM_MAX_THR_YAW_R 7.5
-param set-default RM_YAW_P 5
-param set-default RM_YAW_I 0.1
-param set-default RM_MAX_YAW_RATE 180
-param set-default RM_MISS_SPD_DEF 3
-param set-default RM_MISS_VEL_GAIN 1
-param set-default RM_SPEED_I 0.01
-param set-default RM_SPEED_P 0.1
-
-# Pure pursuit parameters
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-param set-default PP_LOOKAHD_GAIN 0.5
-
-# Simulated sensors
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
-
-# Actuator mapping
-param set-default SIM_GZ_WH_FUNC1 102 # right wheel front
-param set-default SIM_GZ_WH_MIN1 0
-param set-default SIM_GZ_WH_MAX1 200
-param set-default SIM_GZ_WH_DIS1 100
-
-param set-default SIM_GZ_WH_FUNC2 101 # left wheel front
-param set-default SIM_GZ_WH_MIN2 0
-param set-default SIM_GZ_WH_MAX2 200
-param set-default SIM_GZ_WH_DIS2 100
-
-param set-default SIM_GZ_WH_FUNC3 104 # right wheel back
-param set-default SIM_GZ_WH_MIN3 0
-param set-default SIM_GZ_WH_MAX3 200
-param set-default SIM_GZ_WH_DIS3 100
-
-param set-default SIM_GZ_WH_FUNC4 103 # left wheel back
-param set-default SIM_GZ_WH_MIN4 0
-param set-default SIM_GZ_WH_MAX4 200
-param set-default SIM_GZ_WH_DIS4 100
-
-param set-default SIM_GZ_WH_REV 10

ROMFS/px4fmu_common/init.d-posix/airframes/6011_gazebo-classic_typhoon_h480

@@ -63,3 +63,4 @@ param set-default PWM_MAIN_FUNC9 422
 # Landing gear
 param set-default PWM_MAIN_FUNC10 400
 param set-default PWM_MAIN_FUNC11 400
+

ROMFS/px4fmu_common/init.d-posix/airframes/8011_gz_omnicopter

@@ -119,3 +119,4 @@ param set-default CA_METHOD 0
 # disable attitude failure detection
 param set-default FD_FAIL_P 0
 param set-default FD_FAIL_R 0
+

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

@@ -83,10 +83,6 @@ px4_add_romfs_files(
 	4009_gz_r1_rover
 	4010_gz_x500_mono_cam
 	4011_gz_lawnmower
-	4012_gz_rover_ackermann
-	4013_gz_x500_lidar
-	4014_gz_x500_mono_cam_down
-	4015_gz_r1_rover_mecanum
 
 	6011_gazebo-classic_typhoon_h480
 	6011_gazebo-classic_typhoon_h480.post

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

@@ -29,7 +29,7 @@ mavlink start -x -u $udp_offboard_port_local -r 4000000 -f -m onboard -o $udp_of
 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 -f -m gimbal -o $udp_onboard_gimbal_port_remote
+mavlink start -x -u $udp_onboard_gimbal_port_local -r 400000 -m gimbal -o $udp_onboard_gimbal_port_remote
 
 # To display for SIH sitl
 if [ "$PX4_SIMULATOR" = "sihsim" ]; then

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

@@ -15,9 +15,6 @@ if [ "$PX4_SIMULATOR" = "sihsim" ] || [ "$(param show -q SYS_AUTOSTART)" -eq "0"
 	if [ -n "${PX4_HOME_LON}" ]; then
 		param set SIH_LOC_LON0 ${PX4_HOME_LON}
 	fi
-	if [ -n "${PX4_HOME_ALT}" ]; then
-		param set SIH_LOC_H0 ${PX4_HOME_ALT}
-	fi
 
 	if simulator_sih start; then
 

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -157,7 +157,6 @@ param set-default CBRK_SUPPLY_CHK 894281
 
 # disable check, no CPU load reported on posix yet
 param set-default COM_CPU_MAX -1
-param set-default COM_RAM_MAX -1
 
 # Don't require RC calibration and configuration
 param set-default COM_RC_IN_MODE 1
@@ -181,7 +180,7 @@ param set-default TRIG_INTERFACE 3
 param set-default SYS_FAILURE_EN 1
 # Enable low-battery actions by default for (automated) testing. Battery sim
 # does not go below 50% by default, but failure injection can trigger failsafes.
-param set-default COM_LOW_BAT_ACT 3
+param set-default COM_LOW_BAT_ACT 2
 
 
 # Adapt timeout parameters if simulation runs faster or slower than realtime.

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -44,7 +44,6 @@ px4_add_romfs_files(
 	# TODO
 	rc.balloon_apps
 	rc.balloon_defaults
-	rc.sysinit
 )
 
 if(CONFIG_MODULES_AIRSHIP_ATT_CONTROL)
@@ -78,7 +77,7 @@ if(CONFIG_MODULES_ROVER_POS_CONTROL)
 	)
 endif()
 
-if(CONFIG_MODULES_ROVER_DIFFERENTIAL)
+if(CONFIG_MODULES_DIFFERENTIAL_DRIVE)
 	px4_add_romfs_files(
 		rc.rover_differential_apps
 		rc.rover_differential_defaults
@@ -92,13 +91,6 @@ if(CONFIG_MODULES_ROVER_ACKERMANN)
 	)
 endif()
 
-if(CONFIG_MODULES_ROVER_MECANUM)
-	px4_add_romfs_files(
-		rc.rover_mecanum_apps
-		rc.rover_mecanum_defaults
-	)
-endif()
-
 if(CONFIG_MODULES_UUV_ATT_CONTROL)
 	px4_add_romfs_files(
 		rc.uuv_apps

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

@@ -18,6 +18,8 @@ param set UAVCAN_ENABLE 0
 # disable some checks to allow to fly
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 # Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4

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

@@ -96,5 +96,7 @@ param set UAVCAN_ENABLE 0
 # disable some checks to allow to fly
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 param set-default MAV_TYPE 22

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

@@ -44,3 +44,4 @@ param set-default CA_ROTOR4_KM -0.05
 param set-default CA_ROTOR5_PX 0.25
 param set-default CA_ROTOR5_PY -0.433
 param set-default CA_ROTOR5_PZ 0.05
+

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

@@ -20,6 +20,8 @@ param set SYS_HITL 2
 # disable some checks to allow to fly:
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 param set SIH_VEHICLE_TYPE 0
 

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

@@ -41,6 +41,8 @@ param set-default SYS_HITL 2
 # disable some checks to allow to fly:
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 param set SIH_T_MAX 6
 param set SIH_MASS 0.3

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

@@ -43,10 +43,6 @@ param set-default CA_SV_CS1_TRQ_P 0.3
 param set-default CA_SV_CS1_TRQ_Y -0.3
 param set-default CA_SV_CS1_TYPE 6
 
-param set-default FW_AIRSPD_MAX 12
-param set-default FW_AIRSPD_MIN 7
-param set-default FW_AIRSPD_TRIM 10
-
 param set-default HIL_ACT_FUNC1 101
 param set-default HIL_ACT_FUNC2 102
 param set-default HIL_ACT_FUNC5 202
@@ -63,8 +59,8 @@ param set-default SYS_HITL 2
 # disable some checks to allow to fly:
 # - without real battery
 param set-default CBRK_SUPPLY_CHK 894281
-
-param set-default SENS_DPRES_OFF 0.001
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027
 
 param set SIH_T_MAX 2.0
 param set SIH_Q_MAX 0.0165
@@ -79,5 +75,3 @@ param set SIH_L_ROLL 0.145
 
 # sih as tailsitter
 param set SIH_VEHICLE_TYPE 2
-
-param set-default VT_ARSP_TRANS 6

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

@@ -29,6 +29,7 @@ param set-default BAT1_N_CELLS 4
 param set-default BAT1_R_INTERNAL 0.0025
 
 param set-default SYS_HAS_NUM_ASPD 0
+param set-default CBRK_IO_SAFETY 22027
 
 param set-default EKF2_GPS_POS_X -0.12
 param set-default EKF2_IMU_POS_X -0.12

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

@@ -119,3 +119,5 @@ param set-default PWM_MAIN_TIM0 50
 param set-default PWM_MAIN_DIS1 1500
 param set-default PWM_MAIN_DIS2 1500
 param set-default PWM_MAIN_DIS4 1500
+
+

ROMFS/px4fmu_common/init.d/airframes/14001_generic_mc_with_tilt

@@ -32,3 +32,4 @@ param set-default CA_SV_TL0_MAXA 45
 param set-default CA_SV_TL0_MINA -45
 param set-default CA_SV_TL0_TD 90
 param set-default CA_SV_TL_COUNT 1
+

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

@@ -24,3 +24,5 @@ param set-default MC_PITCHRATE_D 0
 param set-default MC_PITCHRATE_FF 0.1
 
 param set-default CA_AIRFRAME 10
+
+

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

@@ -16,9 +16,11 @@
 . ${R}etc/init.d/rc.balloon_defaults
 
 param set-default COM_PREARM_MODE 2  # always in prearm state
+param set-default CBRK_IO_SAFETY 22027
 param set-default SDLOG_PROFILE 17
 param set-default SDLOG_MODE 2
 param set-default MAV_0_MODE 1
 param set-default MAV_0_CONFIG 102
 param set-default GPS_UBX_DYNMODEL 8
 param set-default SER_TEL2_BAUD 9600
+

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

@@ -72,3 +72,5 @@ param set-default PWM_MAIN_DIS5 1000
 param set-default PWM_MAIN_DIS6 1500
 param set-default PWM_MAIN_DIS7 1500
 param set-default PWM_MAIN_DIS8 1500
+
+

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

@@ -66,3 +66,4 @@ param set-default CA_ROTOR11_PX -0.344
 param set-default CA_ROTOR11_PY -0.25
 param set-default CA_ROTOR11_PZ -0.05
 param set-default CA_ROTOR11_KM -0.05
+

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

@@ -16,6 +16,7 @@
 . ${R}etc/init.d/rc.airship_defaults
 
 param set-default COM_PREARM_MODE 2
+param set-default CBRK_IO_SAFETY 22027
 
 param set-default CA_AIRFRAME 9
 
@@ -37,3 +38,4 @@ param set-default CA_SV_CS_COUNT 1
 param set-default CA_SV_CS0_TRQ_P 1
 
 param set-default CA_R_REV 7
+

ROMFS/px4fmu_common/init.d/airframes/4016_holybro_px4vision

@@ -92,6 +92,9 @@ param set-default BAT1_N_CELLS 4
 param set-default BAT1_A_PER_V 36.364
 param set-default BAT1_V_DIV 18.182
 
+# Circuit breakers
+param set-default CBRK_IO_SAFETY 22027
+
 param set-default THR_MDL_FAC 0.3
 
 # Square quadrotor X PX4 numbering

ROMFS/px4fmu_common/init.d/airframes/4017_nxp_hovergames

@@ -6,7 +6,6 @@
 # @class Copter
 #
 # @board px4_fmu-v2 exclude
-# @board px4_fmu-v5x exclude
 # @board bitcraze_crazyflie exclude
 #
 # @maintainer Iain Galloway <iain.galloway@nxp.com>

ROMFS/px4fmu_common/init.d/airframes/4020_holybro_px4vision_v1_5

@@ -93,6 +93,9 @@ param set-default BAT1_N_CELLS 4
 param set-default BAT1_A_PER_V 36.364
 param set-default BAT1_V_DIV 18.182
 
+# Circuit breakers
+param set-default CBRK_IO_SAFETY 22027
+
 param set-default THR_MDL_FAC 0.3
 
 # Square quadrotor X PX4 numbering

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

@@ -7,10 +7,6 @@
 #
 # @maintainer
 # @board px4_fmu-v2 exclude
-# @board cuav_x7pro exclude
-# @board px4_fmu-v4pro exclude
-# @board px4_fmu-v5x exclude
-# @board px4_fmu-v6x exclude
 #
 
 . ${R}etc/init.d/rc.mc_defaults
@@ -40,6 +36,7 @@ param set-default COM_RC_LOSS_T 3
 
 
 # ekf2
+param set-default EKF2_TERR_MASK 1
 param set-default EKF2_BARO_NOISE 2
 
 param set-default EKF2_BCOEF_X 31.5

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

@@ -12,7 +12,6 @@
 # @board px4_fmu-v4pro exclude
 # @board px4_fmu-v5 exclude
 # @board px4_fmu-v5x exclude
-# @board px4_fmu-v6x exclude
 # @board bitcraze_crazyflie exclude
 # @board cuav_x7pro exclude
 #

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

@@ -10,7 +10,6 @@
 # @board px4_fmu-v4pro exclude
 # @board px4_fmu-v5 exclude
 # @board px4_fmu-v5x exclude
-# @board px4_fmu-v6x exclude
 # @board bitcraze_crazyflie exclude
 # @board cuav_x7pro exclude
 #

ROMFS/px4fmu_common/init.d/airframes/4500_clover4

@@ -8,7 +8,6 @@
 # @maintainer Oleg Kalachev <okalachev@gmail.com>
 #
 # @board px4_fmu-v2 exclude
-# @board px4_fmu-v4pro exclude
 # @board bitcraze_crazyflie exclude
 #
 

ROMFS/px4fmu_common/init.d/airframes/4601_droneblocks_dexi_5

@@ -25,6 +25,7 @@
 param set-default BAT1_CAPACITY 4000
 param set-default BAT1_N_CELLS 6
 param set-default BAT1_V_EMPTY 3.3
+param set-default BAT1_V_LOAD_DROP 0.5
 param set-default BAT_AVRG_CURRENT 13
 
 # Square quadrotor X PX4 numbering
@@ -42,16 +43,12 @@ param set-default CA_ROTOR3_PX -0.0762
 param set-default CA_ROTOR3_PY 0.09525
 param set-default CA_ROTOR3_KM -0.05
 
-param set-default PWM_MAIN_TIM0 -3
-param set-default DSHOT_TEL_CFG 104
-
 param set-default EKF2_MIN_RNG 0.01
 param set-default EKF2_OF_POS_X 0.043
 param set-default EKF2_OF_POS_Y 0.011
 param set-default EKF2_OF_QMIN_GND 1
 param set-default EKF2_RNG_POS_X 0.043
 param set-default EKF2_RNG_POS_Y 0.0
-param set-default EKF2_RNG_A_HMAX 25.0
 
 param set-default IMU_GYRO_DNF_EN 2
 
@@ -72,9 +69,6 @@ param set-default MPC_THR_MIN 0.025
 param set-default MPC_VEL_MANUAL 5.0
 param set-default MPC_XY_VEL_MAX 8.0
 
-param set-default RC_CRSF_PRT_CFG 300
-param set-default RC_CRSF_TEL_EN 1
-
 param set-default RTL_RETURN_ALT 15
 
 param set-default SENS_FLOW_MINHGT 0.0
@@ -82,9 +76,3 @@ param set-default SENS_FLOW_MINHGT 0.0
 param set-default SER_TEL2_BAUD 3000000
 
 param set-default UXRCE_DDS_CFG 102
-
-param set-default EKF2_HGT_REF 2
-
-# I saw a very sketchy extreme yaw setpoint that I cant explain
-# https://review.px4.io/plot_app?log=4b69399f-b001-4dc2-acd5-e779fe266799
-param set-default MC_YAWRATE_MAX 100

ROMFS/px4fmu_common/init.d/airframes/4901_crazyflie21

@@ -13,7 +13,6 @@
 # @board px4_fmu-v4pro exclude
 # @board px4_fmu-v5 exclude
 # @board px4_fmu-v5x exclude
-# @board px4_fmu-v6x exclude
 # @board diatone_mamba-f405-mk2 exclude
 #
 . ${R}etc/init.d/rc.mc_defaults

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

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# @name Generic Ground Vehicle (Deprecated)
+# @name Generic Ground Vehicle (Ackermann)
 #
 # @type Rover
 # @class Rover
@@ -48,3 +48,5 @@ 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
+
+

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

@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name Generic Rover Differential
-#
-# @type Rover
-# @class Rover
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.rover_differential_defaults

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

@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# @name Aion Robotics R1 UGV
-#
-# @url https://www.aionrobotics.com/r1
-#
-# @type Rover
-# @class Rover
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.rover_differential_defaults
-
-param set-default BAT1_N_CELLS 4
-
-# Set geometry & output configration
-param set-default RBCLW_ADDRESS 128
-param set-default RBCLW_FUNC1 101
-param set-default RBCLW_FUNC2 102
-param set-default RBCLW_REV 1 # reverse right wheels
-
-# Rover parameters
-param set-default RD_WHEEL_TRACK 0.3
-param set-default RD_MAN_YAW_SCALE 1
-param set-default RD_MAX_ACCEL 5
-param set-default RD_MAX_JERK 10
-param set-default RD_MAX_THR_YAW_R 4
-param set-default RD_YAW_RATE_P 0.1
-param set-default RD_YAW_RATE_I 0
-param set-default RD_YAW_P 5
-param set-default RD_YAW_I 0
-param set-default RD_MAX_SPEED 1.8
-param set-default RD_MAX_THR_SPD 2
-param set-default RD_SPEED_P 0.5
-param set-default RD_SPEED_I 0.1
-param set-default RD_MAX_YAW_RATE 300
-param set-default RD_MISS_SPD_DEF 1.8
-param set-default RD_TRANS_DRV_TRN 0.349066
-param set-default RD_TRANS_TRN_DRV 0.174533
-
-# Pure pursuit parameters
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-param set-default PP_LOOKAHD_GAIN 1

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

@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# @name Aion Robotics R1 UGV
+#
+# @url https://www.aionrobotics.com/r1
+#
+# @type Rover
+# @class Rover
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.rover_differential_defaults
+
+param set-default BAT1_N_CELLS 4
+
+param set-default EKF2_GBIAS_INIT 0.01
+param set-default EKF2_ANGERR_INIT 0.01
+
+# Set geometry & output configration
+param set-default RBCLW_ADDRESS 128
+param set-default RBCLW_FUNC1 101
+param set-default RBCLW_FUNC2 102
+param set-default RBCLW_REV 1 # reverse right wheels

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

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# @name NXP Cup car: DF Robot GPX (Deprecated)
+# @name NXP Cup car: DF Robot GPX
 
 #
 # @type Rover

ROMFS/px4fmu_common/init.d/airframes/50010_ackermann_rover_generic

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# @name Generic Rover Ackermann
+# @name Generic ackermann rover
 #
 # @type Rover
 # @class Rover