drivers/gps: warn if gps_inject_data publications have been missed

This aligns setActiveMissionItems() in rtl_direct_mission_land.cpp and in rtl_mission_fast.cpp with what was already in mission.cpp. It probably was on oversight when the RTL restructure happened. The FW landing requires the previous waypoint to be correctly set, that's why it was only noticeable there.

* Fix position setpoint update logic in Mission RTL

Currently, when proceeding to the landing point the previous setpoint is not updated, which results in an unexpected and off course landing pattern in fixed wing. (see #25436)

* Change to work more like `mission.cpp`

* Fix rtl_direct_misssion_land formatting for style guide

* rtl_mission_fast: fix FW landing by setting previous wp in landing

Signed-off-by: Silvan <silvan@auterion.com>

---------

Signed-off-by: Silvan <silvan@auterion.com>
Co-authored-by: Silvan <silvan@auterion.com>

.clusterfuzzlite/Dockerfile

@@ -0,0 +1,7 @@
+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/

.clusterfuzzlite/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash -eu
+
+PX4_FUZZ=1 make px4_sitl
+cp build/px4_sitl_default/bin/px4 $OUT/px4

.clusterfuzzlite/project.yaml

@@ -0,0 +1 @@
+language: c++

.editorconfig

@@ -12,11 +12,3 @@ max_line_length = 120
 [*.yaml, *.yml]
 indent_style = space
 indent_size = 2
-
-[*.sh]
-indent_style = tab
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-# Not in the official standard, but supported by many editors
-max_line_length = 80

.github/ISSUE_TEMPLATE/config.yml

@@ -3,3 +3,6 @@ contact_links:
   - name: Support Question
     url: https://docs.px4.io/main/en/contribute/support.html#forums-and-chat
     about: For questions about using PX4 or related components, please use the discuss forum and discord server
+  - name: Documentation Issue
+    url: https://github.com/PX4/PX4-user_guide/issues
+    about: If you found an issue in documentation, please submit it directly to the docs repository issues

.github/ISSUE_TEMPLATE/docs_bug_report.yml

@@ -1,33 +0,0 @@
-name: 📑 Documentation Bug report
-description: Create a report to help us improve the docs
-title: "[Docs] [Bug] "
-labels: ["Documentation 📑"]
-body:
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of the bug.
-      placeholder: |
-          # A PR to fix the bug is often better than adding this issue!
-          #
-          # If you can't create a PR please provide the following:
-          # - What page and/or section has the problem
-          # - What is the problem - missing information, incorrect information?
-          # - Suggested fixes, links to corresponding code PRs
-          # - Any additional context
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Page URL
-      description: The URL of the problem page.
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Screenshot / Media
-      description: Add screenshot / media if you have them
-    validations:
-      required: false

.github/fuzzing_issue_template.md

@@ -1,6 +0,0 @@
----
-title: '[CI] Fuzzing Workflow Failed'
-labels: ['Fuzzing']
----
-The automated fuzzing workflow has failed.
-See {{ env.WORKFLOW_RUN_URL }} for details.

.github/labeler.yml

@@ -1,10 +0,0 @@
-# Labeler configuration file for GitHub Actions
-# The action is ./.github/workflows/label.yml
-# Docs for the syntax in this file can be found at
-# https://github.com/actions/labeler
-
-
-# Add 'Documentation' label to any changes within 'docs' folder or any subfolders
-"Documentation 📑":
-- changed-files:
-  - any-glob-to-any-file: docs/**

.github/runs-on.yml

@@ -1,24 +0,0 @@
-runners:
-  x86-small-runner:
-    cpu: [1, 2]
-    ram: [1, 4]
-    disk: default
-    spot: price-capacity-optimized
-    image: ubuntu24-full-x64
-    extras: s3-cache
-  x86-firmware-builder:
-    cpu: [4, 8]
-    ram: [8, 16]
-    disk: default
-    family: ["c7i", "m7i", "r7i"]
-    spot: price-capacity-optimized
-    image: ubuntu24-full-x64
-    extras: s3-cache
-  arm64-firmware-builder:
-    cpu: [4, 8]
-    ram: [8, 16]
-    disk: default
-    family: ["c7g", "m7g", "r7g"]
-    spot: price-capacity-optimized
-    image: ubuntu24-full-arm64
-    extras: s3-cache

.github/workflows/build_all_targets.yml

@@ -2,37 +2,6 @@
 # - 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
-#
-# ===================================================================================
-# RELEASE UPLOAD LOGIC
-# ===================================================================================
-# This workflow handles building firmware and uploading to S3 + GitHub Releases.
-#
-# S3 Bucket Structure (s3://px4-travis/Firmware/):
-#   - master/          <- Latest main branch build (for QGC compatibility)
-#   - stable/          <- Latest stable release, controlled by 'stable' branch
-#   - beta/            <- Latest pre-release, controlled by 'beta' branch
-#   - vX.Y.Z/          <- Archived stable release
-#   - vX.Y.Z-beta1/    <- Archived pre-release
-#
-# Trigger Behavior:
-#   - Tag v1.16.1        -> Upload to: v1.16.1/ only (versioned archive)
-#   - Tag v1.17.0-beta1  -> Upload to: v1.17.0-beta1/ only (versioned archive)
-#   - Branch main        -> Upload to: master/ (for QGC compatibility)
-#   - Branch stable      -> Upload to: stable/ (QGC stable firmware)
-#   - Branch beta        -> Upload to: beta/ (QGC beta firmware)
-#   - Branch release/**  -> Build only, no S3 upload (CI validation)
-#   - Pull requests      -> Build only, no S3 upload (CI validation)
-#
-# GitHub Releases:
-#   - All version tags create a draft GitHub Release
-#   - Pre-releases (alpha/beta/rc suffixes) are automatically marked as such
-#
-# IMPORTANT: Version tags do NOT upload to stable/ or beta/. Only the
-# corresponding branch pushes control those directories. This prevents
-# pre-release tags from accidentally overwriting stable firmware (#26340)
-# and avoids race conditions between tag and branch builds.
-# ===================================================================================
 
 name: Build all targets
 
@@ -53,34 +22,19 @@ on:
     paths-ignore:
       - 'docs/**'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: write
-  actions: read
-
 jobs:
   group_targets:
     name: Scan for Board Targets
     # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     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: Cache Python pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**./Tools/setup/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: Update python packaging to avoid canonicalize_version() error
         run: |
             pip3 install -U packaging
@@ -91,22 +45,13 @@ jobs:
           path: "./Tools/setup/requirements.txt"
 
       - id: set-matrix
-        name: Generate Build Matrix
-        run: echo "matrix=$(./Tools/ci/generate_board_targets_json.py --group)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=matrix::$(./Tools/ci/generate_board_targets_json.py --group)"
 
       - id: set-timestamp
-        name: Save Current Timestamp
-        run: echo "timestamp=$(date +"%Y%m%d%H%M%S")" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=timestamp::$(date +"%Y%m%d%H%M%S")"
 
       - id: set-branch
-        name: Save Current Branch Name
-        run: |
-          echo "branchname=${{
-            github.event_name == 'pull_request' &&
-            format('pr-{0}', github.event.pull_request.number) ||
-            github.head_ref ||
-            github.ref_name
-          }}" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=branchname::${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
 
       - name: Debug Matrix Output
         if: runner.debug == '1'
@@ -116,9 +61,9 @@ jobs:
           echo "$(./Tools/ci/generate_board_targets_json.py --group --verbose)"
 
   setup:
-    name: Build [${{ matrix.runner }}][${{ matrix.group }}]
+    name: Build Group [${{ matrix.group }}]
     # runs-on: ubuntu-latest
-    runs-on: [runs-on,"runner=8cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     needs: group_targets
     strategy:
       matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }}
@@ -126,7 +71,6 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
-      - uses: runs-on/action@v2
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -134,24 +78,14 @@ jobs:
       - name: Git ownership workaround
         run: git config --system --add safe.directory '*'
 
-      # ccache key breakdown:
-      # ccache-<system os>-<system arch>-<builder group>-
-      # ccache-<linux>-<arm64>-<aarch64-0>-
-      # ccache-<linux>-<x64>-<nuttx-0>-
-      - name: Cache Restore from Key
-        id: cc_restore
-        uses: actions/cache/restore@v4
+      - name: Setup ccache
+        uses: actions/cache@v4
         with:
           path: ~/.ccache
-          key: ${{ format('ccache-{0}-{1}-{2}', runner.os, matrix.runner, matrix.group) }}
-          restore-keys: |
-            ccache-${{ runner.os }}-${{ matrix.runner }}-${{ matrix.group }}-
-            ccache-${{ runner.os }}-${{ matrix.runner }}-
-            ccache-${{ runner.os }}-${{ matrix.runner }}-
-            ccache-${{ runner.os }}-
-            ccache-
+          key: ${{ matrix.group }}-ccache-${{ needs.group_targets.outputs.timestamp }}
+          restore-keys: ${{ matrix.group }}-ccache-${{ needs.group_targets.outputs.timestamp }}
 
-      - name: Cache Config and Stats
+      - name: Configure ccache
         run: |
             mkdir -p ~/.ccache
             echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
@@ -159,13 +93,12 @@ jobs:
             echo "compression_level = 6" >> ~/.ccache/ccache.conf
             echo "max_size = 120M" >> ~/.ccache/ccache.conf
             echo "hash_dir = false" >> ~/.ccache/ccache.conf
-            echo "compiler_check = content" >> ~/.ccache/ccache.conf
             ccache -s
             ccache -z
 
-      - name: Building Artifacts for [${{ matrix.targets }}]
+      - name: Building [${{ matrix.group }}]
         run: |
-            ./Tools/ci/build_all_runner.sh ${{matrix.targets}} ${{matrix.arch}}
+            ./Tools/ci/build_all_runner.sh ${{matrix.targets}}
 
       - name: Arrange Build Artifacts
         run: |
@@ -177,34 +110,15 @@ jobs:
           name: px4_${{matrix.group}}_build_artifacts
           path: artifacts/
 
-      - name: Cache Post Build Stats
-        if: always()
-        run: |
-            ccache -s
-            ccache -z
-
       - name: Cache Save
-        if: always()
-        uses: actions/cache/save@v4
-        with:
-          path: ~/.ccache
-          key: ${{ steps.cc_restore.outputs.cache-primary-key }}
+        run: ccache -s
 
-  # ===========================================================================
-  # ARTIFACT UPLOAD JOB
-  # ===========================================================================
-  # Uploads build artifacts to S3 and creates GitHub Releases.
-  # Runs for version tags (v*), main, stable, and beta branch pushes.
-  # See header comments for full upload logic documentation.
-  # ===========================================================================
   artifacts:
-    name: Upload Artifacts
+    name: Upload Artifacts to S3
     # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     needs: [setup, group_targets]
-    if: startsWith(github.ref, 'refs/tags/v') || contains(fromJSON('["main","stable","beta"]'), needs.group_targets.outputs.branchname)
-    outputs:
-      uploadlocation: ${{ steps.upload-location.outputs.uploadlocation }}
+    if: contains(fromJSON('["main", "stable", "beta"]'), needs.group_targets.outputs.branchname)
     steps:
       - name: Download Artifacts
         uses: actions/download-artifact@v4
@@ -212,36 +126,11 @@ jobs:
           path: artifacts/
           merge-multiple: true
 
-      - name: Choose Upload Location
-        id: upload-location
+      - name: Branch Name
         run: |
-          set -euo pipefail
+          echo "${{ needs.group_targets.outputs.branchname }}"
 
-          ref="${GITHUB_REF}"
-          branch=${{ needs.group_targets.outputs.branchname  }}
-          location="$branch"
-          is_prerelease="false"
-
-          # Main branch uploads to "master" for QGC backward compatibility
-          if [[ "$branch" == "main" ]]; then
-            location="master"
-          fi
-
-          # Version tags: upload to versioned directory (e.g., v1.16.1/)
-          if [[ "$ref" == refs/tags/v[0-9]* ]]; then
-            tag="${ref#refs/tags/}"
-            location="$tag"
-
-            # Pre-release tags contain -alpha, -beta, or -rc suffix
-            if [[ "$tag" =~ -(alpha|beta|rc) ]]; then
-              is_prerelease="true"
-            fi
-          fi
-
-          echo "uploadlocation=$location" >> $GITHUB_OUTPUT
-          echo "is_prerelease=$is_prerelease" >> $GITHUB_OUTPUT
-
-      - name: Uploading Artifacts to S3 [${{ steps.upload-location.outputs.uploadlocation }}]
+      - 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
@@ -251,15 +140,23 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: 'us-west-1'
           SOURCE_DIR: artifacts/
-          DEST_DIR: Firmware/${{ steps.upload-location.outputs.uploadlocation }}/
+          DEST_DIR: Firmware/${{ needs.group_targets.outputs.branchname == 'main' && 'master' || needs.group_targets.outputs.branchname }}/
 
-      # Create a draft GitHub Release for all version tags
-      # Pre-releases are automatically marked as such
-      - name: Upload Artifacts to GitHub Release
+  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 }}",spot=false]
+    needs: [setup, group_targets]
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts/
+          merge-multiple: true
+
+      - name: Upload Binaries to Release
         uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/v')
         with:
           draft: true
-          prerelease: ${{ steps.upload-location.outputs.is_prerelease == 'true' }}
           files: artifacts/*.px4
-          name: ${{ steps.upload-location.outputs.uploadlocation }}

.github/workflows/cflite_batch.yml

@@ -0,0 +1,34 @@
+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".

.github/workflows/checks.yml

@@ -6,23 +6,17 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
-
     strategy:
       fail-fast: false
       matrix:
@@ -39,17 +33,20 @@ jobs:
           "px4_sitl_allyes",
           "module_documentation",
         ]
-
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Building [${{ matrix.check }}]
-        run: |
-          cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          make ${{ matrix.check }}
+        uses: addnab/docker-run-action@v3
+        with:
+          image: px4io/px4-dev-nuttx-focal:2022-08-12
+          options: -v ${{ github.workspace }}:/workspace
+          run: |
+            cd /workspace
+            git config --global --add safe.directory /workspace
+            make ${{ matrix.check }}
 
       - name: Uploading Coverage to Codecov.io
         if: contains(matrix.check, 'coverage')

.github/workflows/clang-tidy.yml

@@ -6,11 +6,13 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -19,7 +21,7 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Testing (clang-tidy)
+    - name: Testing (clang-tidy-quiet)
       uses: addnab/docker-run-action@v3
       with:
         image: px4io/px4-dev-clang:2021-09-08
@@ -27,4 +29,4 @@ jobs:
         run: |
           cd /workspace
           git config --global --add safe.directory /workspace
-          make clang-tidy
+          make clang-tidy-quiet

.github/workflows/compile_macos.yml

@@ -6,19 +6,17 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       matrix:
         config: [
@@ -43,12 +41,14 @@ jobs:
       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@v4
       with:
         path: ~/.ccache
         key: macos_${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
         restore-keys: macos_${{matrix.config}}-ccache-
+
     - name: setup ccache
       run: |
           mkdir -p ~/.ccache

.github/workflows/compile_ubuntu.yml

@@ -9,18 +9,13 @@ on:
       - 'release/**'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-env:
-  RUNS_IN_DOCKER: true
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build_and_test:
@@ -29,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['ubuntu:22.04', 'ubuntu:24.04']
-    runs-on: [runs-on,runner=4cpu-linux-x64,"image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,"image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false]
     container:
       image: ${{ matrix.version }}
       volumes:

.github/workflows/dev_container.yml

@@ -1,3 +1,4 @@
+
 name: Container build
 
 on:
@@ -9,58 +10,45 @@ on:
       - 'release/**'
     tags:
       - 'v*'
+    paths-ignore:
+      - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
-    paths:
-      - '.github/workflows/dev_container.yml'
-      - 'Tools/setup/ubuntu.sh'
-      - 'Tools/setup/requirements.txt'
-      - 'Tools/setup/Dockerfile'
-      - 'Tools/setup/docker-entrypoint.sh'
-  workflow_dispatch:
-    inputs:
-      px4_version:
-        description: 'Container tag (e.g. v1.16.0)'
-        required: true
-        type: string
-      deploy_to_registry:
-        description: 'Whether to push built images to the registry'
-        required: false
-        type: boolean
-        default: false
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    paths-ignore:
+      - 'docs/**'
+      - '.github/**'
 
 jobs:
-  setup:
-    name: Set Tags and Variables
-    permissions:
-      contents: read
-    runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
-    outputs:
-      px4_version: ${{ steps.px4_version.outputs.px4_version }}
-      meta_tags: ${{ steps.meta.outputs.tags }}
-      meta_labels: ${{ steps.meta.outputs.labels }}
+  build:
+    name: Build and Push Container
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     steps:
-      - uses: runs-on/action@v1
       - uses: actions/checkout@v4
         with:
           fetch-tags: true
           submodules: false
           fetch-depth: 0
 
-      # If manual dispatch, take the user‐provided input
-      - name: Set PX4 Tag Version
-        id: px4_version
+      - name: Set PX4 Tag
+        id: px4-tag
         run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "px4_version=${{ github.event.inputs.px4_version }}" >> $GITHUB_OUTPUT
-          else
-            echo "px4_version=$(git describe --tags --match 'v[0-9]*')" >> $GITHUB_OUTPUT
-          fi
+          echo "tag=$(git describe --tags --match 'v[0-9]*')" >> $GITHUB_OUTPUT
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
@@ -68,125 +56,52 @@ jobs:
         with:
           images: |
             ghcr.io/PX4/px4-dev
-            px4io/px4-dev
+            ${{ (github.event_name != 'pull_request') && 'px4io/px4-dev' || '' }}
           tags: |
-            type=raw,enable=true,value=${{ steps.px4_version.outputs.px4_version }},priority=1000
-
-  build:
-    name: Build Container (${{ matrix.arch }})
-    permissions:
-      contents: read
-      packages: write
-    needs: setup
-    strategy:
-      matrix:
-        include:
-          - platform: linux/arm64
-            arch: arm64
-            runner: arm64
-          - platform: linux/amd64
-            arch: amd64
-            runner: x64
-    runs-on: [runs-on,"runner=4cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
-    steps:
-      - uses: runs-on/action@v1
-      - uses: actions/checkout@v4
-        with:
-          fetch-tags: true
-          submodules: false
-          fetch-depth: 0
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+            type=raw,enable=true,value=${{ steps.px4-tag.outputs.tag }},priority=1000
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker-container
-          platforms: ${{ matrix.platform }}
 
-      - name: Build and Load Container Image
+      - name: Build and load container image
         uses: docker/build-push-action@v6
         id: docker
         with:
           context: Tools/setup
-          tags: |
-            ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
-            px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
-          labels: ${{ needs.setup.outputs.meta_labels }}
-          platforms: ${{ matrix.platform }}
-          load: false
-          push: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
-          provenance: false
-          cache-from: type=gha,version=1
-          cache-to: type=gha,version=1,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: |
+            linux/amd64
+          load: true
+          push: false
+          cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
+          cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
 
-  deploy:
-    name: Deploy To Registry
-    permissions:
-      contents: read
-      packages: write
-    runs-on: [runs-on,"runner=4cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
-    needs: [build, setup]
-    if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
-    steps:
-      - uses: runs-on/action@v1
-      - uses: actions/checkout@v4
-        with:
-          fetch-tags: true
-          submodules: false
-          fetch-depth: 0
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Verify Images Exist Before Creating Manifest
+      - name: Get Tag Name
+        id: tag_name
         run: |
-          docker manifest inspect px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 || echo "⚠️ Warning: No ARM64 image found!"
-          docker manifest inspect px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 || echo "⚠️ Warning: No AMD64 image found!"
-          docker manifest inspect ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 || echo "⚠️ Warning: No ARM64 image found!"
-          docker manifest inspect ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 || echo "⚠️ Warning: No AMD64 image found!"
+          echo "::set-output name=tag_name::$(echo '${{ fromJSON(steps.docker.outputs.metadata)['image.name'] }}' | sed 's/,.*$//')"
 
-      - name: Create and Push Multi-Arch Manifest for Docker Hub
-        run: |
-          docker manifest create px4io/px4-dev:${{ needs.setup.outputs.px4_version }} \
-            --amend px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 \
-            --amend px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64
+      - name: make quick_check
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ${{ steps.tag_name.outputs.tag_name }}
+          options: -v ${{ github.workspace }}:/workspace
+          run: |
+            cd /workspace
+            git config --global --add safe.directory /workspace
+            make px4_sitl_default
+            make px4_fmu-v6x_default
 
-          docker manifest annotate px4io/px4-dev:${{ needs.setup.outputs.px4_version }} px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 --arch arm64
-          docker manifest annotate px4io/px4-dev:${{ needs.setup.outputs.px4_version }} px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 --arch amd64
-
-          docker manifest push px4io/px4-dev:${{ needs.setup.outputs.px4_version }}
-
-      - name: Create and Push Multi-Arch Manifest for GHCR
-        run: |
-          docker manifest create ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} \
-            --amend ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 \
-            --amend ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64
-
-          docker manifest annotate ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 --arch arm64
-          docker manifest annotate ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 --arch amd64
-
-          docker manifest push ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}
+      - name: Push container image
+        uses: docker/build-push-action@v6
+        with:
+          context: Tools/setup
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: |
+            linux/amd64
+          provenance: mode=max
+          push: ${{ github.event_name != 'pull_request' }}
+          cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
+          cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max

.github/workflows/docs_deploy.yml

@@ -1,6 +1,7 @@
-name: Docs - Deploy PX4 User Guide to Github pages (Manual)
+name: Docs - Deploy PX4 User Guide
 
 on:
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
@@ -20,7 +21,7 @@ env:
 
 jobs:
   build:
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     steps:
       - uses: runs-on/action@v1
       - name: Checkout
@@ -55,7 +56,7 @@ jobs:
   deploy:
     if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged) || github.event_name == 'workflow_dispatch' }}
     needs: build
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
 
     steps:
       - name: Download Artifact

.github/workflows/docs_deploy_aws.yml

@@ -17,8 +17,6 @@ on:
       - "docs/uk/**"
       - "docs/ko/**"
 
-  workflow_dispatch:
-
 permissions:
   contents: read
   actions: read
@@ -30,7 +28,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     outputs:
       branchname: ${{ steps.set-branch.outputs.branchname }}
       releaseversion: ${{ steps.set-version.outputs.releaseversion }}

.github/workflows/docs_flaw_checker.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Get changed english doc files
         id: get_changed_markdown_english
-        uses: tj-actions/changed-files@v46.0.5
+        uses: tj-actions/changed-files@v35.9.2
         with:
           json: true
           base_sha: "${{ github.event.pull_request.base.sha }}"
@@ -42,24 +42,14 @@ jobs:
 
       - name: Save JSON file containing files to link check
         run: |
-          echo "$ALL_CHANGED_FILES"
-          # echo "$ALL_CHANGED_FILES" > ./logs/prFiles.json
-          echo "$ALL_CHANGED_FILES" | sed 's/\\//g' | jq '.' > ./logs/prFiles.json
-        env:
-          ALL_CHANGED_FILES: ${{ steps.get_changed_markdown_english.outputs.all_changed_files }}
+          echo "${{ steps.get_changed_markdown_english.outputs.all_changed_files }}"
+          echo "${{ steps.get_changed_markdown_english.outputs.all_changed_files }}" > ./logs/prFiles.json
 
       - name: Run link checker
         id: link-check
         run: |
           npm -g install markdown_link_checker_sc@0.0.138
-          markdown_link_checker_sc \
-            -r "$GITHUB_WORKSPACE" \
-            -d docs \
-            -e en \
-            -f ./logs/prFiles.json \
-            -i assets \
-            -u docs.px4.io/main/ \
-            > ./logs/errorsFilteredByPrPages.md
+          markdown_link_checker_sc -r ${{ github.workspace }} -d docs -e en -f ./logs/prFiles.json -i assets -u docs.px4.io/main/ > ./logs/errorsFilteredByPrPages.md
           mkdir -p ./pr
           cp ./logs/errorsFilteredByPrPages.md ./pr/errorsFilteredByPrPages.md
 
@@ -70,15 +60,14 @@ jobs:
           path: ./logs/errorsFilteredByPrPages.md
 
       - name: Echo Errors by Page
-        run: echo "$ERRORS"
-        env:
-          ERRORS: ${{ steps.read-errors-by-page.outputs.content }}
+        run: echo "${{ steps.read-errors-by-page.outputs.content }}"
 
       - name: Save PR number
-        run: echo "$PR_NUMBER" > ./pr/pr_number
         env:
           PR_NUMBER: ${{ github.event.number }}
-
+        run: |
+          #mkdir -p ./pr
+          echo $PR_NUMBER > ./pr/pr_number
       - uses: actions/upload-artifact@v4
         with:
           name: pr_number

.github/workflows/docs_pr_comment.yml

@@ -4,7 +4,6 @@ on:
     workflows: ["Docs - Check for flaws in PX4 Guide Source"]
     types:
       - completed
-
 jobs:
   comment:
     permissions:
@@ -57,11 +56,8 @@ jobs:
 
       - name: File detail info
         run: |
-          echo "$ERRORS"
-          echo "$PRNUM"
-        env:
-          ERRORS: ${{ steps.read-errors-by-page.outputs.content }}
-          PRNUM: ${{ steps.read-error-pr-number.outputs.content }}
+          echo "${{ steps.read-errors-by-page.outputs.content }}"
+          echo "${{ steps.read-error-pr-number.outputs.content }}"
 
       - name: Create or update comment
         id: comment_to_pr

.github/workflows/ekf_functional_change_indicator.yml

@@ -6,30 +6,26 @@ on:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-# If two events are triggered within a short time in the same PR, cancel the run of the oldest event
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   unit_tests:
     runs-on: ubuntu-latest
-
-    container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
-
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
-      - name: main test
+    - name: main test
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-base-focal:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
         run: |
-          cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          cd /workspace
+          git config --global --add safe.directory /workspace
           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
+    - name: Check if there is a functional change
+      run: git diff --exit-code
+      working-directory: src/modules/ekf2/test/change_indication

.github/workflows/ekf_update_change_indicator.yml

@@ -4,51 +4,45 @@ on:
   push:
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
 
 jobs:
   unit_tests:
     runs-on: ubuntu-latest
-
-    container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
-
     env:
       GIT_COMMITTER_EMAIL: bot@px4.io
       GIT_COMMITTER_NAME: PX4BuildBot
-
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
-      - name: main test
+    - name: main test
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-base-focal:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
         run: |
-          cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          cd /workspace
+          git config --global --add safe.directory /workspace
           make tests TESTFILTER=EKF
 
-      - name: Check if there exists diff and save result in variable
-        id: diff-check
-        working-directory: src/modules/ekf2/test/change_indication
-        run: |
-          if git diff --quiet; then
-            echo "CHANGE_INDICATED=false" >> $GITHUB_OUTPUT
-          else
-            echo "CHANGE_INDICATED=true" >> $GITHUB_OUTPUT
-          fi
+    - name: Check if there exists diff and save result in variable
+      id: diff-check
+      run: echo "CHANGE_INDICATED=$(git diff --exit-code --output=/dev/null || echo $?)" >> $GITHUB_OUTPUT
+      working-directory: src/modules/ekf2/test/change_indication
 
-      - name: auto-commit any changes to change indication
-        if: steps.diff-check.outputs.CHANGE_INDICATED == 'true'
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          file_pattern: 'src/modules/ekf2/test/change_indication/*.csv'
-          commit_user_name: ${{ env.GIT_COMMITTER_NAME }}
-          commit_user_email: ${{ env.GIT_COMMITTER_EMAIL }}
-          commit_message: |
-            [AUTO COMMIT] update change indication
+    - name: auto-commit any changes to change indication
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        file_pattern: 'src/modules/ekf2/test/change_indication/*.csv'
+        commit_user_name: ${GIT_COMMITTER_NAME}
+        commit_user_email: ${GIT_COMMITTER_EMAIL}
+        commit_message: |
+          '[AUTO COMMIT] update change indication'
 
-            See .github/workflows/ekf_update_change_indicator.yml for more details
+          See .github/workflopws/ekf_update_change_indicator.yml for more details
 
-      - name: if there is a functional change, fail check
-        if: steps.diff-check.outputs.CHANGE_INDICATED == 'true'
-        run: exit 1
+    - name: if there is a functional change, fail check
+      if: ${{ steps.diff-check.outputs.CHANGE_INDICATED }}
+      run: exit 1

.github/workflows/failsafe_sim.yml

@@ -6,15 +6,13 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
@@ -29,7 +27,7 @@ jobs:
           "failsafe_web",
         ]
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: px4io/px4-dev-nuttx-focal:2022-08-12
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
       - name: Install Node v20.18.0
@@ -41,9 +39,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Git ownership workaround
-        run: git config --system --add safe.directory '*'
-
       - name: Install empscripten
         run: |
           git clone https://github.com/emscripten-core/emsdk.git _emscripten_sdk

.github/workflows/flash_analysis.yml

@@ -11,11 +11,13 @@ on:
       - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
 
 env:
   MIN_FLASH_POS_DIFF_FOR_COMMENT: 50
@@ -24,9 +26,9 @@ env:
 jobs:
   analyze_flash:
     name: Analyzing ${{ matrix.target }}
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: px4io/px4-dev-nuttx-focal
     strategy:
       matrix:
         target: [px4_fmu-v5x, px4_fmu-v6x]
@@ -78,7 +80,7 @@ jobs:
         id: bloaty-step
         with:
           bloaty-file-args: ./with-change.elf -- ./before-change.elf
-          bloaty-additional-args: -d sections,symbols -s vm -n 20
+          bloaty-additional-args: -d sections,compileunits -s vm -n 20
           output-to-summary: true
 
       - name: Generate output
@@ -97,7 +99,7 @@ jobs:
   # Track this issue https://github.com/PX4/PX4-Autopilot/issues/24408
   post_pr_comment:
     name: Publish Results
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}"]
+    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     needs: [analyze_flash]
     env:
       V5X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-absolute) }}

.github/workflows/fuzzing.yml

@@ -1,49 +0,0 @@
-name: Fuzzing
-on:
-  schedule:
-    - cron: '0 6 * * *'  # UTC 6am every day.
-
-permissions:
-  contents: read
-  issues: write # for JasonEtco/create-an-issue
-
-env:
-  RUNS_IN_DOCKER: true
-
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    container:
-      image: px4io/px4-dev:v1.16.0-rc2-4-gb67c65bfe6
-    steps:
-      - name: Install Dependencies
-        run: |
-          apt update && apt install -y clang
-
-      - name: Fix git in Container
-        run: |
-          git config --global --add safe.directory $(realpath .)
-
-      - uses: actions/checkout@v4
-
-      - name: Build and Run Fuzz Tests
-        run: |
-          # Only build the tests
-          export CC=clang
-          export CXX=clang++
-          make tests TESTFILTER=__no_tests__
-
-          # Run the fuzz tests
-          for fuzz_binary in build/px4_sitl_test/*fuzz*; do
-            ./Tools/ci/run_fuzz_tests.sh $fuzz_binary 15m
-          done
-
-      # Create a github issue in case of a failure
-      - name: Create Issue
-        if: ${{ failure() }}
-        uses: JasonEtco/create-an-issue@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WORKFLOW_RUN_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        with:
-          filename: .github/fuzzing_issue_template.md

.github/workflows/itcm_check.yml

@@ -1,67 +0,0 @@
-name: ITCM check
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths-ignore:
-      - 'docs/**'
-  pull_request:
-    branches:
-      - '**'
-    paths-ignore:
-      - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check_itcm:
-    name: Checking ${{ matrix.target }}
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
-    container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: px4_fmu-v5x
-            scripts: >
-              boards/px4/fmu-v5x/nuttx-config/scripts/itcm_gen_functions.ld
-              boards/px4/fmu-v5x/nuttx-config/scripts/itcm_static_functions.ld
-          - target: px4_fmu-v6xrt
-            scripts: >
-              boards/px4/fmu-v6xrt/nuttx-config/scripts/itcm_functions_includes.ld
-              boards/px4/fmu-v6xrt/nuttx-config/scripts/itcm_static_functions.ld
-          - target: nxp_tropic-community
-            scripts: >
-              boards/nxp/tropic-community/nuttx-config/scripts/itcm_functions_includes.ld
-              boards/nxp/tropic-community/nuttx-config/scripts/itcm_static_functions.ld
-          - target: nxp_mr-tropic
-            scripts: >
-              boards/nxp/mr-tropic/nuttx-config/scripts/itcm_functions_includes.ld
-              boards/nxp/mr-tropic/nuttx-config/scripts/itcm_static_functions.ld
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Git ownership workaround
-        run: git config --system --add safe.directory '*'
-
-      - name: Build Target
-        run: make ${{ matrix.target }}
-
-      - name: Copy built ELF
-        run: cp ./build/**/*.elf ./built.elf
-
-      - name: Install itcm-check dependencies
-        run: pip3 install -r Tools/setup/optional-requirements.txt --break-system-packages
-
-      - name: Execute the itcm-check
-        run: python3 Tools/itcm_check.py --elf-file built.elf --script-files ${{ matrix.scripts }}

.github/workflows/label.yml

@@ -1,21 +0,0 @@
-# This workflow will triage pull requests and apply a label based on the
-# paths that are modified in the pull request.
-# The paths are set up in .github/labeler.yml
-#
-# See: https://github.com/actions/labeler
-
-name: Labeler
-on: [pull_request_target]
-
-jobs:
-  label:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-
-    steps:
-    - uses: actions/labeler@v5
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/mavros_mission_tests.yml

@@ -6,40 +6,37 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
+      matrix:
+        config:
+          - {vehicle: "iris",          mission: "MC_mission_box"}
+          - {vehicle: "rover",         mission: "rover_mission_1"}
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
-      - name: Build SITL and Run Tests (inside old ROS container)
+    - name: Build SITL and Run Tests
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-ros-melodic:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
         run: |
-          docker run --rm \
-            -v "${GITHUB_WORKSPACE}:/workspace" \
-            -w /workspace \
-            px4io/px4-dev-ros-melodic:2021-09-08 \
-            bash -c '
-              git config --global --add safe.directory /workspace
-              make px4_sitl_default
-              make px4_sitl_default sitl_gazebo-classic
-              ./test/rostest_px4_run.sh \
-                mavros_posix_test_mission.test \
-                mission:=MC_mission_box \
-                vehicle:=iris
-            '
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          make px4_sitl_default
+          make px4_sitl_default sitl_gazebo-classic
+          ./test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=${{matrix.config.mission}} vehicle:=${{matrix.config.vehicle}}

.github/workflows/mavros_offboard_tests.yml

@@ -6,39 +6,38 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
-      - '**'
+    - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     strategy:
       fail-fast: false
+      matrix:
+        config:
+          - {test_file: "mavros_posix_tests_offboard_posctl.test",    vehicle: "iris"}
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
-      - name: Build SITL and Run Tests (inside old ROS container)
+    - name: Build PX4 and Run Tests
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-ros-melodic:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
         run: |
-          docker run --rm \
-            -v "${GITHUB_WORKSPACE}:/workspace" \
-            -w /workspace \
-            px4io/px4-dev-ros-melodic:2021-09-08 \
-            bash -c '
-              git config --global --add safe.directory /workspace
-              make px4_sitl_default
-              make px4_sitl_default sitl_gazebo-classic
-              ./test/rostest_px4_run.sh \
-                mavros_posix_tests_offboard_posctl.test \
-                vehicle:=iris
-            '
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          make px4_sitl_default
+          make px4_sitl_default sitl_gazebo-classic
+          ./test/rostest_px4_run.sh ${{matrix.config.test_file}} vehicle:=${{matrix.config.vehicle}}

.github/workflows/nuttx_env_config.yml

@@ -6,41 +6,38 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
-
     strategy:
       matrix:
-        config:
-          - px4_fmu-v5_default
+        config: [
+          px4_fmu-v5_default,
+          ]
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
-      - name: Build PX4 and Run Test [${{ matrix.config }}]
+    - name: Build PX4 and Run Test [${{ matrix.config }}]
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-nuttx-focal:2022-08-12
+        options: -v ${{ github.workspace }}:/workspace
         run: |
-          cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          export PX4_EXTRA_NUTTX_CONFIG='CONFIG_NSH_LOGIN_PASSWORD="test";CONFIG_NSH_CONSOLE_LOGIN=y'
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          export PX4_EXTRA_NUTTX_CONFIG="CONFIG_NSH_LOGIN_PASSWORD=\"test\";CONFIG_NSH_CONSOLE_LOGIN=y"
           echo "PX4_EXTRA_NUTTX_CONFIG: $PX4_EXTRA_NUTTX_CONFIG"
-
           make ${{ matrix.config }} nuttx_context
-
           echo "Check that the config option is set"
           grep CONFIG_NSH_LOGIN_PASSWORD build/${{ matrix.config }}/NuttX/nuttx/.config

.github/workflows/python_checks.yml

@@ -6,11 +6,13 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
-      - '**'
+    - '**'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
 
 jobs:
   build:

.github/workflows/ros_integration_tests.yml

@@ -17,13 +17,9 @@ on:
     paths-ignore:
       - 'docs/**'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=16cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
       image: px4io/px4-dev-ros2-galactic:2021-09-08
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
@@ -89,7 +85,7 @@ jobs:
         . /opt/ros/galactic/setup.bash
         mkdir -p /opt/px4_ws/src
         cd /opt/px4_ws/src
-        git clone --recursive https://github.com/Auterion/px4-ros2-interface-lib.git
+        git clone --recursive --branch release/1.16 https://github.com/Auterion/px4-ros2-interface-lib.git
         cd ..
         # Copy messages to ROS workspace
         "${PX4_DIR}/Tools/copy_to_ros_ws.sh" "$(pwd)"

.github/workflows/ros_translation_node.yml

@@ -5,23 +5,20 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
       - '**'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
 defaults:
   run:
     shell: bash
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build_and_test:
     name: Build and test
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     strategy:
       fail-fast: false
       matrix:

.github/workflows/sitl_tests.yml

@@ -11,20 +11,18 @@ on:
     - 'main'
     paths-ignore:
       - 'docs/**'
+      - '.github/**'
   pull_request:
     branches:
-    - '**'
+      - '**'
     paths-ignore:
       - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - '.github/**'
 
 jobs:
   build:
     name: Testing PX4 ${{ matrix.config.model }}
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=16cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
       image: px4io/px4-dev-simulation-focal:2021-09-08
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined

.github/workflows/stale.yml

@@ -7,15 +7,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v8
         with:
-          operations-per-run: 250
-          days-before-stale: 90
-          days-before-close: 30
+          days-before-stale: 30
+          days-before-close: -1
           stale-issue-label: 'stale'
           stale-pr-label: 'stale'
           remove-stale-when-updated: true
-          stale-issue-message: 'This issue has been marked as stale due to 90 days of inactivity. If no further activity occurs, it will be automatically closed in 30 days. Please leave a comment, add a reaction, make an update, or remove the stale label if you’d like to keep it open.'
-          close-issue-message: 'This issue has been closed due to prolonged inactivity after being marked as stale. If you believe this was closed in error or the topic is still relevant, please feel free to reopen it or create a new issue.'
-          stale-pr-message: 'This PR was identified as stale and it will be closed in 30 days unless any activity is detected.'
-          close-pr-message: 'This pull request has been closed after being marked as stale with no further activity. Thank you for the time and effort you put into this contribution. If you’d like to continue the discussion or update the work, please feel free to reopen it or submit a new PR.'

.gitmodules

@@ -89,17 +89,3 @@
 [submodule "src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan"]
 	path = src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan
 	url = https://github.com/dronecan/pydronecan
-[submodule "test/fuzztest"]
-	path = test/fuzztest
-	url = https://github.com/google/fuzztest.git
-	branch = main
-[submodule "src/lib/tensorflow_lite_micro/tflite_micro"]
-	path = src/lib/tensorflow_lite_micro/tflite_micro
-	url = https://github.com/PX4/tflite-micro.git
-	branch = main
-[submodule "src/drivers/ins/microstrain/mip_sdk"]
-	path = src/drivers/ins/microstrain/mip_sdk
-	url = https://github.com/PX4/LORD-MicroStrain_mip_sdk.git
-[submodule "src/drivers/ins/sbgecom/sbgECom"]
-	path = src/drivers/ins/sbgecom/sbgECom
-	url = https://github.com/PX4/sbgECom.git

.vscode/cmake-variants.yaml

@@ -6,11 +6,6 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_default
-    px4_sitl_spacecraft:
-      short: px4_sitl_spacecraft
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_spacecraft
     px4_sitl_nolockstep:
       short: px4_sitl_nolockstep
       buildType: RelWithDebInfo
@@ -36,11 +31,6 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_test
-    px4_sitl_zenoh:
-      short: px4_sitl_zenoh
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_test
     px4_io-v2_default:
       short: px4_io-v2
       buildType: MinSizeRel
@@ -196,26 +186,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_cannode_canbootloader
-    ark_dist_default:
-      short: ark_dist_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_dist_default
-    ark_dist_canbootloader:
-      short: ark_dist_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_dist_canbootloader
-    ark_f9p-gps_default:
-      short: ark_f9p-gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_f9p-gps_default
-    ark_f9p-gps_canbootloader:
-      short: ark_f9p-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_f9p-gps_canbootloader
     ark_fmu-v6x_bootloader:
       short: ark_fmu-v6x_bootloader
       buildType: MinSizeRel
@@ -246,16 +216,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_pi6x_default
-    ark_x20-gps_default:
-      short: ark_x20-gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_x20-gps_default
-    ark_x20-gps_canbootloader:
-      short: ark_x20-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_x20-gps_canbootloader
     atl_mantis-edu_default:
       short: atl_mantis-edu
       buildType: MinSizeRel
@@ -301,16 +261,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: cuav_7-nano_default
-    cuav_fmu-v6x_default:
-      short: cuav_fmu-v6x
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_fmu-v6x_default
-    cuav_x25_default:
-      short: cuav_x25-evo
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_x25-evo_default
     cubepilot_cubeorange_test:
       short: cubepilot_cubeorange
       buildType: MinSizeRel
@@ -356,11 +306,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: holybro_kakuteh7-wing_default
-    holybro_kakuteh7dualimu_default:
-      short: holybro_kakuteh7dualimu
-      buildType: MinSizeRel
-      settings:
-        CONFIG: holybro_kakuteh7dualimu_default
     matek_h743-slim_default:
       short: matek_h743-slim
       buildType: MinSizeRel
@@ -456,16 +401,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: nxp_mr-canhubk3_fmu
-    nxp_mr-tropic_default:
-      short: nxp_mr-tropic_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_mr-tropic_default
-    nxp_mr-tropic_bootloader:
-      short: nxp_mr-tropic_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_mr-tropic_bootloader
     nxp_tropic-community_default:
       short: nxp_tropic-community_default
       buildType: MinSizeRel

.vscode/settings.json

@@ -43,7 +43,7 @@
         "files.watcherExclude": {
                 "**/build/**": true
         },
-        "git.detectSubmodulesLimit": 25,
+        "git.detectSubmodulesLimit": 20,
         "git.ignoreLimitWarning": true,
         "githubPullRequests.defaultMergeMethod": "squash",
         "githubPullRequests.telemetry.enabled": false,

CMakeLists.txt

@@ -334,33 +334,6 @@ if(NOT PX4_CHIP)
 	message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP")
 endif()
 
-#=============================================================================
-# Testing - Automatic unit and integration testing with CTest
-# (Needs to be before setting the common compile flags)
-#
-
-# optionally enable cmake testing (supported only on posix)
-option(CMAKE_TESTING "Configure test targets" OFF)
-if(${PX4_CONFIG} STREQUAL "px4_sitl_test")
-	set(CMAKE_TESTING ON)
-endif()
-if(CMAKE_TESTING)
-	include(CTest) # sets BUILD_TESTING variable
-endif()
-
-# enable test filtering to run only specific tests with the ctest -R regex functionality
-set(TESTFILTER "" CACHE STRING "Filter string for ctest to selectively only run specific tests (ctest -R)")
-
-include(px4_add_gtest)
-if(BUILD_TESTING)
-	# Setting FUZZTEST_FUZZING_MODE=on enables ASAN, and is only supported with Clang
-	if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang"))
-		set(FUZZTEST_FUZZING_MODE ON)
-	endif()
-	add_subdirectory(test)
-	fuzztest_setup_fuzzing_flags()
-endif()
-
 #=============================================================================
 # build flags
 #
@@ -413,6 +386,47 @@ if (NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
 	endforeach()
 endif()
 
+#=============================================================================
+# Testing - Automatic unit and integration testing with CTest
+#
+
+# optionally enable cmake testing (supported only on posix)
+option(CMAKE_TESTING "Configure test targets" OFF)
+if(${PX4_CONFIG} STREQUAL "px4_sitl_test")
+	set(CMAKE_TESTING ON)
+endif()
+if(CMAKE_TESTING)
+	include(CTest) # sets BUILD_TESTING variable
+endif()
+
+# enable test filtering to run only specific tests with the ctest -R regex functionality
+set(TESTFILTER "" CACHE STRING "Filter string for ctest to selectively only run specific tests (ctest -R)")
+
+# if testing is enabled download and configure gtest
+list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake/gtest/)
+include(px4_add_gtest)
+if(BUILD_TESTING)
+	include(gtest)
+
+	# Ensure there's no -R without any filter expression since that trips newer ctest versions
+	if(TESTFILTER)
+		set(TESTFILTERARG "-R")
+	else()
+		set(TESTFILTERARG "")
+	endif()
+
+	add_custom_target(test_results
+			COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test ${TESTFILTERARG} ${TESTFILTER}
+			DEPENDS
+				px4
+				examples__dyn_hello
+			USES_TERMINAL
+			COMMENT "Running tests"
+			WORKING_DIRECTORY ${PX4_BINARY_DIR})
+	set_target_properties(test_results PROPERTIES EXCLUDE_FROM_ALL TRUE)
+endif()
+
+
 #=============================================================================
 # subdirectories
 #
@@ -482,6 +496,7 @@ add_custom_target(uorb_graph DEPENDS ${uorb_graph_config})
 include(bloaty)
 
 
+include(doxygen)
 include(metadata)
 include(package)
 

Kconfig

@@ -73,11 +73,6 @@ menu "Toolchain"
         help
             relative path to the ROMFS root directory
 
-    config BOARD_ADDITIONAL_INIT
-        string "Additional init file"
-        help
-            additional configurable init file to include in the ROMFS
-
     config BOARD_IO
         string "IO board name"
         default "px4_io-v2_default"
@@ -211,8 +206,8 @@ source "src/examples/Kconfig"
 endmenu
 
 menu "platforms"
-depends on PLATFORM_QURT || PLATFORM_POSIX || PLATFORM_NUTTX
-source "platforms/Kconfig"
+depends on PLATFORM_QURT || PLATFORM_POSIX
+source "platforms/common/Kconfig"
 endmenu
 
 source "src/lib/*/Kconfig"

MAINTAINERS.md

@@ -7,34 +7,33 @@ See [the documentation on Maintainers](https://docs.px4.io/main/en/contribute/ma
 
 | Name                    | Sector | GitHub | Chat | email
 |-------------------------|--------|--------|------|----------------
-| Lorenz Meier | Founder | [@LorenzMeier](https://github.com/LorenzMeier) |  | <lorenz@px4.io>
-| Daniel Agar | Architecture | [@dagar](https://github.com/dagar) | daniel_agar | <daniel@agar.ca>
-| Beat Küng | Architecture | [@bkueng](https://github.com/bkueng) | beatkueng | <beat-kueng@gmx.net>
-| Ramón Roche | CI / Testing | [@mrpollo](https://github.com/mrpollo) | rroche | <rroche@linuxfoundation.org>
-| Mathieu Bresciani | State Estimation | [@bresch](https://github.com/bresch) | mbresch |
-| Paul Riseborough | State Estimation | [@priseborough](https://github.com/priseborough) |  |
-| David Sidrane | RTOS / NuttX | [@davids5](https://github.com/davids5) | david_s5 | <David.Sidrane@Nscdg.com>
-| Jayoung Lim | Simulation | [@Jaeyoung-Lim](https://github.com/Jaeyoung-Lim) | jaeyounglim. | <jalim@ethz.ch>
-| Beniamino Pozzan | ROS 2 | [@beniaminopozzan](https://github.com/beniaminopozzan) | beniaminopozzan | <beniamino.pozzan@gmail.com>
-| Matthias Grob | Multirotor | [@MaEtUgR](https://github.com/MaEtUgR) | maetugr |
-| Silvan Fuhrer | Fixed-Wing / VTOL | [@sfuhrer](https://github.com/sfuhrer) | sfuhrer |
-| Christian Friedrich | Rover | [@chfriedrich98](https://github.com/chfriedrich98) | christian982564 |
-| Pedro Roque | Spacecraft | [@Pedro-Roque](https://github.com/Pedro-Roque) | .pedroroque | <roque@caltech.edu>
-| Jacob Dahl | Simulation | [@dakejahl](https://github.com/dakejahl) | dakejahl | <dahl.jakejacob@gmail.com>
+| Lorenz Meier | Founder | [LorenzMeier][LorenzMeier] |  | <lorenz@px4.io>
+| Daniel Agar | Architecture | [dagar][dagar] | daniel_agar | <daniel@agar.ca>
+| Beat Küng | Architecture | [bkueng][bkueng] | beatkueng | <beat-kueng@gmx.net>
+| Ramón Roche | CI / Testing | [mrpollo][mrpollo] | rroche | <rroche@linuxfoundation.org>
+| Mathieu Bresciani | State Estimation | [bresch][bresch] | mbresch |
+| Paul Riseborough | State Estimation | [priseborough][priseborough] |  |
+| David Sidrane | RTOS / NuttX | [davids5][davids5] | david_s5 | <David.Sidrane@Nscdg.com>
+| Jayoung Lim | Simulation | [Jaeyoung-Lim][Jaeyoung-Lim] | jaeyounglim. | <jalim@ethz.ch>
+| Beniamino Pozzan | ROS 2 | [beniaminopozzan][beniaminopozzan] | beniaminopozzan | <beniamino.pozzan@gmail.com>
+| Matthias Grob | Multirotor | [MaEtUgR][MaEtUgR] | maetugr |
+| Silvan Fuhrer | Fixed-Wing / VTOL | [sfuhrer][sfuhrer] | sfuhrer |
+| Christian Friedrich | Rover | [chfriedrich98][chfriedrich98] | christian982564 |
+| Pedro Roque | Spacecraft | [Pedro-Roque][Pedro-Roque] | .pedroroque | <padr@kth.se>
 
 
 **Documentation Maintainers**
 
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Hamish Willee  | [@hamishwillee](https://github.com/hamishwillee) | hamishwillee |
+| Hamish Willee  | [hamishwillee][hamishwillee] | hamishwillee |
 
 **Release Managers**
 
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Ramón Roche | [@mrpollo](https://github.com/mrpollo) | rroche | <rroche@linuxfoundation.org>
-| Daniel Agar | [@dagar](https://github.com/dagar) | daniel_agar | <daniel@agar.ca>
+| Ramón Roche | [mrpollo][mrpollo] | rroche | <rroche@linuxfoundation.org>
+| Daniel Agar | [dagar][dagar] | daniel_agar | <daniel@agar.ca>
 
 **Retired Maintainers**
 

Makefile

@@ -160,6 +160,11 @@ else
 		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=UndefinedBehaviorSanitizer
 	endif
 
+	# Fuzz Testing
+	ifdef PX4_FUZZ
+		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=FuzzTesting
+	endif
+
 endif
 
 # Pick up specific Python path if set
@@ -295,8 +300,6 @@ uorb_graphs:
 	@$(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_fmu-v5x_default uorb_graph
-	@$(MAKE) --no-print-directory px4_fmu-v6x_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
 
 px4io_update:
@@ -325,13 +328,9 @@ bootloaders_update: \
 	ark_fmu-v6x_bootloader \
 	ark_fpv_bootloader \
 	ark_pi6x_bootloader \
-	auterion_fmu-v6s_bootloader \
-	auterion_fmu-v6x_bootloader \
 	cuav_nora_bootloader \
 	cuav_x7pro_bootloader \
 	cuav_7-nano_bootloader \
-	cuav_fmu-v6x_bootloader \
-	cuav_x25-evo_bootloader \
 	cubepilot_cubeorange_bootloader \
 	cubepilot_cubeorangeplus_bootloader \
 	hkust_nxt-dual_bootloader \
@@ -351,7 +350,6 @@ bootloaders_update: \
 	mro_ctrl-zero-h7_bootloader \
 	mro_ctrl-zero-h7-oem_bootloader \
 	mro_pixracerpro_bootloader \
-	narinfc_h7_bootloader \
 	px4_fmu-v6c_bootloader \
 	px4_fmu-v6u_bootloader \
 	px4_fmu-v6x_bootloader \
@@ -365,7 +363,7 @@ coverity_scan: px4_sitl_default
 
 # Documentation
 # --------------------------------------------------------------------
-.PHONY: parameters_metadata airframe_metadata module_documentation extract_events px4_metadata
+.PHONY: parameters_metadata airframe_metadata module_documentation extract_events px4_metadata doxygen
 
 parameters_metadata:
 	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters ver_gen
@@ -381,6 +379,12 @@ extract_events:
 
 px4_metadata: parameters_metadata airframe_metadata module_documentation extract_events
 
+doxygen:
+	@mkdir -p "$(SRC_DIR)"/build/doxygen
+	@cd "$(SRC_DIR)"/build/doxygen && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=px4_sitl_default -DBUILD_DOXYGEN=ON
+	@$(PX4_MAKE) -C "$(SRC_DIR)"/build/doxygen
+	@touch "$(SRC_DIR)"/build/doxygen/Documentation/.nojekyll
+
 # Style
 # --------------------------------------------------------------------
 .PHONY: check_format format check_newlines
@@ -410,18 +414,11 @@ tests:
 	$(eval UBSAN_OPTIONS += color=always)
 	$(call cmake-build,px4_sitl_test)
 
-# work around lcov bug #316; remove once lcov is fixed (see https://github.com/linux-test-project/lcov/issues/316)
-LCOBUG = --ignore-errors mismatch
 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 \
-		$(LCOBUG) \
-		-o coverage/lcov.info
+	@lcov --directory build/px4_sitl_test --base-directory build/px4_sitl_test --gcov-tool gcov --capture -o coverage/lcov.info
 
 
 rostest: px4_sitl_default
@@ -473,7 +470,7 @@ python_coverage:
 
 # static analyzers (scan-build, clang-tidy, cppcheck)
 # --------------------------------------------------------------------
-.PHONY: scan-build px4_sitl_default-clang clang-tidy clang-tidy-fix
+.PHONY: scan-build px4_sitl_default-clang clang-tidy clang-tidy-fix clang-tidy-quiet
 .PHONY: cppcheck shellcheck_all validate_module_configs
 
 scan-build:
@@ -499,6 +496,10 @@ clang-tidy: px4_sitl_default-clang
 clang-tidy-fix: px4_sitl_default-clang
 	@cd "$(SRC_DIR)"/build/px4_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j_clang_tidy) -fix -p .
 
+# modified version of run-clang-tidy.py to return error codes and only output relevant results
+clang-tidy-quiet: px4_sitl_default-clang
+	@cd "$(SRC_DIR)"/build/px4_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j_clang_tidy) -p .
+
 # TODO: Fix cppcheck errors then try --enable=warning,performance,portability,style,unusedFunction or --enable=all
 cppcheck: px4_sitl_default
 	@mkdir -p "$(SRC_DIR)"/build/cppcheck
@@ -513,7 +514,6 @@ 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/modules/uxrce_dds_client/dds_topics.yaml" \
-	-not -path "$(SRC_DIR)/src/modules/zenoh/dds_topics.yaml" \
 	-not -path "$(SRC_DIR)/src/modules/zenoh/zenoh-pico/*" \
 	-not -path "$(SRC_DIR)/src/lib/events/libevents/*" \
 	-not -path "$(SRC_DIR)/src/lib/cdrstream/*" \

ROMFS/CMakeLists.txt

@@ -85,32 +85,10 @@ endif()
 if(PX4_ETHERNET)
 	set(added_arguments ${added_arguments} --ethernet)
 endif()
-# Check if board has an rc.board_airframes file to filter airframes
-set(board_airframes_file "${PX4_BOARD_DIR}/init/rc.board_airframes")
-set(airframes_whitelist "")
-if(EXISTS "${board_airframes_file}")
-	message(STATUS "ROMFS: Using board-specific airframes list: ${board_airframes_file}")
-	file(STRINGS "${board_airframes_file}" airframes_whitelist)
-	# Remove comments and empty lines
-	list(FILTER airframes_whitelist EXCLUDE REGEX "^[ \t]*#")
-	list(FILTER airframes_whitelist EXCLUDE REGEX "^[ \t]*$")
-endif()
-
 # create list of relative romfs file names
 set(romfs_copy_files_relative)
 foreach(romfs_file IN LISTS romfs_copy_files)
 	string(REPLACE "${romfs_src_dir}/" "" romfs_file_rel ${romfs_file})
-
-	# If we have an airframes whitelist, filter airframe files
-	if(airframes_whitelist AND romfs_file_rel MATCHES "^init.d/airframes/")
-		# Extract just the filename
-		get_filename_component(airframe_name "${romfs_file_rel}" NAME)
-		# Check if it's in the whitelist
-		if(NOT "${airframe_name}" IN_LIST airframes_whitelist)
-			continue()
-		endif()
-	endif()
-
 	list(APPEND romfs_copy_files_relative ${romfs_file_rel})
 endforeach()
 # copy the ROMFS files by creating a tar and extracting it to the build
@@ -224,31 +202,6 @@ foreach(board_rc_file ${OPTIONAL_BOARD_RC})
 
 endforeach()
 
-if(config_additional_init)
-	if(EXISTS "${PX4_BOARD_DIR}/init/${config_additional_init}")
-		file(RELATIVE_PATH rc_file_relative ${PX4_SOURCE_DIR} ${PX4_BOARD_DIR}/init/${config_additional_init})
-		message(STATUS "ROMFS:  Adding ${rc_file_relative} -> /etc/init.d/rc.additional_init")
-
-		add_custom_command(
-			OUTPUT
-				${romfs_gen_root_dir}/init.d/rc.additional_init
-				${config_additional_init}.stamp
-			COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PX4_BOARD_DIR}/init/${config_additional_init} ${romfs_gen_root_dir}/init.d/rc.additional_init
-			COMMAND ${CMAKE_COMMAND} -E touch ${config_additional_init}.stamp
-			DEPENDS
-				${PX4_BOARD_DIR}/init/${config_additional_init}
-				romfs_copy.stamp
-			COMMENT "ROMFS: copying ${config_additional_init}"
-		)
-
-		list(APPEND extras_dependencies
-			${config_additional_init}.stamp
-			)
-	else()
-		message(FATAL_ERROR "BOARD_ADDITIONAL_INIT file not found at: ${PX4_BOARD_DIR}/init/${config_additional_init}")
-	endif()
-endif()
-
 
 # board extras
 set(OPTIONAL_BOARD_EXTRAS)
@@ -263,33 +216,12 @@ foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
 		if(CONFIG_SYSTEMCMDS_BL_UPDATE)
 			# generate rc.board_bootloader_upgrade
 			set(BOARD_FIRMWARE_BIN "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
-			message(STATUS "ROMFS:  Adding platforms/nuttx/init/rc.board_bootloader_upgrade -> /etc/init.d/rc.board_bootloader_upgrade")
-
-			# Generate the file using configure_file at configure time to a temporary location
-			set(bootloader_upgrade_tmp ${CMAKE_CURRENT_BINARY_DIR}/rc.board_bootloader_upgrade.tmp)
-			configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${bootloader_upgrade_tmp} @ONLY)
-
-			# Then copy it at build time with proper dependencies
-			add_custom_command(
-				OUTPUT
-					${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade
-					rc.board_bootloader_upgrade.stamp
-				COMMAND ${CMAKE_COMMAND} -E copy_if_different ${bootloader_upgrade_tmp} ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade
-				COMMAND ${CMAKE_COMMAND} -E touch rc.board_bootloader_upgrade.stamp
-				DEPENDS
-					${bootloader_upgrade_tmp}
-					${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in
-					romfs_copy.stamp
-				COMMENT "ROMFS: copying rc.board_bootloader_upgrade"
-			)
-
-			list(APPEND extras_dependencies
-				rc.board_bootloader_upgrade.stamp
-			)
+			configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade @ONLY)
 		else()
 			# remove bootloader from extras
 			list(REMOVE_ITEM OPTIONAL_BOARD_EXTRAS ${board_extra_file})
 		endif()
+
 	endif()
 endforeach()
 

ROMFS/cannode/init.d/rcS

@@ -56,17 +56,6 @@ then
 fi
 unset BOARD_RC_DEFAULTS
 
-#
-# Optional additional init file: rc.additional_init
-#
-set BOARD_RC_ADDITIONAL_INIT ${R}etc/init.d/rc.additional_init
-if [ -f $BOARD_RC_ADDITIONAL_INIT ]
-then
-	echo "Board additional init: ${BOARD_RC_ADDITIONAL_INIT}"
-	. $BOARD_RC_ADDITIONAL_INIT
-fi
-unset BOARD_RC_ADDITIONAL_INIT
-
 #
 # Start system state indicator.
 #

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

@@ -46,22 +46,3 @@ param set-default PWM_MAIN_FUNC3 203
 param set-default PWM_MAIN_FUNC4 101
 
 param set-default EKF2_GPS_DELAY 0
-
-# Rate controllers
-param set-default FW_RR_P 0.0500
-param set-default FW_RR_I 2.0000
-param set-default FW_RR_D 0.0000
-param set-default FW_RR_FF 0.0000
-param set-default FW_RR_IMAX 1.0000
-
-param set-default FW_PR_P 0.0800
-param set-default FW_PR_I 2.5000
-param set-default FW_PR_D 0.0000
-param set-default FW_PR_FF 0.0000
-param set-default FW_PR_IMAX 1.0000
-
-param set-default FW_YR_P 0.0500
-param set-default FW_YR_I 3.0000
-param set-default FW_YR_D 0.0000
-param set-default FW_YR_FF 0.0000
-param set-default FW_YR_IMAX 1.0000

ROMFS/px4fmu_common/init.d-posix/airframes/10044_sihsim_hex

@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# @name HexarotorX SITL for SIH
-#
-# @type Hexarotor x
-# @class Copter
-#
-# @maintainer Matthias Grob <maetugr@gmail.com>
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=hex}
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-
-param set SIH_VEHICLE_TYPE 4
-
-# Symmetric hexacopter X clockwise motor numbering
-param set-default CA_ROTOR_COUNT 6
-param set-default CA_ROTOR0_PX 0.866
-param set-default CA_ROTOR0_PY 0.5
-param set-default CA_ROTOR1_PX 0
-param set-default CA_ROTOR1_PY 1
-param set-default CA_ROTOR1_KM -0.05
-param set-default CA_ROTOR2_PX -0.866
-param set-default CA_ROTOR2_PY 0.5
-param set-default CA_ROTOR3_PX -0.866
-param set-default CA_ROTOR3_PY -0.5
-param set-default CA_ROTOR3_KM -0.05
-param set-default CA_ROTOR4_PX 0
-param set-default CA_ROTOR4_PY -1
-param set-default CA_ROTOR5_PX 0.866
-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
-
-param set-default EKF2_GPS_DELAY 0

ROMFS/px4fmu_common/init.d-posix/airframes/10045_sihsim_rover_ackermann

@@ -1,72 +0,0 @@
-#!/bin/sh
-# @name Rover Ackermann
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_ackermann_defaults
-
-set VEHICLE_TYPE rover_ackermann
-param set-default CA_AIRFRAME 5         # Rover (Ackermann)
-param set-default CA_R_REV 1            # Motor is assumed to be reversible
-param set-default EKF2_MAG_TYPE 1       # Make sure magnetometer is fused even when not driving
-param set-default NAV_ACC_RAD 0.5       # Waypoint acceptance radius
-param set-default EKF2_GBIAS_INIT 0.01
-param set-default EKF2_ANGERR_INIT 0.01
-
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_ackermann}
-
-param set-default SIH_VEHICLE_TYPE 5 # sih as rover ackermann
-
-param set-default PWM_MAIN_FUNC1 201 # Steering
-param set-default PWM_MAIN_FUNC2 101 # Throttle
-param set-default SIH_MASS 20
-param set-default SIH_IXX 0.4333
-param set-default SIH_IYY 1.6833
-param set-default SIH_IZZ 2.0833
-param set-default SIH_IXZ 0
-param set-default SIH_KDV 50
-param set-default SIH_KDW 10
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-
-# Ackermann Parameters
-param set-default RA_WHEEL_BASE 0.321
-param set-default RA_ACC_RAD_GAIN 2
-param set-default RA_ACC_RAD_MAX 3
-param set-default RA_MAX_STR_ANG 0.5236
-param set-default RA_STR_RATE_LIM 360
-
-# Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
-param set-default RO_YAW_RATE_P 0.25
-param set-default RO_YAW_RATE_LIM 180
-param set-default RO_YAW_ACCEL_LIM 400
-param set-default RO_YAW_DECEL_LIM 800
-param set-default RO_YAW_RATE_CORR 1
-
-# Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 3
-param set-default RO_DECEL_LIM 3
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 3.2
-param set-default RO_SPEED_LIM 3
-param set-default RO_SPEED_I 0.001
-param set-default RO_SPEED_P 0.001
-param set-default RO_SPEED_RED 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1

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

@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# @name Rover
+#
+
+. ${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
+
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2
+
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 2
+
+param set-default CA_AIRFRAME 5
+
+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

ROMFS/px4fmu_common/init.d-posix/airframes/1061_gazebo-classic_r1_rover

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# @name Aion Robotics R1 Rover
+# @type Rover
+# @class Rover
+
+. ${R}etc/init.d/rc.rover_differential_defaults
+
+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

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

@@ -15,6 +15,7 @@ param set-default NAV_ACC_RAD 0.5
 
 # Differential Parameters
 param set-default RD_WHEEL_TRACK 0.3
+param set-default RD_MAX_THR_YAW_R 1.5
 param set-default RD_TRANS_DRV_TRN 0.349066
 param set-default RD_TRANS_TRN_DRV 0.174533
 
@@ -30,16 +31,14 @@ param set-default RO_YAW_RATE_P 0.25
 param set-default RO_YAW_RATE_LIM 180
 param set-default RO_YAW_ACCEL_LIM 120
 param set-default RO_YAW_DECEL_LIM 1000
-param set-default RO_YAW_RATE_CORR 1.43
 
 # Rover Attitude Control Parameters
 param set-default RO_YAW_P 5
 
-# Rover Velocity Control Parameters
+# Rover Position Control Parameters
 param set-default RO_SPEED_LIM 2
 param set-default RO_SPEED_I 0.01
 param set-default RO_SPEED_P 0.1
-param set-default RO_SPEED_RED 1
 
 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1

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

@@ -1,68 +1,51 @@
 #!/bin/sh
-# @name Gazebo - Zero Turn Lawnmower
+# @name Gazebo lawnmower
 # @type Rover
 # @class Rover
 
 . ${R}etc/init.d/rc.rover_differential_defaults
 
 PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=lawn}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=lawnmower}
 
 param set-default SIM_GZ_EN 1 # Gazebo bridge
 
-param set-default NAV_ACC_RAD 0.5
-
 # We can arm and drive in manual mode when it slides and GPS check fails:
 param set-default COM_ARM_WO_GPS 1
 
-# Differential Parameters
+# Rover parameters
 param set-default RD_WHEEL_TRACK 0.9
+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_TRANS_DRV_TRN 0.349066
 param set-default RD_TRANS_TRN_DRV 0.174533
 
-# Rover Control Parameters
-param set-default RO_ACCEL_LIM 1.5
-param set-default RO_DECEL_LIM 5
-param set-default RO_JERK_LIM 15
-param set-default RO_MAX_THR_SPEED 2.7
-
-# Rover Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.2
-param set-default RO_YAW_RATE_P 1.0
-param set-default RO_YAW_RATE_LIM 60
-param set-default RO_YAW_ACCEL_LIM 50
-param set-default RO_YAW_DECEL_LIM 1000
-param set-default RO_YAW_RATE_CORR 1.0
-
-# Rover Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Rover Velocity Control Parameters
-param set-default RO_SPEED_LIM 2.1
-param set-default RO_SPEED_I 0.01
-param set-default RO_SPEED_P 0.1
-param set-defatul RO_SPEED_RED 1.0
-
 # Pure pursuit parameters
+param set-default PP_LOOKAHD_MAX 30
+param set-default PP_LOOKAHD_MIN 2
 param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
 
 # Actuator mapping - set SITL motors/servos output parameters:
 
 # "Motors" - motor channels 0 (Right) and 1 (Left) - via Wheels GZ bridge:
 param set-default SIM_GZ_WH_FUNC1 101 # right wheel
-param set-default SIM_GZ_WH_MIN1 87
-param set-default SIM_GZ_WH_MAX1 113
-param set-default SIM_GZ_WH_DIS1 100
-param set-default SIM_GZ_WH_FAIL1 100
+#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_FAIL1 100
 
 param set-default SIM_GZ_WH_FUNC2 102 # left wheel
-param set-default SIM_GZ_WH_MIN2 87
-param set-default SIM_GZ_WH_MAX2 113
-param set-default SIM_GZ_WH_DIS2 100
-param set-default SIM_GZ_WH_FAIL2 100
+#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_FAIL2 100
 
 param set-default SIM_GZ_WH_REV 0 # no need to reverse any wheels
 

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

@@ -1,5 +1,5 @@
 #!/bin/sh
-# @name Generic Ackermann Rover
+# @name Rover Ackermann
 # @type Rover
 # @class Rover
 
@@ -14,34 +14,30 @@ param set-default SIM_GZ_EN 1 # Gazebo bridge
 param set-default NAV_ACC_RAD 0.5
 
 # Ackermann Parameters
-param set-default RA_WHEEL_BASE 0.5
+param set-default RA_WHEEL_BASE 0.321
 param set-default RA_ACC_RAD_GAIN 2
-param set-default RA_ACC_RAD_MAX 1.5
+param set-default RA_ACC_RAD_MAX 3
 param set-default RA_MAX_STR_ANG 0.5236
 param set-default RA_STR_RATE_LIM 360
 
-# Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
-param set-default RO_YAW_RATE_P 0.25
-param set-default RO_YAW_RATE_LIM 130
-param set-default RO_YAW_ACCEL_LIM 800
-param set-default RO_YAW_DECEL_LIM 800
-param set-default RO_YAW_RATE_CORR 1
-param set-default RO_YAW_EXPO 0.85
-param set-default RO_YAW_SUPEXPO 0.3
+# Rover Control Parameters
+param set-default RO_ACCEL_LIM 3
+param set-default RO_DECEL_LIM 6
+param set-default RO_JERK_LIM 15
+param set-default RO_MAX_THR_SPEED 3.1
 
-# Attitude Control Parameters
+# Rover Rate Control Parameters
+param set-default RO_YAW_RATE_I 0.1
+param set-default RO_YAW_RATE_P 1
+param set-default RO_YAW_RATE_LIM 180
+
+# Rover Attitude Control Parameters
 param set-default RO_YAW_P 3
 
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 4
-param set-default RO_DECEL_LIM 6
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 3.1
-param set-default RO_SPEED_LIM 2.5
-param set-default RO_SPEED_I 0.01
+# Rover Position Control Parameters
+param set-default RO_SPEED_LIM 3
+param set-default RO_SPEED_I 0.1
 param set-default RO_SPEED_P 1
-param set-default RO_SPEED_RED 1
 
 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1
@@ -50,8 +46,8 @@ param set-default PP_LOOKAHD_MIN 1
 
 # Wheels
 param set-default SIM_GZ_WH_FUNC1 101
-param set-default SIM_GZ_WH_MIN1 70
-param set-default SIM_GZ_WH_MAX1 130
+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

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

@@ -1,5 +1,5 @@
 #!/bin/sh
-# @name Generic Mecanum Rover
+# @name Aion Robotics R1 Rover
 # @type Rover
 # @class Rover
 
@@ -7,15 +7,16 @@
 
 PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
 PX4_GZ_WORLD=${PX4_GZ_WORLD:=rover}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_mecanum}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover_mecanum}
 
 param set-default SIM_GZ_EN 1 # Gazebo bridge
 
 param set-default NAV_ACC_RAD 0.5
 
 # Mecanum Parameters
-param set-default RM_WHEEL_TRACK 0.6
-param set-default RM_YAW_STK_GAIN 0.6
+param set-default RM_WHEEL_TRACK 0.3
+param set-default RM_MAX_THR_YAW_R 1.2
+param set-default RM_MISS_SPD_GAIN 1
 
 # Rover Control Parameters
 param set-default RO_ACCEL_LIM 3
@@ -29,22 +30,14 @@ param set-default RO_YAW_RATE_P 0.1
 param set-default RO_YAW_RATE_LIM 120
 param set-default RO_YAW_ACCEL_LIM 240
 param set-default RO_YAW_DECEL_LIM 1000
-param set-default RO_YAW_RATE_CORR 1.75
-param set-default RO_YAW_EXPO 0.85
-param set-default RO_YAW_SUPEXPO 0.3
 
 # Rover Attitude Control Parameters
 param set-default RO_YAW_P 5
 
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 4
-param set-default RO_DECEL_LIM 6
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 3.1
-param set-default RO_SPEED_LIM 2.5
-param set-default RO_SPEED_I 0.01
-param set-default RO_SPEED_P 0.1
-param set-default RO_SPEED_RED 0.5
+# Rover Position Control Parameters
+param set-default RO_SPEED_LIM 2
+param set-default RO_SPEED_I 0.5
+param set-default RO_SPEED_P 1
 
 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 0.5
@@ -55,24 +48,24 @@ param set-default PP_LOOKAHD_MIN 1
 param set-default SENS_EN_MAGSIM 1
 
 # Actuator mapping
-param set-default SIM_GZ_WH_FUNC1 104 # left wheel back
+param set-default SIM_GZ_WH_FUNC1 102 # right wheel front
 param set-default SIM_GZ_WH_MIN1 70
 param set-default SIM_GZ_WH_MAX1 130
 param set-default SIM_GZ_WH_DIS1 100
 
-param set-default SIM_GZ_WH_FUNC2 103 # right wheel back
+param set-default SIM_GZ_WH_FUNC2 101 # left wheel front
 param set-default SIM_GZ_WH_MIN2 70
 param set-default SIM_GZ_WH_MAX2 130
 param set-default SIM_GZ_WH_DIS2 100
 
-param set-default SIM_GZ_WH_FUNC3 102 # left wheel front
+param set-default SIM_GZ_WH_FUNC3 104 # right wheel back
 param set-default SIM_GZ_WH_MIN3 70
 param set-default SIM_GZ_WH_MAX3 130
 param set-default SIM_GZ_WH_DIS3 100
 
-param set-default SIM_GZ_WH_FUNC4 101 # right wheel front
+param set-default SIM_GZ_WH_FUNC4 103 # left wheel back
 param set-default SIM_GZ_WH_MIN4 70
 param set-default SIM_GZ_WH_MAX4 130
 param set-default SIM_GZ_WH_DIS4 100
 
-param set-default SIM_GZ_WH_REV 0
+param set-default SIM_GZ_WH_REV 10

ROMFS/px4fmu_common/init.d-posix/airframes/50000_gz_rover_differential

@@ -1,59 +0,0 @@
-#!/bin/sh
-# @name Generic Differential Rover
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_differential_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=rover}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_differential}
-
-param set-default SIM_GZ_EN 1 # Gazebo bridge
-
-param set-default NAV_ACC_RAD 0.5
-
-# Differential Parameters
-param set-default RD_WHEEL_TRACK 0.6
-param set-default RD_TRANS_DRV_TRN 0.785398
-param set-default RD_TRANS_TRN_DRV 0.174533
-param set-default RD_YAW_STK_GAIN 0.6
-
-# Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
-param set-default RO_YAW_RATE_P 0.25
-param set-default RO_YAW_RATE_LIM 250
-param set-default RO_YAW_ACCEL_LIM 400
-param set-default RO_YAW_DECEL_LIM 800
-param set-default RO_YAW_RATE_CORR 1
-param set-default RO_YAW_EXPO 0.85
-param set-default RO_YAW_SUPEXPO 0.3
-
-# Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 4
-param set-default RO_DECEL_LIM 6
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 2
-param set-default RO_SPEED_LIM 1.8
-param set-default RO_SPEED_I 0.01
-param set-default RO_SPEED_P 0.01
-param set-default RO_SPEED_RED 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-
-# Actuator mapping
-param set-default SIM_GZ_WH_FUNC1 101 # right wheel
-param set-default SIM_GZ_WH_MIN1 80
-param set-default SIM_GZ_WH_MAX1 120
-param set-default SIM_GZ_WH_DIS1 100
-
-param set-default SIM_GZ_WH_FUNC2 102 # left wheel
-param set-default SIM_GZ_WH_MIN2 80
-param set-default SIM_GZ_WH_MAX2 120
-param set-default SIM_GZ_WH_DIS2 100

ROMFS/px4fmu_common/init.d-posix/airframes/60002_gz_uuv_bluerov2_heavy

@@ -1,137 +0,0 @@
-#!/bin/sh
-#
-# @name BlueROV2 Heavy
-#
-# @type UUV
-#
-# @maintainer Pedro Roque <padr@kth.se>
-# @maintainer Nicola De Carli <ndc@kth.se>
-#
-
-# Source PX4 parameters and configuration
-. ${R}/etc/init.d/rc.uuv_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=underwater}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=uuv_bluerov2_heavy}
-
-param set-default SIM_GZ_EN 1
-
-# Set parameters using `param` utility for SITL
-param set-default CA_AIRFRAME 7
-param set-default CA_METHOD 0
-param set-default MAV_TYPE 12
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-param set-default COM_ARM_CHK_ESCS 0  # We don't have ESCs
-param set-default FD_ESCS_EN 0 # We don't have ESCs - but maybe we need this later?
-
-# Set proper failsafes
-param set-default COM_ACT_FAIL_ACT 0
-param set-default COM_LOW_BAT_ACT 0
-param set-default NAV_DLL_ACT 0
-param set-default GF_ACTION 1
-param set-default NAV_RCL_ACT 1
-
-# disable attitude failure detection
-param set-default FD_FAIL_P 0
-param set-default FD_FAIL_R 0
-
-param set-default CA_ROTOR_COUNT 8
-param set-default CA_R_REV 255
-
-param set-default CA_ROTOR0_AX -1
-param set-default CA_ROTOR0_AY 1
-param set-default CA_ROTOR0_AZ 0
-param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PX 0.14
-param set-default CA_ROTOR0_PY 0.10
-param set-default CA_ROTOR0_PZ 0.06
-#param set-default CA_ROTOR0_PZ 0.0
-
-param set-default CA_ROTOR1_AX -1
-param set-default CA_ROTOR1_AY -1
-param set-default CA_ROTOR1_AZ 0
-param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PX 0.14
-param set-default CA_ROTOR1_PY -0.10
-param set-default CA_ROTOR1_PZ 0.06
-#param set-default CA_ROTOR1_PZ 0.0
-
-param set-default CA_ROTOR2_AX 1
-param set-default CA_ROTOR2_AY 1
-param set-default CA_ROTOR2_AZ 0
-param set-default CA_ROTOR2_KM 0
-param set-default CA_ROTOR2_PX -0.14
-param set-default CA_ROTOR2_PY 0.10
-param set-default CA_ROTOR2_PZ 0.06
-#param set-default CA_ROTOR2_PZ 0.0
-
-param set-default CA_ROTOR3_AX 1
-param set-default CA_ROTOR3_AY -1
-param set-default CA_ROTOR3_AZ 0
-param set-default CA_ROTOR3_KM 0
-param set-default CA_ROTOR3_PX -0.14
-param set-default CA_ROTOR3_PY -0.10
-param set-default CA_ROTOR3_PZ 0.06
-
-param set-default CA_ROTOR4_AX 0
-param set-default CA_ROTOR4_AY 0
-param set-default CA_ROTOR4_AZ 1
-param set-default CA_ROTOR4_KM 0
-param set-default CA_ROTOR4_PX 0.12
-param set-default CA_ROTOR4_PY 0.22
-param set-default CA_ROTOR4_PZ 0
-
-param set-default CA_ROTOR5_AX 0
-param set-default CA_ROTOR5_AY 0
-param set-default CA_ROTOR5_AZ 1
-param set-default CA_ROTOR5_KM 0
-param set-default CA_ROTOR5_PX 0.12
-param set-default CA_ROTOR5_PY -0.22
-param set-default CA_ROTOR5_PZ 0
-
-param set-default CA_ROTOR6_AX 0
-param set-default CA_ROTOR6_AY 0
-param set-default CA_ROTOR6_AZ 1
-param set-default CA_ROTOR6_KM 0
-param set-default CA_ROTOR6_PX -0.12
-param set-default CA_ROTOR6_PY 0.22
-param set-default CA_ROTOR6_PZ 0
-
-param set-default CA_ROTOR7_AX 0
-param set-default CA_ROTOR7_AY 0
-param set-default CA_ROTOR7_AZ 1
-param set-default CA_ROTOR7_KM 0
-param set-default CA_ROTOR7_PX -0.12
-param set-default CA_ROTOR7_PY -0.22
-param set-default CA_ROTOR7_PZ 0
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_FUNC2 102
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_FUNC4 104
-param set-default SIM_GZ_EC_FUNC5 105
-param set-default SIM_GZ_EC_FUNC6 106
-param set-default SIM_GZ_EC_FUNC7 107
-param set-default SIM_GZ_EC_FUNC8 108
-
-param set-default SIM_GZ_EC_MIN1 1100
-param set-default SIM_GZ_EC_MIN2 1100
-param set-default SIM_GZ_EC_MIN3 1100
-param set-default SIM_GZ_EC_MIN4 1100
-param set-default SIM_GZ_EC_MIN5 1100
-param set-default SIM_GZ_EC_MIN6 1100
-param set-default SIM_GZ_EC_MIN7 1100
-param set-default SIM_GZ_EC_MIN8 1100
-
-param set-default SIM_GZ_EC_MAX1 1900
-param set-default SIM_GZ_EC_MAX2 1900
-param set-default SIM_GZ_EC_MAX3 1900
-param set-default SIM_GZ_EC_MAX4 1900
-param set-default SIM_GZ_EC_MAX5 1900
-param set-default SIM_GZ_EC_MAX6 1900
-param set-default SIM_GZ_EC_MAX7 1900
-param set-default SIM_GZ_EC_MAX8 1900

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

@@ -26,6 +26,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 MAV_PROTO_VER 2
 
 param set-default CA_AIRFRAME 0
 param set-default CA_ROTOR_COUNT 6

ROMFS/px4fmu_common/init.d-posix/airframes/70000_gz_atmos

@@ -1,155 +0,0 @@
-#!/bin/sh
-#
-# @name KTH-ATMOS
-#
-# @type Free-Flyer
-# @class Spacecraft
-#
-# @output Motor1 back left thruster, +x thrust
-# @output Motor2 front left thruster, -x thrust
-# @output Motor3 back right thruster, +x thrust
-# @output Motor4 front right thruster, -x thrust
-# @output Motor5 front left thruster, +y thrust
-# @output Motor6 front right thruster, -y thrust
-# @output Motor7 back left thruster, +y thrust
-# @output Motor8 back right thruster, -y thrust
-#
-# @maintainer discower-io
-# @url https://atmos.discower.io
-#
-
-. ${R}etc/init.d/rc.sc_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=atmos}
-
-param set-default SIM_GZ_EN 1
-
-param set-default SENS_EN_MAGSIM 1
-param set-default COM_ARM_CHK_ESCS 0  # We don't have ESCs
-param set-default FD_ESCS_EN 0
-
-param set-default CA_AIRFRAME 14
-param set-default MAV_TYPE 45
-
-param set-default CA_ROTOR_COUNT 8
-param set-default CA_R_REV 0
-
-# Auto to be provided by Custom Airframe
-param set-default CA_METHOD 0
-
-# Set proper failsafes
-param set-default COM_ACT_FAIL_ACT 0
-param set-default COM_LOW_BAT_ACT 0
-param set-default NAV_DLL_ACT 0
-param set-default GF_ACTION 1
-param set-default NAV_RCL_ACT 1
-
-# disable attitude failure detection
-param set-default FD_FAIL_P 0
-param set-default FD_FAIL_R 0
-
-param set-default CA_ROTOR0_PX -0.12
-param set-default CA_ROTOR0_PY -0.12
-param set-default CA_ROTOR0_PZ 0.0
-param set-default CA_ROTOR0_CT 1.4
-param set-default CA_ROTOR0_AX 1.0
-param set-default CA_ROTOR0_AY 0.0
-param set-default CA_ROTOR0_AZ 0.0
-
-param set-default CA_ROTOR1_PX 0.12
-param set-default CA_ROTOR1_PY -0.12
-param set-default CA_ROTOR1_PZ 0.0
-param set-default CA_ROTOR1_CT 1.4
-param set-default CA_ROTOR1_AX -1.0
-param set-default CA_ROTOR1_AY 0.0
-param set-default CA_ROTOR1_AZ 0.0
-
-param set-default CA_ROTOR2_PX -0.12
-param set-default CA_ROTOR2_PY 0.12
-param set-default CA_ROTOR2_PZ 0.0
-param set-default CA_ROTOR2_CT 1.4
-param set-default CA_ROTOR2_AX 1.0
-param set-default CA_ROTOR2_AY 0.0
-param set-default CA_ROTOR2_AZ 0.0
-
-param set-default CA_ROTOR3_PX 0.12
-param set-default CA_ROTOR3_PY 0.12
-param set-default CA_ROTOR3_PZ 0.0
-param set-default CA_ROTOR3_CT 1.4
-param set-default CA_ROTOR3_AX -1.0
-param set-default CA_ROTOR3_AY 0.0
-param set-default CA_ROTOR3_AZ 0.0
-
-param set-default CA_ROTOR4_PX 0.12
-param set-default CA_ROTOR4_PY -0.12
-param set-default CA_ROTOR4_PZ 0.0
-param set-default CA_ROTOR4_CT 1.4
-param set-default CA_ROTOR4_AX 0.0
-param set-default CA_ROTOR4_AY 1.0
-param set-default CA_ROTOR4_AZ 0.0
-
-param set-default CA_ROTOR5_PX 0.12
-param set-default CA_ROTOR5_PY 0.12
-param set-default CA_ROTOR5_PZ 0.0
-param set-default CA_ROTOR5_CT 1.4
-param set-default CA_ROTOR5_AX 0.0
-param set-default CA_ROTOR5_AY -1.0
-param set-default CA_ROTOR5_AZ 0.0
-
-param set-default CA_ROTOR6_PX -0.12
-param set-default CA_ROTOR6_PY -0.12
-param set-default CA_ROTOR6_PZ 0.0
-param set-default CA_ROTOR6_CT 1.4
-param set-default CA_ROTOR6_AX 0.0
-param set-default CA_ROTOR6_AY 1.0
-param set-default CA_ROTOR6_AZ 0.0
-
-param set-default CA_ROTOR7_PX -0.12
-param set-default CA_ROTOR7_PY 0.12
-param set-default CA_ROTOR7_PZ 0.0
-param set-default CA_ROTOR7_CT 1.4
-param set-default CA_ROTOR7_AX 0.0
-param set-default CA_ROTOR7_AY -1.0
-param set-default CA_ROTOR7_AZ 0.0
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_FUNC2 102
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_FUNC4 104
-param set-default SIM_GZ_EC_FUNC5 105
-param set-default SIM_GZ_EC_FUNC6 106
-param set-default SIM_GZ_EC_FUNC7 107
-param set-default SIM_GZ_EC_FUNC8 108
-
-param set-default SIM_GZ_EC_MIN1 0
-param set-default SIM_GZ_EC_MIN2 0
-param set-default SIM_GZ_EC_MIN3 0
-param set-default SIM_GZ_EC_MIN4 0
-param set-default SIM_GZ_EC_MIN5 0
-param set-default SIM_GZ_EC_MIN6 0
-param set-default SIM_GZ_EC_MIN7 0
-param set-default SIM_GZ_EC_MIN8 0
-
-param set-default SIM_GZ_EC_MAX1 10000
-param set-default SIM_GZ_EC_MAX2 10000
-param set-default SIM_GZ_EC_MAX3 10000
-param set-default SIM_GZ_EC_MAX4 10000
-param set-default SIM_GZ_EC_MAX5 10000
-param set-default SIM_GZ_EC_MAX6 10000
-param set-default SIM_GZ_EC_MAX7 10000
-param set-default SIM_GZ_EC_MAX8 10000
-
-# Controller Tunings
-param set SC_YAWRATE_P 3.335
-param set SC_YAWRATE_I 0.87
-param set SC_YAWRATE_D 0.15
-param set SC_YR_INT_LIM 0.2
-param set SC_YAW_P 3.0
-
-param set SPC_POS_P 0.20
-param set SPC_VEL_P 6.55
-param set SPC_VEL_I 0.0
-param set SPC_VEL_D 0.0
-param set SPC_VEL_MAX 12.0

ROMFS/px4fmu_common/init.d-posix/airframes/71001_gazebo-classic_spacecraft_dart

@@ -0,0 +1,155 @@
+#!/bin/sh
+#
+# @name 6DoF Spacecraft Model
+#
+# @type Freeflyer with 8 thrusters
+#
+# @maintainer Pedro Roque <padr@kth.se>
+#
+
+. ${R}etc/init.d/rc.sc_defaults
+
+param set-default CA_AIRFRAME 15
+param set-default MAV_TYPE 99
+
+param set-default CA_THRUSTER_CNT 12
+param set-default CA_R_REV 0
+
+# param set-default FW_ARSP_MODE 1
+
+# Auto to be provided by Custom Airframe
+param set-default CA_METHOD 0
+
+# disable attitude failure detection
+param set-default FD_FAIL_P 0
+param set-default FD_FAIL_R 0
+
+# Set proper failsafes
+param set-default COM_ACT_FAIL_ACT 0
+param set-default COM_LOW_BAT_ACT 0
+param set-default NAV_DLL_ACT 0
+param set-default GF_ACTION 1
+param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
+
+# Set thrusters
+param set-default CA_THRUSTER0_PX -0.50
+param set-default CA_THRUSTER0_PY 0.50
+param set-default CA_THRUSTER0_PZ 0.0
+param set-default CA_THRUSTER0_CT 0.237
+param set-default CA_THRUSTER0_AX 0.0
+param set-default CA_THRUSTER0_AY -1.0
+param set-default CA_THRUSTER0_AZ 0.0
+
+param set-default CA_THRUSTER1_PX 0.50
+param set-default CA_THRUSTER1_PY 0.50
+param set-default CA_THRUSTER1_PZ 0.0
+param set-default CA_THRUSTER1_CT 0.237
+param set-default CA_THRUSTER1_AX 0.0
+param set-default CA_THRUSTER1_AY -1.0
+param set-default CA_THRUSTER1_AZ 0.0
+
+param set-default CA_THRUSTER2_PX 0.50
+param set-default CA_THRUSTER2_PY -0.50
+param set-default CA_THRUSTER2_PZ 0.0
+param set-default CA_THRUSTER2_CT 0.237
+param set-default CA_THRUSTER2_AX 0.0
+param set-default CA_THRUSTER2_AY 1.0
+param set-default CA_THRUSTER2_AZ 0.0
+
+param set-default CA_THRUSTER3_PX -0.50
+param set-default CA_THRUSTER3_PY -0.50
+param set-default CA_THRUSTER3_PZ 0.0
+param set-default CA_THRUSTER3_CT 0.237
+param set-default CA_THRUSTER3_AX 0.0
+param set-default CA_THRUSTER3_AY 1.0
+param set-default CA_THRUSTER3_AZ 0.0
+
+param set-default CA_THRUSTER4_PX -0.50
+param set-default CA_THRUSTER4_PY 0.0
+param set-default CA_THRUSTER4_PZ -0.50
+param set-default CA_THRUSTER4_CT 0.237
+param set-default CA_THRUSTER4_AX 1.0
+param set-default CA_THRUSTER4_AY 0.0
+param set-default CA_THRUSTER4_AZ 0.0
+
+param set-default CA_THRUSTER5_PX 0.50
+param set-default CA_THRUSTER5_PY 0.0
+param set-default CA_THRUSTER5_PZ -0.50
+param set-default CA_THRUSTER5_CT 0.237
+param set-default CA_THRUSTER5_AX -1.0
+param set-default CA_THRUSTER5_AY 0.0
+param set-default CA_THRUSTER5_AZ 0.0
+
+param set-default CA_THRUSTER6_PX 0.50
+param set-default CA_THRUSTER6_PY 0.0
+param set-default CA_THRUSTER6_PZ 0.50
+param set-default CA_THRUSTER6_CT 0.237
+param set-default CA_THRUSTER6_AX -1.0
+param set-default CA_THRUSTER6_AY 0.0
+param set-default CA_THRUSTER6_AZ 0.0
+
+param set-default CA_THRUSTER7_PX -0.50
+param set-default CA_THRUSTER7_PY 0.0
+param set-default CA_THRUSTER7_PZ 0.50
+param set-default CA_THRUSTER7_CT 0.237
+param set-default CA_THRUSTER7_AX 1.0
+param set-default CA_THRUSTER7_AY 0.0
+param set-default CA_THRUSTER7_AZ 0.0
+
+param set-default CA_THRUSTER8_PX 0.0
+param set-default CA_THRUSTER8_PY -0.50
+param set-default CA_THRUSTER8_PZ -0.50
+param set-default CA_THRUSTER8_CT 0.237
+param set-default CA_THRUSTER8_AX 0.0
+param set-default CA_THRUSTER8_AY 0.0
+param set-default CA_THRUSTER8_AZ 1.0
+
+param set-default CA_THRUSTER9_PX 0.0
+param set-default CA_THRUSTER9_PY 0.50
+param set-default CA_THRUSTER9_PZ -0.50
+param set-default CA_THRUSTER9_CT 0.237
+param set-default CA_THRUSTER9_AX 0.0
+param set-default CA_THRUSTER9_AY 0.0
+param set-default CA_THRUSTER9_AZ 1.0
+
+param set-default CA_THRUSTER10_PX 0.0
+param set-default CA_THRUSTER10_PY 0.50
+param set-default CA_THRUSTER10_PZ 0.50
+param set-default CA_THRUSTER10_CT 0.237
+param set-default CA_THRUSTER10_AX 0.0
+param set-default CA_THRUSTER10_AY 0.0
+param set-default CA_THRUSTER10_AZ -1.0
+
+param set-default CA_THRUSTER11_PX 0.0
+param set-default CA_THRUSTER11_PY -0.50
+param set-default CA_THRUSTER11_PZ 0.50
+param set-default CA_THRUSTER11_CT 0.237
+param set-default CA_THRUSTER11_AX 0.0
+param set-default CA_THRUSTER11_AY 0.0
+param set-default CA_THRUSTER11_AZ -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 106
+param set-default PWM_MAIN_FUNC7 107
+param set-default PWM_MAIN_FUNC8 108
+param set-default PWM_MAIN_FUNC9 109
+param set-default PWM_MAIN_FUNC10 110
+param set-default PWM_MAIN_FUNC11 111
+param set-default PWM_MAIN_FUNC12 112
+
+# PWM Simulation
+param set PWM_SIM_PWM_MAX 10000
+param set PWM_SIM_PWM_MIN 0
+
+# Controller Tunings
+param set-default SC_ROLLRATE_P 0.14
+param set-default SC_PITCHRATE_P 0.14
+param set-default SC_ROLLRATE_I 0.3
+param set-default SC_PITCHRATE_I 0.3
+param set-default SC_ROLLRATE_D 0.004
+param set-default SC_PITCHRATE_D 0.004

ROMFS/px4fmu_common/init.d-posix/airframes/71002_gz_spacecraft_2d

@@ -0,0 +1,147 @@
+#!/bin/sh
+#
+# @name 3DoF Spacecraft Model
+#
+# @type 2D Freeflyer with 8 thrusters - Planar motion
+#
+# @maintainer Pedro Roque <padr@kth.se>
+#
+
+. ${R}etc/init.d/rc.sc_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=spacecraft_2d}
+
+param set-default SIM_GZ_EN 1
+
+param set-default SENS_EN_MAGSIM 1
+param set-default COM_ARM_CHK_ESCS 0  # We don't have ESCs
+param set-default FD_ESCS_EN 0 # We don't have ESCs - but maybe we need this later?
+
+param set-default CA_AIRFRAME 14
+param set-default MAV_TYPE 99
+
+param set-default CA_THRUSTER_CNT 8
+param set-default CA_R_REV 0
+
+# param set-default FW_ARSP_MODE 1
+
+# Auto to be provided by Custom Airframe
+param set-default CA_METHOD 0  # 0 is PseudoInverse, 3 is Metric
+
+# Set proper failsafes
+param set-default COM_ACT_FAIL_ACT 0
+param set-default COM_LOW_BAT_ACT 0
+param set-default NAV_DLL_ACT 0
+param set-default GF_ACTION 1
+param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
+
+# disable attitude failure detection
+param set-default FD_FAIL_P 0
+param set-default FD_FAIL_R 0
+
+param set-default CA_THRUSTER0_PX -0.12
+param set-default CA_THRUSTER0_PY -0.12
+param set-default CA_THRUSTER0_PZ 0.0
+param set-default CA_THRUSTER0_CT 1.4
+param set-default CA_THRUSTER0_AX 1.0
+param set-default CA_THRUSTER0_AY 0.0
+param set-default CA_THRUSTER0_AZ 0.0
+
+param set-default CA_THRUSTER1_PX 0.12
+param set-default CA_THRUSTER1_PY -0.12
+param set-default CA_THRUSTER1_PZ 0.0
+param set-default CA_THRUSTER1_CT 1.4
+param set-default CA_THRUSTER1_AX -1.0
+param set-default CA_THRUSTER1_AY 0.0
+param set-default CA_THRUSTER1_AZ 0.0
+
+param set-default CA_THRUSTER2_PX -0.12
+param set-default CA_THRUSTER2_PY 0.12
+param set-default CA_THRUSTER2_PZ 0.0
+param set-default CA_THRUSTER2_CT 1.4
+param set-default CA_THRUSTER2_AX 1.0
+param set-default CA_THRUSTER2_AY 0.0
+param set-default CA_THRUSTER2_AZ 0.0
+
+param set-default CA_THRUSTER3_PX 0.12
+param set-default CA_THRUSTER3_PY 0.12
+param set-default CA_THRUSTER3_PZ 0.0
+param set-default CA_THRUSTER3_CT 1.4
+param set-default CA_THRUSTER3_AX -1.0
+param set-default CA_THRUSTER3_AY 0.0
+param set-default CA_THRUSTER3_AZ 0.0
+
+param set-default CA_THRUSTER4_PX 0.12
+param set-default CA_THRUSTER4_PY -0.12
+param set-default CA_THRUSTER4_PZ 0.0
+param set-default CA_THRUSTER4_CT 1.4
+param set-default CA_THRUSTER4_AX 0.0
+param set-default CA_THRUSTER4_AY 1.0
+param set-default CA_THRUSTER4_AZ 0.0
+
+param set-default CA_THRUSTER5_PX 0.12
+param set-default CA_THRUSTER5_PY 0.12
+param set-default CA_THRUSTER5_PZ 0.0
+param set-default CA_THRUSTER5_CT 1.4
+param set-default CA_THRUSTER5_AX 0.0
+param set-default CA_THRUSTER5_AY -1.0
+param set-default CA_THRUSTER5_AZ 0.0
+
+param set-default CA_THRUSTER6_PX -0.12
+param set-default CA_THRUSTER6_PY -0.12
+param set-default CA_THRUSTER6_PZ 0.0
+param set-default CA_THRUSTER6_CT 1.4
+param set-default CA_THRUSTER6_AX 0.0
+param set-default CA_THRUSTER6_AY 1.0
+param set-default CA_THRUSTER6_AZ 0.0
+
+param set-default CA_THRUSTER7_PX -0.12
+param set-default CA_THRUSTER7_PY 0.12
+param set-default CA_THRUSTER7_PZ 0.0
+param set-default CA_THRUSTER7_CT 1.4
+param set-default CA_THRUSTER7_AX 0.0
+param set-default CA_THRUSTER7_AY -1.0
+param set-default CA_THRUSTER7_AZ 0.0
+
+param set-default SIM_GZ_TH_FUNC1 101
+param set-default SIM_GZ_TH_FUNC2 102
+param set-default SIM_GZ_TH_FUNC3 103
+param set-default SIM_GZ_TH_FUNC4 104
+param set-default SIM_GZ_TH_FUNC5 105
+param set-default SIM_GZ_TH_FUNC6 106
+param set-default SIM_GZ_TH_FUNC7 107
+param set-default SIM_GZ_TH_FUNC8 108
+
+param set-default SIM_GZ_TH_MIN1 0
+param set-default SIM_GZ_TH_MIN2 0
+param set-default SIM_GZ_TH_MIN3 0
+param set-default SIM_GZ_TH_MIN4 0
+param set-default SIM_GZ_TH_MIN5 0
+param set-default SIM_GZ_TH_MIN6 0
+param set-default SIM_GZ_TH_MIN7 0
+param set-default SIM_GZ_TH_MIN8 0
+
+param set-default SIM_GZ_TH_MAX1 10000
+param set-default SIM_GZ_TH_MAX2 10000
+param set-default SIM_GZ_TH_MAX3 10000
+param set-default SIM_GZ_TH_MAX4 10000
+param set-default SIM_GZ_TH_MAX5 10000
+param set-default SIM_GZ_TH_MAX6 10000
+param set-default SIM_GZ_TH_MAX7 10000
+param set-default SIM_GZ_TH_MAX8 10000
+
+# Controller Tunings
+param set SC_YAWRATE_P 3.335
+param set SC_YAWRATE_I 0.87
+param set SC_YAWRATE_D 0.15
+param set SC_YR_INT_LIM 0.2
+param set SC_YAW_P 3.0
+
+param set SPC_POS_P 0.20
+param set SPC_VEL_P 6.55
+param set SPC_VEL_I 0.0
+param set SPC_VEL_D 0.0
+param set SPC_VEL_MAX 12.0

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

@@ -62,6 +62,8 @@ px4_add_romfs_files(
 	1043_gazebo-classic_standard_vtol_drop
 	1044_gazebo-classic_plane_lidar
 	1045_gazebo-classic_quadtailsitter
+	1060_gazebo-classic_rover
+	1061_gazebo-classic_r1_rover
 	1062_flightgear_tf-r1
 	1070_gazebo-classic_boat
 
@@ -80,8 +82,10 @@ px4_add_romfs_files(
 	4009_gz_r1_rover
 	4010_gz_x500_mono_cam
 	4011_gz_lawnmower
+	4012_gz_rover_ackermann
 	4013_gz_x500_lidar_2d
 	4014_gz_x500_mono_cam_down
+	4015_gz_r1_rover_mecanum
 	4016_gz_x500_lidar_down
 	4017_gz_x500_lidar_front
 	4018_gz_quadtailsitter
@@ -105,19 +109,12 @@ px4_add_romfs_files(
 	10041_sihsim_airplane
 	10042_sihsim_xvert
 	10043_sihsim_standard_vtol
-	10044_sihsim_hex
-	10045_sihsim_rover_ackermann
 
 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2
 
-	50000_gz_rover_differential
-	51000_gz_rover_ackermann
-	52000_gz_rover_mecanum
-
-	60002_gz_uuv_bluerov2_heavy
-
-	70000_gz_atmos
+	71001_gazebo-classic_spacecraft_dart
+	71002_gz_spacecraft_2d
 
 	# [22000, 22999] Reserve for custom models
 )

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

@@ -1,13 +1,15 @@
 #!/bin/sh
 # shellcheck disable=SC2154
 
+echo "INFO  [init] Gazebo simulator"
+
 # Enforce minimum gz version as Harmonic (gz-sim8)
 MIN_GZ_VERSION="8.0.0"
 GZ_SIM_VERSION=$(gz sim --versions 2>/dev/null | head -n 1 | tr -d ' ')
 
 if [ -z "$GZ_SIM_VERSION" ]; then
-	echo "ERROR [init] Gazebo gz sim not found. Please install gz-harmonic"
-	exit 1
+    echo "ERROR [init] Gazebo gz sim not found. Please install gz-harmonic"
+    exit 1
 fi
 
 # Use sort compare, check that MIN_GZ_VERSION is ordered last
@@ -15,8 +17,6 @@ if [ "$(printf '%s\n' "$GZ_SIM_VERSION" "$MIN_GZ_VERSION" | sort -V | head -n1)"
 	gz_command="gz"
 	gz_sub_command="sim"
 
-	echo "INFO  [init] Gazebo simulator $GZ_SIM_VERSION"
-
 	# Specify render engine if `GZ_SIM_RENDER_ENGINE` is set
 	# (for example, if you want to use Ogre 1.x instead of Ogre 2.x):
 	if [ -n "${PX4_GZ_SIM_RENDER_ENGINE}" ]; then
@@ -24,15 +24,19 @@ if [ "$(printf '%s\n' "$GZ_SIM_VERSION" "$MIN_GZ_VERSION" | sort -V | head -n1)"
 		gz_sub_command="${gz_sub_command} --render-engine ${PX4_GZ_SIM_RENDER_ENGINE}"
 	fi
 else
-	echo "ERROR [init] Gazebo version too hold ($GZ_SIM_VERSION). Minimum required version is $MIN_GZ_VERSION"
-	exit 1
+    echo "ERROR [init] Gazebo gz sim version is too old ($GZ_SIM_VERSION). Minimum required version is $MIN_GZ_VERSION"
+    exit 1
 fi
 
-# If not standalone launch the world
+# Look for an already running world
+get_gz_world() {
+	gz_world=$( ${gz_command} topic -l | grep -m 1 -e "^/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
+}
+
+# If not standalone
 if [ -z "${PX4_GZ_STANDALONE}" ]; then
 
-	# Look for an already running world
-	gz_world=$( ${gz_command} topic -l | grep -m 1 -e "^/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
+	get_gz_world
 
 	# shellcheck disable=SC2153
 	if [ -z "${gz_world}" ] && [ -n "${PX4_GZ_WORLD}" ]; then
@@ -66,6 +70,13 @@ fi
 
 # Wait for Gazebo world to be ready before proceeding
 check_scene_info() {
+
+	get_gz_world
+
+	if [ -n "${PX4_GZ_STANDALONE}" ] && [ -n "${gz_world}" ]; then
+		PX4_GZ_WORLD=${gz_world}
+	fi
+
 	SERVICE_INFO=$(${gz_command} service -i --service "/world/${PX4_GZ_WORLD}/scene/info" 2>&1)
 	if echo "$SERVICE_INFO" | grep -q "Service providers"; then
 		return 0
@@ -89,57 +100,31 @@ while [ $ATTEMPTS -gt 0 ]; do
 	sleep 1
 done
 
-# World is ready, check if custom location is provided
-if [ -n "${PX4_HOME_LAT}" ] || [ -n "${PX4_HOME_LON}" ] || [ -n "${PX4_HOME_ALT}" ]; then
-	# must have all three
-	if [ -z "${PX4_HOME_LAT}" ] || [ -z "${PX4_HOME_LON}" ] || [ -z "${PX4_HOME_ALT}" ]; then
-		echo "ERROR [init] PX4_HOME_LAT, PX4_HOME_LON and PX4_HOME_ALT must all be set"
-		exit 1
-	fi
-	echo "INFO  [init] Setting world origin to lat: ${PX4_HOME_LAT}, lon: ${PX4_HOME_LON}, alt: ${PX4_HOME_ALT}"
-	${gz_command} service -s "/world/${PX4_GZ_WORLD}/set_spherical_coordinates" \
-		--reqtype gz.msgs.SphericalCoordinates \
-		--reptype gz.msgs.Boolean \
-		--timeout 1000 \
-		--req "surface_model: EARTH_WGS84, latitude_deg: ${PX4_HOME_LAT}, longitude_deg: ${PX4_HOME_LON}, elevation: ${PX4_HOME_ALT}" > /dev/null 2>&1
-fi
-
 # Start gz_bridge - either spawn a model or connect to existing one
 if [ -n "${PX4_SIM_MODEL#*gz_}" ] && [ -z "${PX4_GZ_MODEL_NAME}" ]; then
 	# Spawn a model
 	MODEL_NAME="${PX4_SIM_MODEL#*gz_}"
 	MODEL_NAME_INSTANCE="${MODEL_NAME}_${px4_instance}"
 
-	sdf_pose_str=""
-
+	POSE_ARG=""
 	if [ -n "${PX4_GZ_MODEL_POSE}" ]; then
-		pose_x=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $1}')
-		pose_y=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $2}')
-		pose_z=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $3}')
-		pose_roll=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $4}')
-		pose_pitch=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $5}')
-		pose_yaw=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $6}')
+		pos_x=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $1}')
+		pos_y=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $2}')
+		pos_z=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $3}')
+		pos_x=${pos_x:-0}
+		pos_y=${pos_y:-0}
+		pos_z=${pos_z:-0}
 
-		pose_x=${pose_x:-0}
-		pose_y=${pose_y:-0}
-		pose_z=${pose_z:-0}
-		pose_roll=${pose_roll:-0}
-		pose_pitch=${pose_pitch:-0}
-		pose_yaw=${pose_yaw:-0}
-
-		sdf_pose_str="<pose> ${pose_x} ${pose_y} ${pose_z} ${pose_roll} ${pose_pitch} ${pose_yaw} </pose>"
-		echo "INFO  [init] Gazebo model pose: ${pose_x} ${pose_y} ${pose_z} ${pose_roll} ${pose_pitch} ${pose_yaw}"
+		POSE_ARG=", pose: { position: { x: ${pos_x}, y: ${pos_y}, z: ${pos_z} } }"
+		echo "INFO  [init] Spawning model at position: ${pos_x} ${pos_y} ${pos_z}"
 	fi
 
-	echo "INFO  [init] Spawning Gazebo model"
-
-	# include the actual SDF in this one, containing the pose if given
-	sdf_str="<sdf version=\"1.6\"> <include> <uri>file://${PX4_GZ_MODELS}/${MODEL_NAME}/model.sdf</uri> ${sdf_pose_str} </include> </sdf>"
+	echo "INFO  [init] Spawning model"
 
 	# Spawn model
 	${gz_command} service -s "/world/${PX4_GZ_WORLD}/create" --reqtype gz.msgs.EntityFactory \
 			--reptype gz.msgs.Boolean --timeout 5000 \
-			--req "name: \"${MODEL_NAME_INSTANCE}\", allow_renaming: false, sdf: '${sdf_str}'" > /dev/null 2>&1
+			--req "sdf_filename: \"${PX4_GZ_MODELS}/${MODEL_NAME}/model.sdf\", name: \"${MODEL_NAME_INSTANCE}\", allow_renaming: false${POSE_ARG}" > /dev/null 2>&1
 
 	# Wait for model to spawn
 	sleep 1

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -173,6 +173,7 @@ param set-default COM_RC_IN_MODE 1
 param set-default EKF2_REQ_GPS_H 0.5
 
 param set-default IMU_GYRO_FFT_EN 1
+param set-default MAV_PROTO_VER 2 # Ensures QGC does not drop the first few packets after a SITL restart due to MAVLINK 1 packets
 
 param set-default -s MC_AT_EN 1
 
@@ -297,15 +298,10 @@ then
 	# for multi intances setup, add namespace prefix
 	uxrce_dds_ns="-n px4_$px4_instance"
 fi
-if [ "${PX4_UXRCE_DDS_NS+x}" ]; then
-	# Override, as variable is set (empty or not)
-	if [ -n "$PX4_UXRCE_DDS_NS" ]; then
-		# Override namespace if environment variable is non-empty
-		uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
-	else
-		# Clear namespace if variable is empty
-		uxrce_dds_ns=""
-	fi
+if [ -n "$PX4_UXRCE_DDS_NS" ]
+then
+	# Override namespace if environment variable is defined
+	uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
 fi
 if [ -n "$ROS_DOMAIN_ID" ]
 then
@@ -323,11 +319,6 @@ fi
 
 uxrce_dds_client start -t udp -p $uxrce_dds_port $uxrce_dds_ns
 
-if param greater -s ZENOH_ENABLE 0
-then
-	zenoh start
-fi
-
 if param greater -s MNT_MODE_IN -1
 then
 	gimbal start

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -69,6 +69,15 @@ if(CONFIG_MODULES_MC_RATE_CONTROL)
 	)
 endif()
 
+if(CONFIG_MODULES_ROVER_POS_CONTROL)
+	px4_add_romfs_files(
+		rc.rover_apps
+		rc.rover_defaults
+
+		rc.boat_defaults # hack
+	)
+endif()
+
 if(CONFIG_MODULES_ROVER_DIFFERENTIAL)
 	px4_add_romfs_files(
 		rc.rover_differential_apps

ROMFS/px4fmu_common/init.d/airframes/1104_standard_ackermann_sih.hil

@@ -1,65 +0,0 @@
-#!/bin/sh
-# @name SIH Rover Ackermann
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_ackermann_defaults
-
-set VEHICLE_TYPE rover_ackermann
-param set-default CA_AIRFRAME 5         # Rover (Ackermann)
-param set-default CA_R_REV 1            # Motor is assumed to be reversible
-param set-default EKF2_MAG_TYPE 1       # Make sure magnetometer is fused even when not driving
-param set-default NAV_ACC_RAD 0.5       # Waypoint acceptance radius
-param set-default EKF2_GBIAS_INIT 0.01
-param set-default EKF2_ANGERR_INIT 0.01
-
-param set-default SIH_VEHICLE_TYPE 5 # sih as rover ackermann
-param set-default SYS_HITL 2 # set SYS_HITL to 2 to start the SIH and avoid sensors startup
-
-param set-default HIL_ACT_FUNC1 201 # Steering
-param set-default HIL_ACT_FUNC2 101 # Throttle
-param set-default SIH_MASS 20
-param set-default SIH_IXX 0.4333
-param set-default SIH_IYY 1.6833
-param set-default SIH_IZZ 2.0833
-param set-default SIH_IXZ 0
-param set-default SIH_KDV 50
-param set-default SIH_KDW 10
-
-# Ackermann Parameters
-param set-default RA_WHEEL_BASE 0.321
-param set-default RA_ACC_RAD_GAIN 2
-param set-default RA_ACC_RAD_MAX 3
-param set-default RA_MAX_STR_ANG 0.5236
-param set-default RA_STR_RATE_LIM 360
-
-# Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
-param set-default RO_YAW_RATE_P 0.25
-param set-default RO_YAW_RATE_LIM 180
-param set-default RO_YAW_ACCEL_LIM 400
-param set-default RO_YAW_DECEL_LIM 800
-param set-default RO_YAW_RATE_CORR 1
-
-# Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 3
-param set-default RO_DECEL_LIM 3
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 3.2
-param set-default RO_SPEED_LIM 3
-param set-default RO_SPEED_I 0.001
-param set-default RO_SPEED_P 0.001
-param set-default RO_SPEED_RED 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1

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

@@ -7,10 +7,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board px4_fmu-v5x exclude
-# @board auterion_fmu-v6s exclude
-# @board ark_fmu-v6x exclude
-# @board auterion_fmu-v6x exclude
-# @board px4_fmu-v6x exclude
 # @board bitcraze_crazyflie exclude
 #
 # @maintainer Iain Galloway <iain.galloway@nxp.com>

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

@@ -7,8 +7,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board auterion_fmu-v6x exclude
-# @board px4_fmu-v6x exclude
 #
 
 . ${R}etc/init.d/rc.mc_defaults

ROMFS/px4fmu_common/init.d/airframes/4041_beta75x

@@ -13,11 +13,6 @@
 # @board px4_fmu-v4pro exclude
 # @board px4_fmu-v5 exclude
 # @board px4_fmu-v5x exclude
-# @board auterion_fmu-v6s exclude
-# @board ark_fmu-v6x exclude
-# @board auterion_fmu-v6x exclude
-# @board px4_fmu-v6x exclude
-# @board px4_fmu-v6xrt exclude
 # @board bitcraze_crazyflie exclude
 #
 

ROMFS/px4fmu_common/init.d/airframes/4050_generic_250

@@ -47,6 +47,3 @@ 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-default MPC_Z_VEL_MAX_UP 3.0
-param set-default MPC_Z_VEL_MAX_DN 3.0

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

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

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 auterion_fmu-v6x 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 auterion_fmu-v6x exclude
 # @board px4_fmu-v6x exclude
 # @board bitcraze_crazyflie exclude
 # @board cuav_x7pro exclude

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

@@ -14,7 +14,6 @@
 # @board px4_fmu-v4pro exclude
 # @board px4_fmu-v5 exclude
 # @board px4_fmu-v5x exclude
-# @board auterion_fmu-v6x exclude
 # @board px4_fmu-v6x exclude
 # @board bitcraze_crazyflie exclude
 # @board diatone_mamba-f405-mk2 exclude

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 auterion_fmu-v6x exclude
 # @board px4_fmu-v6x exclude
 # @board diatone_mamba-f405-mk2 exclude
 #

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

@@ -5,5 +5,8 @@
 # @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

@@ -2,11 +2,14 @@
 #
 # @name Aion Robotics R1 UGV
 #
-# @url https://docs.px4.io/main/en/complete_vehicles_rover/aion_r1.html
+# @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
 
@@ -23,6 +26,7 @@ param set-default NAV_ACC_RAD 0.5
 
 # Differential Parameters
 param set-default RD_WHEEL_TRACK 0.3
+param set-default RD_MAX_THR_YAW_R 0.7
 param set-default RD_TRANS_DRV_TRN 0.785398
 param set-default RD_TRANS_TRN_DRV 0.139626
 
@@ -38,16 +42,14 @@ param set-default RO_YAW_RATE_P 0.1
 param set-default RO_YAW_RATE_LIM 250
 param set-default RO_YAW_ACCEL_LIM 600
 param set-default RO_YAW_DECEL_LIM 600
-param set-default RO_YAW_RATE_CORR 2.7
 
 # Rover Attitude Control Parameters
 param set-default RO_YAW_P 2.5
 
-# Rover Velocity Control Parameters
+# Rover Position Control Parameters
 param set-default RO_SPEED_LIM 1.6
 param set-default RO_SPEED_I 0.01
 param set-default RO_SPEED_P 0.1
-param set-default RO_SPEED_RED 1
 
 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1

ROMFS/px4fmu_common/init.d/airframes/51000_generic_rover_ackermann

@@ -5,5 +5,8 @@
 # @type Rover
 # @class Rover
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
 
 . ${R}etc/init.d/rc.rover_ackermann_defaults

ROMFS/px4fmu_common/init.d/airframes/51001_axial_scx10_2_trail_honcho

@@ -7,6 +7,9 @@
 # @type Rover
 # @class Rover
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
 
 . ${R}etc/init.d/rc.rover_ackermann_defaults
 
@@ -30,16 +33,14 @@ param set-default RO_MAX_THR_SPEED 2.8
 param set-default RO_YAW_RATE_I 0.1
 param set-default RO_YAW_RATE_P 0.1
 param set-default RO_YAW_RATE_LIM 120
-param set-default RO_YAW_RATE_CORR 1
 
 # Rover Attitude Control Parameters
 param set-default RO_YAW_P 2.5
 
-# Rover Velocity Control Parameters
+# Rover Position Control Parameters
 param set-default RO_SPEED_LIM 2.5
 param set-default RO_SPEED_I 0.01
 param set-default RO_SPEED_P 0.1
-param set-default RO_SPEED_RED 1
 
 # Pure pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1

ROMFS/px4fmu_common/init.d/airframes/51002_nxp_b3rb

@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# @name NXP B3RB Rover Ackermann
-#
-# @type Rover
-# @class Rover
-#
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#
-
-. ${R}etc/init.d/rc.rover_ackermann_defaults
-
-param set-default BAT1_N_CELLS 3
-
-# Set geometry & output configration
-param set-default PWM_MAIN_FUNC1 201
-param set-default PWM_MAIN_FUNC2 101
-param set-default PWM_MAIN_FUNC3 101
-param set-default PWM_MAIN_DIS1 1500
-param set-default PWM_MAIN_DIS2 0
-param set-default PWM_MAIN_DIS3 1500
-param set-default PWM_MAIN_MIN1 1000
-param set-default PWM_MAIN_MIN2 2500
-param set-default PWM_MAIN_MIN3 0
-param set-default PWM_MAIN_MAX1 2000
-param set-default PWM_MAIN_MAX2 2500
-param set-default PWM_MAIN_MAX3 50
-param set-default PWM_MAIN_TIM0 400
-param set-default PWM_MAIN_TIM1 400
-param set-default PWM_MAIN_TIM2 20000

ROMFS/px4fmu_common/init.d/airframes/52000_generic_rover_mecanum

@@ -5,5 +5,8 @@
 # @type Rover
 # @class Rover
 #
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
 
 . ${R}etc/init.d/rc.rover_mecanum_defaults

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

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# @name Generic Ground Vehicle (Deprecated)
+#
+# @type Rover
+# @class Rover
+#
+# @output Motor1 throttle
+# @output Servo1 steering
+#
+# @maintainer
+#
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.rover_defaults
+
+param set-default BAT1_N_CELLS 2
+
+param set-default EKF2_ANGERR_INIT 0.01
+param set-default EKF2_GBIAS_INIT 0.01
+param set-default EKF2_MAG_TYPE 1
+
+param set-default FW_AIRSPD_MAX 3
+param set-default FW_AIRSPD_MIN 0
+param set-default FW_AIRSPD_TRIM 1
+
+# Settings for a typical wheelbase 0f 0.3m
+param set-default GND_L1_DIST 1
+param set-default GND_L1_PERIOD 5
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_I 3
+param set-default GND_SPEED_D 0.001
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_THR_SC 1
+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-default NAV_ACC_RAD 0.5
+
+param set-default CA_AIRFRAME 5
+
+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

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

@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# @name NXP Cup car: DF Robot GPX (Deprecated)
+
+#
+# @type Rover
+# @class Rover
+#
+# @board px4_fmu-v2 exclude
+#
+# @output Motor1 Speed of left wheels
+# @output Servo1 Steering servo
+#
+# @maintainer Katrin Moritz
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.rover_defaults
+
+param set-default BAT1_N_CELLS 2
+
+param set-default EKF2_GBIAS_INIT 0.01
+param set-default EKF2_ANGERR_INIT 0.01
+param set-default EKF2_MAG_TYPE 1
+
+param set-default FW_AIRSPD_MIN 0
+param set-default FW_AIRSPD_TRIM 1
+param set-default FW_AIRSPD_MAX 3
+
+param set-default GND_THR_CRUISE 0.3
+param set-default GND_THR_MAX 0.5
+
+# Differential drive acts like ackermann steering with a maximum turn angle of 60 degrees, or pi/3 radians
+param set-default GND_MAX_ANG 1.042
+param set-default GND_WHEEL_BASE 0.17
+
+# TODO: Set to -1, to allow reversing. This will require many changes in the codebase
+# to support negative throttle.
+param set-default GND_THR_MIN 0
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_I 3
+param set-default GND_SPEED_D 0.001
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_THR_SC 1
+
+param set-default NAV_ACC_RAD 0.5
+
+param set-default CA_AIRFRAME 5
+
+param set-default CA_R_REV 1
+param set-default PWM_MAIN_FUNC2 201
+param set-default PWM_MAIN_FUNC3 101
+param set-default PWM_MAIN_FUNC4 101
+
+# Provide ESC a constant 1500 us pulse to idle
+param set-default PWM_MAIN_DIS2 1500
+param set-default PWM_MAIN_DIS3 1485
+param set-default PWM_MAIN_DIS4 1485
+param set-default PWM_MAIN_FAIL3 1485
+param set-default PWM_MAIN_FAIL4 1485
+param set-default PWM_MAIN_MIN3 970
+param set-default PWM_MAIN_MIN4 970

ROMFS/px4fmu_common/init.d/airframes/60002_uuv_bluerov2_heavy

@@ -22,7 +22,7 @@
 
 . ${R}etc/init.d/rc.uuv_defaults
 
-# param set-default MAV_1_CONFIG 102
+param set-default MAV_1_CONFIG 102
 
 param set-default BAT1_A_PER_V 37.8798
 param set-default BAT1_CAPACITY 18000
@@ -30,92 +30,53 @@ param set-default BAT1_V_DIV 11
 param set-default BAT1_N_CELLS 4
 param set-default BAT_V_OFFS_CURR 0.33
 
-# Set parameters using `param` utility for SITL
 param set-default CA_AIRFRAME 7
-param set-default CA_METHOD 0
-param set-default MAV_TYPE 12
-
-# Board rotation: set to direct replacement of RPi with PX4
-#       with forward facing vehicle forward
-param set-default SENS_BOARD_ROT 16
-
-# Set proper failsafes
-param set-default COM_ACT_FAIL_ACT 0
-param set-default COM_LOW_BAT_ACT 0
-param set-default NAV_DLL_ACT 0
-param set-default GF_ACTION 1
-param set-default NAV_RCL_ACT 1
-
-# disable attitude failure detection
-param set-default FD_FAIL_P 0
-param set-default FD_FAIL_R 0
 
 param set-default CA_ROTOR_COUNT 8
 param set-default CA_R_REV 255
-
 param set-default CA_ROTOR0_AX 1
 param set-default CA_ROTOR0_AY -1
 param set-default CA_ROTOR0_AZ 0
 param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PX 0.14
-param set-default CA_ROTOR0_PY 0.10
-param set-default CA_ROTOR0_PZ 0.06
-
+param set-default CA_ROTOR0_PX 0.5
+param set-default CA_ROTOR0_PY 0.3
+param set-default CA_ROTOR0_PZ 0.2
 param set-default CA_ROTOR1_AX 1
 param set-default CA_ROTOR1_AY 1
 param set-default CA_ROTOR1_AZ 0
 param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PX 0.14
-param set-default CA_ROTOR1_PY -0.10
-param set-default CA_ROTOR1_PZ 0.06
-
+param set-default CA_ROTOR1_PX 0.5
+param set-default CA_ROTOR1_PY -0.3
+param set-default CA_ROTOR1_PZ 0.2
 param set-default CA_ROTOR2_AX 1
 param set-default CA_ROTOR2_AY 1
 param set-default CA_ROTOR2_AZ 0
 param set-default CA_ROTOR2_KM 0
-param set-default CA_ROTOR2_PX -0.14
-param set-default CA_ROTOR2_PY 0.10
-param set-default CA_ROTOR2_PZ 0.06
-
+param set-default CA_ROTOR2_PX -0.5
+param set-default CA_ROTOR2_PY 0.3
+param set-default CA_ROTOR2_PZ 0.2
 param set-default CA_ROTOR3_AX 1
 param set-default CA_ROTOR3_AY -1
 param set-default CA_ROTOR3_AZ 0
 param set-default CA_ROTOR3_KM 0
-param set-default CA_ROTOR3_PX -0.14
-param set-default CA_ROTOR3_PY -0.10
-param set-default CA_ROTOR3_PZ 0.06
-
-param set-default CA_ROTOR4_AX 0
-param set-default CA_ROTOR4_AY 0
+param set-default CA_ROTOR3_PX -0.5
+param set-default CA_ROTOR3_PY -0.3
+param set-default CA_ROTOR3_PZ 0.2
 param set-default CA_ROTOR4_AZ -1
 param set-default CA_ROTOR4_KM 0
-param set-default CA_ROTOR4_PX 0.12
-param set-default CA_ROTOR4_PY 0.22
-param set-default CA_ROTOR4_PZ 0
-
-param set-default CA_ROTOR5_AX 0
-param set-default CA_ROTOR5_AY 0
+param set-default CA_ROTOR4_PX 0.5
+param set-default CA_ROTOR4_PY 0.5
 param set-default CA_ROTOR5_AZ 1
 param set-default CA_ROTOR5_KM 0
-param set-default CA_ROTOR5_PX 0.12
-param set-default CA_ROTOR5_PY -0.22
-param set-default CA_ROTOR5_PZ 0
-
-param set-default CA_ROTOR6_AX 0
-param set-default CA_ROTOR6_AY 0
+param set-default CA_ROTOR5_PX 0.5
+param set-default CA_ROTOR5_PY -0.5
 param set-default CA_ROTOR6_AZ 1
 param set-default CA_ROTOR6_KM 0
-param set-default CA_ROTOR6_PX -0.12
-param set-default CA_ROTOR6_PY 0.22
-param set-default CA_ROTOR6_PZ 0
-
-param set-default CA_ROTOR7_AX 0
-param set-default CA_ROTOR7_AY 0
-param set-default CA_ROTOR7_AZ -1
+param set-default CA_ROTOR6_PX -0.5
+param set-default CA_ROTOR6_PY 0.5
 param set-default CA_ROTOR7_KM 0
-param set-default CA_ROTOR7_PX -0.12
-param set-default CA_ROTOR7_PY -0.22
-param set-default CA_ROTOR7_PZ 0
+param set-default CA_ROTOR7_PX -0.5
+param set-default CA_ROTOR7_PY -0.5
 
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
@@ -125,30 +86,3 @@ 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
-
-param set-default PWM_MAIN_MIN1 1100
-param set-default PWM_MAIN_MIN2 1100
-param set-default PWM_MAIN_MIN3 1100
-param set-default PWM_MAIN_MIN4 1100
-param set-default PWM_MAIN_MIN5 1100
-param set-default PWM_MAIN_MIN6 1100
-param set-default PWM_MAIN_MIN7 1100
-param set-default PWM_MAIN_MIN8 1100
-
-param set-default PWM_MAIN_MAX1 1900
-param set-default PWM_MAIN_MAX2 1900
-param set-default PWM_MAIN_MAX3 1900
-param set-default PWM_MAIN_MAX4 1900
-param set-default PWM_MAIN_MAX5 1900
-param set-default PWM_MAIN_MAX6 1900
-param set-default PWM_MAIN_MAX7 1900
-param set-default PWM_MAIN_MAX8 1900
-
-param set-default PWM_MAIN_DIS1 1500
-param set-default PWM_MAIN_DIS2 1500
-param set-default PWM_MAIN_DIS3 1500
-param set-default PWM_MAIN_DIS4 1500
-param set-default PWM_MAIN_DIS5 1500
-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/70000_atmos

@@ -1,159 +0,0 @@
-#!/bin/sh
-#
-# @name KTH-ATMOS
-#
-# @type Free-Flyer
-# @class Spacecraft
-#
-# @output Motor1 back left thruster, +x thrust
-# @output Motor2 front left thruster, -x thrust
-# @output Motor3 back right thruster, +x thrust
-# @output Motor4 front right thruster, -x thrust
-# @output Motor5 front left thruster, +y thrust
-# @output Motor6 front right thruster, -y thrust
-# @output Motor7 back left thruster, +y thrust
-# @output Motor8 back right thruster, -y thrust
-#
-# @maintainer DISCOWER
-# @url https://atmos.discower.io
-#
-
-. ${R}etc/init.d/rc.sc_defaults
-
-param set-default CA_AIRFRAME 14
-param set-default MAV_TYPE 45
-
-param set-default CA_ROTOR_COUNT 8
-param set-default CA_R_REV 0
-
-# Auto to be provided by Custom Airframe
-param set-default CA_METHOD 0
-
-# Set proper failsafes
-param set-default COM_ACT_FAIL_ACT 0
-param set-default COM_LOW_BAT_ACT 0
-param set-default NAV_DLL_ACT 0
-param set-default GF_ACTION 1
-param set-default NAV_RCL_ACT 1
-
-# Set Mocap Vision frame
-param set EKF2_EV_CTRL 15
-param set EKF2_HGT_REF 3
-
-# disable attitude failure detection
-param set-default FD_FAIL_P 0
-param set-default FD_FAIL_R 0
-
-param set-default CA_ROTOR0_PX -0.12
-param set-default CA_ROTOR0_PY -0.12
-param set-default CA_ROTOR0_PZ 0.0
-param set-default CA_ROTOR0_CT 1.4
-param set-default CA_ROTOR0_AX 1.0
-param set-default CA_ROTOR0_AY 0.0
-param set-default CA_ROTOR0_AZ 0.0
-
-param set-default CA_ROTOR1_PX 0.12
-param set-default CA_ROTOR1_PY -0.12
-param set-default CA_ROTOR1_PZ 0.0
-param set-default CA_ROTOR1_CT 1.4
-param set-default CA_ROTOR1_AX -1.0
-param set-default CA_ROTOR1_AY 0.0
-param set-default CA_ROTOR1_AZ 0.0
-
-param set-default CA_ROTOR2_PX -0.12
-param set-default CA_ROTOR2_PY 0.12
-param set-default CA_ROTOR2_PZ 0.0
-param set-default CA_ROTOR2_CT 1.4
-param set-default CA_ROTOR2_AX 1.0
-param set-default CA_ROTOR2_AY 0.0
-param set-default CA_ROTOR2_AZ 0.0
-
-param set-default CA_ROTOR3_PX 0.12
-param set-default CA_ROTOR3_PY 0.12
-param set-default CA_ROTOR3_PZ 0.0
-param set-default CA_ROTOR3_CT 1.4
-param set-default CA_ROTOR3_AX -1.0
-param set-default CA_ROTOR3_AY 0.0
-param set-default CA_ROTOR3_AZ 0.0
-
-param set-default CA_ROTOR4_PX 0.12
-param set-default CA_ROTOR4_PY -0.12
-param set-default CA_ROTOR4_PZ 0.0
-param set-default CA_ROTOR4_CT 1.4
-param set-default CA_ROTOR4_AX 0.0
-param set-default CA_ROTOR4_AY 1.0
-param set-default CA_ROTOR4_AZ 0.0
-
-param set-default CA_ROTOR5_PX 0.12
-param set-default CA_ROTOR5_PY 0.12
-param set-default CA_ROTOR5_PZ 0.0
-param set-default CA_ROTOR5_CT 1.4
-param set-default CA_ROTOR5_AX 0.0
-param set-default CA_ROTOR5_AY -1.0
-param set-default CA_ROTOR5_AZ 0.0
-
-param set-default CA_ROTOR6_PX -0.12
-param set-default CA_ROTOR6_PY -0.12
-param set-default CA_ROTOR6_PZ 0.0
-param set-default CA_ROTOR6_CT 1.4
-param set-default CA_ROTOR6_AX 0.0
-param set-default CA_ROTOR6_AY 1.0
-param set-default CA_ROTOR6_AZ 0.0
-
-param set-default CA_ROTOR7_PX -0.12
-param set-default CA_ROTOR7_PY 0.12
-param set-default CA_ROTOR7_PZ 0.0
-param set-default CA_ROTOR7_CT 1.4
-param set-default CA_ROTOR7_AX 0.0
-param set-default CA_ROTOR7_AY -1.0
-param set-default CA_ROTOR7_AZ 0.0
-
-
-param set-default PWM_AUX_TIM0 10
-param set-default PWM_AUX_TIM1 10
-param set-default PWM_AUX_TIM2 10
-
-param set-default PWM_AUX_FUNC1 101
-param set-default PWM_AUX_FUNC2 102
-param set-default PWM_AUX_FUNC3 103
-param set-default PWM_AUX_FUNC4 104
-param set-default PWM_AUX_FUNC5 105
-param set-default PWM_AUX_FUNC6 106
-param set-default PWM_AUX_FUNC7 107
-param set-default PWM_AUX_FUNC8 108
-
-param set-default PWM_AUX_DIS1 0
-param set-default PWM_AUX_DIS2 0
-param set-default PWM_AUX_DIS3 0
-param set-default PWM_AUX_DIS4 0
-param set-default PWM_AUX_DIS5 0
-param set-default PWM_AUX_DIS6 0
-param set-default PWM_AUX_DIS7 0
-param set-default PWM_AUX_DIS8 0
-
-param set-default PWM_AUX_MIN1 0
-param set-default PWM_AUX_MIN2 0
-param set-default PWM_AUX_MIN3 0
-param set-default PWM_AUX_MIN4 0
-param set-default PWM_AUX_MIN5 0
-param set-default PWM_AUX_MIN6 0
-param set-default PWM_AUX_MIN7 0
-param set-default PWM_AUX_MIN8 0
-
-# BOARD_PWM_FREQ is downscaled by 10, thus PWM value is given in 10s of usec
-param set-default PWM_AUX_MAX1 10000
-param set-default PWM_AUX_MAX2 10000
-param set-default PWM_AUX_MAX3 10000
-param set-default PWM_AUX_MAX4 10000
-param set-default PWM_AUX_MAX5 10000
-param set-default PWM_AUX_MAX6 10000
-param set-default PWM_AUX_MAX7 10000
-param set-default PWM_AUX_MAX8 10000
-
-# Controller Tunings
-param set-default SC_ROLLRATE_P 0.14
-param set-default SC_PITCHRATE_P 0.14
-param set-default SC_ROLLRATE_I 0.3
-param set-default SC_PITCHRATE_I 0.3
-param set-default SC_ROLLRATE_D 0.004
-param set-default SC_PITCHRATE_D 0.00

ROMFS/px4fmu_common/init.d/airframes/70000_spacecraft_2d

@@ -0,0 +1,150 @@
+#!/bin/sh
+#
+# @name KTH Space Robot
+#
+# @type Space Robot
+# @class 2D Space Robot
+#
+# @maintainer DISCOWER
+#
+
+. ${R}etc/init.d/rc.sc_defaults
+
+param set-default CA_AIRFRAME 14
+param set-default MAV_TYPE 99
+
+param set-default CA_THRUSTER_CNT 8
+param set-default CA_R_REV 0
+
+# Auto to be provided by Custom Airframe
+param set-default CA_METHOD 0
+
+# Set proper failsafes
+param set-default COM_ACT_FAIL_ACT 0
+param set-default COM_LOW_BAT_ACT 0
+param set-default NAV_DLL_ACT 0
+param set-default GF_ACTION 1
+param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
+
+# Set Mocap Vision frame
+param set EKF2_EV_CTRL 15
+param set EKF2_HGT_REF 3
+
+# disable attitude failure detection
+param set-default FD_FAIL_P 0
+param set-default FD_FAIL_R 0
+
+param set-default CA_THRUSTER0_PX -0.12
+param set-default CA_THRUSTER0_PY -0.12
+param set-default CA_THRUSTER0_PZ 0.0
+param set-default CA_THRUSTER0_CT 1.4
+param set-default CA_THRUSTER0_AX 1.0
+param set-default CA_THRUSTER0_AY 0.0
+param set-default CA_THRUSTER0_AZ 0.0
+
+param set-default CA_THRUSTER1_PX 0.12
+param set-default CA_THRUSTER1_PY -0.12
+param set-default CA_THRUSTER1_PZ 0.0
+param set-default CA_THRUSTER1_CT 1.4
+param set-default CA_THRUSTER1_AX -1.0
+param set-default CA_THRUSTER1_AY 0.0
+param set-default CA_THRUSTER1_AZ 0.0
+
+param set-default CA_THRUSTER2_PX -0.12
+param set-default CA_THRUSTER2_PY 0.12
+param set-default CA_THRUSTER2_PZ 0.0
+param set-default CA_THRUSTER2_CT 1.4
+param set-default CA_THRUSTER2_AX 1.0
+param set-default CA_THRUSTER2_AY 0.0
+param set-default CA_THRUSTER2_AZ 0.0
+
+param set-default CA_THRUSTER3_PX 0.12
+param set-default CA_THRUSTER3_PY 0.12
+param set-default CA_THRUSTER3_PZ 0.0
+param set-default CA_THRUSTER3_CT 1.4
+param set-default CA_THRUSTER3_AX -1.0
+param set-default CA_THRUSTER3_AY 0.0
+param set-default CA_THRUSTER3_AZ 0.0
+
+param set-default CA_THRUSTER4_PX 0.12
+param set-default CA_THRUSTER4_PY -0.12
+param set-default CA_THRUSTER4_PZ 0.0
+param set-default CA_THRUSTER4_CT 1.4
+param set-default CA_THRUSTER4_AX 0.0
+param set-default CA_THRUSTER4_AY 1.0
+param set-default CA_THRUSTER4_AZ 0.0
+
+param set-default CA_THRUSTER5_PX 0.12
+param set-default CA_THRUSTER5_PY 0.12
+param set-default CA_THRUSTER5_PZ 0.0
+param set-default CA_THRUSTER5_CT 1.4
+param set-default CA_THRUSTER5_AX 0.0
+param set-default CA_THRUSTER5_AY -1.0
+param set-default CA_THRUSTER5_AZ 0.0
+
+param set-default CA_THRUSTER6_PX -0.12
+param set-default CA_THRUSTER6_PY -0.12
+param set-default CA_THRUSTER6_PZ 0.0
+param set-default CA_THRUSTER6_CT 1.4
+param set-default CA_THRUSTER6_AX 0.0
+param set-default CA_THRUSTER6_AY 1.0
+param set-default CA_THRUSTER6_AZ 0.0
+
+param set-default CA_THRUSTER7_PX -0.12
+param set-default CA_THRUSTER7_PY 0.12
+param set-default CA_THRUSTER7_PZ 0.0
+param set-default CA_THRUSTER7_CT 1.4
+param set-default CA_THRUSTER7_AX 0.0
+param set-default CA_THRUSTER7_AY -1.0
+param set-default CA_THRUSTER7_AZ 0.0
+
+
+param set-default PWM_AUX_TIM0 10
+param set-default PWM_AUX_TIM1 10
+param set-default PWM_AUX_TIM2 10
+
+param set-default PWM_AUX_FUNC1 101
+param set-default PWM_AUX_FUNC2 102
+param set-default PWM_AUX_FUNC3 103
+param set-default PWM_AUX_FUNC4 104
+param set-default PWM_AUX_FUNC5 105
+param set-default PWM_AUX_FUNC6 106
+param set-default PWM_AUX_FUNC7 107
+param set-default PWM_AUX_FUNC8 108
+
+param set-default PWM_AUX_DIS1 0
+param set-default PWM_AUX_DIS2 0
+param set-default PWM_AUX_DIS3 0
+param set-default PWM_AUX_DIS4 0
+param set-default PWM_AUX_DIS5 0
+param set-default PWM_AUX_DIS6 0
+param set-default PWM_AUX_DIS7 0
+param set-default PWM_AUX_DIS8 0
+
+param set-default PWM_AUX_MIN1 0
+param set-default PWM_AUX_MIN2 0
+param set-default PWM_AUX_MIN3 0
+param set-default PWM_AUX_MIN4 0
+param set-default PWM_AUX_MIN5 0
+param set-default PWM_AUX_MIN6 0
+param set-default PWM_AUX_MIN7 0
+param set-default PWM_AUX_MIN8 0
+
+# BOARD_PWM_FREQ is downscaled by 10, thus PWM value is given in 10s of usec
+param set-default PWM_AUX_MAX1 10000
+param set-default PWM_AUX_MAX2 10000
+param set-default PWM_AUX_MAX3 10000
+param set-default PWM_AUX_MAX4 10000
+param set-default PWM_AUX_MAX5 10000
+param set-default PWM_AUX_MAX6 10000
+param set-default PWM_AUX_MAX7 10000
+param set-default PWM_AUX_MAX8 10000
+
+# Controller Tunings
+param set-default SC_ROLLRATE_P 0.14
+param set-default SC_PITCHRATE_P 0.14
+param set-default SC_ROLLRATE_I 0.3
+param set-default SC_PITCHRATE_I 0.3
+param set-default SC_ROLLRATE_D 0.004
+param set-default SC_PITCHRATE_D 0.004

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

@@ -50,11 +50,6 @@ if(CONFIG_MODULES_SIMULATION_PWM_OUT_SIM)
 		1102_tailsitter_duo_sih.hil
 		1103_standard_vtol_sih.hil
 	)
-	if(CONFIG_MODULES_ROVER_ACKERMANN)
-		px4_add_romfs_files(
-			1104_standard_ackermann_sih.hil
-		)
-	endif()
 endif()
 
 if(CONFIG_MODULES_MC_RATE_CONTROL)
@@ -153,7 +148,6 @@ if(CONFIG_MODULES_ROVER_ACKERMANN)
 		# [51000, 51999] Ackermann rovers
 		51000_generic_rover_ackermann
 		51001_axial_scx10_2_trail_honcho
-		51002_nxp_b3rb
 	)
 endif()
 
@@ -164,6 +158,14 @@ if(CONFIG_MODULES_ROVER_MECANUM)
 	)
 endif()
 
+if(CONFIG_MODULES_ROVER_POS_CONTROL)
+	px4_add_romfs_files(
+		# [59000, 59999] Rover position control (deprecated)
+		59000_generic_ground_vehicle
+		59001_nxpcup_car_dfrobot_gpx
+	)
+endif()
+
 if(CONFIG_MODULES_UUV_ATT_CONTROL)
 	px4_add_romfs_files(
 		# [60000, 61000] (Unmanned) Underwater Robots
@@ -172,10 +174,3 @@ if(CONFIG_MODULES_UUV_ATT_CONTROL)
 		60002_uuv_bluerov2_heavy
 	)
 endif()
-
-if(CONFIG_MODULES_SPACECRAFT)
-	px4_add_romfs_files(
-		# [70000, 70999] Spacecraft
-		70000_atmos
-	)
-endif()

ROMFS/px4fmu_common/init.d/rc.fw_apps

@@ -15,8 +15,7 @@ control_allocator start
 #
 fw_rate_control start
 fw_att_control start
-fw_mode_manager start
-fw_lat_lon_control start
+fw_pos_control start
 airspeed_selector start
 
 #

ROMFS/px4fmu_common/init.d/rc.fw_defaults

@@ -13,6 +13,8 @@ param set-default MAV_TYPE 1
 #
 # Default parameters for fixed wing UAVs.
 #
+# there is a 2.5 factor applied on the _FS thresholds if for invalidation
+param set-default COM_POS_FS_EPH 50
 param set-default COM_VEL_FS_EVH 3
 
 param set-default COM_POS_LOW_EPH 50

ROMFS/px4fmu_common/init.d/rc.logging

@@ -8,9 +8,6 @@
 #                 End Setup for board specific configurations.                #
 ###############################################################################
 
-#
-# Set SD logging mode
-#
 if param compare SDLOG_MODE 1
 then
 	set LOGGER_ARGS "${LOGGER_ARGS} -e"
@@ -31,28 +28,8 @@ then
 	set LOGGER_ARGS "${LOGGER_ARGS} -a"
 fi
 
-#
-# Set logging backend
-#
-if param compare SDLOG_BACKEND 1
-then
-	set LOGGER_ARGS "${LOGGER_ARGS} -m file"
-fi
 
-if param compare SDLOG_BACKEND 2
-then
-	set LOGGER_ARGS "${LOGGER_ARGS} -m mavlink"
-fi
-
-if param compare SDLOG_BACKEND 3
-then
-	set LOGGER_ARGS "${LOGGER_ARGS} -m all"
-fi
-
-#
-# Start logger if any logging backend is enabled
-#
-if ! param compare SDLOG_BACKEND 0
+if ! param compare SDLOG_MODE -1
 then
 	logger start -b ${LOGGER_BUF} -t ${LOGGER_ARGS}
 fi

ROMFS/px4fmu_common/init.d/rc.mc_apps

@@ -36,8 +36,3 @@ mc_pos_control start
 # Start Multicopter Land Detector.
 #
 land_detector start multicopter
-
-if param compare -s MC_NN_EN 1
-then
-	mc_nn_control start
-fi

ROMFS/px4fmu_common/init.d/rc.mc_defaults

@@ -20,5 +20,7 @@ param set-default NAV_ACC_RAD 2
 param set-default RTL_RETURN_ALT 30
 param set-default RTL_DESCEND_ALT 10
 
+param set-default GPS_UBX_DYNMODEL 6
+
 # lower RNG_FOG since MC are expected to fly closer over obstacles
 param set-default EKF2_RNG_FOG 1.0

ROMFS/px4fmu_common/init.d/rc.rover_apps

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Standard apps for unmanned ground vehicles (UGV).
+#
+# NOTE: Script variables are declared/initialized/unset in the rcS script.
+#
+
+#
+# Start Control Allocator
+#
+control_allocator start
+
+#
+# Start attitude controllers.
+#
+rover_pos_control start
+
+#
+# Start Land Detector.
+#
+land_detector start rover

ROMFS/px4fmu_common/init.d/rc.rover_defaults

@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# UGV default parameters.
+#
+# NOTE: Script variables are declared/initialized/unset in the rcS script.
+#
+
+set VEHICLE_TYPE rover
+
+# MAV_TYPE_GROUND_ROVER 10
+param set-default MAV_TYPE 10
+
+param set-default MIS_TAKEOFF_ALT 0.01
+
+param set-default NAV_ACC_RAD 2
+param set-default NAV_LOITER_RAD 2
+
+# Temporary.
+param set-default NAV_FW_ALT_RAD 1000

ROMFS/px4fmu_common/init.d/rc.sc_apps

@@ -5,6 +5,32 @@
 # NOTE: Script variables are declared/initialized/unset in the rcS script.
 #
 
-control_allocator start
-
+# Start Spacecraft App
 spacecraft start
+
+# Estimator Group Selection
+# ekf2 start &
+
+# Start MicroDDS Client
+# uxrce_dds_client start -t udp -h 192.168.0.1 -n spacebot2
+# uxrce_dds_client start -t udp -p 8888
+
+#
+# Start Control Allocator
+#
+# sc_control_allocator start
+
+#
+# Start Spacecraft Rate Controller.
+#
+# sc_rate_control start
+
+#
+# Start Spacecraft Attitude Controller.
+#
+# sc_att_control start
+
+#
+# Start Spacecraft Position Controller.
+#
+# sc_pos_control start

ROMFS/px4fmu_common/init.d/rc.sc_defaults

@@ -3,10 +3,10 @@
 # NOTE: Script variables are declared/initialized/unset in the rcS script.
 #
 
-set VEHICLE_TYPE spacecraft
+set VEHICLE_TYPE sc
 
-# MAV_TYPE_SPACECRAFT_ORBITTER
-param set-default MAV_TYPE 45
+# MAV_TYPE_QUADROTOR 2
+#param set-default MAV_TYPE 12
 
 # Set micro-dds-client to use ethernet and IP-address 192.168.0.1
 param set-default UXRCE_DDS_AG_IP -1062731775

ROMFS/px4fmu_common/init.d/rc.sensors

@@ -234,10 +234,7 @@ then
 		lis3mdl -X -q -a 0x1c start
 	fi
 	qmc5883l -X -q start
-	qmc5883p -X -q start
 	rm3100 -X -q start
-	bmm350 -X -q start
-	iis2mdc -X -q start
 
 	# start last (wait for possible icm20948 passthrough mode)
 	ak09916 -X -q start

ROMFS/px4fmu_common/init.d/rc.uuv_apps

@@ -16,6 +16,6 @@ control_allocator start
 uuv_att_control start
 
 #
-# Start UUV Position Controller.
+# Start UUV Land Detector.
 #
-uuv_pos_control start
+land_detector start rover

ROMFS/px4fmu_common/init.d/rc.uuv_defaults

@@ -9,21 +9,3 @@ set VEHICLE_TYPE uuv
 
 # MAV_TYPE_SUBMARINE 12
 param set-default MAV_TYPE 12
-
-# Set micro-dds-client to use ethernet and IP-address 192.168.0.1
-param set-default UXRCE_DDS_AG_IP -1062731775
-
-# Disable preflight disarm to not interfere with external launching
-param set-default COM_DISARM_PRFLT -1
-param set-default CBRK_SUPPLY_CHK 894281
-param set-default COM_ARM_HFLT_CHK 0
-
-#Missing params
-param set-default CP_DIST -1.0
-
-# Default to MoCap fusion
-param set-default ATT_EXT_HDG_M 2
-param set-default EKF2_EV_CTRL 15
-param set-default EKF2_EV_DELAY 5
-param set-default EKF2_GPS_CTRL 0
-param set-default EKF2_HGT_REF 3

ROMFS/px4fmu_common/init.d/rc.vehicle_setup

@@ -68,15 +68,6 @@ then
 	. ${R}etc/init.d/rc.vtol_apps
 fi
 
-#
-# Spacecraft setup.
-#
-if [ $VEHICLE_TYPE = spacecraft ]
-then
-	# Start standard multicopter apps.
-	. ${R}etc/init.d/rc.sc_apps
-fi
-
 #
 # Airship setup.
 #

ROMFS/px4fmu_common/init.d/rc.vtol_apps

@@ -27,8 +27,7 @@ fi
 
 fw_rate_control start vtol
 fw_att_control start vtol
-fw_mode_manager start
-fw_lat_lon_control start vtol
+fw_pos_control start vtol
 fw_autotune_attitude_control start vtol
 
 # Start Land Detector