fix(rc): warn and deny invalid Spektrum bind sub-type

Previously, an unrecognized param2 sub-type would silently leave
dsm_bind_pulses at 0 and return the generic UNSUPPORTED ACK. Add an
explicit else-branch that logs a PX4_WARN and returns DENIED so users
get clear feedback in QGC.

.clang-tidy

@@ -141,22 +141,15 @@ Checks:          '*,
                   -cppcoreguidelines-avoid-goto,
                   -hicpp-avoid-goto,
                   -bugprone-branch-clone,
-                  -bugprone-unhandled-self-assignment,
-                  -cert-oop54-cpp,
                   -performance-enum-size,
                   -readability-avoid-nested-conditional-operator,
                   -cppcoreguidelines-prefer-member-initializer,
                   -cppcoreguidelines-explicit-virtual-functions,
-                  -cppcoreguidelines-virtual-class-destructor,
                   -readability-convert-member-functions-to-static,
                   -readability-make-member-function-const,
-                  -bugprone-assignment-in-if-condition,
                   -bugprone-implicit-widening-of-multiplication-result,
-                  -bugprone-incorrect-roundings,
-                  -bugprone-macro-parentheses,
                   -bugprone-multi-level-implicit-pointer-conversion,
                   -bugprone-signed-char-misuse,
-                  -bugprone-too-small-loop-variable,
                   -cppcoreguidelines-avoid-non-const-global-variables,
                   -cppcoreguidelines-use-default-member-init,
                   -hicpp-multiway-paths-covered,
@@ -167,13 +160,10 @@ Checks:          '*,
                   -readability-avoid-return-with-void-value,
                   -readability-avoid-unconditional-preprocessor-if,
                   -readability-delete-null-pointer,
-                  -readability-duplicate-include,
                   -readability-redundant-casting,
                   -readability-redundant-member-init,
                   -readability-reference-to-constructed-temporary,
                   -readability-simplify-boolean-expr,
-                  -bugprone-unsafe-functions,
-                  -cert-msc24-c,
                   -cert-msc32-c,
                   -cert-msc33-c,
                   -cert-msc51-cpp,

.github/actions/build-gazebo-sitl/action.yml

@@ -1,21 +0,0 @@
-name: Build Gazebo Classic SITL
-description: Build PX4 firmware and Gazebo Classic plugins with ccache stats
-
-runs:
-  using: composite
-  steps:
-    - name: Build - PX4 Firmware (SITL)
-      shell: bash
-      run: make px4_sitl_default
-
-    - name: Cache - Stats after PX4 Firmware
-      shell: bash
-      run: ccache -s
-
-    - name: Build - Gazebo Classic Plugins
-      shell: bash
-      run: make px4_sitl_default sitl_gazebo-classic
-
-    - name: Cache - Stats after Gazebo Plugins
-      shell: bash
-      run: ccache -s

.github/actions/save-ccache/action.yml

@@ -1,22 +0,0 @@
-name: Save ccache
-description: Print ccache stats and save to cache
-
-inputs:
-  cache-primary-key:
-    description: Primary cache key from setup-ccache output
-    required: true
-
-runs:
-  using: composite
-  steps:
-    - name: Cache - Stats
-      if: always()
-      shell: bash
-      run: ccache -s
-
-    - name: Cache - Save ccache
-      if: always()
-      uses: actions/cache/save@v4
-      with:
-        path: ~/.ccache
-        key: ${{ inputs.cache-primary-key }}

.github/actions/setup-ccache/action.yml

@@ -1,56 +0,0 @@
-name: Setup ccache
-description: Restore ccache from cache and configure ccache.conf
-
-inputs:
-  cache-key-prefix:
-    description: Cache key prefix (e.g. ccache-sitl)
-    required: true
-  max-size:
-    description: Max ccache size (e.g. 300M)
-    required: false
-    default: '300M'
-  base-dir:
-    description: ccache base_dir value
-    required: false
-    default: '${GITHUB_WORKSPACE}'
-  install-ccache:
-    description: Install ccache via apt before configuring
-    required: false
-    default: 'false'
-
-outputs:
-  cache-primary-key:
-    description: Primary cache key (pass to save-ccache)
-    value: ${{ steps.restore.outputs.cache-primary-key }}
-
-runs:
-  using: composite
-  steps:
-    - name: Cache - Install ccache
-      if: inputs.install-ccache == 'true'
-      shell: bash
-      run: apt-get update && apt-get install -y ccache
-
-    - name: Cache - Restore ccache
-      id: restore
-      uses: actions/cache/restore@v4
-      with:
-        path: ~/.ccache
-        key: ${{ inputs.cache-key-prefix }}-${{ github.ref_name }}-${{ github.sha }}
-        restore-keys: |
-          ${{ inputs.cache-key-prefix }}-${{ github.ref_name }}-
-          ${{ inputs.cache-key-prefix }}-${{ github.base_ref || 'main' }}-
-          ${{ inputs.cache-key-prefix }}-
-
-    - name: Cache - Configure ccache
-      shell: bash
-      run: |
-        mkdir -p ~/.ccache
-        echo "base_dir = ${{ inputs.base-dir }}" > ~/.ccache/ccache.conf
-        echo "compression = true" >> ~/.ccache/ccache.conf
-        echo "compression_level = 6" >> ~/.ccache/ccache.conf
-        echo "max_size = ${{ inputs.max-size }}" >> ~/.ccache/ccache.conf
-        echo "hash_dir = false" >> ~/.ccache/ccache.conf
-        echo "compiler_check = content" >> ~/.ccache/ccache.conf
-        ccache -s
-        ccache -z

.github/ci-config.yml.example

@@ -1,67 +0,0 @@
-# PX4 CI Configuration for Forks
-# Copy to .github/ci-config.yml and customize.
-# All settings are optional — omit any key to use the upstream default.
-#
-# This example is tuned for GitHub-hosted runners.
-# The upstream PX4 repo uses RunsOn/AWS for all jobs.
-
-# Infrastructure hint — set to true when running on GitHub-hosted runners.
-# The upstream PX4 repo uses RunsOn/AWS (is_gha: false by default).
-# Jobs may use this flag to skip steps that require RunsOn-specific
-# infrastructure (e.g. S3 cache access, spot instance features).
-# No job behavior is gated on this today — it is wired for future use.
-is_gha: true
-
-# Runner labels — one label per size tier.
-# For GitHub-hosted runners, all tiers can point to ubuntu-latest.
-# For self-hosted runners, map each tier to the appropriate pool.
-runners:
-  small:   '["ubuntu-latest"]'
-  medium:  '["ubuntu-latest"]'
-  large:   '["ubuntu-latest"]'
-  utility: '["ubuntu-latest"]'
-
-# Job toggles — enable only what your fork needs.
-# Jobs marked false below are upstream-specific (hardware boards,
-# platform-specific builds) and rarely useful for feature forks.
-jobs:
-  # T1 — gate checks (disable only if you have a very good reason)
-  gate_checks:          true   # format, newlines, module config validation
-  shellcheck:           true   # shell script linting
-  mavsdk_checks:        true   # mypy + flake8 on MAVSDK Python scripts
-
-  # T2 — core checks (recommended for all forks)
-  sitl_build:           true
-  clang_tidy:           true
-
-  # T2 — upstream-specific, disable for most forks
-  gazebo_classic_build: false  # only needed if running sitl_tests/mavros_tests
-  ubuntu_builds:        false  # verifies clean builds on bare Ubuntu images
-  macos_build:          false  # macOS platform verification
-  itcm_check:           false  # NuttX board ITCM placement, board-specific
-  flash_analysis:       false  # binary size diffing against PR base, repo-specific
-  failsafe_sim:         false  # Emscripten web simulation build
-
-  # T3 — integration tests (expensive, disable unless you need them)
-  sitl_tests:           false  # requires gazebo_classic_build
-  ros_integration:      false  # requires Galactic ROS container
-  mavros_tests:         false  # requires gazebo_classic_build
-  ros_translation_node: true   # lightweight, runs on standard ROS images
-
-# Cache sizes — adjust if you hit your cache storage limit.
-# GitHub-hosted runners share a 10 GB per-repo native cache.
-# With the job set above (~60% of jobs disabled), total warm footprint
-# is roughly 15-20% of the 10 GB limit per concurrent PR.
-# If you re-enable more jobs, total footprint scales up proportionally.
-# Raise your repo's cache limit if needed:
-#   Settings → Actions → Caches (up to 10 TB configurable)
-cache:
-  sitl:                300M   # ~94% fill at current default — do not lower
-  sitl_gazebo_classic: 350M   # only relevant if gazebo_classic_build: true
-  clang_tidy:          150M   # ~40% fill, sized with headroom
-  ubuntu_builds:       200M   # only relevant if ubuntu_builds: true
-  macos:               200M   # only relevant if macos_build: true
-  itcm:                200M   # only relevant if itcm_check: true, growing
-  flash:               200M   # only relevant if flash_analysis: true
-  ros_integration:     400M   # ~70% fill, trending up
-  ros_translation:     150M   # ~35% fill, sized with headroom

.github/workflows/build_all_targets.yml

@@ -37,19 +37,21 @@
 name: Build all targets
 
 on:
-  # Triggered by CI orchestrator for all branches/PRs (after all tiers pass)
-  workflow_run:
-    workflows: ["CI Pipeline (Orchestrator)"]
-    types: [completed]
-    branches: ['**']
-  # Direct trigger for tagged releases (orchestrator doesn't run on tags)
   push:
     tags:
       - 'v*'
+    branches:
+      - 'main'
+      - 'stable'
+      - 'beta'
+      - 'release/**'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
     paths-ignore:
       - 'docs/**'
-  # Manual trigger for debugging
-  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -63,27 +65,14 @@ permissions:
 jobs:
   group_targets:
     name: Scan for Board Targets
-    # Only run if:
-    # 1. Direct push to tag (independent trigger for releases), OR
-    # 2. Orchestrator workflow_run completed successfully (for all branches/PRs), OR
-    # 3. Manual workflow_dispatch
-    if: |
-      github.event_name == 'push' ||
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
     # runs-on: ubuntu-latest
     runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
-    permissions:
-      contents: read
-      actions: read
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       timestamp: ${{ steps.set-timestamp.outputs.timestamp }}
       branchname: ${{ steps.set-branch.outputs.branchname }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_sha || github.sha }}
 
       - name: Cache Python pip
         uses: actions/cache@v4
@@ -113,13 +102,12 @@ jobs:
       - id: set-branch
         name: Save Current Branch Name
         run: |
-          if [ "${{ github.event_name }}" = "workflow_run" ]; then
-            # For workflow_run events, get branch from the triggering workflow
-            echo "branchname=${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
-          else
-            # For push/workflow_dispatch events
-            echo "branchname=${{ github.head_ref || github.ref_name }}" >> $GITHUB_OUTPUT
-          fi
+          echo "branchname=${{
+            github.event_name == 'pull_request' &&
+            format('pr-{0}', github.event.pull_request.number) ||
+            github.head_ref ||
+            github.ref_name
+          }}" >> $GITHUB_OUTPUT
 
       - name: Debug Matrix Output
         if: runner.debug == '1'
@@ -133,9 +121,6 @@ jobs:
     # 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]
     needs: group_targets
-    permissions:
-      contents: read
-      packages: read
     strategy:
       matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }}
       fail-fast: false
@@ -148,7 +133,6 @@ jobs:
       - uses: runs-on/action@v2
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_sha || github.sha }}
           fetch-depth: 0
 
       - name: Git ownership workaround
@@ -223,8 +207,6 @@ jobs:
     runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-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)
-    permissions:
-      contents: write
     outputs:
       uploadlocation: ${{ steps.upload-location.outputs.uploadlocation }}
     steps:

.github/workflows/checks.yml

@@ -0,0 +1,60 @@
+name: Checks
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    container:
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+
+    strategy:
+      fail-fast: false
+      matrix:
+        check: [
+          "check_format",
+          "check_newlines",
+          "tests",
+          "tests_coverage",
+          "px4_fmu-v2_default stack_check",
+          "validate_module_configs",
+          "shellcheck_all",
+          "NO_NINJA_BUILD=1 px4_fmu-v5_default",
+          "NO_NINJA_BUILD=1 px4_sitl_default",
+          "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 }}
+
+      - name: Uploading Coverage to Codecov.io
+        if: contains(matrix.check, 'coverage')
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: unittests
+          file: coverage/lcov.info

.github/workflows/ci-simple.yml.example

@@ -1,41 +0,0 @@
-name: Simple CI (Fork-Friendly)
-
-# Forks: This is a lightweight CI workflow for forks that don't need
-# the full orchestrator pipeline. It builds PX4 SITL + one hardware
-# target and runs unit tests + format checks.
-#
-# To use: rename this file from ci-simple.yml.example to ci-simple.yml
-# and enable GitHub Actions in your fork settings.
-# To customize: adjust the 'make' target or container image tag below.
-
-on:
-  push:
-    branches: ['**']
-  pull_request:
-    branches: ['**']
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  quick-check:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/px4/px4-dev:v1.17.0-beta1
-    steps:
-      - name: Configure git
-        run: git config --system --add safe.directory '*'
-
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Quick Check (SITL + FMUv5 + tests + format)
-        run: make quick_check
-        env:
-          RUNS_IN_DOCKER: true

.github/workflows/clang-tidy.yml

@@ -0,0 +1,69 @@
+name: Static Analysis
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+permissions:
+  contents: read
+
+jobs:
+  clang_tidy:
+    name: Clang-Tidy
+    runs-on: [runs-on, runner=16cpu-linux-x64, "run-id=${{ github.run_id }}", "extras=s3-cache"]
+    container:
+      image: px4io/px4-dev:v1.17.0-beta1
+    steps:
+    - uses: runs-on/action@v2
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        fetch-tags: true
+
+    - name: Configure Git Safe Directory
+      run: git config --system --add safe.directory '*'
+
+    - name: Restore Compiler Cache
+      id: cc_restore
+      uses: actions/cache/restore@v4
+      with:
+        path: ~/.ccache
+        key: ccache-clang-tidy-${{ github.head_ref || github.ref_name }}
+        restore-keys: |
+          ccache-clang-tidy-${{ github.head_ref || github.ref_name }}-
+          ccache-clang-tidy-main-
+          ccache-clang-tidy-
+
+    - name: Configure Compiler Cache
+      run: |
+        mkdir -p ~/.ccache
+        echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+        echo "compression = true" >> ~/.ccache/ccache.conf
+        echo "compression_level = 6" >> ~/.ccache/ccache.conf
+        echo "max_size = 120M" >> ~/.ccache/ccache.conf
+        echo "hash_dir = false" >> ~/.ccache/ccache.conf
+        echo "compiler_check = content" >> ~/.ccache/ccache.conf
+        ccache -s
+        ccache -z
+
+    - name: Run Clang-Tidy Analysis
+      run: make -j16 clang-tidy
+
+    - name: Compiler Cache Stats
+      if: always()
+      run: ccache -s
+
+    - name: Save Compiler Cache
+      if: always()
+      uses: actions/cache/save@v4
+      with:
+        path: ~/.ccache
+        key: ${{ steps.cc_restore.outputs.cache-primary-key }}

.github/workflows/commit_checks.yml

@@ -0,0 +1,148 @@
+name: Commit Quality
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+  IS_FORK: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+
+jobs:
+  pr-title:
+    name: PR Title
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: Tools/ci
+          fetch-depth: 1
+
+      - name: Check PR title
+        id: check
+        run: |
+          python3 Tools/ci/check_pr_title.py "${{ github.event.pull_request.title }}" --markdown-file comment.md && rc=0 || rc=$?
+          echo "exit_code=$rc" >> "$GITHUB_OUTPUT"
+
+      - name: Post or clear comment
+        if: env.IS_FORK == 'false'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if [ "${{ steps.check.outputs.exit_code }}" != "0" ]; then
+            python3 Tools/ci/pr_comment.py --marker pr-title --pr "$PR_NUMBER" --result fail < comment.md
+          else
+            python3 Tools/ci/pr_comment.py --marker pr-title --pr "$PR_NUMBER" --result pass
+          fi
+
+      - name: Result
+        if: steps.check.outputs.exit_code != '0'
+        run: |
+          echo "::error::PR title does not follow conventional commits format. See the PR comment for details."
+          exit 1
+
+  commit-messages:
+    name: Commit Messages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: Tools/ci
+          fetch-depth: 1
+
+      - name: Check commit messages
+        id: check
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh api \
+            "repos/${{ github.repository }}/pulls/${PR_NUMBER}/commits?per_page=100" \
+            | python3 Tools/ci/check_commit_messages.py --markdown-file comment.md && rc=0 || rc=$?
+          echo "exit_code=$rc" >> "$GITHUB_OUTPUT"
+          # Check for warnings (non-empty markdown on exit 0)
+          if [ "$rc" -eq 0 ] && [ -s comment.md ]; then
+            echo "has_warnings=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_warnings=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Post or clear comment
+        if: env.IS_FORK == 'false'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if [ "${{ steps.check.outputs.exit_code }}" != "0" ]; then
+            python3 Tools/ci/pr_comment.py --marker commit-msgs --pr "$PR_NUMBER" --result fail < comment.md
+          elif [ "${{ steps.check.outputs.has_warnings }}" == "true" ]; then
+            python3 Tools/ci/pr_comment.py --marker commit-msgs --pr "$PR_NUMBER" --result warn < comment.md
+          else
+            python3 Tools/ci/pr_comment.py --marker commit-msgs --pr "$PR_NUMBER" --result pass
+          fi
+
+      - name: Result
+        if: steps.check.outputs.exit_code != '0'
+        run: |
+          echo "::error::Commit message errors found. See the PR comment for details."
+          exit 1
+
+  pr-body:
+    name: PR Description
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        if: env.IS_FORK == 'false'
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: Tools/ci
+          fetch-depth: 1
+
+      - name: Check PR body
+        id: check
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
+        run: |
+          message=""
+          if [ -z "$PR_BODY" ]; then
+            message="PR description is empty. Please add a summary of the changes."
+            echo "::warning::PR description is empty."
+          else
+            cleaned=$(echo "$PR_BODY" | sed 's/<!--.*-->//g' | tr -d '[:space:]')
+            if [ -z "$cleaned" ]; then
+              message="PR description contains only template comments. Please fill in the details."
+              echo "::warning::PR description contains only template comments."
+            fi
+          fi
+          echo "message=$message" >> "$GITHUB_OUTPUT"
+
+      - name: Post or clear comment
+        if: env.IS_FORK == 'false'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if [ -n "${{ steps.check.outputs.message }}" ]; then
+            printf '%s\n' \
+              "## PR Description (advisory)" \
+              "" \
+              "This is **not blocking**, but your PR description appears to be empty or incomplete." \
+              "" \
+              "${{ steps.check.outputs.message }}" \
+              "" \
+              "A good PR description helps reviewers understand what changed and why." \
+              "" \
+              "---" \
+              "*This comment will be automatically removed once the issue is resolved.*" \
+            | python3 Tools/ci/pr_comment.py --marker pr-body --pr "$PR_NUMBER" --result warn
+          else
+            python3 Tools/ci/pr_comment.py --marker pr-body --pr "$PR_NUMBER" --result pass
+          fi

.github/workflows/compile_macos.yml

@@ -0,0 +1,67 @@
+name: MacOS build
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        config: [
+          px4_fmu-v5_default,
+          px4_sitl
+          ]
+    steps:
+    - name: install Python 3.10
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.10"
+
+    - uses: actions/checkout@v4
+
+    - name: setup
+      run: |
+        ./Tools/setup/macos.sh
+
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        file(APPEND "$ENV{GITHUB_OUTPUT}" "timestamp=${current_date}\n")
+    - 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
+          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+          echo "compression = true" >> ~/.ccache/ccache.conf
+          echo "compression_level = 6" >> ~/.ccache/ccache.conf
+          echo "max_size = 40M" >> ~/.ccache/ccache.conf
+          echo "hash_dir = false" >> ~/.ccache/ccache.conf
+          ccache -s
+          ccache -z
+
+    - name: make ${{matrix.config}}
+      run: |
+          ccache -z
+          make ${{matrix.config}}
+          ccache -s

.github/workflows/compile_ubuntu.yml

@@ -0,0 +1,57 @@
+name: Ubuntu environment build
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'stable'
+      - 'beta'
+      - 'release/**'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+env:
+  RUNS_IN_DOCKER: true
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_test:
+    name: Build and Test
+    strategy:
+      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]
+    container:
+      image: ${{ matrix.version }}
+      volumes:
+        - /github/workspace:/github/workspace
+    steps:
+
+      - name: Fix git in container
+        run: |
+          # we only need this because we are running the job in a container
+          # when checkout pulls git it does it in a shared volume
+          # and file ownership changes between steps
+          # first we install git since its missing from the base image
+          # then we mark the directory as safe for other instances
+          # of git to use.
+          apt update && apt install git -y
+          git config --global --add safe.directory $(realpath .)
+
+      - uses: actions/checkout@v4
+
+      - name: Install Deps, Build, and Make Quick Check
+        run: |
+          # we need to install dependencies and build on the same step
+          # given the stateless nature of docker images
+          ./Tools/setup/ubuntu.sh
+          make quick_check

.github/workflows/dev_container.yml

@@ -130,8 +130,8 @@ jobs:
           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,scope=${{ matrix.arch }}
-          cache-to: type=gha,version=1,mode=max,scope=${{ matrix.arch }}
+          cache-from: type=gha,scope=${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.arch }}
 
   deploy:
     name: Deploy To Registry

.github/workflows/docs_crowdin_download.yml

@@ -34,13 +34,13 @@ jobs:
           upload_sources: false
           upload_translations: false
           download_translations: true
-          commit_message: New Crowdin translations - ${{ matrix.lc }}
+          commit_message: 'docs(i18n): PX4 guide translations (Crowdin) - ${{ matrix.lc }}'
           localization_branch_name: l10n_crowdin_docs_translations_${{ matrix.lc }}
           crowdin_branch_name: main
           create_pull_request: true
           pull_request_base_branch_name: 'main'
-          pull_request_title: New PX4 guide translations (Crowdin) - ${{ matrix.lc }}
-          pull_request_body: 'New PX4 guide Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action) for ${{ matrix.lc }}'
+          pull_request_title: 'docs(i18n): PX4 guide translations (Crowdin) - ${{ matrix.lc }}'
+          pull_request_body: 'docs(i18n): PX4 guide Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action) for ${{ matrix.lc }}'
           pull_request_labels: 'Documentation 📑'
           pull_request_reviewers: hamishwillee
           download_language: ${{ matrix.lc }}

.github/workflows/ekf_functional_change_indicator.yml

@@ -0,0 +1,35 @@
+name: EKF Change Indicator
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    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
+
+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
+
+      - name: main test
+        run: |
+          cd "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory "$GITHUB_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

.github/workflows/ekf_update_change_indicator.yml

@@ -0,0 +1,54 @@
+name: EKF Update Change Indicator
+
+on:
+  push:
+    paths-ignore:
+      - 'docs/**'
+
+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
+
+      - name: main test
+        run: |
+          cd "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory "$GITHUB_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: 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
+
+            See .github/workflows/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

.github/workflows/failsafe_sim.yml

@@ -0,0 +1,58 @@
+name: Failsafe Simulator Build
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      fail-fast: false
+      matrix:
+        check: [
+          "failsafe_web",
+        ]
+    container:
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    steps:
+      - name: Install Node v20.18.0
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.18.0
+
+      - uses: actions/checkout@v4
+        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
+          cd _emscripten_sdk
+          git checkout 4.0.15
+          ./emsdk install latest
+          ./emsdk activate latest
+
+      - name: Testing [${{ matrix.check }}]
+        run: |
+          . ./_emscripten_sdk/emsdk_env.sh
+          make ${{ matrix.check }}

.github/workflows/flash_analysis.yml

@@ -0,0 +1,154 @@
+name: FLASH usage analysis
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+env:
+  MIN_FLASH_POS_DIFF_FOR_COMMENT: 50
+  MIN_FLASH_NEG_DIFF_FOR_COMMENT: -50
+
+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]
+    container:
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+    strategy:
+      matrix:
+        target: [px4_fmu-v5x, px4_fmu-v6x]
+    outputs:
+      px4_fmu-v5x-bloaty-output: ${{ steps.gen-output.outputs.px4_fmu-v5x-bloaty-output }}
+      px4_fmu-v5x-bloaty-summary-map: ${{ steps.gen-output.outputs.px4_fmu-v5x-bloaty-summary-map }}
+      px4_fmu-v6x-bloaty-output: ${{ steps.gen-output.outputs.px4_fmu-v6x-bloaty-output }}
+      px4_fmu-v6x-bloaty-summary-map: ${{ steps.gen-output.outputs.px4_fmu-v6x-bloaty-summary-map }}
+    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 }}_flash-analysis
+
+      - name: Store the ELF with the change
+        run: cp ./build/**/*.elf ./with-change.elf
+
+      - name: Clean previous build
+        run: |
+          make clean
+          make distclean
+          make submodulesclean
+
+      - name: If it's a PR checkout the base branch
+        if: ${{ github.event.pull_request }}
+        # As checkout creates a merge commit (merging the base branch into the PR branch), the base branch is the base for a diff of the PR changes.
+        run: git checkout ${{ github.event.pull_request.base.ref }}
+
+      - name: If it's a push checkout the previous commit
+        if: github.event_name == 'push'
+        run: git checkout ${{ github.event.before }}
+
+      - name: Update submodules
+        run: make submodulesupdate
+
+      - name: Build
+        run: make ${{ matrix.target }}_flash-analysis
+
+      - name: Store the ELF before the change
+        run: cp ./build/**/*.elf ./before-change.elf
+
+      - name: bloaty-action
+        uses: PX4/bloaty-action@v1.0.0
+        id: bloaty-step
+        with:
+          bloaty-file-args: ./with-change.elf -- ./before-change.elf
+          bloaty-additional-args: -d sections,symbols -s vm -n 20
+          output-to-summary: true
+
+      - name: Generate output
+        id: gen-output
+        run: |
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "${{ matrix.target }}-bloaty-output<<$EOF" >> $GITHUB_OUTPUT
+          echo "${{ steps.bloaty-step.outputs.bloaty-output-encoded }}" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
+          echo "${{ matrix.target }}-bloaty-summary-map<<$EOF" >> $GITHUB_OUTPUT
+          echo '${{ steps.bloaty-step.outputs.bloaty-summary-map }}' >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
+
+  # TODO:
+  # This part of the workflow is causing errors for forks. We should find a way to fix this and enable it again for forks.
+  # 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 }}"]
+    needs: [analyze_flash]
+    env:
+      V5X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-absolute) }}
+      V5X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-percentage) }}
+      V6X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-absolute) }}
+      V6X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-percentage) }}
+    if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
+    steps:
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: FLASH Analysis
+
+      - name: Set Build Time
+        id: bt
+        run: |
+          echo "timestamp=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_OUTPUT
+
+      - name: Create or update comment
+        # This can't be moved to the job-level conditions, as GH actions don't allow a job-level if condition to access the env.
+        if: |
+          steps.fc.outputs.comment-id != '' ||
+          env.V5X-SUMMARY-MAP-ABS >= fromJSON(env.MIN_FLASH_POS_DIFF_FOR_COMMENT) ||
+          env.V5X-SUMMARY-MAP-ABS <= fromJSON(env.MIN_FLASH_NEG_DIFF_FOR_COMMENT) ||
+          env.V6X-SUMMARY-MAP-ABS >= fromJSON(env.MIN_FLASH_POS_DIFF_FOR_COMMENT) ||
+          env.V6X-SUMMARY-MAP-ABS <= fromJSON(env.MIN_FLASH_NEG_DIFF_FOR_COMMENT)
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ## 🔎 FLASH Analysis
+            <details>
+              <summary>px4_fmu-v5x [Total VM Diff: ${{ env.V5X-SUMMARY-MAP-ABS }} byte (${{ env.V5X-SUMMARY-MAP-PERC}} %)]</summary>
+
+              ```
+              ${{ needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-output }}
+              ```
+            </details>
+
+            <details>
+              <summary>px4_fmu-v6x [Total VM Diff: ${{ env.V6X-SUMMARY-MAP-ABS }} byte (${{ env.V6X-SUMMARY-MAP-PERC }} %)]</summary>
+
+              ```
+              ${{ needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-output }}
+              ```
+            </details>
+
+            **Updated: _${{ steps.bt.outputs.timestamp }}_**
+          edit-mode: replace

.github/workflows/itcm_check.yml

@@ -0,0 +1,67 @@
+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/mavros_mission_tests.yml

@@ -0,0 +1,45 @@
+name: MAVROS Mission Tests
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build SITL and Run Tests (inside old ROS container)
+        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
+            '

.github/workflows/mavros_offboard_tests.yml

@@ -0,0 +1,44 @@
+name: MAVROS Offboard Tests
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build SITL and Run Tests (inside old ROS container)
+        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
+            '

.github/workflows/nuttx_env_config.yml

@@ -0,0 +1,46 @@
+name: Nuttx Target with extra env config
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    container:
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+
+    strategy:
+      matrix:
+        config:
+          - px4_fmu-v5_default
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build PX4 and Run Test [${{ matrix.config }}]
+        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'
+          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

@@ -0,0 +1,33 @@
+name: Python CI Checks
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Install Python3
+      run: sudo apt-get install python3 python3-setuptools python3-pip -y
+
+    - name: Install tools
+      run: python3 -m pip install mypy types-requests flake8 --break-system-packages
+
+    - name: Check MAVSDK test scripts with mypy
+      run: $HOME/.local/bin/mypy --strict test/mavsdk_tests/*.py
+
+    - name: Check MAVSDK test scripts with flake8
+      run: $HOME/.local/bin/flake8 test/mavsdk_tests/*.py

.github/workflows/ros_integration_tests.yml

@@ -0,0 +1,134 @@
+# NOTE: this workflow is now running on Dronecode / PX4 AWS account.
+# - If you want to keep the tests running in GitHub Actions you need to uncomment the "runs-on: ubuntu-latest" lines
+#   and comment the "runs-on: [runs-on,runner=..." lines.
+# - If you would like to duplicate this setup try setting up "RunsOn" on your own AWS account try https://runs-on.com
+
+name: ROS Integration Tests
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    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]
+    container:
+      image: px4io/px4-dev-ros2-galactic:2021-09-08
+      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Git Ownership Workaround
+      run: git config --system --add safe.directory '*'
+
+    - name: Update ROS Keys
+      run: |
+        sudo rm /etc/apt/sources.list.d/ros2.list && \
+        sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
+        echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
+
+    - name: Install gazebo
+      run: |
+        apt update && apt install -y gazebo11 libgazebo11-dev gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly libgstreamer-plugins-base1.0-dev
+
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: ccache cache files
+      uses: actions/cache@v4
+      with:
+        path: ~/.ccache
+        key: ros_integration_tests-${{matrix.config.build_type}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: ros_integration_tests-${{matrix.config.build_type}}-ccache-
+    - name: setup ccache
+      run: |
+        mkdir -p ~/.ccache
+        echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+        echo "compression = true" >> ~/.ccache/ccache.conf
+        echo "compression_level = 6" >> ~/.ccache/ccache.conf
+        echo "max_size = 300M" >> ~/.ccache/ccache.conf
+        echo "hash_dir = false" >> ~/.ccache/ccache.conf
+        ccache -s
+        ccache -z
+
+    - name: Get and build micro-xrce-dds-agent
+      run: |
+        cd /opt
+        git clone --recursive https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
+        cd Micro-XRCE-DDS-Agent
+        git checkout v2.2.1 # recent versions require cmake 3.22, but px4-dev-ros2-galactic:2021-09-08 is on 3.16
+        sed -i 's/_fastdds_tag 2.8.x/_fastdds_tag 2.8.2/g' CMakeLists.txt
+        mkdir build
+        cd build
+        cmake ..
+        make -j2
+    - name: ccache post-run micro-xrce-dds-agent
+      run: ccache -s
+
+    - name: Get and build the ros2 interface library
+      shell: bash
+      run: |
+        PX4_DIR="$(pwd)"
+        . /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
+        # Ignore python packages due to compilation issue (can be enabled when updating ROS)
+        touch px4-ros2-interface-lib/px4_ros2_py/COLCON_IGNORE || true
+        touch px4-ros2-interface-lib/examples/python/COLCON_IGNORE || true
+        cd ..
+        # Copy messages to ROS workspace
+        "${PX4_DIR}/Tools/copy_to_ros_ws.sh" "$(pwd)"
+        rm -rf src/translation_node src/px4_msgs_old
+        colcon build --symlink-install
+    - name: ccache post-run ros workspace
+      run: ccache -s
+
+    - name: Build PX4
+      run: make px4_sitl_default
+    - name: ccache post-run px4/firmware
+      run: ccache -s
+    - name: Build SITL Gazebo
+      run: make px4_sitl_default sitl_gazebo-classic
+    - name: ccache post-run sitl_gazebo-classic
+      run: ccache -s
+
+    - name: Core dump settings
+      run: |
+        ulimit -c unlimited
+        echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
+
+    - name: Run tests
+      shell: bash
+      run: |
+        . /opt/px4_ws/install/setup.bash
+        /opt/Micro-XRCE-DDS-Agent/build/MicroXRCEAgent udp4 localhost -p 8888 -v 0 &
+        test/ros_test_runner.py --verbose --model iris --upload --force-color
+      timeout-minutes: 45
+
+    - name: Upload failed logs
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: failed-logs.zip
+        path: |
+          logs/**/**/**/*.log
+          logs/**/**/**/*.ulg
+          build/px4_sitl_default/tmp_ros_tests/rootfs/log/**/*.ulg

.github/workflows/ros_translation_node.yml

@@ -0,0 +1,61 @@
+name: ROS Translation Node Tests
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+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]
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {ros_version: "humble", ubuntu: "jammy"}
+          - {ros_version: "jazzy", ubuntu: "noble"}
+    container:
+      image: rostooling/setup-ros-docker:ubuntu-${{ matrix.config.ubuntu }}-latest
+    steps:
+      - name: Setup ROS 2 (${{ matrix.config.ros_version }})
+        uses: ros-tooling/setup-ros@v0.7
+        with:
+          required-ros-distributions: ${{ matrix.config.ros_version }}
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Workaround for https://github.com/actions/runner/issues/2033
+      - name: ownership workaround
+        run: git config --system --add safe.directory '*'
+
+      - name: Check .msg file versioning
+        if: github.event_name == 'pull_request'
+        run: |
+          ./Tools/ci/check_msg_versioning.sh ${{ github.event.pull_request.base.sha }} ${{github.event.pull_request.head.sha}}
+
+      - name: Build and test
+        run: |
+          ros_ws=/ros_ws
+          mkdir -p $ros_ws/src
+          ./Tools/copy_to_ros_ws.sh $ros_ws
+          cd $ros_ws
+          source /opt/ros/${{ matrix.config.ros_version }}/setup.sh
+          colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --symlink-install --event-handlers=console_cohesion+
+          source ./install/setup.sh
+          ./build/translation_node/translation_node_unit_tests

.github/workflows/sitl_tests.yml

@@ -0,0 +1,163 @@
+# NOTE: this workflow is now running on Dronecode / PX4 AWS account.
+# - If you want to keep the tests running in GitHub Actions you need to uncomment the "runs-on: ubuntu-latest" lines
+#   and comment the "runs-on: [runs-on,runner=..." lines.
+# - If you would like to duplicate this setup try setting up "RunsOn" on your own AWS account try https://runs-on.com
+
+name: SITL Tests
+
+on:
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+    - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+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]
+    container:
+      image: px4io/px4-dev-simulation-focal:2021-09-08
+      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {model: "iris",          latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo" } # Alaska
+          # VTOL/tailsitter disabled: persistent flaky CI failures (timeouts, erratic
+          # transitions). Re-enable once the test infrastructure is stabilized.
+          # - {model: "tailsitter" ,   latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo" } # Florida
+          # - {model: "standard_vtol", latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage" } # Zurich
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Git Ownership Workaround
+        run: git config --system --add safe.directory '*'
+
+      - id: set-timestamp
+        name: Set timestamp for cache
+        run: echo "::set-output name=timestamp::$(date +"%Y%m%d%H%M%S")"
+
+      - name: Cache Key Config
+        uses: actions/cache@v4
+        with:
+          path: ~/.ccache
+          key: sitl-ccache-${{ steps.set-timestamp.outputs.timestamp }}
+          restore-keys: sitl-ccache-${{ steps.set-timestamp.outputs.timestamp }}
+
+      - name: Cache Conf Config
+        run: |
+            mkdir -p ~/.ccache
+            echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+            echo "compression = true" >> ~/.ccache/ccache.conf
+            echo "compression_level = 6" >> ~/.ccache/ccache.conf
+            echo "max_size = 120M" >> ~/.ccache/ccache.conf
+            echo "hash_dir = false" >> ~/.ccache/ccache.conf
+            ccache -s
+            ccache -z
+
+      - name: Build PX4
+        env:
+          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+        run: make px4_sitl_default
+
+      - name: Cache Post-Run [px4_sitl_default]
+        run: ccache -s
+
+      - name: Build SITL Gazebo
+        env:
+          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+        run: make px4_sitl_default sitl_gazebo-classic
+
+      - name: Cache Post-Run [sitl_gazebo-classic]
+        run: ccache -s
+
+      - name: Download MAVSDK
+        run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+
+      - name: Install MAVSDK
+        run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
+
+      - name: Check PX4 Environment Variables
+        env:
+          PX4_HOME_LAT: ${{matrix.config.latitude}}
+          PX4_HOME_LON: ${{matrix.config.longitude}}
+          PX4_HOME_ALT: ${{matrix.config.altitude}}
+          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+        run: |
+            export
+            ulimit -a
+
+      - name: Build PX4 / MAVSDK tests
+        env:
+          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+          DONT_RUN: 1
+        run: make px4_sitl_default sitl_gazebo-classic mavsdk_tests
+
+      - name: Cache Post-Run [px4_sitl_default sitl_gazebo-classic mavsdk_tests]
+        run: ccache -s
+
+      - name: Core Dump Settings
+        run: |
+            ulimit -c unlimited
+            echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
+
+      - name: Run SITL / MAVSDK Tests
+        env:
+          PX4_HOME_LAT: ${{matrix.config.latitude}}
+          PX4_HOME_LON: ${{matrix.config.longitude}}
+          PX4_HOME_ALT: ${{matrix.config.altitude}}
+          PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
+        run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 10 --abort-early --model ${{matrix.config.model}} test/mavsdk_tests/configs/sitl.json --verbose --force-color
+        timeout-minutes: 45
+
+      - name: Upload failed logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: failed-${{matrix.config.model}}-logs.zip
+          path: |
+            logs/**/**/**/*.log
+            logs/**/**/**/*.ulg
+            build/px4_sitl_default/tmp_mavsdk_tests/rootfs/log/**/*.ulg
+
+      - name: Look at Core files
+        if: failure() && ${{ hashFiles('px4.core') != '' }}
+        run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
+
+      - name: Upload PX4 coredump
+        if: failure() && ${{ hashFiles('px4.core') != '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: coredump
+          path: px4.core
+
+      - name: Setup & Generate Coverage Report
+        if: contains(matrix.config.build_type, 'Coverage')
+        run: |
+            git config --global credential.helper "" # disable the keychain credential helper
+            git config --global --add credential.helper store # enable the local store credential helper
+            echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
+            git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
+            mkdir -p coverage
+            lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
+
+      - name: Upload Coverage Information to Codecov
+        if: contains(matrix.config.build_type, 'Coverage')
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: mavsdk
+          file: coverage/lcov.info

.gitmodules

@@ -109,3 +109,9 @@
 [submodule "src/lib/rl_tools/rl_tools"]
 	path = src/lib/rl_tools/rl_tools
 	url = https://github.com/rl-tools/rl-tools.git
+[submodule "libmodal-json"]
+	path = boards/modalai/voxl2/src/lib/mpa/libmodal-json
+	url = https://gitlab.com/voxl-public/voxl-sdk/core-libs/libmodal-json.git
+[submodule "libmodal-pipe"]
+	path = boards/modalai/voxl2/src/lib/mpa/libmodal-pipe
+	url = https://gitlab.com/voxl-public/voxl-sdk/core-libs/libmodal-pipe.git

.vscode/cmake-variants.yaml

@@ -336,6 +336,11 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: cuav_x25-evo_default
+    cuav_x25-super_default:
+      short: cuav_x25-super
+      buildType: MinSizeRel
+      settings:
+        CONFIG: cuav_x25-super_default
     cubepilot_cubeorange_test:
       short: cubepilot_cubeorange
       buildType: MinSizeRel

CITATION.cff

@@ -0,0 +1,27 @@
+cff-version: 1.2.0
+title: "PX4 Autopilot"
+message: "If you use PX4 in your research, please cite it using this metadata."
+type: software
+authors:
+  - family-names: Meier
+    given-names: Lorenz
+  - name: "The PX4 Contributors"
+repository-code: "https://github.com/PX4/PX4-Autopilot"
+url: "https://px4.io"
+abstract: >-
+  PX4 is an open-source autopilot stack for drones and
+  unmanned vehicles. It supports multirotors, fixed-wing,
+  VTOL, rovers, and many more platforms. PX4 runs on both
+  RTOS and POSIX-compatible operating systems.
+keywords:
+  - autopilot
+  - drone
+  - uav
+  - flight-controller
+  - robotics
+  - ros2
+license: BSD-3-Clause
+identifiers:
+  - type: doi
+    value: "10.5281/zenodo.595432"
+    description: "Zenodo concept DOI (resolves to latest version)"

CONTRIBUTING.md

@@ -1,44 +1,170 @@
-# Contributing to PX4 Firmware
+# Contributing to PX4-Autopilot
 
-We follow the [Github flow](https://guides.github.com/introduction/flow/) development model.
+We follow the [GitHub flow](https://guides.github.com/introduction/flow/) development model.
 
-### Fork the project, then clone your repo
+## Fork the project, then clone your repo
 
-First [fork and clone](https://help.github.com/articles/fork-a-repo) the project project.
+First [fork and clone](https://help.github.com/articles/fork-a-repo) the project.
 
-### Create a feature branch
+## Create a feature branch
 
-*Always* branch off main for new features.
+Always branch off `main` for new features.
 
 ```
 git checkout -b mydescriptivebranchname
 ```
 
-### Edit and build the code
+## Edit and build the code
 
-The [developer guide](https://docs.px4.io/main/en/development/development.html) explains how to set up the development environment on Mac OS, Linux or Windows. Please take note of our [coding style](https://docs.px4.io/main/en/contribute/code.html) when editing files.
+The [developer guide](https://docs.px4.io/main/en/development/development.html) explains how to set up the development environment on Mac OS, Linux or Windows.
 
-### Commit your changes
+### Coding standards
 
-Always write descriptive commit messages and add a fixes or relates note to them with an [issue number](https://github.com/px4/Firmware/issues) (Github will link these then conveniently)
+All C/C++ code must follow the [PX4 coding style](https://docs.px4.io/main/en/contribute/code.html). Formatting is enforced by [astyle](http://astyle.sourceforge.net/) in CI (`make check_format`). Code quality checks run via [clang-tidy](https://clang.llvm.org/extra/clang-tidy/). Pull requests that fail either check will not be merged.
 
-**Example:**
+Python code is checked with [mypy](https://mypy-lang.org/) and [flake8](https://flake8.pycqa.org/).
+
+## Commit message convention
+
+PX4 uses [conventional commits](https://www.conventionalcommits.org/) for all commit messages and PR titles.
+
+### Format
 
 ```
-Change how the attitude controller works
-
-- Fixes rate feed forward
-- Allows a local body rate override
-
-Fixes issue #123
+type(scope): short description of the change
 ```
 
-### Test your changes
+| Part | Rule |
+|------|------|
+| **type** | Category of change (see types table below) |
+| **scope** | The module, driver, board, or area of PX4 affected |
+| **`!`** (optional) | Append before `:` to mark a breaking change |
+| **description** | What the change does, at least 5 characters, written in imperative form |
 
-Since we care about safety, we will regularly ask you for test results. Best is to do a test flight (or bench test where it applies) and upload the logfile from it (on the microSD card in the logs directory) to Google Drive or Dropbox and share the link.
+### Types
 
-### Push your changes
+| Type | Description |
+|------|-------------|
+| `feat` | A new feature |
+| `fix` | A bug fix |
+| `docs` | Documentation only changes |
+| `style` | Formatting, whitespace, no code change |
+| `refactor` | Code change that neither fixes a bug nor adds a feature |
+| `perf` | Performance improvement |
+| `test` | Adding or correcting tests |
+| `build` | Build system or external dependencies |
+| `ci` | CI configuration files and scripts |
+| `chore` | Other changes that don't modify src or test files |
+| `revert` | Reverts a previous commit |
 
-Push changes to your repo and send a [pull request](https://github.com/PX4/Firmware/compare/).
+### Scopes
+
+The scope identifies which part of PX4 is affected. Common scopes:
+
+| Scope | Area |
+|-------|------|
+| `ekf2` | Extended Kalman Filter (state estimation) |
+| `mavlink` | MAVLink messaging protocol |
+| `commander` | Commander and mode management |
+| `navigator` | Mission, RTL, Land, and other navigation modes |
+| `sensors` | Sensor drivers and processing |
+| `drivers` | Hardware drivers |
+| `boards/px4_fmu-v6x` | Board-specific changes (use the board name) |
+| `mc_att_control` | Multicopter attitude control |
+| `mc_pos_control` | Multicopter position control |
+| `fw_att_control` | Fixed-wing attitude control |
+| `vtol` | VTOL-specific logic |
+| `actuators` | Mixer and actuator output |
+| `battery` | Battery monitoring and estimation |
+| `logger` | On-board logging |
+| `param` | Parameter system |
+| `simulation` | SITL, Gazebo, SIH |
+| `ci` | Continuous integration and workflows |
+| `docs` | Documentation |
+| `build` | CMake, toolchain, build system |
+| `uorb` | Inter-module messaging |
+
+For changes spanning multiple subsystems, use the primary one affected. Look at the directory path of the files you changed to find the right scope: `src/modules/ekf2/` uses `ekf2`, `src/drivers/imu/` uses `drivers/imu`, `.github/workflows/` uses `ci`.
+
+### Breaking changes
+
+Append `!` before the colon to indicate a breaking change:
+
+```
+feat(ekf2)!: remove deprecated height fusion API
+```
+
+### Good commit messages
+
+```
+feat(ekf2): add height fusion timeout
+fix(mavlink): correct BATTERY_STATUS_V2 parsing
+refactor(navigator): simplify RTL altitude logic
+ci(workflows): migrate to reusable workflows
+docs(ekf2): update tuning guide
+feat(boards/px4_fmu-v6x)!: remove deprecated driver API
+perf(mc_rate_control): reduce loop latency
+```
+
+### Commits to avoid
+
+These will be flagged by CI and should be squashed or reworded before merging:
+
+```
+fix                                    # too vague, no type or scope
+update                                 # too vague, no type or scope
+ekf2: fix something                   # missing type prefix
+apply suggestions from code review     # squash into parent commit
+do make format                         # squash into parent commit
+WIP: trying something                  # not ready for main
+oops                                   # not descriptive
+```
+
+### PR titles
+
+The PR title follows the same `type(scope): description` format. This is enforced by CI and is especially important because the PR title becomes the commit message when a PR is squash-merged.
+
+### Merge policy
+
+Commits should be atomic and independently revertable. Squash at reviewer discretion for obvious cases (multiple WIP commits, messy review-response history). When your commits are clean and logical, they will be preserved as individual commits on `main`.
+
+### Cleaning up commits
+
+If CI flags your commit messages, you can fix them with an interactive rebase:
+
+```bash
+# Squash all commits into one:
+git rebase -i HEAD~N   # replace N with the number of commits
+# mark all commits except the first as 'squash' or 'fixup'
+# reword the remaining commit to follow the format
+git push --force-with-lease
+
+# Or reword specific commits:
+git rebase -i HEAD~N
+# mark the bad commits as 'reword'
+git push --force-with-lease
+```
+
+## Test your changes
+
+PX4 is safety-critical software. All contributions must include adequate testing where practical:
+
+- **New features** must include unit tests and/or integration tests that exercise the new functionality, where practical. Hardware-dependent changes that cannot be tested in SITL should include bench test or flight test evidence.
+- **Bug fixes** must include a regression test where practical. When automated testing is not feasible (hardware-specific issues, race conditions, etc.), provide a link to a flight log demonstrating the fix and the reproduction steps for the original bug.
+- **Reviewers** will verify that tests or test evidence exist before approving a pull request.
+
+### Types of tests
+
+| Test type | When to use | How to run |
+|-----------|-------------|------------|
+| **Unit tests** (gtest) | Module-level logic, math, parsing | `make tests` |
+| **SITL integration tests** (MAVSDK) | Flight behavior, failsafes, missions | `test/mavsdk_tests/` |
+| **Bench tests / flight logs** | Hardware-dependent changes | Upload logs to [Flight Review](https://logs.px4.io) |
+
+Since we care about safety, we will regularly ask you for test results. Best is to do a test flight (or bench test where it applies) and upload the log file from it (on the microSD card in the logs directory) to Google Drive or Dropbox and share the link.
+
+## Push your changes
+
+Push changes to your repo and send a [pull request](https://github.com/PX4/PX4-Autopilot/compare/).
 
 Make sure to provide some testing feedback and if possible the link to a flight log file. Upload flight log files to [Flight Review](http://logs.px4.io) and link the resulting report.

Makefile

@@ -332,6 +332,7 @@ bootloaders_update: \
 	cuav_7-nano_bootloader \
 	cuav_fmu-v6x_bootloader \
 	cuav_x25-evo_bootloader \
+	cuav_x25-super_bootloader \
 	cubepilot_cubeorange_bootloader \
 	cubepilot_cubeorangeplus_bootloader \
 	hkust_nxt-dual_bootloader \

README.md

@@ -10,6 +10,7 @@
 
 <p align="center">
   <a href="https://github.com/PX4/PX4-Autopilot/releases"><img src="https://img.shields.io/github/release/PX4/PX4-Autopilot.svg" alt="Releases"></a>
+  <a href="https://www.bestpractices.dev/projects/6520"><img src="https://www.bestpractices.dev/projects/6520/badge" alt="OpenSSF Best Practices"></a>
   <a href="https://zenodo.org/badge/latestdoi/22634/PX4/PX4-Autopilot"><img src="https://zenodo.org/badge/22634/PX4/PX4-Autopilot.svg" alt="DOI"></a>
   <a href="https://github.com/PX4/PX4-Autopilot/actions/workflows/build_all_targets.yml"><img src="https://github.com/PX4/PX4-Autopilot/actions/workflows/build_all_targets.yml/badge.svg?branch=main" alt="Build Targets"></a>
   <a href="https://discord.gg/dronecode"><img src="https://discordapp.com/api/guilds/1022170275984457759/widget.png?style=shield" alt="Discord"></a>

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

@@ -34,6 +34,7 @@ param set-default PWM_MAIN_FUNC2 102
 param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104
 
-param set-default EKF2_GPS_DELAY 0
+param set-default SENS_GPS0_DELAY 0
+param set-default SENS_GPS1_DELAY 0
 
 param set SIH_VEHICLE_TYPE 0

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

@@ -44,7 +44,8 @@ param set-default PWM_MAIN_FUNC2 202
 param set-default PWM_MAIN_FUNC3 203
 param set-default PWM_MAIN_FUNC4 101
 
-param set-default EKF2_GPS_DELAY 0
+param set-default SENS_GPS0_DELAY 0
+param set-default SENS_GPS1_DELAY 0
 
 # Rate controllers
 param set-default FW_RR_P 0.0500

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

@@ -11,7 +11,8 @@
 PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=xvert}
 
-param set-default EKF2_GPS_DELAY 0
+param set-default SENS_GPS0_DELAY 0
+param set-default SENS_GPS1_DELAY 0
 param set-default EKF2_FUSE_BETA 0 # side slip fusion is currently not supported for tailsitters
 
 param set-default SENS_EN_GPSSIM 1

ROMFS/px4fmu_common/init.d-posix/airframes/10043_sihsim_standard_vtol

@@ -27,7 +27,8 @@ param set-default SENS_EN_BAROSIM 1
 param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1
 
-param set-default EKF2_GPS_DELAY 0
+param set-default SENS_GPS0_DELAY 0
+param set-default SENS_GPS1_DELAY 0
 
 param set-default VT_TYPE 2
 param set-default MPC_MAN_Y_MAX 60

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

@@ -44,4 +44,5 @@ 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
+param set-default SENS_GPS0_DELAY 0
+param set-default SENS_GPS1_DELAY 0

ROMFS/px4fmu_common/init.d-posix/airframes/4003_gz_rc_cessna

@@ -44,8 +44,6 @@ param set-default FW_T_SINK_MIN 3
 
 param set-default FW_W_EN 1
 
-param set-default FD_ESCS_EN 0
-
 param set-default MIS_TAKEOFF_ALT 30
 
 param set-default NAV_ACC_RAD 15

ROMFS/px4fmu_common/init.d-posix/airframes/4004_gz_standard_vtol

@@ -104,4 +104,3 @@ param set-default VT_FWD_THRUST_EN 4
 param set-default VT_PITCH_MIN -5
 param set-default VT_F_TRANS_THR 1
 param set-default VT_TYPE 2
-param set-default FD_ESCS_EN 0

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

@@ -20,8 +20,8 @@ param set-default COM_DISARM_LAND 0.5
 # EKF2 parameters
 param set-default EKF2_DRAG_CTRL 1
 param set-default EKF2_IMU_POS_X 0.02
-param set-default EKF2_GPS_POS_X 0.055
-param set-default EKF2_GPS_POS_Z -0.15
+param set-default SENS_GPS0_OFFX 0.055
+param set-default SENS_GPS0_OFFZ -0.15
 param set-default EKF2_MIN_RNG 0.03
 param set-default EKF2_OF_CTRL 1
 param set-default EKF2_OF_POS_X 0.055

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

@@ -26,7 +26,6 @@ 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
@@ -42,23 +41,21 @@ 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_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_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
@@ -67,7 +64,6 @@ 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
@@ -79,7 +75,7 @@ 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_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
@@ -103,7 +99,7 @@ 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_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

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

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

ROMFS/px4fmu_common/init.d-posix/airframes/70001_gz_atmos_dual

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

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

@@ -2,7 +2,8 @@
 # shellcheck disable=SC2154
 
 # EKF2 specifics
-param set-default EKF2_GPS_DELAY 10
+param set-default SENS_GPS0_DELAY 10
+param set-default SENS_GPS1_DELAY 10
 param set-default EKF2_MULTI_IMU 3
 param set-default SENS_IMU_MODE 0
 

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -119,10 +119,11 @@ else
 	param set SYS_AUTOCONFIG 1
 fi
 
-if param compare SYS_AUTOCONFIG 1
+# To trigger a parameter reset during boot SYS_AUTCONFIG was set to 1 before
+if param greater SYS_AUTOCONFIG 0
 then
-	# Reset params except Airframe, RC calibration, sensor calibration, flight modes, total flight time, and next flight UUID.
-	param reset_all SYS_AUTOSTART RC* CAL_* COM_FLTMODE* LND_FLIGHT* TC_* COM_FLIGHT*
+	# Reset parameters except airframe, parameter version, RC calibration, sensor calibration, total flight time, flight UUID
+	param reset_all SYS_AUTOSTART SYS_PARAM_VER RC* CAL_* LND_FLIGHT* TC_* COM_FLIGHT*
 	set AUTOCNF yes
 fi
 

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

@@ -19,8 +19,8 @@ param set-default COM_DISARM_LAND 0.5
 # EKF2 parameters
 param set-default EKF2_DRAG_CTRL 1
 param set-default EKF2_IMU_POS_X 0.02
-param set-default EKF2_GPS_POS_X 0.055
-param set-default EKF2_GPS_POS_Z -0.15
+param set-default SENS_GPS0_OFFX 0.055
+param set-default SENS_GPS0_OFFZ -0.15
 param set-default EKF2_MIN_RNG 0.03
 param set-default EKF2_OF_CTRL 1
 param set-default EKF2_OF_POS_X 0.055

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

@@ -19,8 +19,8 @@ param set-default COM_DISARM_LAND 0.5
 # EKF2 parameters
 param set-default EKF2_DRAG_CTRL 1
 param set-default EKF2_IMU_POS_X 0.02
-param set-default EKF2_GPS_POS_X 0.055
-param set-default EKF2_GPS_POS_Z -0.15
+param set-default SENS_GPS0_OFFX 0.055
+param set-default SENS_GPS0_OFFZ -0.15
 param set-default EKF2_MIN_RNG 0.03
 param set-default EKF2_OF_CTRL 1
 param set-default EKF2_OF_POS_X 0.055

ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250

@@ -2,7 +2,7 @@
 #
 # @name HolyBro QAV250
 #
-# @url https://docs.px4.io/main/en/frames_multicopter/holybro_qav250_pixhawk4_mini.html
+# @url https://docs.px4.io/main/en/frames_multicopter/holybro_qav250_pixhawk4_mini
 #
 # @type Quadrotor x
 # @class Copter

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

@@ -47,8 +47,9 @@ param set-default EKF2_BCOEF_Y 25.5
 
 param set-default EKF2_DRAG_CTRL 1
 
-param set-default EKF2_GPS_DELAY 100
-param set-default EKF2_GPS_POS_X 0.06
+param set-default SENS_GPS0_DELAY 100
+param set-default SENS_GPS1_DELAY 100
+param set-default SENS_GPS0_OFFX 0.06
 param set-default EKF2_GPS_V_NOISE 0.5
 
 param set-default EKF2_IMU_POS_X 0.06

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

@@ -2,7 +2,7 @@
 #
 # @name Aion Robotics R1 UGV
 #
-# @url https://docs.px4.io/main/en/complete_vehicles_rover/aion_r1.html
+# @url https://docs.px4.io/main/en/complete_vehicles_rover/aion_r1
 #
 # @type Rover
 # @class Rover

ROMFS/px4fmu_common/init.d/rcS

@@ -191,8 +191,8 @@ else
 	# To trigger a parameter reset during boot SYS_AUTCONFIG was set to 1 before
 	if param greater SYS_AUTOCONFIG 0
 	then
-		# Reset parameters except airframe, parameter version, RC calibration, sensor calibration, flight modes, total flight time, flight UUID
-		param reset_all SYS_AUTOSTART SYS_PARAM_VER RC* CAL_* COM_FLTMODE* LND_FLIGHT* TC_* COM_FLIGHT*
+		# Reset parameters except airframe, parameter version, RC calibration, sensor calibration, total flight time, flight UUID
+		param reset_all SYS_AUTOSTART SYS_PARAM_VER RC* CAL_* LND_FLIGHT* TC_* COM_FLIGHT*
 	fi
 
 	#

SECURITY.md

@@ -2,24 +2,40 @@
 
 ## Supported Versions
 
-The following is a list of versions the development team is currently supporting.
+The following versions receive security updates:
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.4.x   | :white_check_mark: |
-| 1.3.3   | :white_check_mark: |
-| < 1.3   | :x:                |
+| 1.16.x  | :white_check_mark: |
+| < 1.16  | :x:                |
 
 ## Reporting a Vulnerability
 
-We currently only receive security vulnerability reports through GitHub.
+We receive security vulnerability reports through GitHub Security Advisories.
 
-To begin a report, please go to the top-level repository, for example, PX4/PX4-Autopilot,
-and click on the Security tab. If you are on mobile, click the ... dropdown menu, and then click Security.
+To begin a report, go to the [PX4/PX4-Autopilot](https://github.com/PX4/PX4-Autopilot) repository
+and click on the **Security** tab. If you are on mobile, click the **...** dropdown menu, then click **Security**.
 
-Click Report a Vulnerability to open the advisory form. Fill in the advisory details form.
-Make sure your title is descriptive, and the development team can find all of the relevant details needed
-to verify on the description box. We recommend you add as much data as possible. We welcome logs,
-screenshots, photos, and videos, anything that can help us verify and identify the issues being reported.
+Click **Report a Vulnerability** to open the advisory form. Fill in the advisory details form.
+Make sure your title is descriptive and the description contains all relevant details needed
+to verify the issue. We welcome logs, screenshots, photos, and videos.
 
-At the bottom of the form, click Submit report. The maintainer team will be notified and will get back to you ASAP.
+At the bottom of the form, click **Submit report**.
+
+## Response Process
+
+1. **Acknowledgment**: The maintainer team will acknowledge your report within **7 days**.
+2. **Triage**: We will assess severity and impact and communicate next steps.
+3. **Disclosure**: We coordinate disclosure with the reporter. We follow responsible disclosure practices and will credit reporters in the advisory unless they request anonymity.
+
+If you do not receive acknowledgment within 7 days, please follow up by emailing the [release managers](MAINTAINERS.md).
+
+## Secure Development Practices
+
+The PX4 development team applies the following practices to reduce security risk:
+
+- **Code review**: All changes require peer review before merging.
+- **Static analysis**: [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) runs on every pull request with warnings treated as errors.
+- **Fuzzing**: A daily fuzzing pipeline using [Google fuzztest](https://github.com/google/fuzztest) tests MAVLink message handling and GNSS driver protocol parsing.
+- **Input validation**: All external inputs (MAVLink messages, RC signals, sensor data) are validated against expected ranges before use.
+- **Compiler hardening**: Builds use `-Wall -Werror`, stack protectors, and other hardening flags where supported by the target platform.

Tools/astyle/files_to_check_code_style.sh

@@ -39,6 +39,8 @@ exec find boards msg src platforms test \
     -path src/lib/cdrstream/rosidl -prune -o \
     -path src/modules/zenoh/zenoh-pico -prune -o \
     -path boards/modalai/voxl2/libfc-sensor-api -prune -o \
+    -path boards/modalai/voxl2/src/lib/mpa/libmodal-json -prune -o \
+    -path boards/modalai/voxl2/src/lib/mpa/libmodal-pipe -prune -o \
     -path src/drivers/actuators/vertiq_io/iq-module-communication-cpp -prune -o \
     -path src/lib/tensorflow_lite_micro/tflite_micro -prune -o \
     -path src/drivers/ins/sbgecom/sbgECom -prune -o \

Tools/ci/check_commit_messages.py

@@ -0,0 +1,331 @@
+#!/usr/bin/env python3
+"""Validate commit messages in a PR against conventional commits format.
+
+Reads a JSON array of GitHub commit objects from stdin (as returned by the
+GitHub API's /pulls/{n}/commits endpoint) and checks each message for
+blocking errors and advisory warnings.
+
+With --markdown, outputs a formatted PR comment body instead of plain text.
+"""
+
+import json
+import sys
+
+from conventional_commits import (
+    EXEMPT_PREFIXES,
+    parse_header,
+)
+
+# Blocking: prefixes that indicate unsquashed fixup commits
+FIXUP_PREFIXES = ('fixup!', 'squash!', 'amend!')
+
+# Blocking: single-word throwaway messages (case-insensitive exact match)
+THROWAWAY_WORDS = frozenset({
+    'fix', 'fixed', 'fixes',
+    'update', 'updated', 'updates',
+    'test', 'tests', 'testing',
+    'tmp', 'temp',
+    'oops', 'wip',
+    'debug', 'cleanup',
+})
+
+# Blocking: debug session leftovers
+DEBUG_KEYWORDS = ('tmate',)
+
+# Warning: review-response messages (case-insensitive substring match)
+REVIEW_RESPONSE_PATTERNS = (
+    'address review',
+    'apply suggestions from code review',
+    'code review',
+)
+
+# Warning: formatter-only commits
+FORMATTER_PATTERNS = (
+    'do make format',
+    'make format',
+    'run formatter',
+    'apply format',
+)
+
+MIN_MESSAGE_LENGTH = 5
+
+
+def check_commit(message: str) -> tuple[list[str], list[str]]:
+    """Return (errors, warnings) for a single commit message."""
+    errors: list[str] = []
+    warnings: list[str] = []
+
+    first_line = message.split('\n', 1)[0].strip()
+    lower = first_line.lower()
+
+    # --- Blocking checks ---
+
+    for prefix in FIXUP_PREFIXES:
+        if lower.startswith(prefix):
+            errors.append(f'Unsquashed commit: starts with "{prefix}"')
+
+    if lower == 'wip' or lower.startswith('wip ') or lower.startswith('wip:'):
+        errors.append('WIP commit should not be merged')
+
+    if len(first_line) < MIN_MESSAGE_LENGTH:
+        errors.append(f'Message too short ({len(first_line)} chars, minimum {MIN_MESSAGE_LENGTH})')
+
+    if first_line.strip() and first_line.strip().lower() in THROWAWAY_WORDS:
+        errors.append(f'Single-word throwaway message: "{first_line.strip()}"')
+
+    for kw in DEBUG_KEYWORDS:
+        if kw in lower:
+            errors.append(f'Debug session leftover: contains "{kw}"')
+
+    # --- Warning checks ---
+
+    for pattern in REVIEW_RESPONSE_PATTERNS:
+        if pattern in lower:
+            warnings.append('Review-response commit')
+            break
+
+    for pattern in FORMATTER_PATTERNS:
+        if pattern in lower:
+            warnings.append('Formatter-only commit')
+            break
+
+    if not parse_header(first_line):
+        # Exempt merge commits
+        for prefix in EXEMPT_PREFIXES:
+            if first_line.startswith(prefix):
+                break
+        else:
+            warnings.append(
+                'Missing conventional commit format '
+                '(e.g. "feat(ekf2): add something")'
+            )
+
+    return errors, warnings
+
+
+def suggest_commit(message: str) -> str | None:
+    """Suggest how to fix a bad commit message."""
+    first_line = message.split('\n', 1)[0].strip()
+    lower = first_line.lower()
+
+    for prefix in FIXUP_PREFIXES:
+        if lower.startswith(prefix):
+            return 'Squash this into the commit it fixes'
+
+    if lower == 'wip' or lower.startswith('wip ') or lower.startswith('wip:'):
+        return 'Reword with a descriptive message (e.g. "feat(scope): what changed")'
+
+    if len(first_line) < MIN_MESSAGE_LENGTH:
+        return 'Reword with a descriptive message (e.g. "feat(ekf2): what changed")'
+
+    if first_line.strip().lower() in THROWAWAY_WORDS:
+        return 'Reword with a descriptive message (e.g. "fix(scope): what changed")'
+
+    return None
+
+
+def format_plain(data: list) -> tuple[bool, bool]:
+    """Print plain text output. Returns (has_blocking, has_warnings)."""
+    has_blocking = False
+    has_warnings = False
+
+    for commit in data:
+        sha = commit.get('sha', '?')[:10]
+        message = commit.get('commit', {}).get('message', '')
+        first_line = message.split('\n', 1)[0].strip()
+
+        errors, warnings = check_commit(message)
+
+        if errors or warnings:
+            print(f"\n  {sha}  {first_line}")
+
+        for err in errors:
+            print(f"    ERROR: {err}")
+            has_blocking = True
+
+        for warn in warnings:
+            print(f"    WARNING: {warn}")
+            has_warnings = True
+
+    if has_blocking:
+        print(
+            "\n"
+            "ERROR = must fix before merging (CI will block the PR)\n"
+            "WARNING = advisory, not blocking, but recommended to fix\n"
+            "\n"
+            "See the contributing guide for details:\n"
+            "  https://github.com/PX4/PX4-Autopilot/blob/main/CONTRIBUTING.md#commit-message-convention\n",
+        )
+
+    elif has_warnings:
+        print(
+            "\n"
+            "WARNING = advisory, not blocking, but recommended to fix\n"
+            "\n"
+            "See the contributing guide for details:\n"
+            "  https://github.com/PX4/PX4-Autopilot/blob/main/CONTRIBUTING.md#commit-message-convention\n",
+        )
+
+    return has_blocking, has_warnings
+
+
+def format_markdown_blocking(data: list) -> str:
+    """Format a blocking error markdown comment."""
+    error_groups: dict[str, list[str]] = {}
+    unique_commits: list[tuple[str, str, list[str], str]] = []
+
+    for commit in data:
+        sha = commit.get('sha', '?')[:10]
+        message = commit.get('commit', {}).get('message', '')
+        first_line = message.split('\n', 1)[0].strip()
+
+        errors, _ = check_commit(message)
+        if not errors:
+            continue
+
+        suggestion = suggest_commit(message) or ''
+        unique_commits.append((sha, first_line, errors, suggestion))
+
+        for err in errors:
+            error_groups.setdefault(err, []).append(sha)
+
+    lines = [
+        "## \u274c Commit messages need attention before merging",
+        "",
+    ]
+
+    has_large_group = any(len(shas) > 3 for shas in error_groups.values())
+
+    if has_large_group:
+        lines.extend([
+            "**Issues found:**",
+            "",
+        ])
+        for err_msg, shas in error_groups.items():
+            if len(shas) > 3:
+                lines.append(f"- **{len(shas)} commits**: {err_msg} "
+                             f"(`{shas[0]}`, `{shas[1]}`, ... `{shas[-1]}`)")
+            else:
+                sha_list = ', '.join(f'`{s}`' for s in shas)
+                lines.append(f"- {err_msg}: {sha_list}")
+
+        distinct_messages = {msg for _, msg, _, _ in unique_commits}
+        if len(distinct_messages) <= 5:
+            lines.extend(["", "**Affected commits:**", ""])
+            for sha, msg, errors, suggestion in unique_commits:
+                safe_msg = msg.replace('|', '\\|')
+                lines.append(f"- `{sha}` {safe_msg}")
+    else:
+        lines.extend([
+            "| Commit | Message | Issue | Suggested fix |",
+            "|--------|---------|-------|---------------|",
+        ])
+        for sha, msg, errors, suggestion in unique_commits:
+            issues = '; '.join(errors)
+            safe_msg = msg.replace('|', '\\|')
+            lines.append(f"| `{sha}` | {safe_msg} | {issues} | {suggestion} |")
+
+    lines.extend([
+        "",
+        "See [CONTRIBUTING.md](https://github.com/PX4/PX4-Autopilot/blob/main/CONTRIBUTING.md#commit-message-convention) "
+        "for how to clean up commits.",
+        "",
+        "---",
+        "*This comment will be automatically removed once the issues are resolved.*",
+    ])
+
+    return '\n'.join(lines)
+
+
+def format_markdown_advisory(data: list) -> str:
+    """Format an advisory warning markdown comment."""
+    lines = [
+        "## \U0001f4a1 Commit messages could be improved",
+        "",
+        "Not blocking, but these commit messages could use some cleanup.",
+        "",
+        "| Commit | Message | Suggestion |",
+        "|--------|---------|------------|",
+    ]
+
+    for commit in data:
+        sha = commit.get('sha', '?')[:10]
+        message = commit.get('commit', {}).get('message', '')
+        first_line = message.split('\n', 1)[0].strip()
+
+        _, warnings = check_commit(message)
+        if not warnings:
+            continue
+
+        suggestion = '; '.join(warnings)
+        safe_msg = first_line.replace('|', '\\|')
+        lines.append(f"| `{sha}` | {safe_msg} | {suggestion} |")
+
+    lines.extend([
+        "",
+        "See the [commit message convention](https://github.com/PX4/PX4-Autopilot/blob/main/CONTRIBUTING.md#commit-message-convention) "
+        "for details.",
+        "",
+        "---",
+        "*This comment will be automatically removed once the issues are resolved.*",
+    ])
+
+    return '\n'.join(lines)
+
+
+def main() -> None:
+    markdown_stdout = '--markdown' in sys.argv
+    markdown_file = None
+    for i, a in enumerate(sys.argv):
+        if a == '--markdown-file' and i + 1 < len(sys.argv):
+            markdown_file = sys.argv[i + 1]
+        elif a.startswith('--markdown-file='):
+            markdown_file = a.split('=', 1)[1]
+
+    try:
+        data = json.load(sys.stdin)
+    except json.JSONDecodeError as exc:
+        print(f"Failed to parse JSON input: {exc}", file=sys.stderr)
+        sys.exit(2)
+
+    if not isinstance(data, list):
+        print("Expected a JSON array of commit objects.", file=sys.stderr)
+        sys.exit(2)
+
+    # Always compute blocking/warning state
+    has_blocking = False
+    has_warnings = False
+    for commit in data:
+        message = commit.get('commit', {}).get('message', '')
+        errors, warnings = check_commit(message)
+        if errors:
+            has_blocking = True
+        if warnings:
+            has_warnings = True
+
+    # Generate markdown if needed
+    md = None
+    if has_blocking:
+        md = format_markdown_blocking(data)
+    elif has_warnings:
+        md = format_markdown_advisory(data)
+
+    if md:
+        if markdown_stdout:
+            print(md)
+        if markdown_file:
+            with open(markdown_file, 'w') as f:
+                f.write(md + '\n')
+    elif markdown_file:
+        with open(markdown_file, 'w') as f:
+            pass
+
+    # Plain text output to stderr for CI logs (always, unless --markdown only)
+    if not markdown_stdout:
+        has_blocking, _ = format_plain(data)
+
+    sys.exit(1 if has_blocking else 0)
+
+
+if __name__ == '__main__':
+    main()

Tools/ci/check_pr_title.py

@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""Validate that a PR title follows conventional commits format.
+
+Format: type(scope): description
+
+Can output plain text for CI logs or markdown for PR comments.
+"""
+
+import re
+import sys
+
+from conventional_commits import (
+    CONVENTIONAL_TYPES,
+    EXEMPT_PREFIXES,
+    parse_header,
+    suggest_scope,
+    suggest_type,
+)
+
+
+def suggest_title(title: str) -> str | None:
+    """Try to suggest a corrected title in conventional commits format."""
+    stripped = title.strip()
+
+    # Remove common bracket prefixes like [docs], [CI], etc.
+    bracket_match = re.match(r'^\[([^\]]+)\]\s*(.+)', stripped)
+    if bracket_match:
+        prefix = bracket_match.group(1).strip().lower()
+        rest = bracket_match.group(2).strip()
+        rest = re.sub(r'^[\-:]\s*', '', rest).strip()
+        if len(rest) >= 5:
+            # Try to map bracket content to a type
+            commit_type = prefix if prefix in CONVENTIONAL_TYPES else suggest_type(rest)
+            scope = suggest_scope(rest)
+            if scope:
+                return f"{commit_type}({scope}): {rest}"
+
+    # Already has old-style "subsystem: description" format - convert it
+    colon_match = re.match(r'^([a-zA-Z][a-zA-Z0-9_/\-\. ]*): (.+)$', stripped)
+    if colon_match:
+        old_subsystem = colon_match.group(1).strip()
+        desc = colon_match.group(2).strip()
+        if len(desc) >= 5:
+            commit_type = suggest_type(desc)
+            # Use the old subsystem as scope (clean it up)
+            scope = old_subsystem.lower().replace(' ', '_')
+            return f"{commit_type}({scope}): {desc}"
+
+    # No format at all - try to guess both type and scope
+    commit_type = suggest_type(stripped)
+    scope = suggest_scope(stripped)
+    if scope:
+        desc = stripped[0].lower() + stripped[1:] if stripped else stripped
+        return f"{commit_type}({scope}): {desc}"
+
+    return None
+
+
+def check_title(title: str) -> bool:
+    title = title.strip()
+
+    if not title:
+        print("PR title is empty.", file=sys.stderr)
+        return False
+
+    for prefix in EXEMPT_PREFIXES:
+        if title.startswith(prefix):
+            return True
+
+    if parse_header(title):
+        return True
+
+    types_str = ', '.join(f'`{t}`' for t in CONVENTIONAL_TYPES.keys())
+    print(
+        f"PR title does not match conventional commits format.\n"
+        f"\n"
+        f"  Title: {title}\n"
+        f"\n"
+        f"Expected format:  type(scope): description\n"
+        f"\n"
+        f"Valid types: {types_str}\n"
+        f"\n"
+        f"Good examples:\n"
+        f"  feat(ekf2): add height fusion timeout\n"
+        f"  fix(mavlink): correct BATTERY_STATUS_V2 parsing\n"
+        f"  ci(workflows): migrate to reusable workflows\n"
+        f"  feat(boards/px4_fmu-v6x)!: remove deprecated driver API\n"
+        f"\n"
+        f"Bad examples:\n"
+        f"  fix stuff\n"
+        f"  Update file\n"
+        f"  ekf2: fix something   (missing type prefix)\n"
+        f"\n"
+        f"See the contributing guide for details:\n"
+        f"  https://github.com/PX4/PX4-Autopilot/blob/main/CONTRIBUTING.md#commit-message-convention\n",
+        file=sys.stderr,
+    )
+    return False
+
+
+def format_markdown(title: str) -> str:
+    """Format a markdown PR comment body for a bad title."""
+    lines = [
+        "## \u274c PR title needs conventional commit format",
+        "",
+        "Expected format: `type(scope): description` "
+        "([conventional commits](https://www.conventionalcommits.org/)).",
+        "",
+        "**Your title:**",
+        f"> {title}",
+        "",
+    ]
+
+    suggestion = suggest_title(title)
+    if suggestion:
+        lines.extend([
+            "**Suggested fix:**",
+            f"> {suggestion}",
+            "",
+        ])
+
+    lines.extend([
+        "**To fix this:** click the ✏️ next to the PR title at the top "
+        "of this page and update it.",
+        "",
+        "See [CONTRIBUTING.md](https://github.com/PX4/PX4-Autopilot/blob/main/CONTRIBUTING.md#commit-message-convention) "
+        "for details.",
+        "",
+        "---",
+        "*This comment will be automatically removed once the issue is resolved.*",
+    ])
+
+    return '\n'.join(lines)
+
+
+def main() -> None:
+    import argparse
+    parser = argparse.ArgumentParser(description='Check PR title format')
+    parser.add_argument('title', help='The PR title to validate')
+    parser.add_argument('--markdown', action='store_true',
+                        help='Output markdown to stdout on failure')
+    parser.add_argument('--markdown-file', metavar='FILE',
+                        help='Write markdown to FILE on failure')
+    args = parser.parse_args()
+
+    passed = check_title(args.title)
+
+    if not passed:
+        md = format_markdown(args.title)
+        if args.markdown:
+            print(md)
+        if args.markdown_file:
+            with open(args.markdown_file, 'w') as f:
+                f.write(md + '\n')
+    elif args.markdown_file:
+        with open(args.markdown_file, 'w') as f:
+            pass
+
+    sys.exit(0 if passed else 1)
+
+
+if __name__ == '__main__':
+    main()

Tools/ci/conventional_commits.py

@@ -0,0 +1,146 @@
+"""Shared constants and helpers for conventional commit validation.
+
+Format: type(scope): description
+Optional breaking change marker: type(scope)!: description
+"""
+
+import re
+
+CONVENTIONAL_TYPES = {
+    'feat':     'A new feature',
+    'fix':      'A bug fix',
+    'docs':     'Documentation only changes',
+    'style':    'Formatting, whitespace, no code change',
+    'refactor': 'Code change that neither fixes a bug nor adds a feature',
+    'perf':     'Performance improvement',
+    'test':     'Adding or correcting tests',
+    'build':    'Build system or external dependencies',
+    'ci':       'CI configuration files and scripts',
+    'chore':    'Other changes that don\'t modify src or test files',
+    'revert':   'Reverts a previous commit',
+}
+
+# type(scope)[!]: description
+# - type: one of CONVENTIONAL_TYPES keys
+# - scope: required, alphanumeric with _/-/.
+# - !: optional breaking change marker
+# - description: at least 5 chars
+HEADER_PATTERN = re.compile(
+    r'^(' + '|'.join(CONVENTIONAL_TYPES.keys()) + r')'
+    r'\(([a-zA-Z0-9_/\-\.]+)\)'
+    r'(!)?'
+    r': (.{5,})$'
+)
+
+EXEMPT_PREFIXES = ('Merge ',)
+
+# Common PX4 subsystem scopes for suggestions
+KNOWN_SCOPES = [
+    'ekf2', 'mavlink', 'commander', 'navigator', 'sensors',
+    'mc_att_control', 'mc_pos_control', 'mc_rate_control',
+    'fw_att_control', 'fw_pos_control', 'fw_rate_control',
+    'vtol', 'actuators', 'battery', 'param', 'logger',
+    'uorb', 'drivers', 'boards', 'simulation', 'sitl',
+    'gps', 'rc', 'safety', 'can', 'serial',
+    'ci', 'docs', 'build', 'cmake', 'tools',
+    'mixer', 'land_detector', 'airspeed', 'gyroscope',
+    'accelerometer', 'magnetometer', 'barometer',
+]
+
+# Keyword patterns to suggest scopes from description text
+KEYWORD_SCOPES = [
+    (r'\b(ekf|estimator|height|fusion|imu|baro)\b', 'ekf2'),
+    (r'\b(mavlink|MAVLink|MAVLINK|command_int|heartbeat)\b', 'mavlink'),
+    (r'\b(uorb|orb|pub|sub|topic)\b', 'uorb'),
+    (r'\b(board|fmu|nuttx|stm32)\b', 'boards'),
+    (r'\b(mixer|actuator|motor|servo|pwm|dshot)\b', 'actuators'),
+    (r'\b(battery|power)\b', 'battery'),
+    (r'\b(param|parameter)\b', 'param'),
+    (r'\b(log|logger|sdlog)\b', 'logger'),
+    (r'\b(sensor|accel|gyro)\b', 'sensors'),
+    (r'\b(land|takeoff|rtl|mission|navigator|geofence)\b', 'navigator'),
+    (r'\b(position|velocity|attitude|rate)\s*(control|ctrl)\b', 'mc_att_control'),
+    (r'\b(mc|multicopter|quad)\b', 'mc_att_control'),
+    (r'\b(fw|fixedwing|fixed.wing|plane)\b', 'fw_att_control'),
+    (r'\b(vtol|transition)\b', 'vtol'),
+    (r'\b(ci|workflow|github.action|pipeline)\b', 'ci'),
+    (r'\b(doc|docs|documentation|readme)\b', 'docs'),
+    (r'\b(cmake|make|toolchain|compiler)\b', 'build'),
+    (r'\b(sitl|simulation|gazebo|jmavsim|sih)\b', 'simulation'),
+    (r'\b(can|uavcan|cyphal|dronecan)\b', 'can'),
+    (r'\b(serial|uart|spi|i2c)\b', 'serial'),
+    (r'\b(safety|failsafe|arm|disarm|kill)\b', 'safety'),
+    (r'\b(rc|radio|sbus|crsf|elrs|dsm)\b', 'rc'),
+    (r'\b(gps|gnss|rtk|ubx)\b', 'gps'),
+    (r'\b(optical.flow|flow|rangefinder|lidar|distance)\b', 'sensors'),
+    (r'\b(orbit|follow|offboard)\b', 'commander'),
+    (r'\b(driver)\b', 'drivers'),
+]
+
+# Verb patterns to suggest conventional commit type
+VERB_TYPE_MAP = [
+    (r'^fix(e[ds])?[\s:]', 'fix'),
+    (r'^bug[\s:]', 'fix'),
+    (r'^add(s|ed|ing)?[\s:]', 'feat'),
+    (r'^implement', 'feat'),
+    (r'^introduce', 'feat'),
+    (r'^support', 'feat'),
+    (r'^enable', 'feat'),
+    (r'^update[ds]?[\s:]', 'feat'),
+    (r'^improv(e[ds]?|ing)', 'perf'),
+    (r'^optimi[zs](e[ds]?|ing)', 'perf'),
+    (r'^refactor', 'refactor'),
+    (r'^clean\s*up', 'refactor'),
+    (r'^restructure', 'refactor'),
+    (r'^simplif(y|ied)', 'refactor'),
+    (r'^remov(e[ds]?|ing)', 'refactor'),
+    (r'^delet(e[ds]?|ing)', 'refactor'),
+    (r'^deprecat', 'refactor'),
+    (r'^replac(e[ds]?|ing)', 'refactor'),
+    (r'^renam(e[ds]?|ing)', 'refactor'),
+    (r'^migrat', 'refactor'),
+    (r'^revert', 'revert'),
+    (r'^doc(s|ument)', 'docs'),
+    (r'^test', 'test'),
+    (r'^format', 'style'),
+    (r'^lint', 'style'),
+    (r'^whitespace', 'style'),
+    (r'^build', 'build'),
+    (r'^ci[\s:]', 'ci'),
+]
+
+
+def parse_header(text: str) -> dict | None:
+    """Parse a conventional commit header into components.
+
+    Returns dict with keys {type, scope, breaking, subject} or None if
+    the text doesn't match conventional commits format.
+    """
+    text = text.strip()
+    m = HEADER_PATTERN.match(text)
+    if not m:
+        return None
+    return {
+        'type': m.group(1),
+        'scope': m.group(2),
+        'breaking': m.group(3) == '!',
+        'subject': m.group(4),
+    }
+
+
+def suggest_type(text: str) -> str:
+    """Infer a conventional commit type from description text."""
+    lower = text.strip().lower()
+    for pattern, commit_type in VERB_TYPE_MAP:
+        if re.search(pattern, lower):
+            return commit_type
+    return 'feat'
+
+
+def suggest_scope(text: str) -> str | None:
+    """Infer a scope from keywords in the text."""
+    lower = text.strip().lower()
+    for pattern, scope in KEYWORD_SCOPES:
+        if re.search(pattern, lower, re.IGNORECASE):
+            return scope
+    return None

Tools/ci/generate_board_targets_json.py

@@ -148,18 +148,18 @@ grouped_targets['base']['manufacturers'] = {}
 grouped_targets['base']['manufacturers']['px4'] = []
 grouped_targets['base']['manufacturers']['px4'] += metadata_targets
 
-for manufacturer in os.scandir(os.path.join(source_dir, '../boards')):
+for manufacturer in sorted(os.scandir(os.path.join(source_dir, '../boards')), key=lambda e: e.name):
     if not manufacturer.is_dir():
         continue
     if manufacturer.name in excluded_manufacturers:
         if verbose: print(f'excluding manufacturer {manufacturer.name}')
         continue
 
-    for board in os.scandir(manufacturer.path):
+    for board in sorted(os.scandir(manufacturer.path), key=lambda e: e.name):
         if not board.is_dir():
             continue
 
-        for files in os.scandir(board.path):
+        for files in sorted(os.scandir(board.path), key=lambda e: e.name):
             if files.is_file() and files.name.endswith('.px4board'):
 
                 board_name = manufacturer.name + '_' + board.name

Tools/ci/metadata_sync.sh

@@ -123,7 +123,7 @@ generate_parameters() {
     if [[ "$VERBOSE" == "true" ]]; then
         make parameters_metadata
     else
-        make parameters_metadata >/dev/null 2>&1
+        make parameters_metadata >/dev/null
     fi
 }
 
@@ -132,7 +132,7 @@ generate_airframes() {
     if [[ "$VERBOSE" == "true" ]]; then
         make airframe_metadata
     else
-        make airframe_metadata >/dev/null 2>&1
+        make airframe_metadata >/dev/null
     fi
 }
 
@@ -141,7 +141,7 @@ generate_modules() {
     if [[ "$VERBOSE" == "true" ]]; then
         make module_documentation
     else
-        make module_documentation >/dev/null 2>&1
+        make module_documentation >/dev/null
     fi
 }
 
@@ -150,7 +150,7 @@ generate_msg_docs() {
     if [[ "$VERBOSE" == "true" ]]; then
         make msg_docs
     else
-        make msg_docs >/dev/null 2>&1
+        make msg_docs >/dev/null
     fi
 }
 
@@ -159,7 +159,7 @@ generate_uorb_graphs() {
     if [[ "$VERBOSE" == "true" ]]; then
         make uorb_graphs
     else
-        make uorb_graphs >/dev/null 2>&1
+        make uorb_graphs >/dev/null
     fi
 }
 
@@ -169,7 +169,7 @@ generate_failsafe_web() {
     if [[ "$VERBOSE" == "true" ]]; then
         make failsafe_web
     else
-        make failsafe_web >/dev/null 2>&1
+        make failsafe_web >/dev/null
     fi
 }
 

Tools/ci/package_build_artifacts.sh

@@ -6,32 +6,42 @@ cp **/**/*.elf artifacts/ 2>/dev/null || true
 for build_dir_path in build/*/ ; do
   build_dir_path=${build_dir_path::${#build_dir_path}-1}
   build_dir=${build_dir_path#*/}
-  mkdir artifacts/$build_dir
+  mkdir -p artifacts/$build_dir
   find artifacts/ -maxdepth 1 -type f -name "*$build_dir*"
-  # Airframe
-  cp $build_dir_path/airframes.xml artifacts/$build_dir/
+  # Airframe (NuttX: build root, SITL: docs/ subdirectory)
+  airframes_src=""
+  if [ -f "$build_dir_path/airframes.xml" ]; then
+    airframes_src="$build_dir_path/airframes.xml"
+  elif [ -f "$build_dir_path/docs/airframes.xml" ]; then
+    airframes_src="$build_dir_path/docs/airframes.xml"
+  fi
+  if [ -n "$airframes_src" ]; then
+    cp "$airframes_src" "artifacts/$build_dir/"
+  fi
   # Parameters
-  cp $build_dir_path/parameters.xml artifacts/$build_dir/
-  cp $build_dir_path/parameters.json artifacts/$build_dir/
-  cp $build_dir_path/parameters.json.xz artifacts/$build_dir/
+  cp $build_dir_path/parameters.xml artifacts/$build_dir/ 2>/dev/null || true
+  cp $build_dir_path/parameters.json artifacts/$build_dir/ 2>/dev/null || true
+  cp $build_dir_path/parameters.json.xz artifacts/$build_dir/ 2>/dev/null || true
   # Actuators
-  cp $build_dir_path/actuators.json artifacts/$build_dir/
-  cp $build_dir_path/actuators.json.xz artifacts/$build_dir/
+  cp $build_dir_path/actuators.json artifacts/$build_dir/ 2>/dev/null || true
+  cp $build_dir_path/actuators.json.xz artifacts/$build_dir/ 2>/dev/null || true
   # Events
-  cp $build_dir_path/events/all_events.json.xz artifacts/$build_dir/
-  # ROS 2 msgs
-  cp $build_dir_path/events/all_events.json.xz artifacts/$build_dir/
-  # Module Docs
+  mkdir -p artifacts/$build_dir/events/
+  cp $build_dir_path/events/all_events.json.xz artifacts/$build_dir/events/ 2>/dev/null || true
   ls -la artifacts/$build_dir
   echo "----------"
 done
 
 if [ -d artifacts/px4_sitl_default ]; then
-  # general metadata
-  mkdir artifacts/_general/
-  cp artifacts/px4_sitl_default/airframes.xml artifacts/_general/
+  # general metadata (used by Flight Review and other downstream consumers)
+  mkdir -p artifacts/_general/
   # Airframe
-  cp artifacts/px4_sitl_default/airframes.xml artifacts/_general/
+  if [ -f artifacts/px4_sitl_default/airframes.xml ]; then
+    cp artifacts/px4_sitl_default/airframes.xml artifacts/_general/
+  else
+    echo "Error: expected 'artifacts/px4_sitl_default/airframes.xml' not found." >&2
+    exit 1
+  fi
   # Parameters
   cp artifacts/px4_sitl_default/parameters.xml artifacts/_general/
   cp artifacts/px4_sitl_default/parameters.json artifacts/_general/
@@ -40,9 +50,11 @@ if [ -d artifacts/px4_sitl_default ]; then
   cp artifacts/px4_sitl_default/actuators.json artifacts/_general/
   cp artifacts/px4_sitl_default/actuators.json.xz artifacts/_general/
   # Events
-  cp artifacts/px4_sitl_default/events/all_events.json.xz artifacts/_general/
-  # ROS 2 msgs
-  cp artifacts/px4_sitl_default/events/all_events.json.xz artifacts/_general/
-  # Module Docs
+  if [ -f artifacts/px4_sitl_default/events/all_events.json.xz ]; then
+    cp artifacts/px4_sitl_default/events/all_events.json.xz artifacts/_general/
+  else
+    echo "Error: expected 'artifacts/px4_sitl_default/events/all_events.json.xz' not found." >&2
+    exit 1
+  fi
   ls -la artifacts/_general/
 fi

Tools/ci/pr_comment.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+"""Post, update, or delete a PR comment with deduplication.
+
+Uses hidden HTML markers to find existing comments and avoid duplicates.
+Reads comment body from stdin when posting or updating.
+
+Usage:
+    echo "comment body" | python3 pr_comment.py --marker pr-title --pr 123 --result fail
+    python3 pr_comment.py --marker pr-title --pr 123 --result pass
+
+Results:
+    fail  - post/update comment with body from stdin
+    warn  - post/update comment with body from stdin
+    pass  - delete existing comment if any
+
+Requires GH_TOKEN and GITHUB_REPOSITORY environment variables.
+"""
+
+import argparse
+import json
+import os
+import subprocess
+import sys
+
+
+def gh_api(endpoint: str, method: str = 'GET', body: dict | None = None) -> str:
+    """Call the GitHub API via gh cli."""
+    cmd = ['gh', 'api', endpoint, '-X', method]
+    if body:
+        for key, value in body.items():
+            cmd.extend(['-f', f'{key}={value}'])
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.returncode != 0 and method != 'DELETE':
+        print(f"gh api error: {result.stderr}", file=sys.stderr)
+    return result.stdout
+
+
+def find_comment(repo: str, pr: int, marker: str) -> str | None:
+    """Find an existing comment by its hidden marker. Returns comment ID or None."""
+    response = gh_api(f"repos/{repo}/issues/{pr}/comments?per_page=100")
+    try:
+        comments = json.loads(response)
+    except json.JSONDecodeError:
+        return None
+
+    if not isinstance(comments, list):
+        return None
+
+    for comment in comments:
+        if isinstance(comment, dict) and comment.get('body', '').startswith(marker):
+            return str(comment['id'])
+    return None
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description='Manage PR quality comments')
+    parser.add_argument('--marker', required=True,
+                        help='Marker name (e.g. pr-title, commit-msgs, pr-body)')
+    parser.add_argument('--pr', required=True, type=int,
+                        help='Pull request number')
+    parser.add_argument('--result', required=True, choices=['pass', 'fail', 'warn'],
+                        help='Check result: pass deletes comment, fail/warn posts it')
+    args = parser.parse_args()
+
+    repo = os.environ.get('GITHUB_REPOSITORY', '')
+    if not repo:
+        print("GITHUB_REPOSITORY not set", file=sys.stderr)
+        sys.exit(2)
+
+    marker = f"<!-- commit-quality-{args.marker} -->"
+    existing_id = find_comment(repo, args.pr, marker)
+
+    if args.result == 'pass':
+        if existing_id:
+            gh_api(f"repos/{repo}/issues/comments/{existing_id}", method='DELETE')
+        return
+
+    # Read comment body from stdin
+    body_content = sys.stdin.read().strip()
+    if not body_content:
+        print("No comment body provided on stdin", file=sys.stderr)
+        sys.exit(2)
+
+    full_body = f"{marker}\n{body_content}"
+
+    if existing_id:
+        gh_api(f"repos/{repo}/issues/comments/{existing_id}", method='PATCH',
+               body={'body': full_body})
+    else:
+        gh_api(f"repos/{repo}/issues/{args.pr}/comments", method='POST',
+               body={'body': full_body})
+
+
+if __name__ == '__main__':
+    main()

Tools/ci/run-clang-tidy-pr.py

@@ -1,147 +0,0 @@
-#!/usr/bin/env python3
-"""
-Run clang-tidy incrementally on files changed in a PR.
-
-Usage: run-clang-tidy-pr.py <base-ref>
-  base-ref: e.g. origin/main
-
-Computes the set of translation units (TUs) affected by the PR diff,
-then invokes Tools/run-clang-tidy.py on that subset only.
-Exits 0 silently when no C++ files were changed.
-"""
-
-import argparse
-import json
-import os
-import subprocess
-import sys
-
-EXTENSIONS_CPP = {'.cpp', '.c'}
-EXTENSIONS_HDR = {'.hpp', '.h'}
-# Manual exclusions from Makefile:508
-EXCLUDE_EXTRA = '|'.join([
-    'src/systemcmds/tests',
-    'src/examples',
-    'src/modules/gyro_fft/CMSIS_5',
-    'src/lib/drivers/smbus',
-    'src/drivers/gpio',
-    r'src/modules/commander/failsafe/emscripten',
-    r'failsafe_test\.dir',
-])
-
-
-def repo_root():
-    try:
-        return subprocess.check_output(
-            ['git', 'rev-parse', '--show-toplevel'], text=True).strip()
-    except subprocess.CalledProcessError:
-        print('error: not inside a git repository', file=sys.stderr)
-        sys.exit(1)
-
-
-def changed_files(base_ref, root):
-    try:
-        out = subprocess.check_output(
-            ['git', 'diff', '--name-only', f'{base_ref}...HEAD',
-             '--', '*.cpp', '*.hpp', '*.h', '*.c'],
-            text=True, cwd=root).strip()
-        return out.splitlines() if out else []
-    except subprocess.CalledProcessError:
-        print(f'error: could not diff against "{base_ref}" — '
-              'is the ref valid and fetched?', file=sys.stderr)
-        sys.exit(1)
-
-
-def submodule_paths(root):
-    # Returns [] if .gitmodules is absent or has no paths — both valid
-    try:
-        out = subprocess.check_output(
-            ['git', 'config', '--file', '.gitmodules',
-             '--get-regexp', 'path'],
-            text=True, cwd=root).strip()
-        return [line.split()[1] for line in out.splitlines()]
-    except subprocess.CalledProcessError:
-        return []
-
-
-def build_exclude(root):
-    submodules = '|'.join(submodule_paths(root))
-    return f'{submodules}|{EXCLUDE_EXTRA}' if submodules else EXCLUDE_EXTRA
-
-
-def load_db(build_dir):
-    db_path = os.path.join(build_dir, 'compile_commands.json')
-    if not os.path.isfile(db_path):
-        print(f'error: {db_path} not found', file=sys.stderr)
-        print('Run "make px4_sitl_default-clang" first to generate '
-              'the compilation database', file=sys.stderr)
-        sys.exit(1)
-    try:
-        with open(db_path) as f:
-            return json.load(f)
-    except json.JSONDecodeError as e:
-        print(f'error: compile_commands.json is malformed: {e}', file=sys.stderr)
-        sys.exit(1)
-
-
-def find_tus(changed, db, root):
-    db_files = {e['file'] for e in db}
-    result = set()
-    for f in changed:
-        abs_path = os.path.join(root, f)
-        ext = os.path.splitext(f)[1]
-        if ext in EXTENSIONS_CPP:
-            if abs_path in db_files:
-                result.add(abs_path)
-        elif ext in EXTENSIONS_HDR:
-            hdr = os.path.basename(f)
-            for e in db:
-                try:
-                    if hdr in open(e['file']).read():
-                        result.add(e['file'])
-                except OSError:
-                    pass  # file deleted in PR — skip
-    return sorted(result)
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('base_ref',
-                        help='Git ref to diff against, e.g. origin/main')
-    args = parser.parse_args()
-
-    root = repo_root()
-    build_dir = os.path.join(root, 'build', 'px4_sitl_default-clang')
-
-    run_tidy = os.path.join(root, 'Tools', 'run-clang-tidy.py')
-    if not os.path.isfile(run_tidy):
-        print(f'error: {run_tidy} not found', file=sys.stderr)
-        sys.exit(1)
-
-    changed = changed_files(args.base_ref, root)
-    if not changed:
-        print('No C++ files changed — skipping clang-tidy')
-        sys.exit(0)
-
-    db = load_db(build_dir)
-    tus = find_tus(changed, db, root)
-
-    if not tus:
-        print('No matching TUs in compile_commands.json — skipping clang-tidy')
-        sys.exit(0)
-
-    print(f'Running clang-tidy on {len(tus)} translation unit(s)')
-
-    result = subprocess.run(
-        [sys.executable, run_tidy,
-         '-header-filter=.*\\.hpp',
-         '-j0',
-         f'-exclude={build_exclude(root)}',
-         '-p', build_dir] + tus
-    )
-    sys.exit(result.returncode)
-
-
-if __name__ == '__main__':
-    main()

Tools/module_config/generate_actuators_metadata.py

@@ -234,14 +234,14 @@ def get_actuator_output(yaml_config, output_functions, timer_config_file, verbos
         param_prefix = process_param_prefix(group['param_prefix'])
         standard_params = group.get('standard_params', {})
         standard_params_array = [
-            ( 'function', 'Function', 'FUNC', False ),
-            ( 'disarmed', 'Disarmed', 'DIS', False ),
-            ( 'min', 'Minimum', 'MIN', False ),
-            ( 'max', 'Maximum', 'MAX', False ),
-            ( 'center', 'Center\n(for Servos)', 'CENT', False ),
-            ( 'failsafe', 'Failsafe', 'FAIL', True ),
+            ( 'function', 'Function', 'FUNC', False, True ),
+            ( 'disarmed', 'Disarmed', 'DIS', False, True ),
+            ( 'min', 'Minimum', 'MIN', False, True ),
+            ( 'center', 'Center\n(for Servos)', 'CENT', False, False ),
+            ( 'max', 'Maximum', 'MAX', False, True ),
+            ( 'failsafe', 'Failsafe', 'FAIL', True, True ),
             ]
-        for key, label, param_suffix, advanced in standard_params_array:
+        for key, label, param_suffix, advanced, has_function in standard_params_array:
             show_if = None
             if key in standard_params and 'show_if' in standard_params[key]:
                 show_if = standard_params[key]['show_if']
@@ -250,13 +250,12 @@ def get_actuator_output(yaml_config, output_functions, timer_config_file, verbos
                 param = {
                         'label': label,
                         'name': param_prefix+'_'+param_suffix+'${i}',
-                        'function': key,
                     }
+                if has_function: param['function'] = key
                 if advanced: param['advanced'] = True
                 if show_if: param['show-if'] = show_if
                 per_channel_params.append(param)
 
-
         param = {
                 'label': 'Rev Range\n(for Servos)',
                 'name': param_prefix+'_REV',

Tools/module_config/generate_params.py

@@ -312,11 +312,7 @@ When set to -1 (default), the value depends on the function (see {:}).
                 if standard_params[key]['max'] >= 1<<16:
                     raise Exception('maximum value for {:} expected <= {:} (got {:})'.format(key, 1<<16, standard_params[key]['max']))
 
-                if key == 'failsafe':
-                    standard_params[key]['default'] = -1
-                    standard_params[key]['min'] = -1
-
-                if key == 'center':
+                if key == 'failsafe' or key == 'center':
                     standard_params[key]['default'] = -1
                     standard_params[key]['min'] = -1
 

Tools/msg/generate_msg_docs.py

@@ -17,10 +17,10 @@ VALID_FIELDS = { #Note, also have to add the message types as those can be field
     'uint32'
 }
 
-ALLOWED_UNITS = set(["m", "m/s", "m/s^2", "(m/s)^2", "deg", "deg/s", "rad", "rad/s", "rad^2", "rpm" ,"V", "A", "mA", "mAh", "W", "dBm", "h", "s", "ms", "us", "Ohm", "MB", "Kb/s", "degC","Pa","%","-"])
+ALLOWED_UNITS = set(["m", "m/s", "m/s^2", "(m/s)^2", "deg", "deg/s", "rad", "rad/s", "rad^2", "rpm" ,"V", "A", "mA", "mAh", "W", "Wh", "dBm", "h", "minutes", "s", "ms", "us", "Ohm", "MB", "Kb/s", "degC","Pa", "%", "norm", "-"])
 invalid_units = set()
-ALLOWED_FRAMES = set(["NED","Body"])
-ALLOWED_INVALID_VALUES = set(["NaN", "0"])
+ALLOWED_FRAMES = set(["NED", "Body", "FRD", "ENU"])
+ALLOWED_INVALID_VALUES = set(["NaN", "0", "-1"])
 ALLOWED_CONSTANTS_NOT_IN_ENUM = set(["ORB_QUEUE_LENGTH","MESSAGE_VERSION"])
 
 class Error:
@@ -36,14 +36,14 @@ class Error:
 
 
         if 'trailing_whitespace' == self.type:
-            if self.issueString.strip():    
+            if self.issueString.strip():
                 print(f"NOTE: Line has trailing whitespace ({self.message}: {self.linenumber}): {self.issueString}")
             else:
                 print(f"NOTE: Line has trailing whitespace ({self.message}: {self.linenumber})")
         elif 'leading_whitespace_field_or_constant' == self.type:
-            print(f"NOTE: Whitespace before field or constant ({self.message}: {self.linenumber}): {self.issueString}")             
+            print(f"NOTE: Whitespace before field or constant ({self.message}: {self.linenumber}): {self.issueString}")
         elif 'field_or_constant_has_multiple_whitepsace' == self.type:
-            print(f"NOTE: Field/constant has more than one sequential whitespace character ({self.message}: {self.linenumber}): {self.issueString}") 
+            print(f"NOTE: Field/constant has more than one sequential whitespace character ({self.message}: {self.linenumber}): {self.issueString}")
         elif 'empty_start_line' == self.type:
             print(f"NOTE: Empty line at start of file ({self.message}: {self.linenumber})")
         elif 'internal_comment' == self.type:
@@ -191,7 +191,7 @@ class CommandParam:
                             if not "unknown_frame" in self.parent.errors:
                                 self.parent.errors["unknown_frame"] = []
                             self.parent.errors["unknown_frame"].append(error)
-                        """    
+                        """
                     else:
                         print(f"WARNING: Unhandled metadata in message comment: {item}")
                         # TODO - report errors for different kinds of metadata
@@ -202,9 +202,9 @@ class CommandParam:
 
                     if item == "-":
                         unit = ""
-                    
+
                     if unit and unit not in self.units:
-                        self.units.append(unit) 
+                        self.units.append(unit)
 
                     if unit not in ALLOWED_UNITS:
                         invalid_units.add(unit)
@@ -221,7 +221,7 @@ class CommandParam:
         print(f"   paramText: {self.paramText}\n  unit:  {self.units}\n  enums: {self.enums}\n  lineNumber: {self.lineNumber}\n  range: {self.range}\n  minValue: {self.minValue}\n  maxValue: {self.maxValue}\n  invalidValue: {self.invalidValue}\n  frameValue: {self.frameValue}\n  parent: {self.parent}\n  ")
 
 
-        
+
 class CommandConstant:
     """
     Represents a constant that is a command definition.
@@ -252,9 +252,9 @@ class CommandConstant:
         if not self.comment: # This is an bug for a command
             #print(f"Debug WARNING: NO COMMENT in CommandConstant: {self.name}")  ## TODO make into ERROR
             return
-            
+
         # Parse command comment to get the description and parameters.
-        # print(f"Debug CommandConstant: {self.comment}") 
+        # print(f"Debug CommandConstant: {self.comment}")
         if not "|" in self.comment:
             # This is an error for a command constant
             error = Error("command_no_params_pipes", self.parent.filename, self.line_number, self.comment, self.name)
@@ -263,7 +263,7 @@ class CommandConstant:
                 self.parent.errors["command_no_params_pipes"] = []
             self.parent.errors["command_no_params_pipes"].append(error)
             return
-        
+
         # Split on pipes
         commandSplit = self.comment.split("|")
         if len(commandSplit) < 9:
@@ -318,7 +318,7 @@ Param | Units | Range/Enum | Description
 
                 output+=f"{i} | {", ".join(val.units)}|{', '.join(f"[{e}](#{e})" for e in val.enums)}{rangeVal} | {val.description}\n"
             else:
-                output+=f"{i} | | | ?\n"                
+                output+=f"{i} | | | ?\n"
 
         output+=f"\n"
         return output
@@ -419,7 +419,7 @@ class MessageField:
 class UORBMessage:
     """
     Represents a whole message, including fields, enums, commands, constants.
-    The parser function delegates the parsing of each part of the message to 
+    The parser function delegates the parsing of each part of the message to
     more appropriate classes, once the specific type of line has been identified.
     """
 
@@ -511,11 +511,11 @@ pageClass: is-wide-page
             markdown += "--- | --- | --- |---\n"
             for name, command in self.commandConstants.items():
                 description = f" {command.comment} " if enum.comment else " "
-                markdown += f'<a href="#{name}"></a> {name} | `{command.type}` | {command.value} |{description}\n'            
+                markdown += f'<a id="#{name}"></a> {name} | `{command.type}` | {command.value} |{description}\n'
             """
             for commandConstant in self.commandConstants.values():
                 #print(commandConstant)
-                markdown += commandConstant.markdown_out()     
+                markdown += commandConstant.markdown_out()
 
         # Generate enum docs
         if len(self.enums) > 0:
@@ -529,7 +529,7 @@ pageClass: is-wide-page
 
                 for enumValueName, enumValue in enum.enumValues.items():
                     description = f" {enumValue.comment} " if enumValue.comment else " "
-                    markdown += f'<a href="#{enumValueName}"></a> {enumValueName} | `{enumValue.type}` | {enumValue.value} |{description}\n'
+                    markdown += f'<a id="#{enumValueName}"></a> {enumValueName} | `{enumValue.type}` | {enumValue.value} |{description}\n'
 
         # Generate table for constants docs
         if len(self.constantFields) > 0:
@@ -538,7 +538,7 @@ pageClass: is-wide-page
             markdown += "--- | --- | --- |---\n"
             for name, enum in self.constantFields.items():
                 description = f" {enum.comment} " if enum.comment else " "
-                markdown += f'<a href="#{name}"></a> {name} | `{enum.type}` | {enum.value} |{description}\n'
+                markdown += f'<a id="#{name}"></a> {name} | `{enum.type}` | {enum.value} |{description}\n'
 
 
 
@@ -635,8 +635,8 @@ pageClass: is-wide-page
             temp = fieldOrConstant.split("=")
             value = temp[-1]
             typeAndName = temp[0].split(" ")
-            type = typeAndName[0]
-            name = typeAndName[1]
+            type = typeAndName[0].strip()
+            name = typeAndName[1].strip()
             if name.startswith("VEHICLE_CMD_") and parentMessage.name == 'VehicleCommand': #it's a command.
                 #print(f"DEBUG: startswith VEHICLE_CMD_ {name}")
                 commandConstant = CommandConstant(name, type, value, comment, line_number, parentMessage)
@@ -708,7 +708,7 @@ pageClass: is-wide-page
                     if stripped_line.startswith("#"):
                         # Its an internal comment
                         stripped_line=stripped_line[1:].strip()
-                        
+
                         if stripped_line:
                             #print(f"{self.filename}: Internal comment: [{line_number}]\n {line}")
                             error = Error("internal_comment", self.filename, line_number, line)
@@ -723,16 +723,16 @@ pageClass: is-wide-page
                             self.errors["internal_comment_empty"].append(error)
                             #pass # Empty comment
                         continue
-                    
+
                     # Must be a field or a comment.
                     self.handleField(line, line_number, parentMessage=self)
 
             # Fix up topics if the topic is empty
             def camel_to_snake(name):
-                # Match upper case not at start of string
-                s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name)
-                # Handle cases with multiple capital first letter
-                return re.sub('([A-Z]+)([A-Z][a-z]*)', r'\1_\2', s1).lower()
+                # Insert underscore between lowercase/digit and uppercase letter
+                s1 = re.sub('([a-z0-9])([A-Z])', r'\1_\2', name)
+                # Insert underscore between consecutive uppercase and uppercase+lowercase
+                return re.sub('([A-Z]+)([A-Z][a-z])', r'\1_\2', s1).lower()
 
             defaultTopic = camel_to_snake(self.name)
             if len(self.topics) == 0:
@@ -745,7 +745,7 @@ pageClass: is-wide-page
                     error = Error("topic_error", self.filename, "", f"WARNING: TOPIC {defaultTopic} unnecessarily declared for {self.name}")
                 else:
                     # Declared topic is not default topic
-                    error = Error("topic_error", self.filename, "", f"NOTE: TOPIC {self.topics[1]}: Only Declared topic is not default topic {defaultTopic} for {self.name}")
+                    error = Error("topic_error", self.filename, "", f"NOTE: TOPIC {self.topics[0]}: Only Declared topic is not default topic {defaultTopic} for {self.name}")
                 if not "topic_error" in self.errors:
                     self.errors["topic_error"] = []
                     self.errors["topic_error"].append(error)
@@ -833,11 +833,9 @@ def generate_dds_yaml_doc(allMessageFiles, output_file = 'dds_topics.md'):
         for message in data["subscriptions"]:
             all_message_types.add(message['type'].split("::")[-1])
             all_topics.add(message['topic'].split('/')[-1])
-        if data["subscriptions_multi"]: # There is none now
-            dds_markdown += "None\n"
-            for message in data["subscriptions_multi"]:
-                all_message_types.add(message['type'].split("::")[-1])
-                all_topics.add(message['topic'].split('/')[-1])
+        for message in (data.get("subscriptions_multi") or []):
+            all_message_types.add(message['type'].split("::")[-1])
+            all_topics.add(message['topic'].split('/')[-1])
         for message in allMessageFiles:
             all_messages_in_source.add(message.split('/')[-1].split('.')[0])
         messagesNotExported = all_messages_in_source - all_message_types
@@ -874,13 +872,17 @@ Topic | Type| Rate Limit
 
         dds_markdown += "\n## Subscriptions Multi\n\n"
 
-        if not data["subscriptions_multi"]: # There is none now
+        subscriptions_multi = data.get("subscriptions_multi") or []
+        if not subscriptions_multi:
             dds_markdown += "None\n"
         else:
-            print("Warning - we now have subscription_multi data - check format")
-            dds_markdown += "Topic | Type\n--- | ---\n"
-            for message in data["subscriptions_multi"]:
-                dds_markdown += f"{message['topic']} | {message['type']}\n"
+            dds_markdown += "Topic | Type | Route Field | Max Instances\n--- | --- | --- | ---\n"
+            for message in subscriptions_multi:
+                type = message['type']
+                px4Type = type.split("::")[-1]
+                route_field = f"`{message['route_field']}`" if 'route_field' in message else "-"
+                max_instances = message.get('max_instances', '-')
+                dds_markdown += f"{message['topic']} | [{type}](../msg_docs/{px4Type}.md) | {route_field} | {max_instances}\n"
 
         if messagesNotExported:
             # Print the topics that are not exported to DDS
@@ -944,9 +946,6 @@ if __name__ == "__main__":
 
     for msg_file in msg_files:
         # Add messages to set of allowed types (compound types)
-        #msg_type = msg_file.rsplit('/')[-1]
-        #msg_type = msg_type.rsplit('\\')[-1]
-        #msg_type = msg_type.rsplit('.')[0]
         msg_name = os.path.splitext(os.path.basename(msg_file))[0]
         msgTypes.add(msg_name)
 

Tools/px_mkfw.py

@@ -42,6 +42,7 @@
 import argparse
 import json
 import base64
+import os
 import zlib
 import time
 import subprocess
@@ -99,14 +100,13 @@ if args.summary != None:
 if args.description != None:
 	desc['description']	= str(args.description)
 if args.git_identity != None:
-	cmd = "git --git-dir '{:}/.git' describe --exclude ext/* --always --tags".format(args.git_identity)
-	p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout
-	desc['git_identity']	= p.read().strip().decode('utf-8')
-	p.close()
-	cmd = "git --git-dir '{:}/.git' rev-parse --verify HEAD".format(args.git_identity)
-	p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout
-	desc['git_hash']	= p.read().strip().decode('utf-8')
-	p.close()
+	git_dir = os.path.join(args.git_identity, '.git')
+	p = subprocess.run(["git", "--git-dir", git_dir, "describe", "--exclude", "ext/*", "--always", "--tags"],
+		stdout=subprocess.PIPE, text=True)
+	desc['git_identity']	= p.stdout.strip()
+	p = subprocess.run(["git", "--git-dir", git_dir, "rev-parse", "--verify", "HEAD"],
+		stdout=subprocess.PIPE, text=True)
+	desc['git_hash']	= p.stdout.strip()
 if args.parameter_xml != None:
 	f = open(args.parameter_xml, "rb")
 	bytes = f.read()

Tools/setup/ubuntu.sh

@@ -196,6 +196,11 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
 	fi
 fi
 
+if [[ "${UBUNTU_RELEASE}" == "25.10" ]]; then
+	echo "[ubuntu.sh] Gazebo binaries are not available for 25.10, skipping installation"
+	INSTALL_SIM="false"
+fi
+
 # Simulation tools
 if [[ $INSTALL_SIM == "true" ]]; then
 

boards/accton-godwit/ga1/src/board_config.h

@@ -221,8 +221,10 @@
 /* HEATER
  * PWM in future
  */
-#define GPIO_HEATER_OUTPUT   /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
-#define HEATER_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
+#define HEATER1_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PE6 is nARMED
  *  The GPIO will be set as input while not armed HW will have external HW Pull UP.
@@ -257,7 +259,7 @@
 #define GPIO_VDD_5V_PERIPH_nOC          /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15)
 #define GPIO_VDD_5V_HIPOWER_nEN         /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10)
 #define GPIO_VDD_5V_HIPOWER_nOC         /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13)
-#define GPIO_VDD_3V3_SENSORS4_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
+#define GPIO_VDD_3V3_SENSORS_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
 #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN  /* PH2  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2)
 #define GPIO_VDD_3V3_SD_CARD_EN         /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13)
 
@@ -284,7 +286,7 @@
 
 #define VDD_5V_PERIPH_EN(on_true)          px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true))
 #define VDD_5V_HIPOWER_EN(on_true)         px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true))
-#define VDD_3V3_SENSORS4_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true))
+#define VDD_3V3_SENSORS_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true))
 #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true))
 #define READ_VDD_3V3_SPEKTRUM_POWER_EN()   px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN)
 #define VDD_3V3_SD_CARD_EN(on_true)        px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true))
@@ -442,7 +444,7 @@
 		GPIO_CAN1_RX,                     \
 		GPIO_CAN2_TX,                     \
 		GPIO_CAN2_RX,                     \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_nPOWER_IN_A,                 \
 		GPIO_nPOWER_IN_B,                 \
 		GPIO_nPOWER_IN_C,                 \
@@ -450,7 +452,7 @@
 		GPIO_VDD_5V_PERIPH_nOC,           \
 		GPIO_VDD_5V_HIPOWER_nEN,          \
 		GPIO_VDD_5V_HIPOWER_nOC,          \
-		GPIO_VDD_3V3_SENSORS4_EN,         \
+		GPIO_VDD_3V3_SENSORS_EN,         \
 		GPIO_VDD_3V3_SPEKTRUM_POWER_EN,   \
 		GPIO_VDD_3V3_SD_CARD_EN,          \
 		GPIO_PD15,                        \

boards/accton-godwit/ga1/src/init.cpp

@@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms)
 
 	VDD_5V_PERIPH_EN(false);
 	board_control_spi_sensors_power(false, 0xffff);
-	VDD_3V3_SENSORS4_EN(false);
+	VDD_3V3_SENSORS_EN(false);
 
 	bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN();
 	/* Keep Spektum on to discharge rail*/
@@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms)
 	/* switch the peripheral rail back on */
 	VDD_3V3_SPEKTRUM_POWER_EN(last);
 	board_control_spi_sensors_power(true, 0xffff);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_5V_PERIPH_EN(true);
 
 }
@@ -219,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	VDD_3V3_SD_CARD_EN(true);
 	VDD_5V_PERIPH_EN(true);
 	VDD_5V_HIPOWER_EN(true);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_3V3_SPEKTRUM_POWER_EN(true);
 
 	/* Need hrt running before using the ADC */

boards/accton-godwit/ga1/src/spi.cpp

@@ -48,7 +48,7 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = {
 	}, {GPIO::PortE, GPIO::Pin7}),
 	//  initSPIBus(SPI::Bus::SPI4, {
 	//    // no devices
-	// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+	// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 	//  }, {GPIO::PortG, GPIO::Pin8}),
 	initSPIBus(SPI::Bus::SPI5, {
 		initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})

boards/ark/fmu-v6x/default.px4board

@@ -28,12 +28,8 @@ CONFIG_DRIVERS_IMU_INVENSENSE_IIM42653=y
 CONFIG_DRIVERS_IMU_MURATA_SCH16T=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM150=y
-CONFIG_DRIVERS_MAGNETOMETER_HMC5883=y
-CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y
-CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8308=y
 CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y
 CONFIG_DRIVERS_MAGNETOMETER_LIS3MDL=y
-CONFIG_DRIVERS_MAGNETOMETER_LSM303AGR=y
 CONFIG_DRIVERS_MAGNETOMETER_RM3100=y
 CONFIG_DRIVERS_MAGNETOMETER_ST_IIS2MDC=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y

boards/ark/fmu-v6x/init/rc.board_defaults

@@ -17,21 +17,21 @@ param set-default MAV_2_UDP_PRT 14550
 param set-default SENS_EN_INA226 1
 param set-default SENS_EN_THERMAL 1
 param set-default SENS_IMU_MODE 1
-param set-default SENS_IMU_TEMP 10.0
-#param set-default SENS_IMU_TEMP_FF 0.0
-#param set-default SENS_IMU_TEMP_I 0.025
-#param set-default SENS_IMU_TEMP_P 1.0
+param set-default HEATER1_TEMP 10.0
+#param set-default HEATER1_TEMP_FF 0.0
+#param set-default HEATER1_TEMP_I 0.025
+#param set-default HEATER1_TEMP_P 1.0
 
 param set-default UAVCAN_ESC_IFACE 2
 
 if ver hwtypecmp ARKV6X000
 then
-	param set-default SENS_TEMP_ID 2818058
+	param set-default HEATER1_IMU_ID 2818058
 fi
 
 if ver hwtypecmp ARKV6X001
 then
-	param set-default SENS_TEMP_ID 3014666
+	param set-default HEATER1_IMU_ID 3014666
 fi
 
 safety_button start

boards/ark/fmu-v6x/init/rc.board_sensors

@@ -100,7 +100,7 @@ bmp388 -I start
 # Start an external PWM generator
 if param greater PCA9685_EN_BUS 0
 then
-	pca9685_pwm_out start
+	pca9685_pwm_out start -X
 fi
 
 unset HAVE_PM2

boards/ark/fmu-v6x/mavlink-dev.px4board

@@ -0,0 +1 @@
+CONFIG_MAVLINK_DIALECT="development"

boards/ark/fmu-v6x/src/board_config.h

@@ -224,8 +224,10 @@
 /* HEATER
  * PWM in future
  */
-#define GPIO_HEATER_OUTPUT   /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
-#define HEATER_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
+#define HEATER1_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PE6 is nARMED
  *  The GPIO will be set as input while not armed HW will have external HW Pull UP.
@@ -243,6 +245,15 @@
  */
 #define DIRECT_PWM_OUTPUT_CHANNELS   9
 
+#define GPIO_FMU_CH1                    /* PI0  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN0)
+#define GPIO_FMU_CH2                    /* PH12 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN12)
+#define GPIO_FMU_CH3                    /* PH11 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN11)
+#define GPIO_FMU_CH4                    /* PH10 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN10)
+#define GPIO_FMU_CH5                    /* PD13 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTD|GPIO_PIN13)
+#define GPIO_FMU_CH6                    /* PD14 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTD|GPIO_PIN14)
+#define GPIO_FMU_CH7                    /* PH6  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN6)
+#define GPIO_FMU_CH8                    /* PH9  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN9)
+
 #define GPIO_FMU_CAP                    /* PE11 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTE|GPIO_PIN11)
 #define GPIO_SPIX_SYNC                  /* PE9  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTE|GPIO_PIN9)
 
@@ -262,7 +273,7 @@
 #define GPIO_VDD_5V_PERIPH_nOC          /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15)
 #define GPIO_VDD_5V_HIPOWER_nEN         /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10)
 #define GPIO_VDD_5V_HIPOWER_nOC         /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13)
-#define GPIO_VDD_3V3_SENSORS4_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
+#define GPIO_VDD_3V3_SENSORS_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
 #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN  /* PH2  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2)
 #define GPIO_VDD_3V3_SD_CARD_EN         /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13)
 
@@ -284,7 +295,7 @@
 
 #define VDD_5V_PERIPH_EN(on_true)          px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true))
 #define VDD_5V_HIPOWER_EN(on_true)         px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true))
-#define VDD_3V3_SENSORS4_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true))
+#define VDD_3V3_SENSORS_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true))
 #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true))
 #define READ_VDD_3V3_SPEKTRUM_POWER_EN()   px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN)
 #define VDD_3V3_SD_CARD_EN(on_true)        px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true))
@@ -410,9 +421,6 @@
 /* This board provides a DMA pool and APIs */
 #define BOARD_DMA_ALLOC_POOL_SIZE 5120
 
-/* This board has 4 DMA channels available for bidirectional dshot */
-#define BOARD_DMA_NUM_DSHOT_CHANNELS 4
-
 /* This board provides the board_on_reset interface */
 
 #define BOARD_HAS_ON_RESET 1
@@ -436,7 +444,7 @@
 		GPIO_CAN1_RX,                     \
 		GPIO_CAN2_TX,                     \
 		GPIO_CAN2_RX,                     \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_nPOWER_IN_A,                 \
 		GPIO_nPOWER_IN_B,                 \
 		GPIO_nPOWER_IN_C,                 \
@@ -444,7 +452,7 @@
 		GPIO_VDD_5V_PERIPH_nOC,           \
 		GPIO_VDD_5V_HIPOWER_nEN,          \
 		GPIO_VDD_5V_HIPOWER_nOC,          \
-		GPIO_VDD_3V3_SENSORS4_EN,         \
+		GPIO_VDD_3V3_SENSORS_EN,         \
 		GPIO_VDD_3V3_SPEKTRUM_POWER_EN,   \
 		GPIO_VDD_3V3_SD_CARD_EN,          \
 		GPIO_PD15,                        \
@@ -456,6 +464,14 @@
 		GPIO_SAFETY_SWITCH_IN,            \
 		GPIO_PG6,                         \
 		GPIO_nARMED_INIT,                 \
+		GPIO_FMU_CH1,     	          \
+		GPIO_FMU_CH2,     	          \
+		GPIO_FMU_CH3,     	          \
+		GPIO_FMU_CH4,     	          \
+		GPIO_FMU_CH5,     	          \
+		GPIO_FMU_CH6,     	          \
+		GPIO_FMU_CH7,     	          \
+		GPIO_FMU_CH8,     	          \
 		GPIO_FMU_CAP,     	          \
 		GPIO_SPIX_SYNC                    \
 	}

boards/ark/fmu-v6x/src/init.c

@@ -108,7 +108,7 @@ __EXPORT void board_peripheral_reset(int ms)
 	VDD_5V_HIPOWER_EN(false);
 	VDD_5V_PERIPH_EN(false);
 	board_control_spi_sensors_power(false, 0xffff);
-	VDD_3V3_SENSORS4_EN(false);
+	VDD_3V3_SENSORS_EN(false);
 	SPI6_RESET(true);
 
 	bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN();
@@ -124,7 +124,7 @@ __EXPORT void board_peripheral_reset(int ms)
 	/* switch the peripheral rail back on */
 	VDD_3V3_SPEKTRUM_POWER_EN(last);
 	board_control_spi_sensors_power(true, 0xffff);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_5V_HIPOWER_EN(true);
 	VDD_5V_PERIPH_EN(true);
 
@@ -221,7 +221,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	/* Power on Interfaces */
 	VDD_5V_PERIPH_EN(true);
 	VDD_5V_HIPOWER_EN(true);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_3V3_SPEKTRUM_POWER_EN(true);
 
 	SPI6_RESET(false);

boards/ark/fmu-v6x/src/spi.cpp

@@ -48,7 +48,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION
 		}, {GPIO::PortE, GPIO::Pin7}),
 		//  initSPIBus(SPI::Bus::SPI4, {
 		//    // no devices
-		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 		//  }, {GPIO::PortG, GPIO::Pin8}),
 		initSPIBus(SPI::Bus::SPI5, {
 			initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})
@@ -71,7 +71,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION
 		}, {GPIO::PortE, GPIO::Pin7}),
 		//  initSPIBus(SPI::Bus::SPI4, {
 		//    // no devices
-		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 		//  }, {GPIO::PortG, GPIO::Pin8}),
 		initSPIBus(SPI::Bus::SPI5, {
 			initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})

boards/ark/fpv/init/rc.board_airframes

@@ -0,0 +1,19 @@
+4001_quad_x
+4050_generic_250
+6001_hexa_x
+12001_octo_cox
+13100_generic_vtol_tiltrotor
+5001_quad_+
+24001_dodeca_cox
+2100_standard_plane
+13000_generic_vtol_standard
+4601_droneblocks_dexi_5
+11001_hexa_cox
+14001_generic_mc_with_tilt
+16001_helicopter
+9001_octo_+
+7001_hexa_+
+3000_generic_wing
+2106_albatross
+13200_generic_vtol_tailsitter
+13030_generic_vtol_quad_tiltrotor

boards/ark/fpv/init/rc.board_defaults

@@ -15,14 +15,14 @@ fi
 
 # TODO: Tune the following parameters
 param set-default SENS_EN_THERMAL 1
-param set-default SENS_IMU_TEMP 10.0
-#param set-default SENS_IMU_TEMP_FF 0.0
-#param set-default SENS_IMU_TEMP_I 0.025
-#param set-default SENS_IMU_TEMP_P 1.0
+param set-default HEATER1_TEMP 10.0
+#param set-default HEATER1_TEMP_FF 0.0
+#param set-default HEATER1_TEMP_I 0.025
+#param set-default HEATER1_TEMP_P 1.0
 
 if ver hwtypecmp ARKFPV000
 then
-	param set-default SENS_TEMP_ID 3014666
+	param set-default HEATER1_IMU_ID 3014666
 fi
 
 param set-default BAT1_V_DIV 21.0

boards/ark/fpv/init/rc.board_sensors

@@ -20,5 +20,5 @@ bmp388 -I -b 2 start
 # Start an external PWM generator
 if param greater PCA9685_EN_BUS 0
 then
-	pca9685_pwm_out start
+	pca9685_pwm_out start -X
 fi

boards/ark/fpv/mavlink-dev.px4board

@@ -0,0 +1 @@
+CONFIG_MAVLINK_DIALECT="development"

boards/ark/fpv/src/board_config.h

@@ -205,8 +205,10 @@
 /* HEATER
  * PWM in future
  */
-#define GPIO_HEATER_OUTPUT   /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
-#define HEATER_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
+#define HEATER1_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PE6 is nARMED
  *  The GPIO will be set as input while not armed HW will have external HW Pull UP.
@@ -223,6 +225,16 @@
  */
 #define DIRECT_PWM_OUTPUT_CHANNELS   9
 
+#define GPIO_FMU_CH1                    /* PI0  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN0)
+#define GPIO_FMU_CH2                    /* PH12 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN12)
+#define GPIO_FMU_CH3                    /* PH11 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN11)
+#define GPIO_FMU_CH4                    /* PH10 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN10)
+#define GPIO_FMU_CH5                    /* PI5  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN5)
+#define GPIO_FMU_CH6                    /* PI6  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN6)
+#define GPIO_FMU_CH7                    /* PI7  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN7)
+#define GPIO_FMU_CH8                    /* PI2  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN2)
+#define GPIO_FMU_CH9                    /* PD12 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTD|GPIO_PIN12)
+
 #define GPIO_SPIX_SYNC                  /* PE9  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTE|GPIO_PIN9)
 
 /* Power supply control and monitoring GPIOs */
@@ -294,9 +306,6 @@
 /* This board provides a DMA pool and APIs */
 #define BOARD_DMA_ALLOC_POOL_SIZE 5120
 
-/* This board has 3 DMA channels available for bidirectional dshot */
-#define BOARD_DMA_NUM_DSHOT_CHANNELS 3
-
 /* This board provides the board_on_reset interface */
 
 #define BOARD_HAS_ON_RESET 1
@@ -318,7 +327,7 @@
 		GPIO_HW_VER_REV_DRIVE,            \
 		GPIO_CAN1_TX,                     \
 		GPIO_CAN1_RX,                     \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_VDD_5V_PGOOD,                \
 		GPIO_VDD_12V_PGOOD,               \
 		GPIO_VDD_12V_EN,                  \
@@ -326,6 +335,15 @@
 		GPIO_VDD_3V3_SD_CARD_EN,          \
 		GPIO_nARMED_INIT,                 \
 		SPI6_nRESET_EXTERNAL1,            \
+		GPIO_FMU_CH1,     	          \
+		GPIO_FMU_CH2,     	          \
+		GPIO_FMU_CH3,     	          \
+		GPIO_FMU_CH4,     	          \
+		GPIO_FMU_CH5,     	          \
+		GPIO_FMU_CH6,     	          \
+		GPIO_FMU_CH7,     	          \
+		GPIO_FMU_CH8,     	          \
+		GPIO_FMU_CH9,     	          \
 		GPIO_SPIX_SYNC                    \
 	}
 

boards/ark/pi6x/init/rc.board_defaults

@@ -21,17 +21,17 @@ param set-default SENS_EN_INA226 1
 
 # TODO: Tune the following parameters
 param set-default SENS_EN_THERMAL 1
-param set-default SENS_IMU_TEMP 10.0
-#param set-default SENS_IMU_TEMP_FF 0.0
-#param set-default SENS_IMU_TEMP_I 0.025
-#param set-default SENS_IMU_TEMP_P 1.0
+param set-default HEATER1_TEMP 10.0
+#param set-default HEATER1_TEMP_FF 0.0
+#param set-default HEATER1_TEMP_I 0.025
+#param set-default HEATER1_TEMP_P 1.0
 
 param set-default UAVCAN_ESC_IFACE 1
 
 if ver hwtypecmp ARKPI6X000
 then
 	# TODO: Add the correct sensor ID
-	param set-default SENS_TEMP_ID 2490378
+	param set-default HEATER1_IMU_ID 2490378
 fi
 
 param set-default EKF2_MULTI_IMU 0

boards/ark/pi6x/init/rc.board_sensors

@@ -38,5 +38,5 @@ afbrs50 start
 # Start an external PWM generator
 if param greater PCA9685_EN_BUS 0
 then
-	pca9685_pwm_out start
+	pca9685_pwm_out start -X
 fi

boards/ark/pi6x/mavlink-dev.px4board

@@ -0,0 +1 @@
+CONFIG_MAVLINK_DIALECT="development"

boards/ark/pi6x/src/board_config.h

@@ -188,8 +188,10 @@
 /* HEATER
  * PWM in future
  */
-#define GPIO_HEATER_OUTPUT   /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
-#define HEATER_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
+#define HEATER1_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PE6 is nARMED
  *  The GPIO will be set as input while not armed HW will have external HW Pull UP.
@@ -206,6 +208,15 @@
  */
 #define DIRECT_PWM_OUTPUT_CHANNELS   8
 
+#define GPIO_FMU_CH1                    /* PI0  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTI|GPIO_PIN0)
+#define GPIO_FMU_CH2                    /* PH12 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN12)
+#define GPIO_FMU_CH3                    /* PH11 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN11)
+#define GPIO_FMU_CH4                    /* PH10 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN10)
+#define GPIO_FMU_CH5                    /* PD13 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTD|GPIO_PIN13)
+#define GPIO_FMU_CH6                    /* PD14 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTD|GPIO_PIN14)
+#define GPIO_FMU_CH7                    /* PH6  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN6)
+#define GPIO_FMU_CH8                    /* PH9  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTH|GPIO_PIN9)
+
 #define GPIO_FMU_CAP                    /* PE11 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTE|GPIO_PIN11)
 #define GPIO_SPIX_SYNC                  /* PE9  */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTE|GPIO_PIN9)
 
@@ -300,9 +311,6 @@
 /* This board provides a DMA pool and APIs */
 #define BOARD_DMA_ALLOC_POOL_SIZE 5120
 
-/* This board has 4 DMA channels available for bidirectional dshot */
-#define BOARD_DMA_NUM_DSHOT_CHANNELS 4
-
 /* This board provides the board_on_reset interface */
 
 #define BOARD_HAS_ON_RESET 1
@@ -324,7 +332,7 @@
 		GPIO_HW_VER_REV_DRIVE,            \
 		GPIO_CAN1_TX,                     \
 		GPIO_CAN1_RX,                     \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_VDD_5V_HIPOWER_nEN,          \
 		GPIO_VDD_5V_HIPOWER_nOC,          \
 		GPIO_VDD_3V3_SD_CARD_EN,          \
@@ -332,6 +340,14 @@
 		GPIO_NFC_GPIO,                    \
 		GPIO_TONE_ALARM_IDLE,             \
 		GPIO_nARMED_INIT,                 \
+		GPIO_FMU_CH1,     	          \
+		GPIO_FMU_CH2,     	          \
+		GPIO_FMU_CH3,     	          \
+		GPIO_FMU_CH4,     	          \
+		GPIO_FMU_CH5,     	          \
+		GPIO_FMU_CH6,     	          \
+		GPIO_FMU_CH7,     	          \
+		GPIO_FMU_CH8,     	          \
 		GPIO_FMU_CAP,     	          \
 		GPIO_SPIX_SYNC                    \
 	}

boards/ark/pi6x/src/spi.cpp

@@ -48,7 +48,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION
 		}),
 		//  initSPIBus(SPI::Bus::SPI4, {
 		//    // no devices
-		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 		//  }, {GPIO::PortG, GPIO::Pin8}),
 		// initSPIBus(SPI::Bus::SPI5, {
 		// 	initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})
@@ -69,7 +69,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION
 		}),
 		//  initSPIBus(SPI::Bus::SPI4, {
 		//    // no devices
-		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+		// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 		//  }, {GPIO::PortG, GPIO::Pin8}),
 		// initSPIBus(SPI::Bus::SPI5, {
 		// 	initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})

boards/atl/mantis-edu/src/board_config.h

@@ -121,7 +121,9 @@
 #define BOARD_REAR_LED_MASK  (1 << 1) | (1 << 2)
 
 /* HEATER */
-#define GPIO_HEATER_OUTPUT   /* PA7  T14CH1 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN7)
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PA7  T14CH1 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN7)
 
 #define BOARD_HAS_LED_PWM              1
 #define BOARD_LED_PWM_DRIVE_ACTIVE_LOW 1
@@ -182,7 +184,7 @@
 		PX4_ADC_GPIO,                     \
 		GPIO_HW_REV_DRIVE,                \
 		GPIO_HW_VER_DRIVE,                \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_VDD_3V3_SD_CARD_EN,          \
 		GPIO_OTGFS_VBUS                   \
 	}

boards/auterion/fmu-v6s/default.px4board

@@ -55,6 +55,7 @@ CONFIG_MODULES_HARDFAULT_STREAM=y
 CONFIG_MODULES_LAND_DETECTOR=y
 CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=y
 CONFIG_MODULES_LOAD_MON=y
+CONFIG_MODULES_TASK_WATCHDOG=y
 CONFIG_MODULES_LOGGER=y
 CONFIG_LOGGER_STACK_SIZE=4100
 CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y

boards/auterion/fmu-v6s/init/rc.board_defaults

@@ -34,5 +34,8 @@ nshterm /dev/ttyS3 &
 # Start the time_persistor to cyclically store the RTC in FRAM
 time_persistor start
 
+# Start the task_watchdog as we do not have the logger watchdog
+task_watchdog start
+
 # Start the ESC telemetry
 dshot telemetry -d /dev/ttyS5 -x

boards/auterion/fmu-v6s/init/rc.board_sensors

@@ -77,5 +77,5 @@ ist8310 -X -b 1 -R 10 start
 # Start an external PWM generator
 if param greater PCA9685_EN_BUS 0
 then
-	pca9685_pwm_out start
+	pca9685_pwm_out start -X
 fi

boards/auterion/fmu-v6x/src/board_config.h

@@ -224,8 +224,10 @@
 /* HEATER
  * PWM in future
  */
-#define GPIO_HEATER_OUTPUT   /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
-#define HEATER_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
+#define HEATER1_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PE6 is nARMED
  *  The GPIO will be set as input while not armed HW will have external HW Pull UP.
@@ -260,7 +262,7 @@
 #define GPIO_VDD_5V_PERIPH_nOC          /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15)
 #define GPIO_VDD_5V_HIPOWER_nEN         /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10)
 #define GPIO_VDD_5V_HIPOWER_nOC         /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13)
-#define GPIO_VDD_3V3_SENSORS4_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
+#define GPIO_VDD_3V3_SENSORS_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
 #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN  /* PH2  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2)
 #define GPIO_VDD_3V3_SD_CARD_EN         /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13)
 
@@ -287,7 +289,7 @@
 
 #define VDD_5V_PERIPH_EN(on_true)          px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true))
 #define VDD_5V_HIPOWER_EN(on_true)         px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true))
-#define VDD_3V3_SENSORS4_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true))
+#define VDD_3V3_SENSORS_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true))
 #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true))
 #define READ_VDD_3V3_SPEKTRUM_POWER_EN()   px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN)
 #define VDD_3V3_SD_CARD_EN(on_true)        px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true))
@@ -443,7 +445,7 @@
 		GPIO_CAN1_RX,                     \
 		GPIO_CAN2_TX,                     \
 		GPIO_CAN2_RX,                     \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_nPOWER_IN_A,                 \
 		GPIO_nPOWER_IN_B,                 \
 		GPIO_nPOWER_IN_C,                 \
@@ -451,7 +453,7 @@
 		GPIO_VDD_5V_PERIPH_nOC,           \
 		GPIO_VDD_5V_HIPOWER_nEN,          \
 		GPIO_VDD_5V_HIPOWER_nOC,          \
-		GPIO_VDD_3V3_SENSORS4_EN,         \
+		GPIO_VDD_3V3_SENSORS_EN,         \
 		GPIO_VDD_3V3_SPEKTRUM_POWER_EN,   \
 		GPIO_VDD_3V3_SD_CARD_EN,          \
 		GPIO_PD15,                        \

boards/auterion/fmu-v6x/src/init.cpp

@@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms)
 
 	VDD_5V_PERIPH_EN(false);
 	board_control_spi_sensors_power(false, 0xffff);
-	VDD_3V3_SENSORS4_EN(false);
+	VDD_3V3_SENSORS_EN(false);
 
 	bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN();
 	/* Keep Spektum on to discharge rail*/
@@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms)
 	/* switch the peripheral rail back on */
 	VDD_3V3_SPEKTRUM_POWER_EN(last);
 	board_control_spi_sensors_power(true, 0xffff);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_5V_PERIPH_EN(true);
 
 }
@@ -215,7 +215,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	VDD_3V3_SD_CARD_EN(true);
 	VDD_5V_PERIPH_EN(true);
 	VDD_5V_HIPOWER_EN(true);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_3V3_SPEKTRUM_POWER_EN(true);
 
 	/* Need hrt running before using the ADC */

boards/auterion/fmu-v6x/src/spi.cpp

@@ -48,7 +48,7 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = {
 	}, {GPIO::PortE, GPIO::Pin7}),
 	//  initSPIBus(SPI::Bus::SPI4, {
 	//    // no devices
-	// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+	// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 	//  }, {GPIO::PortG, GPIO::Pin8}),
 	initSPIBus(SPI::Bus::SPI5, {
 		initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})

boards/bluerobotics/navigator/init/rc.board_sensors

@@ -28,7 +28,7 @@ then
 	echo "ads1115 not found."
 fi
 
-if ! pca9685_pwm_out start
+if ! pca9685_pwm_out start -X
 then
 	echo "pca9685_pwm_out not found."
 fi

boards/cuav/fmu-v6x/src/board_config.h

@@ -230,8 +230,10 @@
 /* HEATER
  * PWM in future
  */
-#define GPIO_HEATER_OUTPUT   /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
-#define HEATER_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PB10  T2CH3 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
+#define HEATER1_OUTPUT_EN(on_true)	       px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PE6 is nARMED
  *  The GPIO will be set as input while not armed HW will have external HW Pull UP.
@@ -269,7 +271,7 @@
 #define GPIO_VDD_5V_PERIPH_nOC          /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15)
 #define GPIO_VDD_5V_HIPOWER_nEN         /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10)
 #define GPIO_VDD_5V_HIPOWER_nOC         /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13)
-#define GPIO_VDD_3V3_SENSORS4_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
+#define GPIO_VDD_3V3_SENSORS_EN        /* PG8  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8)
 #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN  /* PH2  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2)
 #define GPIO_VDD_3V3_SD_CARD_EN         /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13)
 
@@ -295,7 +297,7 @@
 
 #define VDD_5V_PERIPH_EN(on_true)          px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true))
 #define VDD_5V_HIPOWER_EN(on_true)         px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true))
-#define VDD_3V3_SENSORS4_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true))
+#define VDD_3V3_SENSORS_EN(on_true)       px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true))
 #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true))
 #define READ_VDD_3V3_SPEKTRUM_POWER_EN()   px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN)
 #define VDD_3V3_SD_CARD_EN(on_true)        px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true))
@@ -453,7 +455,7 @@
 		GPIO_CAN1_RX,                     \
 		GPIO_CAN2_TX,                     \
 		GPIO_CAN2_RX,                     \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_nPOWER_IN_A,                 \
 		GPIO_nPOWER_IN_B,                 \
 		GPIO_nPOWER_IN_C,                 \
@@ -461,7 +463,7 @@
 		GPIO_VDD_5V_PERIPH_nOC,           \
 		GPIO_VDD_5V_HIPOWER_nEN,          \
 		GPIO_VDD_5V_HIPOWER_nOC,          \
-		GPIO_VDD_3V3_SENSORS4_EN,         \
+		GPIO_VDD_3V3_SENSORS_EN,         \
 		GPIO_VDD_3V3_SPEKTRUM_POWER_EN,   \
 		GPIO_VDD_3V3_SD_CARD_EN,          \
 		GPIO_SYNC,                        \

boards/cuav/fmu-v6x/src/init.cpp

@@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms)
 
 	VDD_5V_PERIPH_EN(false);
 	board_control_spi_sensors_power(false, 0xffff);
-	VDD_3V3_SENSORS4_EN(false);
+	VDD_3V3_SENSORS_EN(false);
 
 	bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN();
 	/* Keep Spektum on to discharge rail*/
@@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms)
 	/* switch the peripheral rail back on */
 	VDD_3V3_SPEKTRUM_POWER_EN(last);
 	board_control_spi_sensors_power(true, 0xffff);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_5V_PERIPH_EN(true);
 
 }
@@ -219,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	VDD_3V3_SD_CARD_EN(true);
 	VDD_5V_PERIPH_EN(true);
 	VDD_5V_HIPOWER_EN(true);
-	VDD_3V3_SENSORS4_EN(true);
+	VDD_3V3_SENSORS_EN(true);
 	VDD_3V3_SPEKTRUM_POWER_EN(true);
 
 	/* Need hrt running before using the ADC */

boards/cuav/fmu-v6x/src/spi.cpp

@@ -49,7 +49,7 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = {
 	}, {GPIO::PortE, GPIO::Pin7}),
 	//  initSPIBus(SPI::Bus::SPI4, {
 	//    // no devices
-	// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h
+	// TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h
 	//  }, {GPIO::PortG, GPIO::Pin8}),
 	initSPIBus(SPI::Bus::SPI5, {
 		initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7})

boards/cuav/nora/src/board_config.h

@@ -104,8 +104,10 @@
 #define GPIO_CAN2_SILENT_S1  /* PH3  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN3)
 
 /* HEATER */
-#define GPIO_HEATER_OUTPUT   /* PA8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN8)
-#define HEATER_OUTPUT_EN(on_true)      px4_arch_gpiowrite(GPIO_HEATER_OUTPUT, (on_true))
+#define GPIO_HEATER_OUTPUT
+#define HEATER_NUM 	1
+#define GPIO_HEATER1_OUTPUT  /* PA8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN8)
+#define HEATER1_OUTPUT_EN(on_true)      px4_arch_gpiowrite(GPIO_HEATER1_OUTPUT, (on_true))
 
 /* PWM */
 #define DIRECT_PWM_OUTPUT_CHANNELS   14
@@ -212,7 +214,7 @@
 		GPIO_CAN2_RX,                     \
 		GPIO_CAN1_SILENT_S0,              \
 		GPIO_CAN2_SILENT_S1,              \
-		GPIO_HEATER_OUTPUT,               \
+		GPIO_HEATER1_OUTPUT,              \
 		GPIO_nPOWER_IN_CAN,               \
 		GPIO_nPOWER_IN_ADC,               \
 		GPIO_nPOWER_IN_C,                 \