bl_update: Allow booting from SD card (without forced BL copy to ROMFS)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -3,45 +3,92 @@ description: Create a report to help us improve
 title: "[Bug] "
 labels: ["bug-report"]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        **Tips for a great bug report:**
-        - Describe what went wrong and what you expected
-        - Include a flight log link from [logs.px4.io](http://logs.px4.io/) if possible
-        - Mention your PX4 version, flight controller, and vehicle type if relevant
-
   - type: textarea
     attributes:
       label: Describe the bug
-      description: A clear description of the bug and what you expected to happen.
-      placeholder: |
-        What happened and what did you expect instead?
-
-        Steps to reproduce (if applicable):
-        1.
-        2.
-        3.
+      description: A clear and concise description of the bug.
     validations:
       required: true
 
   - type: textarea
     attributes:
-      label: Flight Log / Additional Information
+      label: To Reproduce
       description: |
-        **Flight log** (highly recommended for flight-related issues):
-        - Upload to [PX4 Flight Review](http://logs.px4.io/) and paste the link
-
-        **Additional details** (if relevant):
-        - PX4 version (output of `ver all` in MAVLink Shell)
-        - Flight controller model
-        - Vehicle type (multicopter, fixed-wing, VTOL, etc.)
-        - Screenshots or media
-      placeholder: |
-        Flight log link:
-
-        Version:
-
-        Hardware:
+          Steps to reproduce the behavior.
+          1. Drone switched on '...'
+          2. Uploaded mission '....' (attach QGC mission file)
+          3. Took off '....'
+          4. See error
     validations:
       required: false
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Screenshot / Media
+      description: Add screenshot / media if you have them
+
+  - type: textarea
+    attributes:
+      label: Flight Log
+      description: |
+          *Always* provide a link to the flight log file:
+          - Download the flight log file from the vehicle ([tutorial](https://docs.px4.io/main/en/getting_started/flight_reporting.html)).
+          - Upload the log to the [PX4 Flight Review](http://logs.px4.io/)
+          - Share the link to the log (Copy and paste the URL of the log)
+      placeholder: |
+          # PASTE HERE THE LINK TO THE LOG
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        ## Setup
+
+  - type: textarea
+    attributes:
+      label: Software Version
+      description: |
+          Which version of PX4 are you using?
+      placeholder: |
+          # If you don't know the version, paste the output of `ver all` in the MAVLink Shell of QGC
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Flight controller
+      description: Specify your flight controller model (what type is it, where was it bought from, ...).
+    validations:
+      required: false
+
+  - type: dropdown
+    attributes:
+      label: Vehicle type
+      options:
+        - Multicopter
+        - Helicopter
+        - Fixed Wing
+        - Hybrid VTOL
+        - Airship/Balloon
+        - Rover
+        - Boat
+        - Submarine
+        - Other
+
+  - type: textarea
+    attributes:
+      label: How are the different components wired up (including port information)
+      description: Details about how all is wired.
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Support Question
     url: https://docs.px4.io/main/en/contribute/support.html#forums-and-chat

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,22 @@
 <!--
 
+Thank you for your contribution!
+
+Get early feedback through
+- Dronecode Discord: https://discord.gg/dronecode
+- PX4 Discuss: http://discuss.px4.io/
+- opening a draft pr and sharing the link
+
+-->
+
 ### Solved Problem
+When ... I found that ...
+
 Fixes #{Github issue ID}
 
 ### Solution
+- Add ... for ...
+- Refactor ...
 
 ### Changelog Entry
 For release notes:
@@ -14,10 +27,11 @@ Documentation: Need to clarify page ... / done, read docs.px4.io/...
 ```
 
 ### Alternatives
+We could also ...
 
 ### Test coverage
+- Unit/integration test: ...
+- Simulation/hardware testing logs: https://review.px4.io/
 
 ### Context
 Related links, screenshot before/after, video
-
--->

.github/instructions/docs.en.instructions.md

@@ -1,48 +0,0 @@
----
-applyTo: "docs/en/**"
----
-
-# Review Guidelines docs/en Tree
-
-## File System & Structure
-
-- **Naming:** Use `lowercase_with_underscores` for all filenames. No spaces.
-- **Hierarchy:** Markdown files must reside exactly in a first-level category folder. 
-  - Valid: `docs/en/category/file.md`
-  - Invalid: `docs/en/category/subcategory/file.md`
-- **Text Files:** Any `.txt` or `.text` files must start with an underscore (e.g., `_notes.txt`).
-- **Assets:** All images/non-docs must be in `/docs/assets/`. Deep nesting is permitted here.
-- **Formats:** Prefer **SVG** for diagrams and **PNG** for screenshots. Flag JPG files.
-
-## Markdown & Style
-
-- **Headings:** Use Title Case ("First Letter Capitalisation"). 
-  - The Page Title must be the only H1 (`#`). All others must be `##` or lower.
-  - Do not apply bold or italic styling inside a heading.
-- **Formatting:** 
-  - **Bold:** Only for UI elements (buttons, menu items).
-  - **Italics (Emphasis):** For tool names (e.g., *QGroundControl*).
-  - **Inline Code:** Use backticks for file paths, parameters, and CLI commands (e.g., `prettier`).
-- **Structure:** End every line at the end of a sentence (Semantic Line Breaks).
-
-## Linking & Navigation
-
-- **Standard Links:** Use standard inline syntax: `[link text](../category/filename.md)`.
-  Note relative link. 
-- **Table Links:** To keep tables readable, use reference-style links.
-  - Definition: `[Link Name]: https://example.com` (placed below the table).
-  - Usage: `[Link Name]` within the table cell.
-- **Images:** All image links must include a descriptive, accessible alt-text in the brackets: `![Detailed description of the image content](../../assets/path/to/image.png)`.
-  Note that all images should be relative references to images stored in the assets folder, which should be two folders below the any markdown file (as they are stored in a "category" subfolder) 
-
-- **Standard Links:** Use standard inline syntax: `[link text](../category/filename.md)`. Note the use of relative links.
-- **Table Links:** To keep tables easier to edit, prefer reference-style links.
-  - Definition: `[Link Name]: https://example.com` (placed below the table).
-  - Usage: `[Link Name]` within the table cell.
-- **Images:** All image links must include a descriptive, accessible alt-text: `![Detailed description of the image content](../../assets/path/to/image.png)`.
-  - **Note:** All images must be relative references to the `/docs/assets/` folder. Since documents are nested in a category folder, this is usually two levels up (`../../assets/`).
-
-## Quality Control
-
-- **Prettier Check:** Ensure Prettier rules have been applied. If there is evidence of inconsistent indentation or spacing, request the author run `npx prettier --write .` before merging.
-- **Language:** Enforce **UK English** spelling and grammar.

.github/runs-on.yml

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

.github/workflows/build_all_targets.yml

@@ -26,15 +26,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: write
-  actions: read
-
 jobs:
   group_targets:
     name: Scan for Board Targets
     # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       timestamp: ${{ steps.set-timestamp.outputs.timestamp }}
@@ -42,14 +38,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache Python pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**./Tools/setup/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: Update python packaging to avoid canonicalize_version() error
         run: |
             pip3 install -U packaging
@@ -60,15 +48,12 @@ jobs:
           path: "./Tools/setup/requirements.txt"
 
       - id: set-matrix
-        name: Generate Build Matrix
-        run: echo "matrix=$(./Tools/ci/generate_board_targets_json.py --group)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=matrix::$(./Tools/ci/generate_board_targets_json.py --group)"
 
       - id: set-timestamp
-        name: Save Current Timestamp
-        run: echo "timestamp=$(date +"%Y%m%d%H%M%S")" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=timestamp::$(date +"%Y%m%d%H%M%S")"
 
       - id: set-branch
-        name: Save Current Branch Name
         run: |
           echo "branchname=${{
             github.event_name == 'pull_request' &&
@@ -85,7 +70,7 @@ jobs:
           echo "$(./Tools/ci/generate_board_targets_json.py --group --verbose)"
 
   setup:
-    name: Build [${{ matrix.runner }}][${{ matrix.group }}]
+    name: Build Group [${{ matrix.group }}][${{ matrix.arch == 'nuttx' && 'x86' || 'arm64' }}]
     # 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
@@ -95,7 +80,6 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
-      - uses: runs-on/action@v2
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -103,24 +87,14 @@ jobs:
       - name: Git ownership workaround
         run: git config --system --add safe.directory '*'
 
-      # ccache key breakdown:
-      # ccache-<system os>-<system arch>-<builder group>-
-      # ccache-<linux>-<arm64>-<aarch64-0>-
-      # ccache-<linux>-<x64>-<nuttx-0>-
-      - name: Cache Restore from Key
-        id: cc_restore
-        uses: actions/cache/restore@v4
+      - name: Setup ccache
+        uses: actions/cache@v4
         with:
           path: ~/.ccache
-          key: ${{ format('ccache-{0}-{1}-{2}', runner.os, matrix.runner, matrix.group) }}
-          restore-keys: |
-            ccache-${{ runner.os }}-${{ matrix.runner }}-${{ matrix.group }}-
-            ccache-${{ runner.os }}-${{ matrix.runner }}-
-            ccache-${{ runner.os }}-${{ matrix.runner }}-
-            ccache-${{ runner.os }}-
-            ccache-
+          key: ${{ matrix.group }}-ccache-${{ needs.group_targets.outputs.timestamp }}
+          restore-keys: ${{ matrix.group }}-ccache-${{ needs.group_targets.outputs.timestamp }}
 
-      - name: Cache Config and Stats
+      - name: Configure ccache
         run: |
             mkdir -p ~/.ccache
             echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
@@ -128,11 +102,10 @@ jobs:
             echo "compression_level = 6" >> ~/.ccache/ccache.conf
             echo "max_size = 120M" >> ~/.ccache/ccache.conf
             echo "hash_dir = false" >> ~/.ccache/ccache.conf
-            echo "compiler_check = content" >> ~/.ccache/ccache.conf
             ccache -s
             ccache -z
 
-      - name: Building Artifacts for [${{ matrix.targets }}]
+      - name: Building [${{ matrix.group }}]
         run: |
             ./Tools/ci/build_all_runner.sh ${{matrix.targets}} ${{matrix.arch}}
 
@@ -146,27 +119,15 @@ jobs:
           name: px4_${{matrix.group}}_build_artifacts
           path: artifacts/
 
-      - name: Cache Post Build Stats
-        if: always()
-        run: |
-            ccache -s
-            ccache -z
-
       - name: Cache Save
-        if: always()
-        uses: actions/cache/save@v4
-        with:
-          path: ~/.ccache
-          key: ${{ steps.cc_restore.outputs.cache-primary-key }}
+        run: ccache -s
 
   artifacts:
-    name: Upload Artifacts
+    name: Upload Artifacts to S3
     # runs-on: ubuntu-latest
     runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     needs: [setup, group_targets]
-    if: startsWith(github.ref, 'refs/tags/v') || contains(fromJSON('["main","stable","beta"]'), needs.group_targets.outputs.branchname)
-    outputs:
-      uploadlocation: ${{ steps.upload-location.outputs.uploadlocation }}
+    if: contains(fromJSON('["main", "stable", "beta"]'), needs.group_targets.outputs.branchname)
     steps:
       - name: Download Artifacts
         uses: actions/download-artifact@v4
@@ -174,36 +135,11 @@ jobs:
           path: artifacts/
           merge-multiple: true
 
-      - name: Choose Upload Location
-        id: upload-location
+      - name: Branch Name
         run: |
-          # Determine upload location based on branch or tag with the following considerations:
-          # Destination: AWS S3 bucket px4-travis in folder Firmware/
-          # - If branch is main -> upload to master/
-          #   - Older versions of QGC are hardocded to look for master/
-          # - If branch is stable or beta -> upload to stable/ or beta/
-          # - If a tag vX.Y.Z -> upload to vX.Y.Z/
-          #   - Also update stable/ to point to the same version
-          #.  - Older versions of QGC are hardocded to look for stable/
-          # - If a pull request -> do not upload
-          set -euo pipefail
+          echo "${{ needs.group_targets.outputs.branchname }}"
 
-          ref="${GITHUB_REF}"
-          branch=${{ needs.group_targets.outputs.branchname  }}
-          location="$branch"
-
-          if [[ "$branch" == "main" ]]; then
-            location="master"
-          fi
-
-          if [[ "$ref" == refs/tags/v[0-9]* ]]; then
-            tag="${ref#refs/tags/}"
-            location="$tag"
-          fi
-
-          echo "uploadlocation=$location" >> $GITHUB_OUTPUT
-
-      - name: Uploading Artifacts to S3 [${{ steps.upload-location.outputs.uploadlocation }}]
+      - name: Uploading Artifacts to S3 [${{ needs.group_targets.outputs.branchname == 'main' && 'master' || needs.group_targets.outputs.branchname }}]
         uses: jakejarvis/s3-sync-action@master
         with:
           args: --acl public-read
@@ -213,30 +149,25 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: 'us-west-1'
           SOURCE_DIR: artifacts/
-          DEST_DIR: Firmware/${{ steps.upload-location.outputs.uploadlocation }}/
+          DEST_DIR: Firmware/${{ needs.group_targets.outputs.branchname == 'main' && 'master' || needs.group_targets.outputs.branchname }}/
 
-      # if we are uploading artifacts to a versioned folder
-      # we should also update the stable folder in the s3 bucket
-      - name: Uploading Artifacts to S3 [stable]
-        uses: jakejarvis/s3-sync-action@master
-        if: startsWith(github.ref, 'refs/tags/v')
+  release:
+    name: Create Release and Upload Artifacts
+    permissions:
+      contents: write
+    # runs-on: ubuntu-latest
+    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/')
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
         with:
-          args: --acl public-read
-        env:
-          AWS_S3_BUCKET: 'px4-travis'
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: 'us-west-1'
-          SOURCE_DIR: artifacts/
-          DEST_DIR: Firmware/stable/
+          path: artifacts/
+          merge-multiple: true
 
-      # if build is a release triggered by a versioned tag then create a github release
-      # and upload the build artifacts. A draft release is created so that the release
-      # can be reviewed before publishing
-      - name: Upload Artifacts to GitHub Release
+      - name: Upload Binaries to Release
         uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/v')
         with:
           draft: true
           files: artifacts/*.px4
-          name: ${{ steps.upload-location.outputs.uploadlocation }}

.github/workflows/compile_ubuntu.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['ubuntu:22.04', 'ubuntu:24.04']
-    runs-on: [runs-on,runner=4cpu-linux-x64,"image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,"image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false]
     container:
       image: ${{ matrix.version }}
       volumes:

.github/workflows/dev_container.yml

@@ -39,7 +39,7 @@ jobs:
     name: Set Tags and Variables
     permissions:
       contents: read
-    runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
+    runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     outputs:
       px4_version: ${{ steps.px4_version.outputs.px4_version }}
       meta_tags: ${{ steps.meta.outputs.tags }}
@@ -87,7 +87,7 @@ jobs:
           - platform: linux/amd64
             arch: amd64
             runner: x64
-    runs-on: [runs-on,"runner=4cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
+    runs-on: [runs-on,"runner=8cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     steps:
       - uses: runs-on/action@v1
       - uses: actions/checkout@v4
@@ -130,15 +130,15 @@ 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,version=1
+          cache-to: type=gha,version=1,mode=max
 
   deploy:
     name: Deploy To Registry
     permissions:
       contents: read
       packages: write
-    runs-on: [runs-on,"runner=4cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
+    runs-on: [runs-on,"runner=8cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     needs: [build, setup]
     if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
     steps:

.github/workflows/docs_deploy.yml

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

.github/workflows/docs_deploy2.yml

@@ -7,52 +7,42 @@ on:
       - "release/**"
     paths:
       - "docs/en/**"
-      - "docs/zh/**"
-      - "docs/uk/**"
-      - "docs/ko/**"
   pull_request:
+    branches:
+      - "**"
     paths:
       - "docs/en/**"
-      - "docs/zh/**"
-      - "docs/uk/**"
-      - "docs/ko/**"
 
   workflow_dispatch:
 
 permissions:
   contents: read
-  actions: read
   id-token: write # for AWS OIDC
 
 concurrency:
   group: docs-deploy
   cancel-in-progress: false
 
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
 jobs:
   build:
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
-    outputs:
-      branchname: ${{ steps.set-branch.outputs.branchname }}
-      releaseversion: ${{ steps.set-version.outputs.releaseversion }}
+    runs-on:
+      [
+        runs-on,
+        runner=8cpu-linux-x64,
+        image=ubuntu24-full-x64,
+        "run-id=${{ github.run_id }}",
+        spot=false,
+        extras=s3-cache,
+      ]
     steps:
       - uses: runs-on/action@v1
 
       - name: Checkout
         uses: actions/checkout@v4
 
-      - id: set-branch
-        run: echo "branchname=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-
-      - id: set-version
-        run: |
-          branch="${{ steps.set-branch.outputs.branchname }}"
-          if [[ "$branch" == "main" ]]; then
-            version="main"
-          else
-            version="v${branch#release/}"
-          fi
-          echo "releaseversion=$version" >> $GITHUB_OUTPUT
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
@@ -65,8 +55,6 @@ jobs:
 
       - name: Build with VitePress
         working-directory: ./docs
-        env:
-          BRANCH_NAME: ${{ steps.set-version.outputs.releaseversion }}
         run: |
           npm run docs:build_ubuntu
           touch .vitepress/dist/.nojekyll
@@ -103,14 +91,14 @@ jobs:
 
       - name: Upload HTML with short cache
         run: |
-          aws s3 sync ~/_book/ s3://px4-docs/${{ needs.build.outputs.releaseversion }}/ \
+          aws s3 sync ~/_book/ s3://px4-docs/${{ env.BRANCH_NAME }}/ \
             --delete \
             --exclude "*" --include "*.html" \
             --cache-control "public, max-age=60"
 
       - name: Upload assets with long cache
         run: |
-          aws s3 sync ~/_book/ s3://px4-docs/${{ needs.build.outputs.releaseversion }}/ \
+          aws s3 sync ~/_book/ s3://px4-docs/${{ env.BRANCH_NAME }}/ \
             --delete \
             --exclude "*.html" \
             --cache-control "public, max-age=86400, immutable"

.github/workflows/failsafe_sim.yml

@@ -48,7 +48,6 @@ jobs:
         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
 

.github/workflows/flash_analysis.yml

@@ -24,7 +24,7 @@ env:
 jobs:
   analyze_flash:
     name: Analyzing ${{ matrix.target }}
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
       image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
     strategy:
@@ -54,7 +54,6 @@ jobs:
         run: |
           make clean
           make distclean
-          make submodulesclean
 
       - name: If it's a PR checkout the base branch
         if: ${{ github.event.pull_request }}
@@ -98,7 +97,7 @@ jobs:
   # Track this issue https://github.com/PX4/PX4-Autopilot/issues/24408
   post_pr_comment:
     name: Publish Results
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}"]
+    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     needs: [analyze_flash]
     env:
       V5X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-absolute) }}

.github/workflows/fuzzing.yml

@@ -5,7 +5,6 @@ on:
 
 permissions:
   contents: read
-  issues: write # for JasonEtco/create-an-issue
 
 env:
   RUNS_IN_DOCKER: true

.github/workflows/itcm_check.yml

@@ -22,7 +22,7 @@ concurrency:
 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]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
       image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
     strategy:
@@ -41,10 +41,6 @@ jobs:
             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:

.github/workflows/ros_integration_tests.yml

@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=16cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
       image: px4io/px4-dev-ros2-galactic:2021-09-08
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
@@ -90,9 +90,6 @@ jobs:
         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)"

.github/workflows/ros_translation_node.yml

@@ -21,7 +21,7 @@ concurrency:
 jobs:
   build_and_test:
     name: Build and test
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     strategy:
       fail-fast: false
       matrix:

.github/workflows/sitl_tests.yml

@@ -24,7 +24,7 @@ concurrency:
 jobs:
   build:
     name: Testing PX4 ${{ matrix.config.model }}
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=16cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
       image: px4io/px4-dev-simulation-focal:2021-09-08
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
@@ -118,7 +118,7 @@ jobs:
           PX4_HOME_LON: ${{matrix.config.longitude}}
           PX4_HOME_ALT: ${{matrix.config.altitude}}
           PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 10 --abort-early --model ${{matrix.config.model}} test/mavsdk_tests/configs/sitl.json --verbose --force-color
+        run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 10 --abort-early --model ${{matrix.config.model}} --upload test/mavsdk_tests/configs/sitl.json --verbose --force-color
         timeout-minutes: 45
 
       - name: Upload failed logs

.github/workflows/stale.yml

@@ -7,15 +7,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v8
         with:
-          operations-per-run: 250
-          days-before-stale: 90
-          days-before-close: 30
+          days-before-stale: 30
+          days-before-close: -1
           stale-issue-label: 'stale'
           stale-pr-label: 'stale'
           remove-stale-when-updated: true
-          stale-issue-message: ''
-          close-issue-message: 'This issue has been automatically closed due to 120 days of inactivity. If you believe this is still relevant, please feel free to reopen it or create a new issue.'
-          stale-pr-message: ''
-          close-pr-message: 'This pull request has been automatically closed due to 120 days of inactivity. If you would like to continue, please feel free to reopen it or submit a new PR.'

.github/workflows/sync_to_px4_msgs.yml

@@ -1,62 +0,0 @@
-name: Sync ROS 2 messages to px4_msgs
-on:
-  push:
-    branches:
-      - 'main'
-      - 'stable'
-      - 'beta'
-      - 'release/**'
-    paths:
-      - 'msg/**'
-      - 'srv/**'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  sync_to_px4_msgs:
-    if: github.repository == 'PX4/PX4-Autopilot'
-    runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
-    steps:
-      - name: Checkout PX4 repo
-        uses: actions/checkout@v4
-
-      - name: Setup git credentials
-        run: |
-          git config --global user.name "${{ secrets.PX4BUILDBOT_USER }}"
-          git config --global user.email "${{ secrets.PX4BUILDBOT_EMAIL }}"
-
-      - name: Clone PX4_msgs repo
-        run: |
-          git clone https://${{ secrets.PX4BUILTBOT_PERSONAL_ACCESS_TOKEN }}@github.com/PX4/px4_msgs.git
-
-      - name: Check out the same branch as the PX4 repo
-        run: |
-          cd px4_msgs
-          if git checkout ${{ github.ref_name }}; then
-            echo "Checked out existing branch"
-          else
-            git checkout -b ${{ github.ref_name }}
-          fi
-
-      - name: Copy ROS 2 messages
-        run: |
-          rm -f px4_msgs/msg/*.msg
-          rm -f px4_msgs/msg/versioned/*.msg
-          rm -f px4_msgs/srv/*.srv
-          rm -f px4_msgs/srv/versioned/*.srv
-          cp msg/*.msg px4_msgs/msg/
-          cp msg/versioned/*.msg px4_msgs/msg/ || true
-          cp srv/*.srv px4_msgs/srv/
-          cp srv/versioned/*.srv px4_msgs/srv/ || true
-
-      - name: Commit and push changes
-        run: |
-          cd px4_msgs
-          git status
-          git add .
-          git commit -a -m "Update to PX4 ${{ github.sha }}" || true
-          git push origin ${{ github.ref_name }} || true
-          cd ..
-          rm -rf px4_msgs

.gitmodules

@@ -100,12 +100,3 @@
 [submodule "src/drivers/ins/microstrain/mip_sdk"]
 	path = src/drivers/ins/microstrain/mip_sdk
 	url = https://github.com/PX4/LORD-MicroStrain_mip_sdk.git
-[submodule "src/drivers/ins/sbgecom/sbgECom"]
-	path = src/drivers/ins/sbgecom/sbgECom
-	url = https://github.com/PX4/sbgECom.git
-[submodule "src/modules/mc_raptor/blob"]
-	path = src/modules/mc_raptor/blob
-	url = https://github.com/rl-tools/px4-blob
-[submodule "src/lib/rl_tools/rl_tools"]
-	path = src/lib/rl_tools/rl_tools
-	url = https://github.com/rl-tools/rl-tools.git

.vscode/cmake-variants.yaml

@@ -6,16 +6,6 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_default
-    px4_sitl_raptor:
-      short: px4_sitl_raptor
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_raptor
-    px4_sitl_raptor_debug:
-      short: px4_sitl_raptor_debug
-      buildType: Debug
-      settings:
-        CONFIG: px4_sitl_raptor
     px4_sitl_spacecraft:
       short: px4_sitl_spacecraft
       buildType: RelWithDebInfo
@@ -46,11 +36,6 @@ CONFIG:
       buildType: RelWithDebInfo
       settings:
         CONFIG: px4_sitl_test
-    px4_sitl_zenoh:
-      short: px4_sitl_zenoh
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_test
     px4_io-v2_default:
       short: px4_io-v2
       buildType: MinSizeRel
@@ -151,11 +136,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_can-flow_canbootloader
-    ark_can-flow-mr_default:
-      short: ark_can-flow-mr_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-flow-mr_default
     ark_can-flow-mr_canbootloader:
       short: ark_can-flow-mr_canbootloader
       buildType: MinSizeRel
@@ -221,16 +201,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_dist_canbootloader
-    ark_f9p-gps_default:
-      short: ark_f9p-gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_f9p-gps_default
-    ark_f9p-gps_canbootloader:
-      short: ark_f9p-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_f9p-gps_canbootloader
     ark_fmu-v6x_bootloader:
       short: ark_fmu-v6x_bootloader
       buildType: MinSizeRel
@@ -251,16 +221,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_fpv_default
-    ark_mag_canbootloader:
-      short: ark_mag_canbootloader
-      buildType: MiniSizeRel
-      settings:
-        CONFIG: ark_mag_canbootloader
-    ark_mag_default:
-      short: ark_mag_default
-      buildType: MiniSizeRel
-      settings:
-        CONFIG: ark_mag_default
     ark_pi6x_bootloader:
       short: ark_pi6x_bootloader
       buildType: MinSizeRel
@@ -271,16 +231,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_pi6x_default
-    ark_x20-gps_default:
-      short: ark_x20-gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_x20-gps_default
-    ark_x20-gps_canbootloader:
-      short: ark_x20-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_x20-gps_canbootloader
     atl_mantis-edu_default:
       short: atl_mantis-edu
       buildType: MinSizeRel
@@ -431,16 +381,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: micoair_h743-v2_default
-    micoair_h743-lite_bootloader:
-      short: micoair_h743-lite_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: micoair_h743-lite_bootloader
-    micoair_h743-lite_default:
-      short: micoair_h743-lite
-      buildType: MinSizeRel
-      settings:
-        CONFIG: micoair_h743-lite_default
     modalai_fc-v1_default:
       short: modalai_fc-v1
       buildType: MinSizeRel
@@ -491,16 +431,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: nxp_mr-canhubk3_fmu
-    nxp_mr-tropic_default:
-      short: nxp_mr-tropic_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_mr-tropic_default
-    nxp_mr-tropic_bootloader:
-      short: nxp_mr-tropic_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_mr-tropic_bootloader
     nxp_tropic-community_default:
       short: nxp_tropic-community_default
       buildType: MinSizeRel
@@ -531,23 +461,3 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: x-mav_ap-h743v2_default
-    svehicle_e2_bootloader:
-      short: svehicle_e2_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: svehicle_e2_bootloader
-    svehicle_e2_default:
-      short: svehicle_e2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: svehicle_e2_default
-    x-mav_ap-h743r1_bootloader:
-      short: x-mav_ap-h743r1-boot
-      buildType: MinSizeRel
-      settings:
-        CONFIG: x-mav_ap-h743r1_bootloader
-    x-mav_ap-h743r1_default:
-      short: x-mav_ap-h743r1
-      buildType: MinSizeRel
-      settings:
-        CONFIG: x-mav_ap-h743r1_default

.vscode/settings.json

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

CLAUDE.md

@@ -1,467 +0,0 @@
-# Bitbang DShot Prototype - Design Specification
-
-## Goal
-
-Implement bitbang DShot (including bidirectional) as an alternative to the existing DMA burst/capture approach in the STM32H7 platform layer. The implementation is generic - it works on any STM32H7 board by dynamically discovering port/pin groupings from `timer_io_channels[]` at init time. The **ARK FPV** board is the test target.
-
-Bitbang DShot uses a pacer timer to trigger DMA transfers to/from GPIO registers (BSRR for output, IDR for input), instead of using timer PWM channels with DMA burst to CCR registers. This decouples motor signal generation from timer channel hardware and enables simultaneous capture of all motors on a GPIO port (eliminating round-robin).
-
-## Key Advantage Over Current Approach
-
-The current BDShot implementation captures **one motor per timer per cycle** (round-robin) because each capture channel needs its own DMA stream. At 200Hz update rate, each motor gets RPM updates at only 50Hz (200/4).
-
-Bitbang capture reads the entire GPIO IDR register on every sample, capturing **all motors on a port simultaneously**. Every cycle produces RPM data for every motor - a 4x improvement in per-motor RPM update rate.
-
-## Architecture Overview
-
-### Current (DMA Burst/Capture)
-```
-Timer (PWM mode) ──► CCR1-CCR4 (via DMA burst to DMAR) ──► Pin AF output
-Timer (Capture mode) ──► CCR edge timestamps (via per-channel DMA) ──► one channel at a time
-```
-
-### Bitbang
-```
-Timer (counter mode) ──► Update event triggers DMA ──► writes BSRR words to GPIO port
-Timer (counter mode) ──► Update event triggers DMA ──► reads IDR from GPIO port (all pins)
-```
-
-## Port Group Discovery
-
-At init time, the implementation iterates `timer_io_channels[]` and groups channels by GPIO port. The port and pin are extracted from the existing `gpio_out` field using NuttX bit encoding:
-
-```c
-#include <stm32_gpio.h>  // GPIO_PORT_MASK, GPIO_PORT_SHIFT, GPIO_PIN_MASK, GPIO_PIN_SHIFT
-
-// Extract port index and pin number from timer_io_channels[ch].gpio_out
-uint8_t port_index = (gpio_out & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;  // 0=A, 1=B, ... 7=H, 8=I
-uint8_t pin_number = (gpio_out & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;    // 0-15
-
-// Get GPIO peripheral base address from NuttX lookup table
-uint32_t gpio_base = g_gpiobase[port_index];  // e.g., STM32_GPIOH_BASE = 0x58021C00
-```
-
-### Port Group Init Algorithm
-
-```c
-// Pseudocode for up_dshot_init()
-for (uint8_t ch = 0; ch < MAX_TIMER_IO_CHANNELS; ch++) {
-    if (!(channel_mask & (1 << ch))) continue;
-
-    uint32_t gpio_out = timer_io_channels[ch].gpio_out;
-    uint8_t port_index = (gpio_out & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-    uint8_t pin_num = (gpio_out & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
-    uint8_t timer_index = timer_io_channels[ch].timer_index;
-
-    // Find or create port group for this GPIO port
-    port_group_t *pg = find_or_create_port_group(port_index);
-    pg->gpio_base = g_gpiobase[port_index];
-    pg->pin_mask |= (1 << pin_num);
-    pg->moder_mask |= (3 << (pin_num * 2));
-    pg->moder_output |= (1 << (pin_num * 2));  // 01 = output mode
-    pg->pin_numbers[pg->pin_count] = pin_num;
-    pg->output_channels[pg->pin_count] = ch;
-    pg->pin_count++;
-
-    // Assign a pacer timer - use the first timer associated with any motor on this port.
-    // On H7 with DMAMUX the timer just needs a TIMx_UP DMA mapping; any timer works.
-    if (pg->timer_index == UINT8_MAX) {
-        pg->timer_index = timer_index;
-    }
-}
-```
-
-This works on any board. Motors on the same GPIO port share a port group regardless of which timer they were originally assigned to.
-
-### ARK FPV Example (test target)
-
-On the ARK FPV, the above algorithm produces two port groups:
-
-| Motor   | GPIO  | Pin | Port Group | Pacer Timer |
-|---------|-------|-----|------------|-------------|
-| FMU_CH1 | PI0   | 0   | Port I     | TIM5 (first timer seen on Port I) |
-| FMU_CH2 | PH12  | 12  | Port H     | TIM5        |
-| FMU_CH3 | PH11  | 11  | Port H     | TIM5        |
-| FMU_CH4 | PH10  | 10  | Port H     | TIM5        |
-| FMU_CH5 | PI5   | 5   | Port I     | (already assigned) |
-| FMU_CH6 | PI6   | 6   | Port I     | (already assigned) |
-| FMU_CH7 | PI7   | 7   | Port I     | (already assigned) |
-| FMU_CH8 | PI2   | 2   | Port I     | (already assigned) |
-
-- **Port H group**: 3 motors, pin_mask=0x1C00, pacer=TIM5
-- **Port I group**: 5 motors, pin_mask=0xE5, pacer=TIM5 (first timer found; could also be TIM8)
-
-Note: The pacer timer just needs a valid `dma_map_up` entry. The first timer encountered for a port group is used. Since DMAMUX on H7 can route any timer update event to any DMA stream, any timer with DMA configured works as a pacer.
-
-## GPIO Registers (STM32H7)
-
-```
-Offset 0x00: MODER   - Mode register (2 bits/pin: 00=input, 01=output, 10=AF, 11=analog)
-Offset 0x10: IDR     - Input data register (read-only, bits [15:0] = pin state)
-Offset 0x14: ODR     - Output data register
-Offset 0x18: BSRR    - Bit set/reset register (write-only, atomic)
-                        Bits [15:0]  = SET (writing 1 sets pin HIGH)
-                        Bits [31:16] = RESET (writing 1 sets pin LOW)
-                        Writing 0 = no change
-```
-
-GPIO base addresses are looked up at runtime via `g_gpiobase[port_index]` (NuttX global array).
-
-### MODER Manipulation
-
-Pin masks and MODER masks are computed dynamically during port group init from the discovered pin numbers:
-
-```c
-// For each pin in the port group:
-pg->pin_mask |= (1 << pin_num);                 // for BSRR set/reset
-pg->moder_mask |= (3 << (pin_num * 2));         // which MODER bits to touch
-pg->moder_output |= (1 << (pin_num * 2));       // 01 = general purpose output
-// moder_input is always 0 (clear the bits = input mode)
-```
-
-To switch to output: `modifyreg32(gpio_base + STM32_GPIO_MODER_OFFSET, pg->moder_mask, pg->moder_output)`
-To switch to input:  `modifyreg32(gpio_base + STM32_GPIO_MODER_OFFSET, pg->moder_mask, 0)`
-
-## DMA Configuration
-
-The DMA request source (DMAMUX) stays the same as current - TIMx_UP triggers each DMA transfer. The only change is the **peripheral address** and **transfer direction**.
-
-### Output DMA (Memory → GPIO BSRR)
-```c
-// Peripheral address is GPIO BSRR instead of TIM DMAR
-px4_stm32_dmasetup(pg->dma_handle,
-    pg->gpio_base + STM32_GPIO_BSRR_OFFSET,       // e.g., 0x58021C18 for Port H
-    (uint32_t)bsrr_output_buffer[pg_index],
-    SUBPERIODS_PER_BIT * DSHOT_FRAME_BITS,          // 20 * 16 = 320 transfers (+ 1 trailing zero)
-    DMA_SCR_PRIHI | DMA_SCR_MSIZE_32BITS | DMA_SCR_PSIZE_32BITS |
-    DMA_SCR_MINC | DMA_SCR_DIR_M2P | DMA_SCR_TCIE);
-```
-
-### Input DMA (GPIO IDR → Memory)
-```c
-px4_stm32_dmasetup(pg->dma_handle,
-    pg->gpio_base + STM32_GPIO_IDR_OFFSET,          // e.g., 0x58021C10 for Port H
-    (uint32_t)idr_capture_buffer[pg_index],
-    CAPTURE_SAMPLE_COUNT,                            // enough samples for GCR frame (~512)
-    DMA_SCR_PRIHI | DMA_SCR_MSIZE_16BITS | DMA_SCR_PSIZE_16BITS |
-    DMA_SCR_MINC | DMA_SCR_DIR_P2M | DMA_SCR_TCIE);
-```
-
-### DMAMUX Routing (unchanged)
-
-Each port group uses its pacer timer's `dma_map_up` for DMAMUX routing:
-```c
-pg->dma_handle = stm32_dmachannel(io_timers[pg->timer_index].dshot.dma_map_up);
-```
-
-The DMAMUX determines **when** the DMA fires (on timer update events). The DMA stream registers determine **what** gets transferred (BSRR/IDR addresses). These are independent - the DMA request source and transfer target don't need to be the same peripheral.
-
-## Timer Configuration
-
-Each port group's pacer timer is configured as a simple upcounter. No PWM output, no capture-compare - just generate periodic update events.
-
-```c
-// Same prescaler as current DShot implementation
-rPSC(timer) = ((timer_clock_freq / dshot_pwm_freq) / DSHOT_MOTOR_PWM_BIT_WIDTH) - 1;
-rARR(timer) = DSHOT_MOTOR_PWM_BIT_WIDTH - 1;  // 19 (20 counts per sub-period)
-// Enable update DMA request
-rDIER(timer) |= ATIM_DIER_UDE;
-// Enable counter
-rCR1(timer) |= GTIM_CR1_CEN;
-```
-
-With `DSHOT_MOTOR_PWM_BIT_WIDTH = 20`, each timer update fires DMA once per sub-period. One DShot bit = 20 sub-periods.
-
-## Output Buffer Layout (BSRR Words)
-
-Each DShot frame is 16 bits. Each bit has 20 sub-periods. The buffer contains one 32-bit BSRR word per sub-period.
-
-**DShot bit waveform (sub-periods 0-19):**
-- Bit '1' (70% duty): SET at sub-period 0, RESET at sub-period 14, zeros elsewhere
-- Bit '0' (35% duty): SET at sub-period 0, RESET at sub-period 7, zeros elsewhere
-
-**Buffer structure per port:**
-```
-[bit0_subperiod0] [bit0_subperiod1] ... [bit0_subperiod19]
-[bit1_subperiod0] [bit1_subperiod1] ... [bit1_subperiod19]
-...
-[bit15_subperiod0] [bit15_subperiod1] ... [bit15_subperiod19]
-[trailing_zero]  ← ensures all pins return LOW at frame end
-```
-
-Total: (16 * 20) + 1 = 321 BSRR words = 1284 bytes per port.
-
-**Encoding example** (3 motors on pins 10, 11, 12 of some port, sending bits 1, 0, 1):
-```
-Sub-period 0:  BSRR = (1<<10) | (1<<11) | (1<<12)  = 0x00001C00  (SET all three)
-Sub-period 7:  BSRR = (1<<(11+16))                  = 0x00080000  (RESET pin11 only - it's '0')
-Sub-period 14: BSRR = (1<<(10+16)) | (1<<(12+16))   = 0x14000000  (RESET pin10, pin12 - they're '1')
-All other sub-periods: BSRR = 0x00000000 (no change)
-```
-
-### Motor Data Set Function
-
-The port group index and pin number for each output channel are determined at init time and stored in a lookup table. No per-frame discovery needed.
-
-```c
-// Populated during up_dshot_init() from timer_io_channels[ch].gpio_out
-static uint8_t _channel_to_port_group[MAX_TIMER_IO_CHANNELS];
-static uint8_t _channel_to_pin[MAX_TIMER_IO_CHANNELS];
-
-void dshot_motor_data_set(uint8_t output_channel, uint16_t packet)
-{
-    uint8_t pg_index = _channel_to_port_group[output_channel];
-    uint8_t pin_num = _channel_to_pin[output_channel];
-    uint32_t set_mask = (1 << pin_num);
-    uint32_t reset_mask = (1 << (pin_num + 16));
-
-    uint32_t *buffer = bsrr_output_buffer[pg_index];
-
-    for (int bit = 0; bit < 16; bit++) {
-        int base = bit * SUBPERIODS_PER_BIT;
-        bool is_one = (packet >> (15 - bit)) & 1;  // MSB first
-        int reset_point = is_one ? MOTOR_PWM_BIT_1 : MOTOR_PWM_BIT_0;
-
-        buffer[base + 0] |= set_mask;               // SET at start of bit
-        buffer[base + reset_point] |= reset_mask;    // RESET at duty cycle end
-    }
-}
-```
-
-Note: Buffer must be zeroed before building each frame, then all motors OR their masks into the shared per-port buffer.
-
-## Capture Buffer Layout (IDR Samples)
-
-After transmitting, GPIO pins switch to input mode. DMA samples the IDR register at the same timer rate (20 sub-periods per DShot bit period).
-
-**GCR response timing:**
-- GCR bit rate = DShot bit rate * 5/4 (750kHz for DShot600)
-- GCR bit period = 1.333us
-- Sample period = 83.3ns (at DShot600 with 20 sub-periods)
-- Samples per GCR bit = ~16 (heavy oversampling, good for edge detection)
-- GCR frame = 21 bits = ~336 samples minimum
-- Use 400-512 samples to be safe
-
-**Buffer:** Array of uint16_t, one per IDR sample.
-```
-[idr_sample_0] [idr_sample_1] ... [idr_sample_N]
-```
-
-Each sample contains all 16 pins of the port. Extract per-motor bitstream by masking:
-```c
-bool pin_state = (idr_sample >> pin_num) & 1;
-```
-
-### Capture Processing
-
-Convert IDR samples to edge intervals, then reuse existing GCR decoder:
-
-```c
-void process_bitbang_capture(uint8_t port_group, uint8_t pin_num, uint8_t output_channel)
-{
-    uint16_t *buffer = idr_capture_buffer[port_group];
-    uint32_t intervals[32];
-    unsigned interval_count = 0;
-
-    // Extract edges from IDR samples
-    bool prev_state = (buffer[0] >> pin_num) & 1;
-    unsigned last_edge = 0;
-
-    for (unsigned i = 1; i < CAPTURE_SAMPLE_COUNT; i++) {
-        bool state = (buffer[i] >> pin_num) & 1;
-        if (state != prev_state) {
-            // Edge detected
-            if (last_edge > 0 && interval_count < 32) {
-                intervals[interval_count++] = i - last_edge;
-            }
-            last_edge = i;
-            prev_state = state;
-        }
-    }
-
-    // Now decode using same GCR logic as existing code
-    // intervals[] contains sample counts between edges
-    // (equivalent to CCR timestamp differences in current impl)
-}
-```
-
-The existing `convert_edge_intervals_to_bitstream()` logic (adaptive base interval, bit counting, RLL/GCR decode, CRC check) can be reused with minor adaptation since the interval units are now sample counts instead of timer ticks. The ratio math is identical.
-
-## Sequence of Operations
-
-### Per-cycle flow (called from `up_dshot_trigger()`):
-
-```
-1. TRANSMIT PHASE
-   a. Zero the BSRR output buffers for all port groups
-   b. Build BSRR buffers (call dshot_motor_data_set for each motor)
-      - Each motor ORs its pin masks into its port group's shared buffer
-   c. Configure GPIO pins as output (MODER = 01) for each port group
-   d. Flush dcache on output buffers
-   e. For each port group:
-      - Allocate DMA via stm32_dmachannel(io_timers[pg->timer_index].dshot.dma_map_up)
-      - Setup DMA: memory→BSRR, 32-bit, 321 transfers
-      - Enable timer UDE (update DMA request)
-      - Start DMA with burst_finished_callback
-      - Enable timer counter
-   f. ~27us later (16 bits × 20 sub-periods × 83.3ns), DMA complete fires
-
-2. TRANSITION PHASE (in burst_finished_callback, per port group)
-   a. Stop DMA, free DMA handle
-   b. Disable timer
-   c. Switch GPIO pins to input mode (MODER = 00)
-   d. Schedule capture start via hrt_call_after(30us)
-
-3. CAPTURE PHASE (in capture_start_callback, per port group)
-   a. Zero capture buffer for this port group
-   b. Flush dcache
-   c. Allocate DMA via stm32_dmachannel(dma_map_up) [reuse same DMAMUX route]
-   d. Setup DMA: IDR→memory, 16-bit, 512 transfers
-   e. Enable timer UDE, start DMA, enable timer
-   f. Schedule capture_complete via hrt_call_after(frame_time + margin)
-
-4. PROCESSING PHASE (in capture_complete_callback, per port group)
-   a. Stop DMA, free DMA handle
-   b. Disable timer
-   c. Invalidate dcache on capture buffer
-   d. For EACH motor on the port (not round-robin!):
-      - Extract per-pin bitstream from IDR samples using pin_numbers[]
-      - Detect edges, compute intervals
-      - Decode GCR → eRPM/EDT
-   e. Switch GPIO back to output mode (MODER = 01)
-   f. Mark port group cycle complete
-
-```
-
-## File Structure
-
-### New file: `platforms/nuttx/src/px4/stm/stm32_common/dshot/dshot_bitbang.c`
-
-Implements the same `up_dshot_*` API as `dshot.c`:
-- `up_dshot_init()` - Initialize port groups, allocate DMA, configure timers
-- `up_dshot_trigger()` - Start the TX→wait→RX→process cycle
-- `dshot_motor_data_set()` - Build BSRR words into port group buffers
-- `up_dshot_arm()` - Enable/disable GPIO output
-- `up_bdshot_get_erpm()` - Return captured eRPM (unchanged)
-- `up_bdshot_channel_online()` - Return online status (unchanged)
-- `up_bdshot_status()` - Print diagnostics
-
-### New/modified: `platforms/nuttx/src/px4/stm/stm32_common/dshot/CMakeLists.txt`
-
-Add build option to select `dshot.c` vs `dshot_bitbang.c`.
-
-### Board-level config
-
-No board-specific changes needed. The bitbang implementation reads the same `io_timers[]` and `timer_io_channels[]` structures that every board already defines. It extracts GPIO port/pin from `timer_io_channels[].gpio_out` (which `initIOTimerChannel()` already populates with `getGPIOPort(pin.port) | getGPIOPin(pin.pin)`) and the DMA mapping from `io_timers[].dshot.dma_map_up`.
-
-A board opts into bitbang mode via a build flag or Kconfig option that selects `dshot_bitbang.c` instead of `dshot.c`.
-
-### What stays the same
-- `drv_dshot.h` API - no changes
-- `DShot.cpp` / `DShot.h` (the driver module) - no changes
-- `DShotTelemetry.cpp` / `DShotTelemetry.h` - no changes
-- GCR decoding logic - copied/adapted from dshot.c but the core algorithm is identical
-- All higher-level consumers of eRPM data
-
-## Data Structures
-
-```c
-#define MAX_PORT_GROUPS 4  // Max distinct GPIO ports with motor pins (typically 1-3)
-#define MAX_PINS_PER_GROUP 8
-
-// Port group: one per GPIO port that has motor pins. Built dynamically at init.
-typedef struct port_group_t {
-    uint32_t gpio_base;                          // GPIO port base address (from g_gpiobase[])
-    uint8_t  port_index;                         // NuttX port index (0=A, 7=H, 8=I, etc.)
-    uint32_t pin_mask;                           // Bitmask of motor pins on this port
-    uint32_t moder_mask;                         // MODER register mask for mode switching
-    uint32_t moder_output;                       // MODER value for output mode (01 per pin)
-    uint8_t  pin_count;                          // Number of motor pins on this port
-    uint8_t  pin_numbers[MAX_PINS_PER_GROUP];    // Pin numbers (0-15)
-    uint8_t  output_channels[MAX_PINS_PER_GROUP]; // Corresponding output channel indices
-    uint8_t  timer_index;                        // Pacer timer index (into io_timers[])
-    DMA_HANDLE dma_handle;                       // DMA stream handle (reused between TX/RX)
-    bool     bidirectional;                      // BDShot enabled for this group
-    bool     cycle_complete;                     // Ready for next trigger
-} port_group_t;
-
-static port_group_t _port_groups[MAX_PORT_GROUPS] = {};
-static uint8_t _num_port_groups = 0;
-
-// Per-channel lookup tables (populated at init from timer_io_channels[].gpio_out)
-static uint8_t _channel_to_port_group[MAX_TIMER_IO_CHANNELS];
-static uint8_t _channel_to_pin[MAX_TIMER_IO_CHANNELS];
-```
-
-## DMA Resource Usage Comparison
-
-### Current (DMA burst + capture)
-- **Output**: 1 DMA stream per timer = N_timers streams
-- **Capture**: 1 DMA stream per captured channel (round-robin, 1 at a time per timer)
-- DMA streams are freed/reallocated between burst and capture phases
-
-### Bitbang
-- **Output**: 1 DMA stream per port group = N_ports streams
-- **Capture**: 1 DMA stream per port group (same streams, reconfigured)
-- DMA streams freed/reallocated between phases (same pattern as current)
-
-DMA resource usage is equivalent (typically N_timers == N_ports or close). The DMAMUX routing uses the same timer update event mappings.
-
-## Memory Usage
-
-### Current
-- Output: ~272 bytes per timer (4 channels * 17 words * 4 bytes, cache-aligned)
-- Capture: ~256 bytes per timer (4 channels * 32 samples * 2 bytes)
-
-### Bitbang
-- Output: ~1284 bytes per port group (321 words * 4 bytes, cache-aligned)
-- Capture: ~1024 bytes per port group (512 samples * 2 bytes, cache-aligned)
-- Scales with number of port groups, not number of motors
-- Higher per-group cost, but acceptable for H7 (1MB+ SRAM)
-
-## Open Questions / Risks
-
-1. **GPIO output speed**: BSRR writes through AHB4 bus on H7. At 83.3ns per DMA transfer (12MHz), is there enough bus bandwidth? Should be fine - AHB4 runs at 240MHz, and BSRR writes are single-cycle.
-
-2. **DMA priority vs other peripherals**: SPI1 (IMU) is on DMA1. Timer DMA is already high priority. No change expected.
-
-3. **GPIO input threshold**: When reading IDR for bidir, the input threshold depends on GPIO input configuration (Schmitt trigger, pull-up/down). The current capture approach uses timer input capture which has different input characteristics. May need to configure GPIO pull-up to match idle-high behavior.
-
-4. **Signal integrity**: Timer PWM output has precise edge timing locked to the timer clock. BSRR writes via DMA may have slight jitter due to bus arbitration. This is likely negligible (< 10ns on H7) but should be verified.
-
-5. **OTYPER configuration**: For bidirectional DShot, the pin needs to be open-drain (or at least not actively driven when in input mode). The MODER switch to input (00) handles this, but verify that switching MODER during/after a frame doesn't cause glitches.
-
-6. **Cache coherency**: BSRR output buffers need dcache clean before DMA. IDR capture buffers need dcache invalidate after DMA. Same pattern as current code.
-
-## Implementation Order
-
-1. **Port group initialization**: Parse `timer_io_channels[]` to build `port_group_t` structures grouped by GPIO port instead of timer
-2. **Output-only DShot**: Implement BSRR buffer building and DMA output. Verify with logic analyzer that DShot frames are correct
-3. **Bidirectional capture**: Implement IDR sampling and per-pin edge extraction. Verify GCR decode produces valid eRPM
-4. **Integration**: Wire up to the existing `up_dshot_*` API so `DShot.cpp` works unchanged
-5. **Testing**: Compare eRPM data quality (CRC error rate, update rate) vs current implementation
-
-## Reference: Betaflight Bitbang Implementation
-
-- [Betaflight dshot_bitbang.c](https://github.com/betaflight/betaflight/blob/master/src/platform/STM32/dshot_bitbang.c)
-- [Betaflight dshot_bitbang_impl.h](https://github.com/betaflight/betaflight/blob/master/src/main/drivers/dshot_bitbang_impl.h)
-- [Original GPIO banging PR #7446](https://github.com/betaflight/betaflight/pull/7446)
-- [Bidirectional bitbang PR #8779](https://github.com/betaflight/betaflight/pull/8779)
-
-## Reference: Current PX4 Implementation Files
-
-- DShot platform layer: `platforms/nuttx/src/px4/stm/stm32_common/dshot/dshot.c`
-- IO timer layer: `platforms/nuttx/src/px4/stm/stm32_common/io_pins/io_timer.c`
-- IO timer struct defs: `platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h`
-- GPIO/pin helpers: `platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/hw_description.h`
-- H7 timer/DMA descriptions: `platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/io_timer_hw_description.h`
-- H7 GPIO register defs: NuttX `arch/arm/src/stm32h7/stm32_gpio.h` (GPIO_PORT_MASK, GPIO_PIN_MASK, g_gpiobase[])
-- H7 GPIO HW registers: NuttX `arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h` (STM32_GPIO_MODER_OFFSET, etc.)
-- DShot API header: `src/drivers/drv_dshot.h`
-- DShot driver module: `src/drivers/dshot/DShot.cpp`
-
-## Reference: Test Target (ARK FPV)
-
-- Timer config: `boards/ark/fpv/src/timer_config.cpp`
-- DMA map: `boards/ark/fpv/nuttx-config/include/board_dma_map.h`
-- Board config: `boards/ark/fpv/src/board_config.h`

CMakeLists.txt

@@ -267,7 +267,7 @@ endif()
 
 set(package-contact "px4users@googlegroups.com")
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)

CTestConfig.cmake

@@ -0,0 +1,15 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+##
+## # The following are required to submit to the CDash dashboard:
+##   ENABLE_TESTING()
+##   INCLUDE(CTest)
+
+set(CTEST_PROJECT_NAME "PX4 Firmware")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=PX4+Firmware")
+set(CTEST_DROP_SITE_CDASH TRUE)

Jenkinsfile

@@ -101,7 +101,6 @@ pipeline {
             echo $0;
             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;
             cd ..;
@@ -221,6 +220,36 @@ pipeline {
           }
         }
 
+        stage('PX4 ROS msgs') {
+          agent {
+            docker { image 'px4io/px4-dev-base-focal:2021-08-18' }
+          }
+          steps {
+            sh('export')
+            sh('make distclean; git clean -ff -x -d .')
+            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
+              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
+              // 'main' branch
+              sh('rm -f px4_msgs/msg/*.msg')
+              sh('rm -f px4_msgs/msg/versioned/*.msg')
+              sh('rm -f px4_msgs/srv/*.srv')
+              sh('rm -f px4_msgs/srv/versioned/*.srv')
+              sh('cp msg/*.msg px4_msgs/msg/')
+              sh('cp msg/versioned/*.msg px4_msgs/msg/ || true')
+              sh('cp srv/*.srv px4_msgs/srv/')
+              sh('cp srv/versioned/*.srv px4_msgs/srv/ || true')
+              sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
+              sh('cd px4_msgs; git push origin main || true')
+              sh('rm -rf px4_msgs')
+            }
+          }
+          when {
+            anyOf {
+              branch 'main'
+            }
+          }
+        }
+
         stage('S3') {
           agent {
             docker { image 'px4io/px4-dev-base-focal:2021-08-18' }

Kconfig

@@ -73,11 +73,6 @@ menu "Toolchain"
         help
             relative path to the ROMFS root directory
 
-    config BOARD_ADDITIONAL_INIT
-        string "Additional init file"
-        help
-            additional configurable init file to include in the ROMFS
-
     config BOARD_IO
         string "IO board name"
         default "px4_io-v2_default"

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2012 - 2025, PX4 Development Team
+Copyright (c) 2012 - 2023, PX4 Development Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

MAINTAINERS.md

@@ -19,7 +19,7 @@ See [the documentation on Maintainers](https://docs.px4.io/main/en/contribute/ma
 | Matthias Grob | Multirotor | [@MaEtUgR](https://github.com/MaEtUgR) | maetugr |
 | Silvan Fuhrer | Fixed-Wing / VTOL | [@sfuhrer](https://github.com/sfuhrer) | sfuhrer |
 | Christian Friedrich | Rover | [@chfriedrich98](https://github.com/chfriedrich98) | christian982564 |
-| Pedro Roque | Spacecraft | [@Pedro-Roque](https://github.com/Pedro-Roque) | .pedroroque | <roque@caltech.edu>
+| Pedro Roque | Spacecraft | [@Pedro-Roque](https://github.com/Pedro-Roque) | .pedroroque | <padr@kth.se>
 | Jacob Dahl | Simulation | [@dakejahl](https://github.com/dakejahl) | dakejahl | <dahl.jakejacob@gmail.com>
 
 

Makefile

@@ -325,8 +325,6 @@ bootloaders_update: \
 	ark_fmu-v6x_bootloader \
 	ark_fpv_bootloader \
 	ark_pi6x_bootloader \
-	auterion_fmu-v6s_bootloader \
-	auterion_fmu-v6x_bootloader \
 	cuav_nora_bootloader \
 	cuav_x7pro_bootloader \
 	cuav_7-nano_bootloader \
@@ -346,7 +344,6 @@ bootloaders_update: \
         micoair_h743_bootloader \
         micoair_h743-aio_bootloader \
 	micoair_h743-v2_bootloader \
-	micoair_h743-lite_bootloader \
 	modalai_fc-v2_bootloader \
 	mro_ctrl-zero-classic_bootloader \
 	mro_ctrl-zero-h7_bootloader \
@@ -514,7 +511,6 @@ validate_module_configs:
 	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f \
 	-not -path "$(SRC_DIR)/src/lib/mixer_module/*" \
 	-not -path "$(SRC_DIR)/src/modules/uxrce_dds_client/dds_topics.yaml" \
-	-not -path "$(SRC_DIR)/src/modules/zenoh/dds_topics.yaml" \
 	-not -path "$(SRC_DIR)/src/modules/zenoh/zenoh-pico/*" \
 	-not -path "$(SRC_DIR)/src/lib/events/libevents/*" \
 	-not -path "$(SRC_DIR)/src/lib/cdrstream/*" \

ROMFS/CMakeLists.txt

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

ROMFS/cannode/init.d/rcS

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

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

@@ -27,6 +27,7 @@ param set-default SIH_KDV 0.2
 param set-default SIH_VEHICLE_TYPE 1 	# sih as fixed wing
 param set-default RWTO_TKOFF 1  # enable takeoff from runway (as opposed to launched)
 
+param set-default CA_AIRFRAME 1
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -44,6 +44,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -46,6 +46,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -46,6 +46,8 @@ param set-default MIS_TAKEOFF_ALT 30
 param set-default NAV_ACC_RAD 15
 param set-default NAV_DLL_ACT 2
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -31,6 +31,8 @@ param set-default NAV_DLL_ACT 2
 param set-default RWTO_TKOFF 1
 param set-default RWTO_PSP 8
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

ROMFS/px4fmu_common/init.d-posix/airframes/1034_flightgear_rascal-electric

@@ -31,6 +31,8 @@ param set-default NAV_DLL_ACT 2
 param set-default RWTO_TKOFF 1
 param set-default RWTO_PSP 8
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -30,6 +30,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -31,6 +31,8 @@ param set-default NAV_DLL_ACT 2
 param set-default RWTO_TKOFF 1
 param set-default RWTO_PSP 8
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -38,6 +38,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -44,6 +44,8 @@ param set-default MIS_TAKEOFF_ALT 30
 param set-default NAV_ACC_RAD 15
 param set-default NAV_DLL_ACT 2
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -35,6 +35,8 @@ param set-default RWTO_MAX_PITCH 20
 param set-default RWTO_PSP 8
 param set-default RWTO_AIRSPD_SCL 1.8
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

ROMFS/px4fmu_common/init.d-posix/airframes/1039_gazebo-classic_advanced_plane

@@ -35,6 +35,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -46,6 +46,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -43,6 +43,8 @@ param set-default FW_THR_TRIM 0.8
 param set-default FW_THR_IDLE 0
 param set-default COM_DISARM_PRFLT 0
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -48,6 +48,8 @@ param set-default FW_THR_TRIM 0.8
 param set-default FW_THR_IDLE 0
 param set-default COM_DISARM_PRFLT 0
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

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

@@ -53,6 +53,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default COM_PREARM_MODE 2
 
 param set-default CA_ROTOR_COUNT 1

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

@@ -101,6 +101,6 @@ param set-default NAV_ACC_RAD 5
 param set-default NAV_DLL_ACT 2
 
 param set-default VT_FWD_THRUST_EN 4
-param set-default VT_F_TRANS_THR 1
+param set-default VT_F_TRANS_THR 0.3
 param set-default VT_TYPE 2
 param set-default FD_ESCS_EN 0

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

@@ -11,6 +11,8 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=advanced_plane}
 
 param set-default SIM_GZ_EN 1
 
+param set-default SENS_EN_ARSPDSIM 1
+
 param set-default FW_LND_ANG 8
 
 param set-default FW_PR_FF 0.08
@@ -46,6 +48,8 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 
 param set-default CA_SV_CS_COUNT 6

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

@@ -1,5 +1,5 @@
 #!/bin/sh
-# @name Generic Ackermann Rover
+# @name Rover Ackermann
 # @type Rover
 # @class Rover
 
@@ -14,32 +14,30 @@ param set-default SIM_GZ_EN 1 # Gazebo bridge
 param set-default NAV_ACC_RAD 0.5
 
 # Ackermann Parameters
-param set-default RA_WHEEL_BASE 0.5
+param set-default RA_WHEEL_BASE 0.321
 param set-default RA_ACC_RAD_GAIN 2
-param set-default RA_ACC_RAD_MAX 1.5
+param set-default RA_ACC_RAD_MAX 3
 param set-default RA_MAX_STR_ANG 0.5236
 param set-default RA_STR_RATE_LIM 360
 
-# Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
-param set-default RO_YAW_RATE_P 0.25
-param set-default RO_YAW_RATE_LIM 130
-param set-default RO_YAW_ACCEL_LIM 800
-param set-default RO_YAW_DECEL_LIM 800
-param set-default RO_YAW_RATE_CORR 1
-param set-default RO_YAW_EXPO 0.85
-param set-default RO_YAW_SUPEXPO 0.3
+# Rover Control Parameters
+param set-default RO_ACCEL_LIM 3
+param set-default RO_DECEL_LIM 6
+param set-default RO_JERK_LIM 15
+param set-default RO_MAX_THR_SPEED 3.1
 
-# Attitude Control Parameters
+# Rover Rate Control Parameters
+param set-default RO_YAW_RATE_I 0.1
+param set-default RO_YAW_RATE_P 1
+param set-default RO_YAW_RATE_LIM 180
+param set-default RO_YAW_RATE_CORR 1
+
+# Rover Attitude Control Parameters
 param set-default RO_YAW_P 3
 
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 4
-param set-default RO_DECEL_LIM 6
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 3.1
-param set-default RO_SPEED_LIM 2.5
-param set-default RO_SPEED_I 0.01
+# Rover Velocity Control Parameters
+param set-default RO_SPEED_LIM 3
+param set-default RO_SPEED_I 0.1
 param set-default RO_SPEED_P 1
 param set-default RO_SPEED_RED 1
 
@@ -50,8 +48,8 @@ param set-default PP_LOOKAHD_MIN 1
 
 # Wheels
 param set-default SIM_GZ_WH_FUNC1 101
-param set-default SIM_GZ_WH_MIN1 70
-param set-default SIM_GZ_WH_MAX1 130
+param set-default SIM_GZ_WH_MIN1 0
+param set-default SIM_GZ_WH_MAX1 200
 param set-default SIM_GZ_WH_DIS1 100
 
 # Steering

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

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

ROMFS/px4fmu_common/init.d-posix/airframes/4019_gz_x500_gimbal

@@ -19,6 +19,5 @@ param set-default MNT_MAN_PITCH 2
 param set-default MNT_MAN_YAW 3
 
 param set-default MNT_RANGE_ROLL 180
-param set-default MNT_MAX_PITCH 45
-param set-default MNT_MIN_PITCH -135
+param set-default MNT_RANGE_PITCH 180
 param set-default MNT_RANGE_YAW 720

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

@@ -17,7 +17,6 @@ param set-default NAV_ACC_RAD 0.5
 param set-default RD_WHEEL_TRACK 0.6
 param set-default RD_TRANS_DRV_TRN 0.785398
 param set-default RD_TRANS_TRN_DRV 0.174533
-param set-default RD_YAW_STK_GAIN 0.6
 
 # Rate Control Parameters
 param set-default RO_YAW_RATE_I 0.01
@@ -26,8 +25,6 @@ param set-default RO_YAW_RATE_LIM 250
 param set-default RO_YAW_ACCEL_LIM 400
 param set-default RO_YAW_DECEL_LIM 800
 param set-default RO_YAW_RATE_CORR 1
-param set-default RO_YAW_EXPO 0.85
-param set-default RO_YAW_SUPEXPO 0.3
 
 # Attitude Control Parameters
 param set-default RO_YAW_P 5

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

@@ -34,6 +34,7 @@ param set-default COM_LOW_BAT_ACT 0
 param set-default NAV_DLL_ACT 0
 param set-default GF_ACTION 1
 param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
 
 # disable attitude failure detection
 param set-default FD_FAIL_P 0

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

@@ -26,6 +26,7 @@ param set-default TRIG_INTERFACE 3
 param set-default TRIG_MODE 4
 param set-default MNT_MODE_IN 4
 param set-default MNT_MODE_OUT 2
+param set-default MAV_PROTO_VER 2
 
 param set-default CA_AIRFRAME 0
 param set-default CA_ROTOR_COUNT 6

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

@@ -1,21 +1,10 @@
 #!/bin/sh
 #
-# @name KTH-ATMOS
+# @name 3DoF Spacecraft Model
 #
-# @type Free-Flyer
-# @class Spacecraft
+# @type 2D Freeflyer with 8 thrusters - Planar motion
 #
-# @output Motor1 back left thruster, +x thrust
-# @output Motor2 front left thruster, -x thrust
-# @output Motor3 back right thruster, +x thrust
-# @output Motor4 front right thruster, -x thrust
-# @output Motor5 front left thruster, +y thrust
-# @output Motor6 front right thruster, -y thrust
-# @output Motor7 back left thruster, +y thrust
-# @output Motor8 back right thruster, -y thrust
-#
-# @maintainer discower-io
-# @url https://atmos.discower.io
+# @maintainer Pedro Roque <padr@kth.se>
 #
 
 . ${R}etc/init.d/rc.sc_defaults
@@ -45,6 +34,7 @@ param set-default COM_LOW_BAT_ACT 0
 param set-default NAV_DLL_ACT 0
 param set-default GF_ACTION 1
 param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
 
 # disable attitude failure detection
 param set-default FD_FAIL_P 0

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

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

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

@@ -80,8 +80,10 @@ px4_add_romfs_files(
 	4009_gz_r1_rover
 	4010_gz_x500_mono_cam
 	4011_gz_lawnmower
+	4012_gz_rover_ackermann
 	4013_gz_x500_lidar_2d
 	4014_gz_x500_mono_cam_down
+	4015_gz_r1_rover_mecanum
 	4016_gz_x500_lidar_down
 	4017_gz_x500_lidar_front
 	4018_gz_quadtailsitter
@@ -112,13 +114,10 @@ px4_add_romfs_files(
 	17002_flightgear_tf-g2
 
 	50000_gz_rover_differential
-	51000_gz_rover_ackermann
-	52000_gz_rover_mecanum
 
 	60002_gz_uuv_bluerov2_heavy
 
 	70000_gz_atmos
-	70001_gz_atmos_dual
 
 	# [22000, 22999] Reserve for custom models
 )

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

@@ -159,19 +159,24 @@ if [ -n "${PX4_SIM_MODEL#*gz_}" ] && [ -z "${PX4_GZ_MODEL_NAME}" ]; then
 	fi
 
 	# Set up camera to follow the model if requested
-	if [ -z "${PX4_GZ_NO_FOLLOW}" ]; then
+	if [ -n "${PX4_GZ_FOLLOW}" ]; then
 
 		echo "INFO  [init] Setting camera to follow ${MODEL_NAME_INSTANCE}"
 
+		# Set camera to follow the model
+		${gz_command} service -s "/gui/follow" --reqtype gz.msgs.StringMsg \
+				--reptype gz.msgs.Boolean --timeout 5000 \
+				--req "data: \"${MODEL_NAME_INSTANCE}\"" > /dev/null 2>&1
+
 		# Set default camera offset if not specified
 		follow_x=${PX4_GZ_FOLLOW_OFFSET_X:--2.0}
 		follow_y=${PX4_GZ_FOLLOW_OFFSET_Y:--2.0}
 		follow_z=${PX4_GZ_FOLLOW_OFFSET_Z:-2.0}
 
 		# Set camera offset
-		${gz_command} topic -t /gui/track -m gz.msgs.CameraTrack \
-				-p "track_mode: FOLLOW, follow_target: {name: '${MODEL_NAME_INSTANCE}'},\
-				 follow_offset: {x: ${follow_x}, y: ${follow_y}, z: ${follow_z}}, follow_pgain: 1.0, track_pgain: 1.0"
+		${gz_command} service -s "/gui/follow/offset" --reqtype gz.msgs.Vector3d \
+				--reptype gz.msgs.Boolean --timeout 5000 \
+				--req "x: ${follow_x}, y: ${follow_y}, z: ${follow_z}" > /dev/null 2>&1
 
 		echo "INFO  [init] Camera follow offset set to ${follow_x}, ${follow_y}, ${follow_z}"
 	fi

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -126,6 +126,15 @@ then
 	set AUTOCNF yes
 fi
 
+# Allow overriding parameters via env variables: export PX4_PARAM_{name}={value}
+env | while IFS='=' read -r line; do
+  value=${line#*=}
+  name=${line%%=*}
+  case $name in
+    "PX4_PARAM_"*) param set "${name#PX4_PARAM_}" "$value" ;;
+  esac
+done
+
 # multi-instance setup
 # shellcheck disable=SC2154
 param set MAV_SYS_ID $((px4_instance+1))
@@ -164,6 +173,7 @@ param set-default COM_RC_IN_MODE 1
 param set-default EKF2_REQ_GPS_H 0.5
 
 param set-default IMU_GYRO_FFT_EN 1
+param set-default MAV_PROTO_VER 2 # Ensures QGC does not drop the first few packets after a SITL restart due to MAVLINK 1 packets
 
 param set-default -s MC_AT_EN 1
 
@@ -229,15 +239,6 @@ then
 	exit 1
 fi
 
-# Allow overriding parameters via env variables: export PX4_PARAM_{name}={value}
-env | while IFS='=' read -r line; do
-  value=${line#*=}
-  name=${line%%=*}
-  case $name in
-    "PX4_PARAM_"*) param set "${name#PX4_PARAM_}" "$value" ;;
-  esac
-done
-
 dataman start
 
 # only start the simulator if not in replay mode, as both control the lockstep time
@@ -323,11 +324,6 @@ fi
 
 uxrce_dds_client start -t udp -p $uxrce_dds_port $uxrce_dds_ns
 
-if param greater -s ZENOH_ENABLE 0
-then
-	zenoh start
-fi
-
 if param greater -s MNT_MODE_IN -1
 then
 	gimbal start

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -123,9 +123,3 @@ if(CONFIG_MODULES_TEMPERATURE_COMPENSATION)
 		rc.thermal_cal
 	)
 endif()
-
-if(CONFIG_DRIVERS_VTXTABLE)
-	px4_add_romfs_files(
-		rc.vtxtable
-	)
-endif()

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

@@ -14,6 +14,7 @@
 
 param set UAVCAN_ENABLE 0
 
+param set-default CA_AIRFRAME 1
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2

@@ -18,8 +18,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board px4_fmu-v6x exclude
-# @board ark_fmu-v6x exclude
 #
 
 . ${R}etc/init.d/rc.fw_defaults
@@ -42,6 +40,8 @@ param set-default FW_P_LIM_MAX 25
 param set-default FW_P_LIM_MIN -5
 param set-default FW_P_RMAX_NEG 20
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

ROMFS/px4fmu_common/init.d/airframes/17003_TF-G2

@@ -16,8 +16,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board px4_fmu-v6x exclude
-# @board ark_fmu-v6x exclude
 #
 
 . ${R}etc/init.d/rc.fw_defaults
@@ -39,6 +37,8 @@ param set-default FW_P_LIM_MAX 25
 param set-default FW_P_LIM_MIN -5
 param set-default FW_P_RMAX_NEG 20
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 

ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane

@@ -10,6 +10,7 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default CA_AIRFRAME 1
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
 param set-default CA_SV_CS_COUNT 4

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

@@ -32,6 +32,7 @@ param set-default FW_WR_IMAX 0.8
 param set-default FW_WR_P 1
 param set-default FW_W_RMAX 0
 
+param set-default CA_AIRFRAME 1
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_SV_CS_COUNT 7
 param set-default CA_SV_CS0_TRQ_R -0.5

ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing

@@ -10,6 +10,8 @@
 
 . ${R}etc/init.d/rc.fw_defaults
 
+param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.15
 param set-default CA_SV_CS_COUNT 2

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

@@ -7,8 +7,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board px4_fmu-v6x exclude
-# @board ark_fmu-v6x exclude
 #
 
 . ${R}etc/init.d/rc.mc_defaults
@@ -77,6 +75,9 @@ param set-default NAV_ACC_RAD 2
 param set-default RTL_DESCEND_ALT 5
 param set-default RTL_RETURN_ALT 5
 
+# Logging Parameters
+param set-default SDLOG_PROFILE 131
+
 # Sensors Parameters
 param set-default SENS_CM8JL65_CFG 104
 param set-default SENS_FLOW_MAXHGT 25

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

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

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

@@ -7,7 +7,6 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
-# @board auterion_fmu-v6x exclude
 # @board px4_fmu-v6x exclude
 #
 
@@ -78,6 +77,9 @@ param set-default NAV_ACC_RAD 2
 param set-default RTL_DESCEND_ALT 5
 param set-default RTL_RETURN_ALT 5
 
+# Logging Parameters
+param set-default SDLOG_PROFILE 131
+
 # Sensors Parameters
 param set-default SENS_CM8JL65_CFG 202
 param set-default SENS_FLOW_MAXHGT 25

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

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

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

@@ -29,6 +29,9 @@ param set-default MPC_MAN_TILT_MAX 60
 
 param set-default THR_MDL_FAC 0.3
 
+# enable high-rate logging profile (helps with tuning)
+param set-default SDLOG_PROFILE 19
+
 param set-default IMU_DGYRO_CUTOFF 50
 param set-default IMU_GYRO_CUTOFF 90
 

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

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

ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -45,6 +45,7 @@ param set-default COM_LOW_BAT_ACT 0
 param set-default NAV_DLL_ACT 0
 param set-default GF_ACTION 1
 param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
 
 # disable attitude failure detection
 param set-default FD_FAIL_P 0

ROMFS/px4fmu_common/init.d/airframes/6002_draco_r

@@ -12,9 +12,7 @@
 # @board px4_fmu-v4pro exclude
 # @board px4_fmu-v5 exclude
 # @board px4_fmu-v5x exclude
-# @board px4_fmu-v6x exclude
 # @board bitcraze_crazyflie exclude
-# @board ark_fmu-v6x exclude
 #
 
 . ${R}etc/init.d/rc.mc_defaults

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

@@ -5,24 +5,11 @@
 # @type Free-Flyer
 # @class Spacecraft
 #
-# @output Motor1 back left thruster, +x thrust
-# @output Motor2 front left thruster, -x thrust
-# @output Motor3 back right thruster, +x thrust
-# @output Motor4 front right thruster, -x thrust
-# @output Motor5 front left thruster, +y thrust
-# @output Motor6 front right thruster, -y thrust
-# @output Motor7 back left thruster, +y thrust
-# @output Motor8 back right thruster, -y thrust
-#
 # @maintainer DISCOWER
-# @url https://atmos.discower.io
 #
 
 . ${R}etc/init.d/rc.sc_defaults
 
-# Overwrite DDS AG IP to `192.168.0.1`
-param set-default UXRCE_DDS_AG_IP -1062731775
-
 param set-default CA_AIRFRAME 14
 param set-default MAV_TYPE 45
 
@@ -38,6 +25,7 @@ param set-default COM_LOW_BAT_ACT 0
 param set-default NAV_DLL_ACT 0
 param set-default GF_ACTION 1
 param set-default NAV_RCL_ACT 1
+param set-default COM_POSCTL_NAVL 2
 
 # Set Mocap Vision frame
 param set EKF2_EV_CTRL 15

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

@@ -153,7 +153,6 @@ if(CONFIG_MODULES_ROVER_ACKERMANN)
 		# [51000, 51999] Ackermann rovers
 		51000_generic_rover_ackermann
 		51001_axial_scx10_2_trail_honcho
-		51002_nxp_b3rb
 	)
 endif()
 

ROMFS/px4fmu_common/init.d/rc.fw_defaults

@@ -10,8 +10,6 @@ set VEHICLE_TYPE fw
 # MAV_TYPE_FIXED_WING 1
 param set-default MAV_TYPE 1
 
-param set-default CA_AIRFRAME 1
-
 #
 # Default parameters for fixed wing UAVs.
 #
@@ -28,7 +26,6 @@ param set-default EKF2_MAG_ACCLIM 0
 param set-default EKF2_REQ_EPH 10
 param set-default EKF2_REQ_EPV 10
 param set-default EKF2_REQ_HDRIFT 0.5
-param set-default EKF2_REQ_PDOP 4
 param set-default EKF2_REQ_SACC 1
 param set-default EKF2_REQ_VDRIFT 1
 param set-default EKF2_RNG_QLTY_T 3

ROMFS/px4fmu_common/init.d/rc.logging

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

ROMFS/px4fmu_common/init.d/rc.mc_apps

@@ -41,9 +41,3 @@ if param compare -s MC_NN_EN 1
 then
 	mc_nn_control start
 fi
-
-
-if param compare -s MC_RAPTOR_ENABLE 1
-then
-	mc_raptor start
-fi

ROMFS/px4fmu_common/init.d/rc.sc_defaults

@@ -8,6 +8,9 @@ set VEHICLE_TYPE spacecraft
 # MAV_TYPE_SPACECRAFT_ORBITTER
 param set-default MAV_TYPE 45
 
+# Set micro-dds-client to use ethernet and IP-address 192.168.0.1
+param set-default UXRCE_DDS_AG_IP -1062731775
+
 # Disable preflight disarm to not interfere with external launching
 param set-default COM_DISARM_PRFLT -1
 param set-default CBRK_SUPPLY_CHK 894281

ROMFS/px4fmu_common/init.d/rc.sensors

@@ -154,12 +154,6 @@ then
 	fi
 fi
 
-# Microchip MCP9808 temperature sensor external I2C
-if param compare -s SENS_EN_MCP9808 1
-then
-	mcp9808 start -X
-fi
-
 # TE MS4515 differential pressure sensor external I2C
 if param compare -s SENS_EN_MS4515 1
 then
@@ -225,24 +219,6 @@ then
 	pcf8583 start -X -a 0x51
 fi
 
-# ADC sensor ADS7953 external SPI
-if param compare -s ADC_ADS7953_EN 1
-then
-	ads7953 start -S
-fi
-
-# ADC sensor tla2528 external I2C
-if param compare -s ADC_TLA2528_EN 1
-then
-	tla2528 start -X
-fi
-
-# Start TMP102 temperature sensor
-if param compare SENS_EN_TMP102 1
-then
-	tmp102 start -X
-fi
-
 # probe for optional external I2C devices
 if param compare SENS_EXT_I2C_PRB 1
 then
@@ -261,7 +237,6 @@ then
 	qmc5883p -X -q start
 	rm3100 -X -q start
 	bmm350 -X -q start
-	iis2mdc -X -q start
 
 	# start last (wait for possible icm20948 passthrough mode)
 	ak09916 -X -q start

ROMFS/px4fmu_common/init.d/rc.vtxtable

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# VTX table loading script.
-#
-# NOTE: Script variables are declared/initialized/unset in the rcS script.
-#
-
-vtxtable load

ROMFS/px4fmu_common/init.d/rcS

@@ -217,37 +217,30 @@ else
 	fi
 	unset BOARD_RC_DEFAULTS
 
-	#
-	# Optional additional init file: rc.additional_init
-	#
-	set BOARD_RC_ADDITIONAL_INIT ${R}etc/init.d/rc.additional_init
-	if [ -f $BOARD_RC_ADDITIONAL_INIT ]
+	# Load airframe configuration based on SYS_AUTOSTART parameter
+	if ! param compare SYS_AUTOSTART 0
 	then
-		echo "Board additional init: ${BOARD_RC_ADDITIONAL_INIT}"
-		. $BOARD_RC_ADDITIONAL_INIT
-	fi
-	unset BOARD_RC_ADDITIONAL_INIT
+		# rc.autostart directly run the right airframe script which sets the VEHICLE_TYPE
+		# Look for airframe in ROMFS
+		. ${R}etc/init.d/rc.autostart
 
-	# Load airframe configuration based on SYS_AUTOSTART parameter if successful VEHICLE_TYPE gets set
-	# Run autogenerated ROMFS airframe script
-	. ${R}etc/init.d/rc.autostart
-
-	if [ ${VEHICLE_TYPE} = none ]
-	then
-		# Run external airframe script on SD card
-		if [ $STORAGE_AVAILABLE = yes ]
+		if [ ${VEHICLE_TYPE} = none ]
 		then
-			. ${R}etc/init.d/rc.autostart_ext
-		else
-			echo "ERROR [init] SD not mounted, skipping external airframe"
+			# Use external startup file
+			if [ $STORAGE_AVAILABLE = yes ]
+			then
+				. ${R}etc/init.d/rc.autostart_ext
+			else
+				echo "ERROR [init] SD card not mounted - can't load external airframe"
+			fi
 		fi
-	fi
 
-	if [ ${VEHICLE_TYPE} = none ]
-	then
-		echo "ERROR [init] No airframe file found for SYS_AUTOSTART value"
-		param set SYS_AUTOSTART 0
-		tune_control play error
+		if [ ${VEHICLE_TYPE} = none ]
+		then
+			echo "ERROR [init] No airframe file found for SYS_AUTOSTART value"
+			param set SYS_AUTOSTART 0
+			tune_control play error
+		fi
 	fi
 
 	# Check parameter version and reset upon airframe configuration version mismatch.
@@ -479,19 +472,6 @@ else
 		pwm_out start
 	fi
 
-	#
-	# Optional UAVCAN/DroneCAN or Cyphal
-	#
-	if param greater -s UAVCAN_ENABLE 0
-	then
-		uavcan start
-	else
-		if param greater -s CYPHAL_ENABLE 0
-		then
-			cyphal start
-		fi
-	fi
-
 	#
 	# Configure vehicle type specific parameters.
 	# Note: rc.vehicle_setup is the entry point for all vehicle type specific setup.
@@ -520,11 +500,6 @@ else
 	#
 	. ${R}etc/init.d/rc.serial
 
-	if param greater -s ZENOH_ENABLE 0
-	then
-		zenoh start
-	fi
-
 	# Must be started after the serial config is read
 	rc_input start $RC_INPUT_ARGS
 
@@ -630,16 +605,6 @@ else
 	fi
 	unset RC_LOGGING
 
-	#
-	# Start the VTX services.
-	#
-	set RC_VTXTABLE ${R}etc/init.d/rc.vtxtable
-	if [ -f ${RC_VTXTABLE} ]
-	then
-		. ${RC_VTXTABLE}
-	fi
-	unset RC_VTXTABLE
-
 	#
 	# Set additional parameters and env variables for selected AUTOSTART.
 	#
@@ -648,7 +613,9 @@ else
 		. ${R}etc/init.d/rc.autostart.post
 	fi
 
-
+	#
+	# Bootloader upgrade (ROMFS)
+	#
 	set BOARD_BOOTLOADER_UPGRADE ${R}etc/init.d/rc.board_bootloader_upgrade
 	if [ -f $BOARD_BOOTLOADER_UPGRADE ]
 	then
@@ -656,6 +623,43 @@ else
 	fi
 	unset BOARD_BOOTLOADER_UPGRADE
 
+	#
+	# Bootloader upgrade (SD card)
+	#
+	if param compare -s SYS_BL_UPDATE 2
+	then
+		if [ -f "/fs/microsd/bl/bl.bin" ]
+		then
+			param set SYS_BL_UPDATE 0
+			param save
+			echo "bootloader update..."
+			bl_update "/fs/microsd/bl/bl.bin"
+			echo "bootloader update done, rebooting"
+			reboot
+		fi
+	fi
+
+	#
+	# Check if UAVCAN is enabled, default to it for ESCs.
+	#
+	if param greater -s UAVCAN_ENABLE 0
+	then
+		# Start core UAVCAN module.
+		if ! uavcan start
+		then
+			tune_control play error
+		fi
+	else
+		if param greater -s CYPHAL_ENABLE 0
+		then
+			cyphal start
+		fi
+	fi
+	if param greater -s ZENOH_ENABLE 0
+	then
+		zenoh start
+	fi
+
 #
 # End of autostart.
 #

Tools/astyle/astylerc

@@ -15,4 +15,4 @@ ignore-exclude-errors-x
 lineend=linux
 exclude=EASTL
 add-brackets
-max-code-length=140
+max-code-length=120

Tools/astyle/files_to_check_code_style.sh

@@ -21,13 +21,11 @@ exec find boards msg src platforms test \
     -path src/lib/crypto/monocypher -prune -o \
     -path src/lib/events/libevents -prune -o \
     -path src/lib/parameters/uthash -prune -o \
-    -path src/lib/rl_tools/rl_tools -prune -o \
     -path src/lib/wind_estimator/python/generated -prune -o \
     -path src/modules/ekf2/EKF/python/ekf_derivation/generated -prune -o \
     -path src/modules/ekf2/EKF/yaw_estimator/derivation/generated -prune -o \
     -path src/modules/gyro_fft/CMSIS_5 -prune -o \
     -path src/modules/mavlink/mavlink -prune -o \
-    -path src/modules/mc_raptor/blob -prune -o \
     -path test/fuzztest -prune -o \
     -path test/mavsdk_tests/catch2 -prune -o \
     -path src/lib/crypto/monocypher -prune -o \
@@ -41,5 +39,4 @@ exec find boards msg src platforms test \
     -path boards/modalai/voxl2/libfc-sensor-api -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 \
     \( -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) -print \) | grep $PATTERN

Tools/auterion/remote_update_fmu.sh

@@ -7,7 +7,6 @@ fi
 
 ssh_port=22
 ssh_user=root
-ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 while getopts ":f:c:d:p:u:r" opt; do
 	case ${opt} in
@@ -68,7 +67,7 @@ target_file_name="update-dev.tar"
 if [ "$revert" == true ]; then
 	# revert to the release version which was originally deployed
 	cmd="cp $target_dir/update.tar $target_dir/$target_file_name"
-	ssh $ssh_opts -t -p $ssh_port $ssh_user@$device "$cmd"
+	ssh -t -p $ssh_port $ssh_user@$device "$cmd"
 else
 	# create custom update-dev.tar
 	tmp_dir="$(mktemp -d)"
@@ -106,11 +105,11 @@ else
 	$tar_name -C "$tmp_dir" --sort=name --owner=root:0 --group=root:0 --mtime='2019-01-01 00:00:00' -cvf $target_file_name $firmware_path $config_path
 
 	# send it to the target to start flashing
-	scp $ssh_opts -P $ssh_port "$target_file_name" $ssh_user@"$device":$target_dir
+	scp -P $ssh_port "$target_file_name" $ssh_user@"$device":$target_dir
 	popd &>/dev/null
 	rm -rf "$tmp_dir"
 fi
 
 # grab status output for flashing progress
 cmd="tail --follow=name $target_dir/update_status 2>/dev/null || true"
-ssh $ssh_opts -t -p $ssh_port $ssh_user@$device "$cmd"
+ssh -t -p $ssh_port $ssh_user@$device "$cmd"

Tools/bdshot_analyzer.py

@@ -1,433 +0,0 @@
-#!/usr/bin/env python3
-"""
-BDShot Timing Jitter Analyzer
-
-Analyzes BDShot (Bidirectional DShot) signal timing from Saleae Logic Analyzer
-CSV exports. Measures scheduling consistency and jitter in PX4 flight controller
-DShot output timing.
-
-Usage:
-    python bdshot_analyzer.py capture.csv
-    python bdshot_analyzer.py capture.csv --dshot-rate 300 --loop-rate 800
-    python bdshot_analyzer.py capture.csv --channel-a 0 --channel-b 1
-
-Arguments:
-    input_file          Path to Saleae CSV export
-    --dshot-rate        DShot variant: 150/300/600/1200 (default: 300)
-    --loop-rate         Expected loop rate in Hz (default: 800)
-    --channel-a         CSV column index for first channel (default: 0)
-    --channel-b         CSV column index for second channel (default: 1)
-    --no-plots          Disable histogram display
-    --verbose           Enable verbose debugging output
-
-Capture Setup:
-    1. Connect Saleae to two BDShot signals from different timers
-       (e.g., Motor 1 from Timer1, Motor 5 from Timer2)
-    2. Sample rate: 24+ MS/s for DShot300
-    3. Export as CSV: File -> Export Raw Data -> CSV
-
-Interpreting Results:
-    - Frame Intervals: Should cluster tightly around expected loop period
-    - Inter-Channel Gap: Measures sequential DMA scheduling overhead
-    - Jitter: Small std dev is typical for well-behaved systems
-
-Dependencies: numpy, matplotlib
-"""
-
-import argparse
-import csv
-import sys
-from dataclasses import dataclass
-from pathlib import Path
-
-import numpy as np
-
-# Try to import matplotlib, but allow running without it
-try:
-    import matplotlib.pyplot as plt
-    HAS_MATPLOTLIB = True
-except ImportError:
-    HAS_MATPLOTLIB = False
-
-
-# DShot bit periods in microseconds
-DSHOT_BIT_PERIODS = {
-    150: 6.67,
-    300: 3.33,
-    600: 1.67,
-    1200: 0.83,
-}
-
-
-@dataclass
-class BDShotTransaction:
-    """Represents a single BDShot transaction (command + response)."""
-    start: float   # Timestamp of first falling edge (seconds)
-    end: float     # Timestamp of final rising edge before idle (seconds)
-
-    @property
-    def duration_us(self) -> float:
-        """Transaction duration in microseconds."""
-        return (self.end - self.start) * 1_000_000
-
-
-@dataclass
-class ChannelStats:
-    """Statistics for a single channel's frame intervals."""
-    channel_name: str
-    count: int
-    min_us: float
-    max_us: float
-    mean_us: float
-    std_us: float
-    expected_us: float
-
-    @property
-    def min_jitter_us(self) -> float:
-        return self.min_us - self.expected_us
-
-    @property
-    def max_jitter_us(self) -> float:
-        return self.max_us - self.expected_us
-
-    @property
-    def mean_jitter_us(self) -> float:
-        return self.mean_us - self.expected_us
-
-
-@dataclass
-class GapStats:
-    """Statistics for inter-channel gaps."""
-    count: int
-    min_us: float
-    max_us: float
-    mean_us: float
-    std_us: float
-
-
-def parse_csv(filepath: Path, channel_a_idx: int, channel_b_idx: int, verbose: bool = False):
-    """
-    Parse Saleae CSV export and extract edges for each channel.
-
-    Returns:
-        Tuple of (edges_a, edges_b) where each is a list of (timestamp, new_state) tuples.
-    """
-    edges_a, edges_b = [], []
-    prev_a, prev_b = None, None
-    ch_a_col, ch_b_col = channel_a_idx + 1, channel_b_idx + 1  # +1 for time column
-
-    with open(filepath, 'r', newline='') as f:
-        reader = csv.reader(f)
-        header = next(reader)
-
-        if verbose:
-            print(f"CSV Header: {header}")
-            print(f"Using columns: time=0, ch_a={ch_a_col} ({header[ch_a_col]}), "
-                  f"ch_b={ch_b_col} ({header[ch_b_col]})")
-
-        if ch_a_col >= len(header) or ch_b_col >= len(header):
-            raise ValueError(
-                f"Channel indices out of range. CSV has {len(header)-1} channels. "
-                f"Requested channel_a={channel_a_idx}, channel_b={channel_b_idx}"
-            )
-
-        for row_num, row in enumerate(reader, start=2):
-            try:
-                timestamp = float(row[0])
-                state_a, state_b = int(row[ch_a_col]), int(row[ch_b_col])
-
-                # Record edges (state changes) or initial LOW state
-                if (prev_a is not None and state_a != prev_a) or (prev_a is None and state_a == 0):
-                    edges_a.append((timestamp, state_a))
-                if (prev_b is not None and state_b != prev_b) or (prev_b is None and state_b == 0):
-                    edges_b.append((timestamp, state_b))
-
-                prev_a, prev_b = state_a, state_b
-
-            except (ValueError, IndexError) as e:
-                if verbose:
-                    print(f"Warning: Skipping malformed row {row_num}: {e}")
-
-    if verbose:
-        print(f"Parsed {len(edges_a)} edges for channel A, {len(edges_b)} edges for channel B")
-
-    return edges_a, edges_b
-
-
-def detect_transactions(edges, idle_threshold_us: float, verbose: bool = False):
-    """
-    Detect BDShot transactions from edge list.
-
-    A transaction starts with a falling edge after an idle period and ends
-    when the line returns HIGH and stays HIGH for > idle_threshold_us.
-    """
-    if not edges:
-        return []
-
-    idle_threshold_s = idle_threshold_us / 1_000_000
-    transactions = []
-    tx_start = None
-    last_rising = None
-
-    for i, (timestamp, state) in enumerate(edges):
-        if state == 0:  # Falling edge - start transaction if idle
-            if tx_start is None and (last_rising is None or timestamp - last_rising > idle_threshold_s):
-                tx_start = timestamp
-        elif tx_start is not None:  # Rising edge with active transaction
-            last_rising = timestamp
-            # Complete transaction if next edge is far away or this is the last edge
-            next_gap = edges[i + 1][0] - timestamp if i + 1 < len(edges) else float('inf')
-            if next_gap > idle_threshold_s:
-                transactions.append(BDShotTransaction(start=tx_start, end=timestamp))
-                tx_start = None
-        else:
-            last_rising = timestamp
-
-    if verbose:
-        print(f"Detected {len(transactions)} transactions")
-        if transactions:
-            durations = [tx.duration_us for tx in transactions]
-            print(f"  Duration range: {min(durations):.1f} - {max(durations):.1f} us")
-
-    return transactions
-
-
-def compute_channel_stats(transactions, channel_name: str, expected_interval_us: float):
-    """Compute frame interval statistics for a channel."""
-    if len(transactions) < 2:
-        raise ValueError(f"Need at least 2 transactions to compute intervals, got {len(transactions)}")
-
-    intervals_us = np.diff([tx.start for tx in transactions]) * 1_000_000
-
-    stats = ChannelStats(
-        channel_name=channel_name,
-        count=len(intervals_us),
-        min_us=float(np.min(intervals_us)),
-        max_us=float(np.max(intervals_us)),
-        mean_us=float(np.mean(intervals_us)),
-        std_us=float(np.std(intervals_us)),
-        expected_us=expected_interval_us,
-    )
-
-    return stats, intervals_us
-
-
-def compute_inter_channel_gaps(transactions_a, transactions_b, expected_interval_us: float,
-                               verbose: bool = False):
-    """Compute inter-channel gap statistics (CH_A end -> CH_B start)."""
-    gaps = []
-    max_reasonable_gap_us = expected_interval_us * 0.5
-    b_idx = 0
-
-    for tx_a in transactions_a:
-        # Find first CH_B transaction that starts after this CH_A ends
-        while b_idx < len(transactions_b) and transactions_b[b_idx].start <= tx_a.end:
-            b_idx += 1
-        if b_idx >= len(transactions_b):
-            break
-
-        gap_us = (transactions_b[b_idx].start - tx_a.end) * 1_000_000
-        if 0 < gap_us < max_reasonable_gap_us:
-            gaps.append(gap_us)
-
-    if verbose:
-        print(f"Inter-channel gap matching: {len(gaps)} matched")
-
-    if not gaps:
-        raise ValueError("No valid inter-channel gaps found")
-
-    gaps_arr = np.array(gaps)
-    stats = GapStats(
-        count=len(gaps_arr),
-        min_us=float(np.min(gaps_arr)),
-        max_us=float(np.max(gaps_arr)),
-        mean_us=float(np.mean(gaps_arr)),
-        std_us=float(np.std(gaps_arr)),
-    )
-
-    return stats, gaps_arr
-
-
-def _plot_histogram(ax, data, title: str, xlabel: str, expected_value=None, stats_text=None):
-    """Plot a histogram on the given axes."""
-    bin_count = min(100, max(20, len(data) // 100)) if np.ptp(data) > 0 else 20
-    ax.hist(data, bins=bin_count, edgecolor='black', alpha=0.7)
-    ax.set_title(title, fontsize=12, fontweight='bold')
-    ax.set_xlabel(xlabel, fontsize=10)
-    ax.set_ylabel('Count', fontsize=10)
-
-    if expected_value is not None:
-        ax.axvline(expected_value, color='red', linestyle='--', linewidth=2,
-                   label=f'Expected: {expected_value:.2f} us')
-    ax.axvline(np.mean(data), color='green', linestyle='-', linewidth=2,
-               label=f'Mean: {np.mean(data):.2f} us')
-
-    if stats_text:
-        ax.text(0.98, 0.97, stats_text, transform=ax.transAxes, fontsize=9,
-                verticalalignment='top', horizontalalignment='right',
-                bbox=dict(boxstyle='round', facecolor='wheat', alpha=0.8), family='monospace')
-
-    ax.legend(loc='upper left', fontsize=8)
-    ax.grid(True, alpha=0.3)
-
-
-def generate_combined_histogram(intervals_a, intervals_b, gaps, stats_a, stats_b,
-                                gap_stats, expected_interval_us: float, dshot_rate: int):
-    """Generate a combined figure with all histograms."""
-    if not HAS_MATPLOTLIB:
-        return None
-
-    fig = plt.figure(figsize=(14, 10))
-    gs = fig.add_gridspec(2, 2, height_ratios=[1, 1], hspace=0.3, wspace=0.25)
-    ax_a, ax_b, ax_gap = fig.add_subplot(gs[0, 0]), fig.add_subplot(gs[0, 1]), fig.add_subplot(gs[1, :])
-
-    def stats_text(s):
-        return format_stats_text(s.min_us, s.max_us, s.mean_us, s.std_us, s.count)
-
-    _plot_histogram(ax_a, intervals_a, "Channel A Frame Intervals", "Interval (us)",
-                    expected_value=expected_interval_us, stats_text=stats_text(stats_a))
-    _plot_histogram(ax_b, intervals_b, "Channel B Frame Intervals", "Interval (us)",
-                    expected_value=expected_interval_us, stats_text=stats_text(stats_b))
-
-    if len(gaps) > 0:
-        _plot_histogram(ax_gap, gaps, "Inter-Channel Gap (CH_A End -> CH_B Start)",
-                        "Gap (us)", stats_text=stats_text(gap_stats))
-    else:
-        ax_gap.text(0.5, 0.5, "No inter-channel gap data available",
-                    ha='center', va='center', transform=ax_gap.transAxes)
-        ax_gap.set_title("Inter-Channel Gap (CH_A End -> CH_B Start)")
-
-    fig.suptitle(f"BDShot Timing Analysis (DShot{dshot_rate})", fontsize=14, fontweight='bold', y=0.98)
-    return fig
-
-
-def format_stats_text(min_val: float, max_val: float, mean_val: float,
-                      std_val: float, count: int) -> str:
-    """Format statistics as a text block for histogram annotation."""
-    return (f"Count: {count}\n"
-            f"Min:   {min_val:.2f} us\n"
-            f"Max:   {max_val:.2f} us\n"
-            f"Mean:  {mean_val:.2f} us\n"
-            f"Std:   {std_val:.2f} us")
-
-
-def print_report(input_file: Path, dshot_rate: int, loop_rate: float,
-                 capture_duration: float, tx_count_a: int, tx_count_b: int,
-                 stats_a: ChannelStats, stats_b: ChannelStats, gap_stats: GapStats):
-    """Print the analysis report to console."""
-    bit_period = DSHOT_BIT_PERIODS.get(dshot_rate, 3.33)
-    expected_interval = 1_000_000 / loop_rate
-
-    print(f"""
-BDShot Timing Analysis
-{"=" * 60}
-Input: {input_file}
-DShot Rate: {dshot_rate} (bit period: {bit_period:.2f} us)
-Expected Loop Rate: {loop_rate:.0f} Hz ({expected_interval:.2f} us interval)
-Capture Duration: {capture_duration:.2f} s
-Transactions Detected: CH_A={tx_count_a}, CH_B={tx_count_b}
-""")
-
-    def print_channel_stats(name: str, s: ChannelStats):
-        print(f"{name} Frame Intervals")
-        print("-" * 40)
-        print(f"  Count:     {s.count}")
-        print(f"  Min:       {s.min_us:.2f} us  ({s.min_jitter_us:+.2f} us from nominal)")
-        print(f"  Max:       {s.max_us:.2f} us  ({s.max_jitter_us:+.2f} us from nominal)")
-        print(f"  Mean:      {s.mean_us:.2f} us  ({s.mean_jitter_us:+.2f} us from nominal)")
-        print(f"  Std Dev:   {s.std_us:.2f} us\n")
-
-    print_channel_stats("Channel A", stats_a)
-    print_channel_stats("Channel B", stats_b)
-
-    print(f"""Inter-Channel Gap (CH_A End -> CH_B Start)
-{"-" * 40}
-  Count:     {gap_stats.count}
-  Min:       {gap_stats.min_us:.2f} us
-  Max:       {gap_stats.max_us:.2f} us
-  Mean:      {gap_stats.mean_us:.2f} us
-  Std Dev:   {gap_stats.std_us:.2f} us
-""")
-
-
-def fatal(msg: str):
-    """Print error and exit."""
-    print(f"Error: {msg}", file=sys.stderr)
-    sys.exit(1)
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Analyze BDShot timing from Saleae Logic Analyzer CSV exports",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="Examples:\n  %(prog)s capture.csv\n  %(prog)s capture.csv --dshot-rate 300 --loop-rate 800"
-    )
-    parser.add_argument('input_file', type=Path, help='Path to Saleae CSV export')
-    parser.add_argument('--dshot-rate', type=int, default=300, choices=[150, 300, 600, 1200],
-                        help='DShot variant (default: 300)')
-    parser.add_argument('--loop-rate', type=float, default=800, help='Expected loop rate in Hz (default: 800)')
-    parser.add_argument('--channel-a', type=int, default=0, help='CSV column index for first channel (default: 0)')
-    parser.add_argument('--channel-b', type=int, default=1, help='CSV column index for second channel (default: 1)')
-    parser.add_argument('--no-plots', action='store_true', help='Disable histogram display')
-    parser.add_argument('--verbose', '-v', action='store_true', help='Enable verbose output for debugging')
-    args = parser.parse_args()
-
-    if not args.input_file.exists():
-        fatal(f"Input file not found: {args.input_file}")
-
-    # Calculate timing parameters
-    bit_period_us = DSHOT_BIT_PERIODS.get(args.dshot_rate, 3.33)
-    idle_threshold_us = max(50.0, bit_period_us * 15)  # Must exceed turnaround gap (~25-30us)
-    expected_interval_us = 1_000_000 / args.loop_rate
-
-    if args.verbose:
-        print(f"Bit period: {bit_period_us:.2f} us\nIdle threshold: {idle_threshold_us:.2f} us\n"
-              f"Expected interval: {expected_interval_us:.2f} us\n")
-
-    # Parse CSV
-    print(f"Parsing {args.input_file}...")
-    try:
-        edges_a, edges_b = parse_csv(args.input_file, args.channel_a, args.channel_b, args.verbose)
-    except Exception as e:
-        fatal(f"parsing CSV: {e}")
-
-    if not edges_a or not edges_b:
-        fatal("No edges found in one or both channels")
-
-    # Detect transactions
-    print("Detecting transactions...")
-    transactions_a = detect_transactions(edges_a, idle_threshold_us, args.verbose)
-    transactions_b = detect_transactions(edges_b, idle_threshold_us, args.verbose)
-
-    for name, txns in [("A", transactions_a), ("B", transactions_b)]:
-        if len(txns) < 2:
-            fatal(f"Insufficient transactions in channel {name} ({len(txns)})")
-
-    # Calculate capture duration
-    all_txns = transactions_a + transactions_b
-    capture_duration = max(tx.end for tx in all_txns) - min(tx.start for tx in all_txns)
-
-    # Compute statistics
-    print("Computing statistics...")
-    stats_a, intervals_a = compute_channel_stats(transactions_a, "Channel A", expected_interval_us)
-    stats_b, intervals_b = compute_channel_stats(transactions_b, "Channel B", expected_interval_us)
-
-    try:
-        gap_stats, gaps = compute_inter_channel_gaps(transactions_a, transactions_b,
-                                                     expected_interval_us, args.verbose)
-    except ValueError as e:
-        print(f"Warning: {e}", file=sys.stderr)
-        gap_stats = GapStats(count=0, min_us=0, max_us=0, mean_us=0, std_us=0)
-        gaps = np.array([])
-
-    print_report(args.input_file, args.dshot_rate, args.loop_rate, capture_duration,
-                 len(transactions_a), len(transactions_b), stats_a, stats_b, gap_stats)
-
-    if not args.no_plots and HAS_MATPLOTLIB:
-        generate_combined_histogram(intervals_a, intervals_b, gaps, stats_a, stats_b,
-                                    gap_stats, expected_interval_us, args.dshot_rate)
-        plt.show()
-
-
-if __name__ == '__main__':
-    main()

Tools/check_submodules.sh

@@ -17,12 +17,37 @@ if [[ -f $1"/.git" || -d $1"/.git" ]]; then
 	SUBMODULE_STATUS=$(git submodule summary "$1")
 	STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1")
 	if ! [[ -z "$STATUSRETVAL" ]]; then
-		echo -e "\033[33mWarning: $1 submodule has uncommitted changes:\033[0m"
+		echo -e "\033[31mChecked $1 submodule, ACTION REQUIRED:\033[0m"
+		echo ""
+		echo -e "Different commits:"
 		echo -e "$SUBMODULE_STATUS"
 		echo ""
-		echo -e "To update submodules to the expected version, run:"
-		echo -e "   \033[94mgit submodule sync --recursive && git submodule update --init --recursive\033[0m"
 		echo ""
+		echo -e " *******************************************************************************"
+		echo -e " *   \033[31mIF YOU DID NOT CHANGE THIS FILE (OR YOU DON'T KNOW WHAT A SUBMODULE IS):\033[0m  *"
+		echo -e " *   \033[31mHit 'u' and <ENTER> to update ALL submodules and resolve this.\033[0m            *"
+		echo -e " *   (performs \033[94mgit submodule sync --recursive\033[0m                                  *"
+		echo -e " *    and \033[94mgit submodule update --init --recursive\033[0m )                            *"
+		echo -e " *******************************************************************************"
+		echo ""
+		echo ""
+		echo -e "   Only for EXPERTS:"
+		echo -e "   $1 submodule is not in the recommended version."
+		echo -e "   Hit 'y' and <ENTER> to continue the build with this version. Hit <ENTER> to resolve manually."
+		echo -e "   Use \033[94mgit add $1 && git commit -m 'Updated $1'\033[0m to choose this version (careful!)"
+		echo ""
+		read user_cmd
+		if [ "$user_cmd" == "y" ]; then
+			echo "Continuing build with manually overridden submodule.."
+		elif [ "$user_cmd" == "u" ]; then
+			git submodule sync --recursive -- $1
+			git submodule update --init --recursive -- $1 || true
+			git submodule update --init --recursive --force -- $1
+			echo "Submodule fixed, continuing build.."
+		else
+			echo "Build aborted."
+			exit 1
+		fi
 	fi
 else
 	git submodule --quiet sync --recursive --quiet -- $1

Tools/ci/generate_board_targets_json.py

@@ -25,15 +25,15 @@ parser.add_argument('-p', '--pretty', dest='pretty', action='store_true',
                     help='Pretty output instead of a single line')
 parser.add_argument('-g', '--groups', dest='group', action='store_true',
                     help='Groups targets')
-parser.add_argument('-f', '--filter', dest='filter', help='comma separated list of build target name prefixes to include instead of all e.g. "px4_fmu-v5_"')
+parser.add_argument('-f', '--filter', dest='filter', help='comma separated list of board names to use instead of all')
 
 args = parser.parse_args()
 verbose = args.verbose
 
-target_filter = []
+board_filter = []
 if args.filter:
-    for target in args.filter.split(','):
-        target_filter.append(target)
+    for board in args.filter.split(','):
+        board_filter.append(board)
 
 default_container = 'ghcr.io/px4/px4-dev:v1.16.0-rc1-258-g0369abd556'
 build_configs = []
@@ -144,7 +144,7 @@ for manufacturer in os.scandir(os.path.join(source_dir, '../boards')):
                 label = files.name[:-9]
                 target_name = manufacturer.name + '_' + board.name + '_' + label
 
-                if target_filter and not any(target_name.startswith(f) for f in target_filter):
+                if board_filter and not board_name in board_filter:
                     if verbose: print(f'excluding board {board_name} ({target_name})')
                     continue
 

Tools/mavlink_shell.py

@@ -191,7 +191,7 @@ def main():
                         cur_history_index = len(command_history)
                     mav_serialport.write(cur_line+'\n')
                     cur_line = ''
-                elif ord(ch) == 8: # backspace
+                elif ord(ch) == 127: # backslash
                     if len(cur_line) > 0:
                         erase_last_n_chars(1)
                         cur_line = cur_line[:-1]

Tools/module_config/generate_actuators_metadata.py

@@ -238,7 +238,6 @@ def get_actuator_output(yaml_config, output_functions, timer_config_file, verbos
             ( 'disarmed', 'Disarmed', 'DIS', False ),
             ( 'min', 'Minimum', 'MIN', False ),
             ( 'max', 'Maximum', 'MAX', False ),
-            ( 'center', 'Center\n(for Servos)', 'CENT', False ),
             ( 'failsafe', 'Failsafe', 'FAIL', True ),
             ]
         for key, label, param_suffix, advanced in standard_params_array: