Merge branch 'main' into pr-boards_serial_rc

2026-05-02 00:24:08 +08:00 · 2025-07-21 12:32:24 -07:00 · 2025-07-21 12:32:24 -07:00 · 8575199bc7
commit 8575199bc7
parent d9039b0cf6 8dd14d9aaa
6449 changed files with 616088 additions and 27050 deletions
--- a/.clusterfuzzlite/Dockerfile
+++ b/.clusterfuzzlite/Dockerfile
@ -1,7 +0,0 @@
-FROM gcr.io/oss-fuzz-base/base-builder:v1
-COPY . $SRC/PX4-Autopilot
-RUN apt-get install -y libjpeg8-dev zlib1g-dev
-RUN pip3 install --upgrade pip
-RUN python3 -m pip install -r $SRC/PX4-Autopilot/Tools/setup/requirements.txt
-WORKDIR $SRC/PX4-Autopilot
-COPY ./.clusterfuzzlite/build.sh $SRC/
--- a/.clusterfuzzlite/build.sh
+++ b/.clusterfuzzlite/build.sh
@ -1,4 +0,0 @@
-#!/usr/bin/env bash -eu
-
-PX4_FUZZ=1 make px4_sitl
-cp build/px4_sitl_default/bin/px4 $OUT/px4
--- a/.clusterfuzzlite/project.yaml
+++ b/.clusterfuzzlite/project.yaml
@ -1 +0,0 @@
-language: c++
--- a/.gitattributes
+++ b/.gitattributes
@ -72,6 +72,7 @@ Makefile.* text eol=lf
 *.tar    binary
 *.tgz    binary
 *.zip    binary
+*.hex    binary

 # everything else
 .gitattributes text eol=lf
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -3,6 +3,3 @@ contact_links:
  - name: Support Question
    url: https://docs.px4.io/main/en/contribute/support.html#forums-and-chat
    about: For questions about using PX4 or related components, please use the discuss forum and discord server
-  - name: Documentation Issue
-    url: https://github.com/PX4/PX4-user_guide/issues
-    about: If you found an issue in documentation, please submit it directly to the docs repository issues
--- a/.github/ISSUE_TEMPLATE/docs_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/docs_bug_report.yml
@ -0,0 +1,33 @@
+name: 📑 Documentation Bug report
+description: Create a report to help us improve the docs
+title: "[Docs] [Bug] "
+labels: ["Documentation 📑"]
+body:
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of the bug.
+      placeholder: |
+          # A PR to fix the bug is often better than adding this issue!
+          #
+          # If you can't create a PR please provide the following:
+          # - What page and/or section has the problem
+          # - What is the problem - missing information, incorrect information?
+          # - Suggested fixes, links to corresponding code PRs
+          # - Any additional context
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Page URL
+      description: The URL of the problem page.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Screenshot / Media
+      description: Add screenshot / media if you have them
+    validations:
+      required: false
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -0,0 +1,10 @@
+# Labeler configuration file for GitHub Actions
+# The action is ./.github/workflows/label.yml
+# Docs for the syntax in this file can be found at
+# https://github.com/actions/labeler
+
+
+# Add 'Documentation' label to any changes within 'docs' folder or any subfolders
+"Documentation 📑":
+- changed-files:
+  - any-glob-to-any-file: docs/**
--- a/.github/workflows/build_all_targets.yml
+++ b/.github/workflows/build_all_targets.yml
@ -14,9 +14,17 @@ on:
      - 'stable'
      - 'beta'
      - 'release/**'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-      - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  group_targets:
@ -26,7 +34,6 @@ jobs:
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
      timestamp: ${{ steps.set-timestamp.outputs.timestamp }}
-      tagname: ${{ steps.set-tag.outputs.tagname }}
      branchname: ${{ steps.set-branch.outputs.branchname }}
    steps:
      - uses: actions/checkout@v4
@ -47,7 +54,13 @@ jobs:
        run: echo "::set-output name=timestamp::$(date +"%Y%m%d%H%M%S")"

      - id: set-branch
-        run: echo "::set-output name=branchname::${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
+        run: |
+          echo "branchname=${{
+            github.event_name == 'pull_request' &&
+            format('pr-{0}', github.event.pull_request.number) ||
+            github.head_ref ||
+            github.ref_name
+          }}" >> $GITHUB_OUTPUT

      - name: Debug Matrix Output
        if: runner.debug == '1'
@ -57,9 +70,9 @@ jobs:
          echo "$(./Tools/ci/generate_board_targets_json.py --group --verbose)"

  setup:
-    name: Build Group [${{ matrix.group }}]
+    name: Build Group [${{ matrix.group }}][${{ matrix.arch == 'nuttx' && 'x86' || 'arm64' }}]
    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,"runner=8cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",spot=false]
    needs: group_targets
    strategy:
      matrix: ${{ fromJson(needs.group_targets.outputs.matrix) }}
@ -94,7 +107,7 @@ jobs:

      - name: Building [${{ matrix.group }}]
        run: |
-            ./Tools/ci/build_all_runner.sh ${{matrix.targets}}
+            ./Tools/ci/build_all_runner.sh ${{matrix.targets}} ${{matrix.arch}}

      - name: Arrange Build Artifacts
        run: |
@ -112,7 +125,7 @@ jobs:
  artifacts:
    name: Upload Artifacts to S3
    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
    needs: [setup, group_targets]
    if: contains(fromJSON('["main", "stable", "beta"]'), needs.group_targets.outputs.branchname)
    steps:
@ -140,10 +153,12 @@ jobs:

  release:
    name: Create Release and Upload Artifacts
+    permissions:
+      contents: write
    # runs-on: ubuntu-latest
-    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
+    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')
+    if: startsWith(github.ref, 'refs/tags/')
    steps:
      - name: Download Artifacts
        uses: actions/download-artifact@v4
--- a/.github/workflows/cflite_batch.yml
+++ b/.github/workflows/cflite_batch.yml
@ -1,34 +0,0 @@
-name: ClusterFuzzLite batch fuzzing
-on:
-  schedule:
-    - cron: '0 6 * * *'  # UTC 6am every day.
-permissions: read-all
-jobs:
-  BatchFuzzing:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer:
-        - address
-        - undefined
-        - memory
-    steps:
-    - name: Build Fuzzers (${{ matrix.sanitizer }})
-      id: build
-      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
-      with:
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Run Fuzzers (${{ matrix.sanitizer }})
-      id: run
-      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        fuzz-seconds: 1800 # 30 mins
-        mode: 'batch'
-        sanitizer: ${{ matrix.sanitizer }}
-        # Optional but recommended: For storing certain artifacts from fuzzing.
-        # See later section on "Git repo for storage".
-        # storage-repo: https://${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/OWNER/STORAGE-REPO-NAME.git
-        # storage-repo-branch: main   # Optional. Defaults to "main"
-        # storage-repo-branch-coverage: gh-pages  # Optional. Defaults to "gh-pages".
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@ -4,9 +4,17 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
@ -35,7 +43,7 @@ jobs:
      - name: Building [${{ matrix.check }}]
        uses: addnab/docker-run-action@v3
        with:
-          image: px4io/px4-dev-nuttx-focal:2022-08-12
+          image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
          options: -v ${{ github.workspace }}:/workspace
          run: |
            cd /workspace
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@ -4,10 +4,13 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
-
+      - '**'
+    paths-ignore:
+      - 'docs/**'
 jobs:
  build:
    runs-on: ubuntu-latest
--- a/.github/workflows/compile_macos.yml
+++ b/.github/workflows/compile_macos.yml
@ -4,9 +4,17 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
--- a/.github/workflows/compile_ubuntu.yml
+++ b/.github/workflows/compile_ubuntu.yml
@ -7,9 +7,20 @@ on:
      - 'stable'
      - 'beta'
      - 'release/**'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-      - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+env:
+  RUNS_IN_DOCKER: true
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build_and_test:
--- a/.github/workflows/dev_container.yml
+++ b/.github/workflows/dev_container.yml
@ -1,4 +1,3 @@
-
 name: Container build

 on:
@ -12,27 +11,146 @@ on:
      - 'v*'
  pull_request:
    branches:
-      - '*'
+      - '**'
+    paths:
+      - '.github/workflows/dev_container.yml'
+      - 'Tools/setup/ubuntu.sh'
+      - 'Tools/setup/requirements.txt'
+      - 'Tools/setup/Dockerfile'
+      - 'Tools/setup/docker-entrypoint.sh'
+  workflow_dispatch:
+    inputs:
+      px4_version:
+        description: 'Container tag (e.g. v1.16.0)'
+        required: true
+        type: string
+      deploy_to_registry:
+        description: 'Whether to push built images to the registry'
+        required: false
+        type: boolean
+        default: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
-  build:
-    name: Build and Push Container
-    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+  setup:
+    name: Set Tags and Variables
+    permissions:
+      contents: read
+    runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
+    outputs:
+      px4_version: ${{ steps.px4_version.outputs.px4_version }}
+      meta_tags: ${{ steps.meta.outputs.tags }}
+      meta_labels: ${{ steps.meta.outputs.labels }}
    steps:
+      - uses: runs-on/action@v1
      - uses: actions/checkout@v4
        with:
          fetch-tags: true
          submodules: false
          fetch-depth: 0

-      - name: Set PX4 Tag
-        id: px4-tag
+      # If manual dispatch, take the user‐provided input
+      - name: Set PX4 Tag Version
+        id: px4_version
        run: |
-          echo "tag=$(git describe --tags --match 'v[0-9]*')" >> $GITHUB_OUTPUT
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo "px4_version=${{ github.event.inputs.px4_version }}" >> $GITHUB_OUTPUT
+          else
+            echo "px4_version=$(git describe --tags --match 'v[0-9]*')" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/PX4/px4-dev
+            px4io/px4-dev
+          tags: |
+            type=raw,enable=true,value=${{ steps.px4_version.outputs.px4_version }},priority=1000
+
+  build:
+    name: Build Container (${{ matrix.arch }})
+    permissions:
+      contents: read
+      packages: write
+    needs: setup
+    strategy:
+      matrix:
+        include:
+          - platform: linux/arm64
+            arch: arm64
+            runner: arm64
+          - platform: linux/amd64
+            arch: amd64
+            runner: x64
+    runs-on: [runs-on,"runner=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
+        with:
+          fetch-tags: true
+          submodules: false
+          fetch-depth: 0
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+          platforms: ${{ matrix.platform }}
+
+      - name: Build and Load Container Image
+        uses: docker/build-push-action@v6
+        id: docker
+        with:
+          context: Tools/setup
+          tags: |
+            ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
+            px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
+          labels: ${{ needs.setup.outputs.meta_labels }}
+          platforms: ${{ matrix.platform }}
+          load: false
+          push: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_registry) }}
+          provenance: false
+          cache-from: type=gha,version=1
+          cache-to: type=gha,version=1,mode=max
+
+  deploy:
+    name: Deploy To Registry
+    permissions:
+      contents: read
+      packages: write
+    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:
+      - uses: runs-on/action@v1
+      - uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          submodules: false
+          fetch-depth: 0

      - name: Login to Docker Hub
        uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@ -44,58 +162,31 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/PX4/px4-dev
-            ${{ (github.event_name != 'pull_request') && 'px4io/px4-dev' || '' }}
-          tags: |
-            type=raw,enable=true,value=${{ steps.px4-tag.outputs.tag }},priority=1000
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and load container image
-        uses: docker/build-push-action@v6
-        id: docker
-        with:
-          context: Tools/setup
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: |
-            linux/amd64
-          load: true
-          push: false
-          cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
-          cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
-
-      - name: Get Tag Name
-        id: tag_name
+      - name: Verify Images Exist Before Creating Manifest
        run: |
-          echo "::set-output name=tag_name::$(echo '${{ fromJSON(steps.docker.outputs.metadata)['image.name'] }}' | sed 's/,.*$//')"
+          docker manifest inspect px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 || echo "⚠️ Warning: No ARM64 image found!"
+          docker manifest inspect px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 || echo "⚠️ Warning: No AMD64 image found!"
+          docker manifest inspect ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 || echo "⚠️ Warning: No ARM64 image found!"
+          docker manifest inspect ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 || echo "⚠️ Warning: No AMD64 image found!"

-      - name: make quick_check
-        uses: addnab/docker-run-action@v3
-        with:
-          image: ${{ steps.tag_name.outputs.tag_name }}
-          options: -v ${{ github.workspace }}:/workspace
-          run: |
-            cd /workspace
-            git config --global --add safe.directory /workspace
-            make px4_sitl_default
-            make px4_fmu-v6x_default
+      - name: Create and Push Multi-Arch Manifest for Docker Hub
+        run: |
+          docker manifest create px4io/px4-dev:${{ needs.setup.outputs.px4_version }} \
+            --amend px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 \
+            --amend px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64

-      - name: Push container image
-        uses: docker/build-push-action@v6
-        with:
-          context: Tools/setup
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: |
-            linux/amd64
-          provenance: mode=max
-          push: ${{ github.event_name != 'pull_request' }}
-          cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
-          cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
+          docker manifest annotate px4io/px4-dev:${{ needs.setup.outputs.px4_version }} px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 --arch arm64
+          docker manifest annotate px4io/px4-dev:${{ needs.setup.outputs.px4_version }} px4io/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 --arch amd64
+
+          docker manifest push px4io/px4-dev:${{ needs.setup.outputs.px4_version }}
+
+      - name: Create and Push Multi-Arch Manifest for GHCR
+        run: |
+          docker manifest create ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} \
+            --amend ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 \
+            --amend ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64
+
+          docker manifest annotate ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-arm64 --arch arm64
+          docker manifest annotate ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}-amd64 --arch amd64
+
+          docker manifest push ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}
--- a/.github/workflows/docs_crowdin_download.yml
+++ b/.github/workflows/docs_crowdin_download.yml
@ -0,0 +1,55 @@
+name: Docs - Crowdin - Download Guide Translations
+
+# https://github.com/crowdin/github-action/tree/master
+
+on:
+  schedule:
+    - cron: '0 0 * * 0' # Runs every Sunday at 00:00 UTC
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  synchronize-with-crowdin:
+    name: Synchronize with Crowdin
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 1 # Should be 1 to avoid parallel builds
+      matrix:
+        lc: [ko, uk, zh-CN] # Target languages https://developer.crowdin.com/language-codes/
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Debug Environment Variables
+        run: |
+          echo "CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_DOCS_PROJECT_ID }}"
+          echo "CROWDIN_PERSONAL_TOKEN: ${{ secrets.PX4BUILDBOT_CROWDIN_PERSONAL_TOKEN }}"
+      - name: Matrix
+        uses: crowdin/github-action@v2
+        with:
+          config: 'docs/crowdin_docs.yml'
+          upload_sources: false
+          upload_translations: false
+          download_translations: true
+          commit_message: New Crowdin translations - ${{ matrix.lc }}
+          localization_branch_name: l10n_crowdin_docs_translations_${{ matrix.lc }}
+          crowdin_branch_name: main
+          create_pull_request: true
+          pull_request_base_branch_name: 'main'
+          pull_request_title: New PX4 guide translations (Crowdin) - ${{ matrix.lc }}
+          pull_request_body: 'New PX4 guide Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action) for ${{ matrix.lc }}'
+          pull_request_labels: 'Documentation 📑'
+          pull_request_reviewers: hamishwillee
+          download_language: ${{ matrix.lc }}
+        env:
+          # A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
+          GITHUB_TOKEN: ${{ secrets.PX4BUILTBOT_PERSONAL_ACCESS_TOKEN }}
+
+          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_DOCS_PROJECT_ID }}
+
+          # Visit https://crowdin.com/settings#api-key to create this token
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.PX4BUILDBOT_CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/docs_crowdin_upload.yml
+++ b/.github/workflows/docs_crowdin_upload.yml
@ -0,0 +1,44 @@
+name: Docs - Crowdin - Upload Guide sources (en)
+
+# https://github.com/crowdin/github-action/tree/master
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'docs/en/**'
+  #pull_request:
+  #  types:
+  #    - closed
+  #  branches:
+  #    - main
+  #  paths:
+  #    - 'docs/en/**'
+  workflow_dispatch:
+
+jobs:
+  upload-to-crowdin:
+    #if: github.event.pull_request.merged == true || github.event_name == 'push'  || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: crowdin push
+        uses: crowdin/github-action@v2
+        with:
+          config: 'docs/crowdin_docs.yml'
+          upload_sources: true
+          upload_translations: false
+          download_translations: false
+          crowdin_branch_name: main
+        env:
+          # A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
+          GITHUB_TOKEN: ${{ secrets.PX4BUILDBOT_ACCESSTOKEN }}
+
+          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_DOCS_PROJECT_ID }}
+
+          # Visit https://crowdin.com/settings#api-key to create this token
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.PX4BUILDBOT_CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/docs_deploy.yml
+++ b/.github/workflows/docs_deploy.yml
@ -0,0 +1,99 @@
+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
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  build:
+    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
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+          # Specify the path to lock file for correct caching
+          cache-dependency-path: ./docs/yarn.lock
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --cwd ./docs
+
+      - name: Build with VitePress
+        working-directory: ./docs
+        run: |
+          npm run docs:build_ubuntu
+          touch .vitepress/dist/.nojekyll
+          npm run docs:sitemap
+
+      - name: Upload artifact
+        if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged) || github.event_name == 'workflow_dispatch' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: px4_docs_build
+          path: docs/.vitepress/dist/
+          retention-days: 1
+
+  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=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
+
+    steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: px4_docs_build
+          path: ~/_book
+
+      - name: Deploy
+        run: |
+          git clone --single-branch --branch main --depth 1 https://${{ secrets.PX4BUILTBOT_PERSONAL_ACCESS_TOKEN }}@github.com/PX4/docs.px4.io.git
+          # make it an orphan branch
+          cd docs.px4.io
+          CURRENT_DATETIME=$(date +'%Y%m%d_%H_%M')
+          git checkout --orphan "${CURRENT_DATETIME}_main"
+          rm -rf ${BRANCH_NAME}
+          mkdir -p ${BRANCH_NAME}
+          cp -r ~/_book/* ${BRANCH_NAME}/
+          git config --global user.name "${{ secrets.PX4BUILDBOT_USER }}"
+          git config --global user.email "${{ secrets.PX4BUILDBOT_EMAIL }}"
+          git add .
+          git commit -a -m "PX4 docs build update (vitepress) `date`"
+          # push branch as backup
+          git push origin "${CURRENT_DATETIME}_main"
+          # Now make main from backup and push updated
+          git branch -D main
+          git checkout -b main
+          git push origin main -f
--- a/.github/workflows/docs_flaw_checker.yml
+++ b/.github/workflows/docs_flaw_checker.yml
@ -0,0 +1,74 @@
+name: Docs - Check for flaws in PX4 Guide Source
+# So far:
+  # Modifications of translations files
+  # Broken internal links
+
+on:
+  pull_request_target:
+    types: [opened, edited, synchronize]
+    paths:
+      - 'docs/en/**'
+
+jobs:
+  check_flaws:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+
+      - name: Create logs directory
+        run: |
+          mkdir logs
+
+      - name: Get changed english doc files
+        id: get_changed_markdown_english
+        uses: tj-actions/changed-files@v35.9.2
+        with:
+          json: true
+          base_sha: "${{ github.event.pull_request.base.sha }}"
+          sha: "${{ github.event.pull_request.head.sha }}"
+          # Below are used to output files to a directory. May use in flaw checker.
+          # write_output_files: true
+          # output_dir: "./logs"
+          files: |
+            docs/en/**/*.md
+
+      - name: Save JSON file containing files to link check
+        run: |
+          echo "${{ steps.get_changed_markdown_english.outputs.all_changed_files }}"
+          echo "${{ steps.get_changed_markdown_english.outputs.all_changed_files }}" > ./logs/prFiles.json
+
+      - name: Run link checker
+        id: link-check
+        run: |
+          npm -g install markdown_link_checker_sc@0.0.138
+          markdown_link_checker_sc -r ${{ github.workspace }} -d docs -e en -f ./logs/prFiles.json -i assets -u docs.px4.io/main/ > ./logs/errorsFilteredByPrPages.md
+          mkdir -p ./pr
+          cp ./logs/errorsFilteredByPrPages.md ./pr/errorsFilteredByPrPages.md
+
+      - name: Read errorsFilteredByPrPages.md file
+        id: read-errors-by-page
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./logs/errorsFilteredByPrPages.md
+
+      - name: Echo Errors by Page
+        run: echo "${{ steps.read-errors-by-page.outputs.content }}"
+
+      - name: Save PR number
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+        run: |
+          #mkdir -p ./pr
+          echo $PR_NUMBER > ./pr/pr_number
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pr_number
+          path: pr/
--- a/.github/workflows/docs_pr_comment.yml
+++ b/.github/workflows/docs_pr_comment.yml
@ -0,0 +1,107 @@
+name: Docs - Comment Workflow
+on:
+  workflow_run:
+    workflows: ["Docs - Check for flaws in PX4 Guide Source"]
+    types:
+      - completed
+jobs:
+  comment:
+    permissions:
+      pull-requests: write # for marocchino/sticky-pull-request-comment
+    name: Comments
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Download PR artifact'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr_number"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
+
+      - name: 'Unzip artifact'
+        run: unzip pr_number.zip
+
+      # Doesn't work across workflows
+      #- name: Get artifacts from flaw checker workflow
+      #  uses: actions/download-artifact@v3
+      #  with:
+      #    name: logs_and_errors
+      #    #path: ./logs
+
+      - name: Read errorsFilteredByPrPages.md file
+        id: read-errors-by-page
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./errorsFilteredByPrPages.md
+
+      - name: Read PR number
+        id: read-error-pr-number
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./pr_number
+
+      - name: File detail info
+        run: |
+          echo "${{ steps.read-errors-by-page.outputs.content }}"
+          echo "${{ steps.read-error-pr-number.outputs.content }}"
+
+      - name: Create or update comment
+        id: comment_to_pr
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          recreate: true
+          number: ${{ steps.read-error-pr-number.outputs.content }}
+          header: flaws
+          message: ${{ steps.read-errors-by-page.outputs.content || 'No flaws found' }}
+
+      #- name: Dump GitHub context
+      #  env:
+      #    GITHUB_CONTEXT: ${{ toJSON(github) }}
+      #  run: echo "$GITHUB_CONTEXT"
+
+      # Would like to do this, but it doesn't work (for me).
+      # Moving to time-based, or triggering on workflow
+      #- name: Wait for artifacts upload to succeed
+      #  uses: lewagon/wait-on-check-action@v1.3.1
+      #  with:
+      #    ref: ${{ github.ref }}
+      #    check-name: 'Archive production artifacts'
+      #    repo-token: ${{ secrets.GITHUB_TOKEN }}
+      #    wait-interval: 80
+
+      # Not needed for now - trying to trigger off the workflow
+      #- name: Sleep for 80 seconds
+      #  run: sleep 80s
+      #  shell: bash
+      #- name: Find Comment
+      #  uses: peter-evans/find-comment@v2
+      #  id: fc
+      #  with:
+      #    issue-number: ${{ steps.read-error-pr-number.outputs.content }}
+      #    comment-author: 'github-actions[bot]'
+      #    body-includes: Flaws (may be none)
+
+      #- name: Create or update comment
+      #  uses: peter-evans/create-or-update-comment@v3
+      #  with:
+      #    comment-id: ${{ steps.fc.outputs.comment-id }}
+      #    issue-number: ${{ steps.read-error-pr-number.outputs.content }}
+      #    body: |
+      #      Flaws (may be none)
+      #      ${{ steps.read-errors-by-page.outputs.content }}
+      #    edit-mode: replace
--- a/.github/workflows/ekf_functional_change_indicator.yml
+++ b/.github/workflows/ekf_functional_change_indicator.yml
@ -3,7 +3,14 @@ name: EKF Change Indicator
 on:
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+# If two events are triggered within a short time in the same PR, cancel the run of the oldest event
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true

 jobs:
  unit_tests:
@ -16,7 +23,7 @@ jobs:
    - name: main test
      uses: addnab/docker-run-action@v3
      with:
-        image: px4io/px4-dev-base-focal:2021-09-08
+        image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
        options: -v ${{ github.workspace }}:/workspace
        run: |
          cd /workspace
--- a/.github/workflows/ekf_update_change_indicator.yml
+++ b/.github/workflows/ekf_update_change_indicator.yml
@ -1,6 +1,9 @@
 name: EKF Update Change Indicator

-on: push
+on:
+  push:
+    paths-ignore:
+      - 'docs/**'

 jobs:
  unit_tests:
@ -16,7 +19,7 @@ jobs:
    - name: main test
      uses: addnab/docker-run-action@v3
      with:
-        image: px4io/px4-dev-base-focal:2021-09-08
+        image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
        options: -v ${{ github.workspace }}:/workspace
        run: |
          cd /workspace
--- a/.github/workflows/failsafe_sim.yml
+++ b/.github/workflows/failsafe_sim.yml
@ -4,9 +4,17 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
@ -21,7 +29,7 @@ jobs:
          "failsafe_web",
        ]
    container:
-      image: px4io/px4-dev-nuttx-focal:2022-08-12
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
    steps:
      - name: Install Node v20.18.0
@ -33,6 +41,9 @@ jobs:
        with:
          fetch-depth: 0

+      - name: Git ownership workaround
+        run: git config --system --add safe.directory '*'
+
      - name: Install empscripten
        run: |
          git clone https://github.com/emscripten-core/emsdk.git _emscripten_sdk
--- a/.github/workflows/flash_analysis.yml
+++ b/.github/workflows/flash_analysis.yml
@ -1,12 +1,21 @@
 name: FLASH usage analysis

+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
 on:
  push:
    branches:
      - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-      - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'

 env:
  MIN_FLASH_POS_DIFF_FOR_COMMENT: 50
@ -17,7 +26,7 @@ jobs:
    name: Analyzing ${{ matrix.target }}
    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
    container:
-      image: px4io/px4-dev-nuttx-focal
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
    strategy:
      matrix:
        target: [px4_fmu-v5x, px4_fmu-v6x]
@ -69,7 +78,7 @@ jobs:
        id: bloaty-step
        with:
          bloaty-file-args: ./with-change.elf -- ./before-change.elf
-          bloaty-additional-args: -d sections,compileunits -s vm -n 20
+          bloaty-additional-args: -d sections,symbols -s vm -n 20
          output-to-summary: true

      - name: Generate output
@ -83,6 +92,9 @@ jobs:
          echo '${{ steps.bloaty-step.outputs.bloaty-summary-map }}' >> $GITHUB_OUTPUT
          echo "$EOF" >> $GITHUB_OUTPUT

+  # TODO:
+  # This part of the workflow is causing errors for forks. We should find a way to fix this and enable it again for forks.
+  # Track this issue https://github.com/PX4/PX4-Autopilot/issues/24408
  post_pr_comment:
    name: Publish Results
    runs-on: [runs-on,runner=1cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
@ -92,7 +104,7 @@ jobs:
      V5X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-percentage) }}
      V6X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-absolute) }}
      V6X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-percentage) }}
-    if: ${{ github.event.pull_request }}
+    if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
    steps:
      - name: Find Comment
        uses: peter-evans/find-comment@v3
--- a/.github/workflows/fuzzing.yml
+++ b/.github/workflows/fuzzing.yml
@ -0,0 +1,38 @@
+name: Fuzzing
+on:
+  schedule:
+    - cron: '0 6 * * *'  # UTC 6am every day.
+
+permissions:
+  contents: read
+
+env:
+  RUNS_IN_DOCKER: true
+
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    container:
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt update && apt install -y clang
+
+      - name: Fix git in Container
+        run: |
+          git config --global --add safe.directory $(realpath .)
+
+      - uses: actions/checkout@v4
+
+      - name: Build and Run Fuzz Tests
+        run: |
+          # Only build the tests
+          export CC=clang
+          export CXX=clang++
+          make tests TESTFILTER=__no_tests__
+
+          # Run the fuzz tests
+          for fuzz_binary in build/px4_sitl_test/*fuzz*; do
+            ./Tools/ci/run_fuzz_tests.sh $fuzz_binary 15m
+          done
--- a/.github/workflows/itcm_check.yml
+++ b/.github/workflows/itcm_check.yml
@ -0,0 +1,63 @@
+name: ITCM check
+
+permissions:
+  contents: read
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check_itcm:
+    name: Checking ${{ matrix.target }}
+    runs-on: [runs-on,runner=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:
+      fail-fast: false
+      matrix:
+        include:
+          - target: px4_fmu-v5x
+            scripts: >
+              boards/px4/fmu-v5x/nuttx-config/scripts/itcm_gen_functions.ld
+              boards/px4/fmu-v5x/nuttx-config/scripts/itcm_static_functions.ld
+          - target: px4_fmu-v6xrt
+            scripts: >
+              boards/px4/fmu-v6xrt/nuttx-config/scripts/itcm_functions_includes.ld
+              boards/px4/fmu-v6xrt/nuttx-config/scripts/itcm_static_functions.ld
+          - target: nxp_tropic-community
+            scripts: >
+              boards/nxp/tropic-community/nuttx-config/scripts/itcm_functions_includes.ld
+              boards/nxp/tropic-community/nuttx-config/scripts/itcm_static_functions.ld
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Git ownership workaround
+        run: git config --system --add safe.directory '*'
+
+      - name: Build Target
+        run: make ${{ matrix.target }}
+
+      - name: Copy built ELF
+        run: cp ./build/**/*.elf ./built.elf
+
+      - name: Install itcm-check dependencies
+        run: pip3 install -r Tools/setup/optional-requirements.txt --break-system-packages
+
+      - name: Execute the itcm-check
+        run: python3 Tools/itcm_check.py --elf-file built.elf --script-files ${{ matrix.scripts }}
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@ -0,0 +1,21 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+# The paths are set up in .github/labeler.yml
+#
+# See: https://github.com/actions/labeler
+
+name: Labeler
+on: [pull_request_target]
+
+jobs:
+  label:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+    - uses: actions/labeler@v5
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/mavros_mission_tests.yml
+++ b/.github/workflows/mavros_mission_tests.yml
@ -4,9 +4,17 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
@ -16,7 +24,6 @@ jobs:
      matrix:
        config:
          - {vehicle: "iris",          mission: "MC_mission_box"}
-          - {vehicle: "rover",         mission: "rover_mission_1"}

    steps:
    - uses: actions/checkout@v4
--- a/.github/workflows/mavros_offboard_tests.yml
+++ b/.github/workflows/mavros_offboard_tests.yml
@ -4,9 +4,17 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
--- a/.github/workflows/nuttx_env_config.yml
+++ b/.github/workflows/nuttx_env_config.yml
@ -4,9 +4,17 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  build:
@ -25,7 +33,7 @@ jobs:
    - name: Build PX4 and Run Test [${{ matrix.config }}]
      uses: addnab/docker-run-action@v3
      with:
-        image: px4io/px4-dev-nuttx-focal:2022-08-12
+        image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
        options: -v ${{ github.workspace }}:/workspace
        run: |
          cd /workspace
--- a/.github/workflows/python_checks.yml
+++ b/.github/workflows/python_checks.yml
@ -4,9 +4,13 @@ on:
  push:
    branches:
    - 'main'
+    paths-ignore:
+      - 'docs/**'
  pull_request:
    branches:
-    - '*'
+      - '**'
+    paths-ignore:
+      - 'docs/**'

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

 jobs:
  build:
@ -110,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}} --upload test/mavsdk_tests/configs/sitl.json --verbose
+        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
@ -121,7 +129,7 @@ jobs:
          path: |
            logs/**/**/**/*.log
            logs/**/**/**/*.ulg
-            build/px4_sitl_default/tmp_mavsdk_tests/rootfs/*.ulg
+            build/px4_sitl_default/tmp_mavsdk_tests/rootfs/log/**/*.ulg

      - name: Look at Core files
        if: failure() && ${{ hashFiles('px4.core') != '' }}
--- a/.gitignore
+++ b/.gitignore
@ -108,3 +108,4 @@ src/systemcmds/topic_listener/listener_generated.cpp

 # colcon
 log/
+keys/
--- a/.gitmodules
+++ b/.gitmodules
@ -89,3 +89,6 @@
 [submodule "src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan"]
 	path = src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan
 	url = https://github.com/dronecan/pydronecan
+[submodule "test/fuzztest"]
+	path = test/fuzztest
+	url = https://github.com/google/fuzztest.git
--- a/.vscode/cmake-variants.yaml
+++ b/.vscode/cmake-variants.yaml
@ -6,6 +6,11 @@ CONFIG:
      buildType: RelWithDebInfo
      settings:
        CONFIG: px4_sitl_default
+    px4_sitl_spacecraft:
+      short: px4_sitl_spacecraft
+      buildType: RelWithDebInfo
+      settings:
+        CONFIG: px4_sitl_spacecraft
    px4_sitl_nolockstep:
      short: px4_sitl_nolockstep
      buildType: RelWithDebInfo
@ -231,6 +236,11 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: bitcraze_crazyflie_default
+    bluerobotics_navigator_default:
+      short: bluerobotics_navigator
+      buildType: MinSizeRel
+      settings:
+        CONFIG: bluerobotics_navigator_default
    cuav_can-gps-v1_default:
      short: cuav_can-gps-v1_default
      buildType: MinSizeRel
@ -296,6 +306,16 @@ CONFIG:
      buildType: MinSizeRel
      settings:
        CONFIG: holybro_durandal-v1_default
+    holybro_kakuteh7-wing_default:
+      short: holybro_kakuteh7-wing
+      buildType: MinSizeRel
+      settings:
+        CONFIG: holybro_kakuteh7-wing_default
+    holybro_kakuteh7dualimu_default:
+      short: holybro_kakuteh7dualimu
+      buildType: MinSizeRel
+      settings:
+        CONFIG: holybro_kakuteh7dualimu_default
    matek_h743-slim_default:
      short: matek_h743-slim
      buildType: MinSizeRel
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -99,7 +99,7 @@
 #
 #=============================================================================

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

 set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE FILEPATH "PX4 source directory" FORCE)
 set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE FILEPATH "PX4 binary directory" FORCE)
@ -334,6 +334,33 @@ if(NOT PX4_CHIP)
 	message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP")
 endif()

+#=============================================================================
+# Testing - Automatic unit and integration testing with CTest
+# (Needs to be before setting the common compile flags)
+#
+
+# optionally enable cmake testing (supported only on posix)
+option(CMAKE_TESTING "Configure test targets" OFF)
+if(${PX4_CONFIG} STREQUAL "px4_sitl_test")
+	set(CMAKE_TESTING ON)
+endif()
+if(CMAKE_TESTING)
+	include(CTest) # sets BUILD_TESTING variable
+endif()
+
+# enable test filtering to run only specific tests with the ctest -R regex functionality
+set(TESTFILTER "" CACHE STRING "Filter string for ctest to selectively only run specific tests (ctest -R)")
+
+include(px4_add_gtest)
+if(BUILD_TESTING)
+	# Setting FUZZTEST_FUZZING_MODE=on enables ASAN, and is only supported with Clang
+	if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang"))
+		set(FUZZTEST_FUZZING_MODE ON)
+	endif()
+	add_subdirectory(test)
+	fuzztest_setup_fuzzing_flags()
+endif()
+
 #=============================================================================
 # build flags
 #
@ -386,47 +413,6 @@ if (NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
 	endforeach()
 endif()

-#=============================================================================
-# Testing - Automatic unit and integration testing with CTest
-#
-
-# optionally enable cmake testing (supported only on posix)
-option(CMAKE_TESTING "Configure test targets" OFF)
-if(${PX4_CONFIG} STREQUAL "px4_sitl_test")
-	set(CMAKE_TESTING ON)
-endif()
-if(CMAKE_TESTING)
-	include(CTest) # sets BUILD_TESTING variable
-endif()
-
-# enable test filtering to run only specific tests with the ctest -R regex functionality
-set(TESTFILTER "" CACHE STRING "Filter string for ctest to selectively only run specific tests (ctest -R)")
-
-# if testing is enabled download and configure gtest
-list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake/gtest/)
-include(px4_add_gtest)
-if(BUILD_TESTING)
-	include(gtest)
-
-	# Ensure there's no -R without any filter expression since that trips newer ctest versions
-	if(TESTFILTER)
-		set(TESTFILTERARG "-R")
-	else()
-		set(TESTFILTERARG "")
-	endif()
-
-	add_custom_target(test_results
-			COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test ${TESTFILTERARG} ${TESTFILTER}
-			DEPENDS
-				px4
-				examples__dyn_hello
-			USES_TERMINAL
-			COMMENT "Running tests"
-			WORKING_DIRECTORY ${PX4_BINARY_DIR})
-	set_target_properties(test_results PROPERTIES EXCLUDE_FROM_ALL TRUE)
-endif()
-
-
 #=============================================================================
 # subdirectories
 #
@ -496,7 +482,6 @@ add_custom_target(uorb_graph DEPENDS ${uorb_graph_config})
 include(bloaty)


-include(doxygen)
 include(metadata)
 include(package)

--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
--- a/4
+++ b/4
@ -235,9 +235,9 @@ pipeline {
              sh('rm -f px4_msgs/srv/*.srv')
              sh('rm -f px4_msgs/srv/versioned/*.srv')
              sh('cp msg/*.msg px4_msgs/msg/')
-              sh('mkdir -p px4_msgs/msg/versioned && cp msg/versioned/*.msg px4_msgs/msg/versioned/')
+              sh('cp msg/versioned/*.msg px4_msgs/msg/ || true')
              sh('cp srv/*.srv px4_msgs/srv/')
-              sh('mkdir -p px4_msgs/srv/versioned && cp srv/versioned/*.srv px4_msgs/srv/versioned/')
+              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')
--- a/7
+++ b/7
@ -73,13 +73,6 @@ menu "Toolchain"
        help
            relative path to the ROMFS root directory

-    config BOARD_ROOTFSDIR
-        string "Root directory"
-        depends on PLATFORM_POSIX
-        default "."
-        help
-            Configure the root directory in the file system for PX4 files
-
    config BOARD_IO
        string "IO board name"
        default "px4_io-v2_default"
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@ -7,33 +7,34 @@ See [the documentation on Maintainers](https://docs.px4.io/main/en/contribute/ma

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


 **Documentation Maintainers**

 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Hamish Willee  | [hamishwillee][hamishwillee] | hamishwillee |
+| Hamish Willee  | [@hamishwillee](https://github.com/hamishwillee) | hamishwillee |

 **Release Managers**

 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Ramón Roche | [mrpollo][mrpollo] | rroche | <rroche@linuxfoundation.org>
-| Daniel Agar | [dagar][dagar] | daniel_agar | <daniel@agar.ca>
+| Ramón Roche | [@mrpollo](https://github.com/mrpollo) | rroche | <rroche@linuxfoundation.org>
+| Daniel Agar | [@dagar](https://github.com/dagar) | daniel_agar | <daniel@agar.ca>

 **Retired Maintainers**

--- a/24
+++ b/24
@ -160,11 +160,6 @@ else
 		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=UndefinedBehaviorSanitizer
 	endif

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

 # Pick up specific Python path if set
@ -300,6 +295,8 @@ uorb_graphs:
 	@$(MAKE) --no-print-directory px4_fmu-v2_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v4_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v5_default uorb_graph
+	@$(MAKE) --no-print-directory px4_fmu-v5x_default uorb_graph
+	@$(MAKE) --no-print-directory px4_fmu-v6x_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph

 px4io_update:
@ -363,7 +360,7 @@ coverity_scan: px4_sitl_default

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

 parameters_metadata:
 	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters ver_gen
@ -379,12 +376,6 @@ extract_events:

 px4_metadata: parameters_metadata airframe_metadata module_documentation extract_events

-doxygen:
-	@mkdir -p "$(SRC_DIR)"/build/doxygen
-	@cd "$(SRC_DIR)"/build/doxygen && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=px4_sitl_default -DBUILD_DOXYGEN=ON
-	@$(PX4_MAKE) -C "$(SRC_DIR)"/build/doxygen
-	@touch "$(SRC_DIR)"/build/doxygen/Documentation/.nojekyll
-
 # Style
 # --------------------------------------------------------------------
 .PHONY: check_format format check_newlines
@ -414,11 +405,18 @@ tests:
 	$(eval UBSAN_OPTIONS += color=always)
 	$(call cmake-build,px4_sitl_test)

+# work around lcov bug #316; remove once lcov is fixed (see https://github.com/linux-test-project/lcov/issues/316)
+LCOBUG = --ignore-errors mismatch
 tests_coverage:
 	@$(MAKE) clean
 	@$(MAKE) --no-print-directory tests PX4_CMAKE_BUILD_TYPE=Coverage
 	@mkdir -p coverage
-	@lcov --directory build/px4_sitl_test --base-directory build/px4_sitl_test --gcov-tool gcov --capture -o coverage/lcov.info
+	@lcov --directory build/px4_sitl_test \
+		--base-directory build/px4_sitl_test \
+		--gcov-tool gcov \
+		--capture \
+		$(LCOBUG) \
+		-o coverage/lcov.info


 rostest: px4_sitl_default
--- a/README.md
+++ b/README.md
@ -17,17 +17,19 @@ PX4 is highly portable, OS-independent and supports Linux, NuttX and MacOS out o
  * [VTOL](https://docs.px4.io/main/en/frames_vtol/)
  * [Autogyro](https://docs.px4.io/main/en/frames_autogyro/)
  * [Rover](https://docs.px4.io/main/en/frames_rover/)
-  * many more experimental types (Blimps, Boats, Submarines, High altitude balloons, etc)
+  * many more experimental types (Blimps, Boats, Submarines, High Altitude Balloons, Spacecraft, etc)
 * Releases: [Downloads](https://github.com/PX4/PX4-Autopilot/releases)

+## Releases
+
+Release notes and supporting information for PX4 releases can be found on the [Developer Guide](https://docs.px4.io/main/en/releases/).

 ## Building a PX4 based drone, rover, boat or robot

-The [PX4 User Guide](https://docs.px4.io/main/en/) explains how to assemble [supported vehicles](https://docs.px4.io/main/en/airframes/airframe_reference.html) and fly drones with PX4.
-See the [forum and chat](https://docs.px4.io/main/en/#getting-help) if you need help!
+The [PX4 User Guide](https://docs.px4.io/main/en/) explains how to assemble [supported vehicles](https://docs.px4.io/main/en/airframes/airframe_reference.html) and fly drones with PX4. See the [forum and chat](https://docs.px4.io/main/en/#getting-help) if you need help!


-## Changing code and contributing
+## Changing Code and Contributing

 This [Developer Guide](https://docs.px4.io/main/en/development/development.html) is for software developers who want to modify the flight stack and middleware (e.g. to add new flight modes), hardware integrators who want to support new flight controller boards and peripherals, and anyone who wants to get PX4 working on a new (unsupported) airframe/vehicle.

@ -35,7 +37,7 @@ Developers should read the [Guide for Contributions](https://docs.px4.io/main/en
 See the [forum and chat](https://docs.px4.io/main/en/#getting-help) if you need help!


-### Weekly Dev Call
+## Weekly Dev Call

 The PX4 Dev Team syncs up on a [weekly dev call](https://docs.px4.io/main/en/contribute/).

@ -50,69 +52,11 @@ For the latest stats on contributors please see the latest stats for the Droneco

 ## Supported Hardware

-Pixhawk standard boards and proprietary boards are shown below (discontinued boards aren't listed).
-
-For the most up to date information, please visit [PX4 user Guide > Autopilot Hardware](https://docs.px4.io/main/en/flight_controller/).
-
-### Pixhawk Standard Boards
-
-These boards fully comply with Pixhawk Standard, and are maintained by the PX4-Autopilot maintainers and Dronecode team
-
-* FMUv6X and FMUv6C
-  * [CUAV Pixahwk V6X (FMUv6X)](https://docs.px4.io/main/en/flight_controller/cuav_pixhawk_v6x.html)
-  * [Holybro Pixhawk 6X (FMUv6X)](https://docs.px4.io/main/en/flight_controller/pixhawk6x.html)
-  * [Holybro Pixhawk 6C (FMUv6C)](https://docs.px4.io/main/en/flight_controller/pixhawk6c.html)
-  * [Holybro Pix32 v6 (FMUv6C)](https://docs.px4.io/main/en/flight_controller/holybro_pix32_v6.html)
-* FMUv5 and FMUv5X (STM32F7, 2019/20)
-  * [Pixhawk 4 (FMUv5)](https://docs.px4.io/main/en/flight_controller/pixhawk4.html)
-  * [Pixhawk 4 mini (FMUv5)](https://docs.px4.io/main/en/flight_controller/pixhawk4_mini.html)
-  * [CUAV V5+ (FMUv5)](https://docs.px4.io/main/en/flight_controller/cuav_v5_plus.html)
-  * [CUAV V5 nano (FMUv5)](https://docs.px4.io/main/en/flight_controller/cuav_v5_nano.html)
-  * [Auterion Skynode (FMUv5X)](https://docs.auterion.com/avionics/skynode)
-* FMUv4 (STM32F4, 2015)
-  * [Pixracer](https://docs.px4.io/main/en/flight_controller/pixracer.html)
-  * [Pixhawk 3 Pro](https://docs.px4.io/main/en/flight_controller/pixhawk3_pro.html)
-* FMUv3 (STM32F4, 2014)
-  * [Pixhawk 2](https://docs.px4.io/main/en/flight_controller/pixhawk-2.html)
-  * [Pixhawk Mini](https://docs.px4.io/main/en/flight_controller/pixhawk_mini.html)
-  * [CUAV Pixhack v3](https://docs.px4.io/main/en/flight_controller/pixhack_v3.html)
-* FMUv2 (STM32F4, 2013)
-  * [Pixhawk](https://docs.px4.io/main/en/flight_controller/pixhawk.html)
-
-### Manufacturer supported
-
-These boards are maintained to be compatible with PX4-Autopilot by the Manufacturers.
-
-* [ARK Electronics ARKV6X](https://docs.px4.io/main/en/flight_controller/ark_v6x.html)
-* [CubePilot Cube Orange+](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_orangeplus.html)
-* [CubePilot Cube Orange](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_orange.html)
-* [CubePilot Cube Yellow](https://docs.px4.io/main/en/flight_controller/cubepilot_cube_yellow.html)
-* [Holybro Durandal](https://docs.px4.io/main/en/flight_controller/durandal.html)
-* [Airmind MindPX V2.8](http://www.mindpx.net/assets/accessories/UserGuide_MindPX.pdf)
-* [Airmind MindRacer V1.2](http://mindpx.net/assets/accessories/mindracer_user_guide_v1.2.pdf)
-* [Holybro Kakute F7](https://docs.px4.io/main/en/flight_controller/kakutef7.html)
-
-### Community supported
-
-These boards don't fully comply industry standards, and thus is solely maintained by the PX4 public community members.
-
-### Experimental
-
-These boards are not maintained by PX4 team nor Manufacturer, and is not guaranteed to be compatible with up to date PX4 releases.
-
-* [Raspberry PI with Navio 2](https://docs.px4.io/main/en/flight_controller/raspberry_pi_navio2.html)
-* [Bitcraze Crazyflie 2.0](https://docs.px4.io/main/en/complete_vehicles/crazyflie2.html)
-
-## Project Roadmap
-
-**Note: Outdated**
-
-A high level project roadmap is available [here](https://github.com/orgs/PX4/projects/25).
+For the most up to date information, please visit [PX4 User Guide > Autopilot Hardware](https://docs.px4.io/main/en/flight_controller/).

 ## Project Governance

 The PX4 Autopilot project including all of its trademarks is hosted under [Dronecode](https://www.dronecode.org/), part of the Linux Foundation.

-<a href="https://www.dronecode.org/" style="padding:20px" ><img src="https://mavlink.io/assets/site/logo_dronecode.png" alt="Dronecode Logo" width="110px"/></a>
-<a href="https://www.linuxfoundation.org/projects" style="padding:20px;"><img src="https://mavlink.io/assets/site/logo_linux_foundation.png" alt="Linux Foundation Logo" width="80px" /></a>
+<a href="https://www.dronecode.org/" style="padding:20px" ><img src="https://dronecode.org/wp-content/uploads/sites/24/2020/08/dronecode_logo_default-1.png" alt="Dronecode Logo" width="110px"/></a>
 <div style="padding:10px">&nbsp;</div>
--- a/ROMFS/CMakeLists.txt
+++ b/ROMFS/CMakeLists.txt
@ -216,12 +216,33 @@ foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
 		if(CONFIG_SYSTEMCMDS_BL_UPDATE)
 			# generate rc.board_bootloader_upgrade
 			set(BOARD_FIRMWARE_BIN "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
-			configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade @ONLY)
+			message(STATUS "ROMFS:  Adding platforms/nuttx/init/rc.board_bootloader_upgrade -> /etc/init.d/rc.board_bootloader_upgrade")
+
+			# Generate the file using configure_file at configure time to a temporary location
+			set(bootloader_upgrade_tmp ${CMAKE_CURRENT_BINARY_DIR}/rc.board_bootloader_upgrade.tmp)
+			configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${bootloader_upgrade_tmp} @ONLY)
+
+			# Then copy it at build time with proper dependencies
+			add_custom_command(
+				OUTPUT
+					${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade
+					rc.board_bootloader_upgrade.stamp
+				COMMAND ${CMAKE_COMMAND} -E copy_if_different ${bootloader_upgrade_tmp} ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade
+				COMMAND ${CMAKE_COMMAND} -E touch rc.board_bootloader_upgrade.stamp
+				DEPENDS
+					${bootloader_upgrade_tmp}
+					${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in
+					romfs_copy.stamp
+				COMMENT "ROMFS: copying rc.board_bootloader_upgrade"
+			)
+
+			list(APPEND extras_dependencies
+				rc.board_bootloader_upgrade.stamp
+			)
 		else()
 			# remove bootloader from extras
 			list(REMOVE_ITEM OPTIONAL_BOARD_EXTRAS ${board_extra_file})
 		endif()
-
 	endif()
 endforeach()

--- a/ROMFS/performance-test/CMakeLists.txt
+++ b/ROMFS/performance-test/CMakeLists.txt
@ -0,0 +1,34 @@
+############################################################################
+#
+#   Copyright (c) 2025 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+add_subdirectory(init.d)
--- a/ROMFS/performance-test/init.d/CMakeLists.txt
+++ b/ROMFS/performance-test/init.d/CMakeLists.txt
@ -0,0 +1,36 @@
+############################################################################
+#
+#   Copyright (c) 2025 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+px4_add_romfs_files(
+	rcS
+)
--- a/ROMFS/performance-test/init.d/rcS
+++ b/ROMFS/performance-test/init.d/rcS
@ -0,0 +1,68 @@
+#!/bin/sh
+# Un comment and use set +e to ignore and set -e to enable 'exit on error control'
+set +e
+# Un comment the line below to help debug scripts by printing a trace of the script commands
+#set -x
+# PX4FMU startup script.
+#
+# NOTE: environment variable references:
+#    If the dollar sign ('$') is followed by a left bracket ('{') then the
+#    variable name is terminated with the right bracket character ('}').
+#    Otherwise, the variable name goes to the end of the argument.
+#
+#
+# NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS.
+#
+#------------------------------------------------------------------------------
+set R /
+
+#
+# Print full system version.
+#
+ver all
+
+#
+# Set the parameter file the board supports params on
+# MTD device.
+#
+if mft query -q -k MTD -s MTD_PARAMETERS -v /fs/mtd_params
+then
+	set PARAM_FILE /fs/mtd_params
+fi
+
+#
+# Load parameters.
+#
+# if the board has a storage for (factory) calibration data
+if mft query -q -k MTD -s MTD_CALDATA -v /fs/mtd_caldata
+then
+	param load /fs/mtd_caldata
+fi
+
+#
+# Load parameters.
+#
+param select $PARAM_FILE
+if ! param load
+then
+	param reset_all
+fi
+
+#
+# Try to mount the microSD card.
+#
+mount -t vfat /dev/mmcsd0 /fs/microsd
+if [ $? = 0 ]
+then
+	echo "SD card mounted at /fs/microsd"
+else
+	echo "No SD card found"
+fi
+
+unset R
+
+echo ""
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "!!!!!!     This is the PERFORMANCE TESTING firmware! WARNs and ERRORs are expected!     !!!!!"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo ""
--- a/ROMFS/px4fmu_common/init.d-posix/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d-posix/CMakeLists.txt
@ -35,8 +35,11 @@ add_subdirectory(airframes)

 px4_add_romfs_files(
 	px4-rc.mavlink
-	px4-rc.params
 	px4-rc.simulator
+	px4-rc.gzsim
+	px4-rc.jmavsim
+	px4-rc.mavlinksim
+	px4-rc.sihsim
 	rc.replay
 	rcS
 )
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/10041_sihsim_airplane
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/10041_sihsim_airplane
@ -46,3 +46,22 @@ param set-default PWM_MAIN_FUNC3 203
 param set-default PWM_MAIN_FUNC4 101

 param set-default EKF2_GPS_DELAY 0
+
+# Rate controllers
+param set-default FW_RR_P 0.0500
+param set-default FW_RR_I 2.0000
+param set-default FW_RR_D 0.0000
+param set-default FW_RR_FF 0.0000
+param set-default FW_RR_IMAX 1.0000
+
+param set-default FW_PR_P 0.0800
+param set-default FW_PR_I 2.5000
+param set-default FW_PR_D 0.0000
+param set-default FW_PR_FF 0.0000
+param set-default FW_PR_IMAX 1.0000
+
+param set-default FW_YR_P 0.0500
+param set-default FW_YR_I 3.0000
+param set-default FW_YR_D 0.0000
+param set-default FW_YR_FF 0.0000
+param set-default FW_YR_IMAX 1.0000
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/10044_sihsim_hex
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/10044_sihsim_hex
@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# @name HexarotorX SITL for SIH
+#
+# @type Hexarotor x
+# @class Copter
+#
+# @maintainer Matthias Grob <maetugr@gmail.com>
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=hex}
+
+param set-default SENS_EN_GPSSIM 1
+param set-default SENS_EN_BAROSIM 1
+param set-default SENS_EN_MAGSIM 1
+
+param set SIH_VEHICLE_TYPE 4
+
+# Symmetric hexacopter X clockwise motor numbering
+param set-default CA_ROTOR_COUNT 6
+param set-default CA_ROTOR0_PX 0.866
+param set-default CA_ROTOR0_PY 0.5
+param set-default CA_ROTOR1_PX 0
+param set-default CA_ROTOR1_PY 1
+param set-default CA_ROTOR1_KM -0.05
+param set-default CA_ROTOR2_PX -0.866
+param set-default CA_ROTOR2_PY 0.5
+param set-default CA_ROTOR3_PX -0.866
+param set-default CA_ROTOR3_PY -0.5
+param set-default CA_ROTOR3_KM -0.05
+param set-default CA_ROTOR4_PX 0
+param set-default CA_ROTOR4_PY -1
+param set-default CA_ROTOR5_PX 0.866
+param set-default CA_ROTOR5_PY -0.5
+param set-default CA_ROTOR5_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+param set-default PWM_MAIN_FUNC5 105
+param set-default PWM_MAIN_FUNC6 106
+
+param set-default EKF2_GPS_DELAY 0
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/10045_sihsim_rover_ackermann
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/10045_sihsim_rover_ackermann
@ -0,0 +1,72 @@
+#!/bin/sh
+# @name Rover Ackermann
+# @type Rover
+# @class Rover
+
+. ${R}etc/init.d/rc.rover_ackermann_defaults
+
+set VEHICLE_TYPE rover_ackermann
+param set-default CA_AIRFRAME 5         # Rover (Ackermann)
+param set-default CA_R_REV 1            # Motor is assumed to be reversible
+param set-default EKF2_MAG_TYPE 1       # Make sure magnetometer is fused even when not driving
+param set-default NAV_ACC_RAD 0.5       # Waypoint acceptance radius
+param set-default EKF2_GBIAS_INIT 0.01
+param set-default EKF2_ANGERR_INIT 0.01
+
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_ackermann}
+
+param set-default SIH_VEHICLE_TYPE 5 # sih as rover ackermann
+
+param set-default PWM_MAIN_FUNC1 201 # Steering
+param set-default PWM_MAIN_FUNC2 101 # Throttle
+param set-default SIH_MASS 20
+param set-default SIH_IXX 0.4333
+param set-default SIH_IYY 1.6833
+param set-default SIH_IZZ 2.0833
+param set-default SIH_IXZ 0
+param set-default SIH_KDV 50
+param set-default SIH_KDW 10
+
+param set-default SENS_EN_GPSSIM 1
+param set-default SENS_EN_BAROSIM 1
+param set-default SENS_EN_MAGSIM 1
+
+# Ackermann Parameters
+param set-default RA_WHEEL_BASE 0.321
+param set-default RA_ACC_RAD_GAIN 2
+param set-default RA_ACC_RAD_MAX 3
+param set-default RA_MAX_STR_ANG 0.5236
+param set-default RA_STR_RATE_LIM 360
+
+# Rate Control Parameters
+param set-default RO_YAW_RATE_I 0.01
+param set-default RO_YAW_RATE_P 0.25
+param set-default RO_YAW_RATE_LIM 180
+param set-default RO_YAW_ACCEL_LIM 400
+param set-default RO_YAW_DECEL_LIM 800
+param set-default RO_YAW_RATE_CORR 1
+
+# Attitude Control Parameters
+param set-default RO_YAW_P 5
+
+# Velocity Control Parameters
+param set-default RO_ACCEL_LIM 3
+param set-default RO_DECEL_LIM 3
+param set-default RO_JERK_LIM 10
+param set-default RO_MAX_THR_SPEED 3.2
+param set-default RO_SPEED_LIM 3
+param set-default RO_SPEED_I 0.001
+param set-default RO_SPEED_P 0.001
+param set-default RO_SPEED_RED 1
+
+# Pure Pursuit parameters
+param set-default PP_LOOKAHD_GAIN 1
+param set-default PP_LOOKAHD_MAX 10
+param set-default PP_LOOKAHD_MIN 1
+
+# Pure Pursuit parameters
+param set-default PP_LOOKAHD_GAIN 1
+param set-default PP_LOOKAHD_MAX 10
+param set-default PP_LOOKAHD_MIN 1
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/1060_gazebo-classic_rover
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1060_gazebo-classic_rover
@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# @name Rover
-#
-
-. ${R}etc/init.d/rc.rover_defaults
-
-param set-default GND_L1_DIST 5
-param set-default GND_L1_PERIOD 10
-param set-default GND_SP_CTRL_MODE 1
-param set-default GND_SPEED_D 0.001
-param set-default GND_SPEED_I 3
-param set-default GND_SPEED_IMAX 0.125
-param set-default GND_SPEED_P 0.25
-param set-default GND_SPEED_THR_SC 1
-param set-default GND_SPEED_TRIM 4
-param set-default GND_THR_CRUISE 0.3
-param set-default GND_THR_MAX 0.5
-param set-default GND_THR_MIN 0
-
-param set-default NAV_ACC_RAD 0.5
-param set-default NAV_LOITER_RAD 2
-
-param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 2
-
-param set-default CA_AIRFRAME 5
-
-param set-default CA_R_REV 1
-param set-default PWM_MAIN_FUNC1 201
-param set-default PWM_MAIN_FUNC2 201
-param set-default PWM_MAIN_FUNC6 101
-param set-default PWM_MAIN_FUNC7 101
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/1061_gazebo-classic_r1_rover
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1061_gazebo-classic_r1_rover
@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name Aion Robotics R1 Rover
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_differential_defaults
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 101
-param set-default PWM_MAIN_FUNC6 102
-param set-default PWM_MAIN_FUNC7 102
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/17002_flightgear_tf-g2
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/17002_flightgear_tf-g2
@ -44,7 +44,7 @@ param set-default FW_R_LIM 30

 param set-default FW_MAN_R_MAX 30

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

--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4001_gz_x500
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4001_gz_x500
@ -13,10 +13,6 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500}

 param set-default SIM_GZ_EN 1

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-
 param set-default CA_AIRFRAME 0
 param set-default CA_ROTOR_COUNT 4

--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4003_gz_rc_cessna
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4003_gz_rc_cessna
@ -12,13 +12,8 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=rc_cessna}

 param set-default SIM_GZ_EN 1

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1

-
-
 param set-default FW_LND_ANG 8

 param set-default NPFG_PERIOD 12
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4004_gz_standard_vtol
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4004_gz_standard_vtol
@ -13,9 +13,6 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=standard_vtol}

 param set-default SIM_GZ_EN 1

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1

 # TODO: Enable motor failure detection when the
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4006_gz_px4vision
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4006_gz_px4vision
@ -14,10 +14,6 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=px4vision}

 param set-default SIM_GZ_EN 1

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-
 # Commander Parameters
 param set-default COM_DISARM_LAND 0.5

--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4008_gz_advanced_plane
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4008_gz_advanced_plane
@ -11,8 +11,6 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=advanced_plane}

 param set-default SIM_GZ_EN 1

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1

 param set-default FW_LND_ANG 8
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4009_gz_r1_rover
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4009_gz_r1_rover
@ -15,7 +15,6 @@ param set-default NAV_ACC_RAD 0.5

 # Differential Parameters
 param set-default RD_WHEEL_TRACK 0.3
-param set-default RD_MAX_THR_YAW_R 1.5
 param set-default RD_TRANS_DRV_TRN 0.349066
 param set-default RD_TRANS_TRN_DRV 0.174533

@ -31,26 +30,22 @@ param set-default RO_YAW_RATE_P 0.25
 param set-default RO_YAW_RATE_LIM 180
 param set-default RO_YAW_ACCEL_LIM 120
 param set-default RO_YAW_DECEL_LIM 1000
+param set-default RO_YAW_RATE_CORR 1.43

 # Rover Attitude Control Parameters
 param set-default RO_YAW_P 5

-# Rover Position Control Parameters
+# 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_I 0.01
+param set-default RO_SPEED_P 0.1
+param set-default RO_SPEED_RED 1

 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1
 param set-default PP_LOOKAHD_MAX 10
 param set-default PP_LOOKAHD_MIN 1

-# Simulated sensors
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
-
 # Actuator mapping
 param set-default SIM_GZ_WH_FUNC1 101 # right wheel
 param set-default SIM_GZ_WH_MIN1 70
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4011_gz_lawnmower
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4011_gz_lawnmower
@ -1,56 +1,68 @@
 #!/bin/sh
-# @name Gazebo lawnmower
+# @name Gazebo - Zero Turn Lawnmower
 # @type Rover
 # @class Rover

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

 PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=lawn}
 PX4_SIM_MODEL=${PX4_SIM_MODEL:=lawnmower}

 param set-default SIM_GZ_EN 1 # Gazebo bridge

-# Simulated sensors
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
+param set-default NAV_ACC_RAD 0.5
+
 # We can arm and drive in manual mode when it slides and GPS check fails:
 param set-default COM_ARM_WO_GPS 1

-# Rover parameters
+# Differential Parameters
 param set-default RD_WHEEL_TRACK 0.9
-param set-default RD_YAW_RATE_I 0.1
-param set-default RD_YAW_RATE_P 5
-param set-default RD_MAX_ACCEL 1
-param set-default RD_MAX_JERK 3
-param set-default RD_MAX_SPEED 8
-param set-default RD_YAW_P 5
-param set-default RD_YAW_I 0.1
-param set-default RD_MAX_YAW_RATE 30
 param set-default RD_TRANS_DRV_TRN 0.349066
 param set-default RD_TRANS_TRN_DRV 0.174533

+# Rover Control Parameters
+param set-default RO_ACCEL_LIM 1.5
+param set-default RO_DECEL_LIM 5
+param set-default RO_JERK_LIM 15
+param set-default RO_MAX_THR_SPEED 2.7
+
+# Rover Rate Control Parameters
+param set-default RO_YAW_RATE_I 0.2
+param set-default RO_YAW_RATE_P 1.0
+param set-default RO_YAW_RATE_LIM 60
+param set-default RO_YAW_ACCEL_LIM 50
+param set-default RO_YAW_DECEL_LIM 1000
+param set-default RO_YAW_RATE_CORR 1.0
+
+# Rover Attitude Control Parameters
+param set-default RO_YAW_P 5
+
+# Rover Velocity Control Parameters
+param set-default RO_SPEED_LIM 2.1
+param set-default RO_SPEED_I 0.01
+param set-default RO_SPEED_P 0.1
+param set-defatul RO_SPEED_RED 1.0
+
 # Pure pursuit parameters
-param set-default PP_LOOKAHD_MAX 30
-param set-default PP_LOOKAHD_MIN 2
 param set-default PP_LOOKAHD_GAIN 1
+param set-default PP_LOOKAHD_MAX 10
+param set-default PP_LOOKAHD_MIN 1

 # Actuator mapping - set SITL motors/servos output parameters:

 # "Motors" - motor channels 0 (Right) and 1 (Left) - via Wheels GZ bridge:
 param set-default SIM_GZ_WH_FUNC1 101 # right wheel
-#param set-default SIM_GZ_WH_MIN1 0
-#param set-default SIM_GZ_WH_MAX1 200
-#param set-default SIM_GZ_WH_DIS1 100
-#param set-default SIM_GZ_WH_FAIL1 100
+param set-default SIM_GZ_WH_MIN1 87
+param set-default SIM_GZ_WH_MAX1 113
+param set-default SIM_GZ_WH_DIS1 100
+param set-default SIM_GZ_WH_FAIL1 100

 param set-default SIM_GZ_WH_FUNC2 102 # left wheel
-#param set-default SIM_GZ_WH_MIN2 0
-#param set-default SIM_GZ_WH_MAX2 200
-#param set-default SIM_GZ_WH_DIS2 100
-#param set-default SIM_GZ_WH_FAIL2 100
+param set-default SIM_GZ_WH_MIN2 87
+param set-default SIM_GZ_WH_MAX2 113
+param set-default SIM_GZ_WH_DIS2 100
+param set-default SIM_GZ_WH_FAIL2 100

 param set-default SIM_GZ_WH_REV 0 # no need to reverse any wheels

--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4012_gz_rover_ackermann
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4012_gz_rover_ackermann
@ -30,26 +30,22 @@ param set-default RO_MAX_THR_SPEED 3.1
 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

-# Rover Position Control Parameters
+# 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

 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1
 param set-default PP_LOOKAHD_MAX 10
 param set-default PP_LOOKAHD_MIN 1

-# Simulated sensors
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
-
 # Wheels
 param set-default SIM_GZ_WH_FUNC1 101
 param set-default SIM_GZ_WH_MIN1 0
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4015_gz_r1_rover_mecanum
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4015_gz_r1_rover_mecanum
@ -11,34 +11,41 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover_mecanum}

 param set-default SIM_GZ_EN 1 # Gazebo bridge

-# Rover parameters
-param set-default RM_WHEEL_TRACK 0.3
-param set-default RM_YAW_RATE_I 0.1
-param set-default RM_YAW_RATE_P 0.1
-param set-default RM_MAX_ACCEL 3
-param set-default RM_MAX_DECEL 5
-param set-default RM_MAX_JERK 5
-param set-default RM_MAX_SPEED 2
-param set-default RM_MAX_THR_SPD 2.2
-param set-default RM_MAX_THR_YAW_R 1.2
-param set-default RM_YAW_P 5
-param set-default RM_YAW_I 0.1
-param set-default RM_MAX_YAW_RATE 120
-param set-default RM_MAX_YAW_ACCEL 240
-param set-default RM_MISS_VEL_GAIN 1
-param set-default RM_SPEED_I 0.01
-param set-default RM_SPEED_P 0.1
+param set-default NAV_ACC_RAD 0.5

-# Pure pursuit parameters
+# Mecanum Parameters
+param set-default RM_WHEEL_TRACK 0.3
+
+# Rover Control Parameters
+param set-default RO_ACCEL_LIM 3
+param set-default RO_DECEL_LIM 5
+param set-default RO_JERK_LIM 30
+param set-default RO_MAX_THR_SPEED 2.1
+
+# Rover Rate Control Parameters
+param set-default RO_YAW_RATE_I 0.1
+param set-default RO_YAW_RATE_P 0.1
+param set-default RO_YAW_RATE_LIM 120
+param set-default RO_YAW_ACCEL_LIM 240
+param set-default RO_YAW_DECEL_LIM 1000
+param set-default RO_YAW_RATE_CORR 1.75
+
+# Rover Attitude Control Parameters
+param set-default RO_YAW_P 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
 param set-default PP_LOOKAHD_MAX 10
 param set-default PP_LOOKAHD_MIN 1
-param set-default PP_LOOKAHD_GAIN 0.5

 # Simulated sensors
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
 param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0

 # Actuator mapping
 param set-default SIM_GZ_WH_FUNC1 102 # right wheel front
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4018_gz_quadtailsitter
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4018_gz_quadtailsitter
@ -13,12 +13,6 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=quadtailsitter}

 param set-default SIM_GZ_EN 1 # Gazebo bridge

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
-
-
 param set-default MAV_TYPE 20

 param set-default CA_AIRFRAME 4
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4020_gz_tiltrotor
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4020_gz_tiltrotor
@ -13,11 +13,6 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=tiltrotor}

 param set-default SIM_GZ_EN 1 # Gazebo bridge

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 0
-
 param set-default MAV_TYPE 21

 param set-default CA_AIRFRAME 3
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/4021_gz_x500_flow
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4021_gz_x500_flow
@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# @name Gazebo x500 with downward optical flow and distance sensor
+#
+# @type Quadrotor
+#
+
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_flow}
+
+. ${R}etc/init.d-posix/airframes/4001_gz_x500
+
+echo "Disabling Sim GPS"
+param set-default SYS_HAS_GPS 0
+param set-default SIM_GPS_USED 0
+param set-default EKF2_GPS_CTRL 0
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/50000_gz_rover_differential
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/50000_gz_rover_differential
@ -0,0 +1,56 @@
+#!/bin/sh
+# @name Generic Differential Rover
+# @type Rover
+# @class Rover
+
+. ${R}etc/init.d/rc.rover_differential_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=rover}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_differential}
+
+param set-default SIM_GZ_EN 1 # Gazebo bridge
+
+param set-default NAV_ACC_RAD 0.5
+
+# Differential Parameters
+param set-default RD_WHEEL_TRACK 0.6
+param set-default RD_TRANS_DRV_TRN 0.785398
+param set-default RD_TRANS_TRN_DRV 0.174533
+
+# Rate Control Parameters
+param set-default RO_YAW_RATE_I 0.01
+param set-default RO_YAW_RATE_P 0.25
+param set-default RO_YAW_RATE_LIM 250
+param set-default RO_YAW_ACCEL_LIM 400
+param set-default RO_YAW_DECEL_LIM 800
+param set-default RO_YAW_RATE_CORR 1
+
+# Attitude Control Parameters
+param set-default RO_YAW_P 5
+
+# Velocity Control Parameters
+param set-default RO_ACCEL_LIM 4
+param set-default RO_DECEL_LIM 6
+param set-default RO_JERK_LIM 10
+param set-default RO_MAX_THR_SPEED 2
+param set-default RO_SPEED_LIM 1.8
+param set-default RO_SPEED_I 0.01
+param set-default RO_SPEED_P 0.01
+param set-default RO_SPEED_RED 1
+
+# Pure Pursuit parameters
+param set-default PP_LOOKAHD_GAIN 1
+param set-default PP_LOOKAHD_MAX 10
+param set-default PP_LOOKAHD_MIN 1
+
+# Actuator mapping
+param set-default SIM_GZ_WH_FUNC1 101 # right wheel
+param set-default SIM_GZ_WH_MIN1 80
+param set-default SIM_GZ_WH_MAX1 120
+param set-default SIM_GZ_WH_DIS1 100
+
+param set-default SIM_GZ_WH_FUNC2 102 # left wheel
+param set-default SIM_GZ_WH_MIN2 80
+param set-default SIM_GZ_WH_MAX2 120
+param set-default SIM_GZ_WH_DIS2 100
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/71001_gazebo-classic_spacecraft_dart
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/71001_gazebo-classic_spacecraft_dart
@ -1,155 +0,0 @@
-#!/bin/sh
-#
-# @name 6DoF Spacecraft Model
-#
-# @type Freeflyer with 8 thrusters
-#
-# @maintainer Pedro Roque <padr@kth.se>
-#
-
-. ${R}etc/init.d/rc.sc_defaults
-
-param set-default CA_AIRFRAME 15
-param set-default MAV_TYPE 99
-
-param set-default CA_THRUSTER_CNT 12
-param set-default CA_R_REV 0
-
-# param set-default FW_ARSP_MODE 1
-
-# Auto to be provided by Custom Airframe
-param set-default CA_METHOD 0
-
-# disable attitude failure detection
-param set-default FD_FAIL_P 0
-param set-default FD_FAIL_R 0
-
-# Set proper failsafes
-param set-default COM_ACT_FAIL_ACT 0
-param set-default COM_LOW_BAT_ACT 0
-param set-default NAV_DLL_ACT 0
-param set-default GF_ACTION 1
-param set-default NAV_RCL_ACT 1
-param set-default COM_POSCTL_NAVL 2
-
-# Set thrusters
-param set-default CA_THRUSTER0_PX -0.50
-param set-default CA_THRUSTER0_PY 0.50
-param set-default CA_THRUSTER0_PZ 0.0
-param set-default CA_THRUSTER0_CT 0.237
-param set-default CA_THRUSTER0_AX 0.0
-param set-default CA_THRUSTER0_AY -1.0
-param set-default CA_THRUSTER0_AZ 0.0
-
-param set-default CA_THRUSTER1_PX 0.50
-param set-default CA_THRUSTER1_PY 0.50
-param set-default CA_THRUSTER1_PZ 0.0
-param set-default CA_THRUSTER1_CT 0.237
-param set-default CA_THRUSTER1_AX 0.0
-param set-default CA_THRUSTER1_AY -1.0
-param set-default CA_THRUSTER1_AZ 0.0
-
-param set-default CA_THRUSTER2_PX 0.50
-param set-default CA_THRUSTER2_PY -0.50
-param set-default CA_THRUSTER2_PZ 0.0
-param set-default CA_THRUSTER2_CT 0.237
-param set-default CA_THRUSTER2_AX 0.0
-param set-default CA_THRUSTER2_AY 1.0
-param set-default CA_THRUSTER2_AZ 0.0
-
-param set-default CA_THRUSTER3_PX -0.50
-param set-default CA_THRUSTER3_PY -0.50
-param set-default CA_THRUSTER3_PZ 0.0
-param set-default CA_THRUSTER3_CT 0.237
-param set-default CA_THRUSTER3_AX 0.0
-param set-default CA_THRUSTER3_AY 1.0
-param set-default CA_THRUSTER3_AZ 0.0
-
-param set-default CA_THRUSTER4_PX -0.50
-param set-default CA_THRUSTER4_PY 0.0
-param set-default CA_THRUSTER4_PZ -0.50
-param set-default CA_THRUSTER4_CT 0.237
-param set-default CA_THRUSTER4_AX 1.0
-param set-default CA_THRUSTER4_AY 0.0
-param set-default CA_THRUSTER4_AZ 0.0
-
-param set-default CA_THRUSTER5_PX 0.50
-param set-default CA_THRUSTER5_PY 0.0
-param set-default CA_THRUSTER5_PZ -0.50
-param set-default CA_THRUSTER5_CT 0.237
-param set-default CA_THRUSTER5_AX -1.0
-param set-default CA_THRUSTER5_AY 0.0
-param set-default CA_THRUSTER5_AZ 0.0
-
-param set-default CA_THRUSTER6_PX 0.50
-param set-default CA_THRUSTER6_PY 0.0
-param set-default CA_THRUSTER6_PZ 0.50
-param set-default CA_THRUSTER6_CT 0.237
-param set-default CA_THRUSTER6_AX -1.0
-param set-default CA_THRUSTER6_AY 0.0
-param set-default CA_THRUSTER6_AZ 0.0
-
-param set-default CA_THRUSTER7_PX -0.50
-param set-default CA_THRUSTER7_PY 0.0
-param set-default CA_THRUSTER7_PZ 0.50
-param set-default CA_THRUSTER7_CT 0.237
-param set-default CA_THRUSTER7_AX 1.0
-param set-default CA_THRUSTER7_AY 0.0
-param set-default CA_THRUSTER7_AZ 0.0
-
-param set-default CA_THRUSTER8_PX 0.0
-param set-default CA_THRUSTER8_PY -0.50
-param set-default CA_THRUSTER8_PZ -0.50
-param set-default CA_THRUSTER8_CT 0.237
-param set-default CA_THRUSTER8_AX 0.0
-param set-default CA_THRUSTER8_AY 0.0
-param set-default CA_THRUSTER8_AZ 1.0
-
-param set-default CA_THRUSTER9_PX 0.0
-param set-default CA_THRUSTER9_PY 0.50
-param set-default CA_THRUSTER9_PZ -0.50
-param set-default CA_THRUSTER9_CT 0.237
-param set-default CA_THRUSTER9_AX 0.0
-param set-default CA_THRUSTER9_AY 0.0
-param set-default CA_THRUSTER9_AZ 1.0
-
-param set-default CA_THRUSTER10_PX 0.0
-param set-default CA_THRUSTER10_PY 0.50
-param set-default CA_THRUSTER10_PZ 0.50
-param set-default CA_THRUSTER10_CT 0.237
-param set-default CA_THRUSTER10_AX 0.0
-param set-default CA_THRUSTER10_AY 0.0
-param set-default CA_THRUSTER10_AZ -1.0
-
-param set-default CA_THRUSTER11_PX 0.0
-param set-default CA_THRUSTER11_PY -0.50
-param set-default CA_THRUSTER11_PZ 0.50
-param set-default CA_THRUSTER11_CT 0.237
-param set-default CA_THRUSTER11_AX 0.0
-param set-default CA_THRUSTER11_AY 0.0
-param set-default CA_THRUSTER11_AZ -1.0
-
-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-param set-default PWM_MAIN_FUNC5 105
-param set-default PWM_MAIN_FUNC6 106
-param set-default PWM_MAIN_FUNC7 107
-param set-default PWM_MAIN_FUNC8 108
-param set-default PWM_MAIN_FUNC9 109
-param set-default PWM_MAIN_FUNC10 110
-param set-default PWM_MAIN_FUNC11 111
-param set-default PWM_MAIN_FUNC12 112
-
-# PWM Simulation
-param set PWM_SIM_PWM_MAX 10000
-param set PWM_SIM_PWM_MIN 0
-
-# Controller Tunings
-param set-default SC_ROLLRATE_P 0.14
-param set-default SC_PITCHRATE_P 0.14
-param set-default SC_ROLLRATE_I 0.3
-param set-default SC_PITCHRATE_I 0.3
-param set-default SC_ROLLRATE_D 0.004
-param set-default SC_PITCHRATE_D 0.004
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/71002_gz_spacecraft_2d
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/71002_gz_spacecraft_2d
@ -15,14 +15,12 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=spacecraft_2d}

 param set-default SIM_GZ_EN 1

-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
 param set-default SENS_EN_MAGSIM 1
 param set-default COM_ARM_CHK_ESCS 0  # We don't have ESCs
 param set-default FD_ESCS_EN 0 # We don't have ESCs - but maybe we need this later?

 param set-default CA_AIRFRAME 14
-param set-default MAV_TYPE 99
+param set-default MAV_TYPE 45

 param set-default CA_THRUSTER_CNT 8
 param set-default CA_R_REV 0
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/8011_gz_omnicopter
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/8011_gz_omnicopter
@ -83,9 +83,6 @@ param set-default CA_ROTOR7_AY -0.211325
 param set-default CA_ROTOR7_AZ -0.57735

 param set-default SIM_GZ_EN 1
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 0
-param set-default SENS_EN_MAGSIM 1

 param set-default SIM_GZ_EC_FUNC1 101
 param set-default SIM_GZ_EC_FUNC2 102
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
@ -62,8 +62,6 @@ px4_add_romfs_files(
 	1043_gazebo-classic_standard_vtol_drop
 	1044_gazebo-classic_plane_lidar
 	1045_gazebo-classic_quadtailsitter
-	1060_gazebo-classic_rover
-	1061_gazebo-classic_r1_rover
 	1062_flightgear_tf-r1
 	1070_gazebo-classic_boat

@ -91,6 +89,7 @@ px4_add_romfs_files(
 	4018_gz_quadtailsitter
 	4019_gz_x500_gimbal
 	4020_gz_tiltrotor
+	4021_gz_x500_flow

 	6011_gazebo-classic_typhoon_h480
 	6011_gazebo-classic_typhoon_h480.post
@ -108,11 +107,14 @@ px4_add_romfs_files(
 	10041_sihsim_airplane
 	10042_sihsim_xvert
 	10043_sihsim_standard_vtol
+	10044_sihsim_hex
+	10045_sihsim_rover_ackermann

 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2

-	71001_gazebo-classic_spacecraft_dart
+	50000_gz_rover_differential
+
 	71002_gz_spacecraft_2d

 	# [22000, 22999] Reserve for custom models
--- a/ROMFS/px4fmu_common/init.d-posix/px4-rc.gzsim
+++ b/ROMFS/px4fmu_common/init.d-posix/px4-rc.gzsim
@ -0,0 +1,206 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+# Enforce minimum gz version as Harmonic (gz-sim8)
+MIN_GZ_VERSION="8.0.0"
+GZ_SIM_VERSION=$(gz sim --versions 2>/dev/null | head -n 1 | tr -d ' ')
+
+if [ -z "$GZ_SIM_VERSION" ]; then
+	echo "ERROR [init] Gazebo gz sim not found. Please install gz-harmonic"
+	exit 1
+fi
+
+# Use sort compare, check that MIN_GZ_VERSION is ordered last
+if [ "$(printf '%s\n' "$GZ_SIM_VERSION" "$MIN_GZ_VERSION" | sort -V | head -n1)" = "$MIN_GZ_VERSION" ]; then
+	gz_command="gz"
+	gz_sub_command="sim"
+
+	echo "INFO  [init] Gazebo simulator $GZ_SIM_VERSION"
+
+	# Specify render engine if `GZ_SIM_RENDER_ENGINE` is set
+	# (for example, if you want to use Ogre 1.x instead of Ogre 2.x):
+	if [ -n "${PX4_GZ_SIM_RENDER_ENGINE}" ]; then
+		echo "INFO  [init] Setting Gazebo render engine to '${PX4_GZ_SIM_RENDER_ENGINE}'!"
+		gz_sub_command="${gz_sub_command} --render-engine ${PX4_GZ_SIM_RENDER_ENGINE}"
+	fi
+else
+	echo "ERROR [init] Gazebo version too hold ($GZ_SIM_VERSION). Minimum required version is $MIN_GZ_VERSION"
+	exit 1
+fi
+
+# If not standalone launch the world
+if [ -z "${PX4_GZ_STANDALONE}" ]; then
+
+	# Look for an already running world
+	gz_world=$( ${gz_command} topic -l | grep -m 1 -e "^/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
+
+	# shellcheck disable=SC2153
+	if [ -z "${gz_world}" ] && [ -n "${PX4_GZ_WORLD}" ]; then
+
+		# Setup gz environment variables
+		if [ -f ./gz_env.sh ]; then
+			. ./gz_env.sh
+
+		elif [ -f ../gz_env.sh ]; then
+			. ../gz_env.sh
+		fi
+
+		echo "INFO  [init] Starting gazebo with world: ${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf"
+
+		${gz_command} ${gz_sub_command} --verbose=${GZ_VERBOSE:=1} -r -s "${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf" &
+
+		if [ -z "${HEADLESS}" ]; then
+			echo "INFO  [init] Starting gz gui"
+			${gz_command} ${gz_sub_command} -g > /dev/null 2>&1 &
+		fi
+
+	else
+		# Gazebo is already running
+		echo "INFO  [init] gazebo already running world: ${gz_world}"
+		PX4_GZ_WORLD=${gz_world}
+	fi
+
+else
+	echo "INFO  [init] Standalone PX4 launch, waiting for Gazebo"
+fi
+
+# Wait for Gazebo world to be ready before proceeding
+check_scene_info() {
+	SERVICE_INFO=$(${gz_command} service -i --service "/world/${PX4_GZ_WORLD}/scene/info" 2>&1)
+	if echo "$SERVICE_INFO" | grep -q "Service providers"; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+ATTEMPTS=30
+while [ $ATTEMPTS -gt 0 ]; do
+	if check_scene_info; then
+		echo "INFO  [init] Gazebo world is ready"
+		break
+	fi
+	ATTEMPTS=$((ATTEMPTS-1))
+	if [ $ATTEMPTS -eq 0 ]; then
+		echo "ERROR [init] Timed out waiting for Gazebo world"
+		exit 1
+	fi
+	echo "INFO  [init] Waiting for Gazebo world..."
+	sleep 1
+done
+
+# World is ready, check if custom location is provided
+if [ -n "${PX4_HOME_LAT}" ] || [ -n "${PX4_HOME_LON}" ] || [ -n "${PX4_HOME_ALT}" ]; then
+	# must have all three
+	if [ -z "${PX4_HOME_LAT}" ] || [ -z "${PX4_HOME_LON}" ] || [ -z "${PX4_HOME_ALT}" ]; then
+		echo "ERROR [init] PX4_HOME_LAT, PX4_HOME_LON and PX4_HOME_ALT must all be set"
+		exit 1
+	fi
+	echo "INFO  [init] Setting world origin to lat: ${PX4_HOME_LAT}, lon: ${PX4_HOME_LON}, alt: ${PX4_HOME_ALT}"
+	${gz_command} service -s "/world/${PX4_GZ_WORLD}/set_spherical_coordinates" \
+		--reqtype gz.msgs.SphericalCoordinates \
+		--reptype gz.msgs.Boolean \
+		--timeout 1000 \
+		--req "surface_model: EARTH_WGS84, latitude_deg: ${PX4_HOME_LAT}, longitude_deg: ${PX4_HOME_LON}, elevation: ${PX4_HOME_ALT}" > /dev/null 2>&1
+fi
+
+# Start gz_bridge - either spawn a model or connect to existing one
+if [ -n "${PX4_SIM_MODEL#*gz_}" ] && [ -z "${PX4_GZ_MODEL_NAME}" ]; then
+	# Spawn a model
+	MODEL_NAME="${PX4_SIM_MODEL#*gz_}"
+	MODEL_NAME_INSTANCE="${MODEL_NAME}_${px4_instance}"
+
+	sdf_pose_str=""
+
+	if [ -n "${PX4_GZ_MODEL_POSE}" ]; then
+		pose_x=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $1}')
+		pose_y=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $2}')
+		pose_z=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $3}')
+		pose_roll=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $4}')
+		pose_pitch=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $5}')
+		pose_yaw=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $6}')
+
+		pose_x=${pose_x:-0}
+		pose_y=${pose_y:-0}
+		pose_z=${pose_z:-0}
+		pose_roll=${pose_roll:-0}
+		pose_pitch=${pose_pitch:-0}
+		pose_yaw=${pose_yaw:-0}
+
+		sdf_pose_str="<pose> ${pose_x} ${pose_y} ${pose_z} ${pose_roll} ${pose_pitch} ${pose_yaw} </pose>"
+		echo "INFO  [init] Gazebo model pose: ${pose_x} ${pose_y} ${pose_z} ${pose_roll} ${pose_pitch} ${pose_yaw}"
+	fi
+
+	echo "INFO  [init] Spawning Gazebo model"
+
+	# include the actual SDF in this one, containing the pose if given
+	sdf_str="<sdf version=\"1.6\"> <include> <uri>file://${PX4_GZ_MODELS}/${MODEL_NAME}/model.sdf</uri> ${sdf_pose_str} </include> </sdf>"
+
+	# Spawn model
+	${gz_command} service -s "/world/${PX4_GZ_WORLD}/create" --reqtype gz.msgs.EntityFactory \
+			--reptype gz.msgs.Boolean --timeout 5000 \
+			--req "name: \"${MODEL_NAME_INSTANCE}\", allow_renaming: false, sdf: '${sdf_str}'" > /dev/null 2>&1
+
+	# Wait for model to spawn
+	sleep 1
+
+	# Start gz_bridge
+	if ! gz_bridge start -w "${PX4_GZ_WORLD}" -n "${MODEL_NAME_INSTANCE}"; then
+		echo "ERROR [init] gz_bridge failed to start and spawn model"
+		exit 1
+	fi
+
+	# Set physics parameters for faster-than-realtime simulation if needed
+	if [ -n "${PX4_SIM_SPEED_FACTOR}" ]; then
+		echo "INFO  [init] Setting simulation speed factor: ${PX4_SIM_SPEED_FACTOR}"
+		${gz_command} service -s "/world/${PX4_GZ_WORLD}/set_physics" --reqtype gz.msgs.Physics \
+					--reptype gz.msgs.Boolean --timeout 5000 \
+					--req "real_time_factor: ${PX4_SIM_SPEED_FACTOR}" > /dev/null 2>&1
+	fi
+
+	# Set up camera to follow the model if requested
+	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} 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
+
+elif [ -n "${PX4_GZ_MODEL_NAME}" ]; then
+	# Connect to existing model
+	echo "INFO  [init] PX4_GZ_MODEL_NAME set, PX4 will attach to existing model"
+	if ! gz_bridge start -w "${PX4_GZ_WORLD}" -n "${PX4_GZ_MODEL_NAME}"; then
+		echo "ERROR [init] gz_bridge failed to start and attach to existing model"
+		exit 1
+	fi
+else
+	echo "ERROR [init] failed to pass either PX4_GZ_MODEL_NAME or PX4_SIM_MODEL"
+	exit 1
+fi
+
+# NOTE: Only for rover_mecanum and spacecraft_2d. All other models have
+# the magnetometer sensor in the model.sdf.
+if param compare -s SENS_EN_MAGSIM 1
+then
+	sensor_mag_sim start
+fi
+# NOTE: new gz has airspeed sensor, remove once added
+if param compare -s SENS_EN_ARSPDSIM 1
+then
+	sensor_airspeed_sim start
+fi
--- a/ROMFS/px4fmu_common/init.d-posix/px4-rc.jmavsim
+++ b/ROMFS/px4fmu_common/init.d-posix/px4-rc.jmavsim
@ -0,0 +1,14 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+echo "INFO  [init] jMAVSim simulator"
+
+if jps | grep -i jmavsim; then
+	kill "$(jps | grep -i jmavsim | awk '{print $1}')" || true
+	sleep 1
+fi
+
+param set IMU_INTEG_RATE 250
+./jmavsim_run.sh -l -r 250 &
+
+simulator_mavlink start -h localhost $((4560+px4_instance))
--- a/ROMFS/px4fmu_common/init.d-posix/px4-rc.mavlinksim
+++ b/ROMFS/px4fmu_common/init.d-posix/px4-rc.mavlinksim
@ -0,0 +1,27 @@
+#!/bin/sh
+# shellcheck disable=SC2154
+
+# EKF2 specifics
+param set-default EKF2_GPS_DELAY 10
+param set-default EKF2_MULTI_IMU 3
+param set-default SENS_IMU_MODE 0
+
+simulator_tcp_port=$((4560+px4_instance))
+
+# Check if PX4_SIM_HOSTNAME environment variable is empty
+# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
+# If both are empty use localhost for simulator
+if [ -z "${PX4_SIM_HOSTNAME}" ]; then
+
+	if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
+		echo "INFO  [init] PX4_SIM_HOSTNAME: localhost"
+		simulator_mavlink start -c $simulator_tcp_port
+	else
+		echo "INFO  [init] PX4_SIM_HOSTNAME: ${PX4_SIM_HOST_ADDR}"
+		simulator_mavlink start -t "${PX4_SIM_HOST_ADDR}" "${simulator_tcp_port}"
+	fi
+
+else
+	echo "INFO  [init] PX4_SIM_HOSTNAME: ${PX4_SIM_HOSTNAME}"
+	simulator_mavlink start -h "${PX4_SIM_HOSTNAME}" "${simulator_tcp_port}"
+fi
--- a/ROMFS/px4fmu_common/init.d-posix/px4-rc.params
+++ b/ROMFS/px4fmu_common/init.d-posix/px4-rc.params
@ -1,5 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154
-
-#param set-default MAV_SYS_ID $((px4_instance+1))
-#param set-default IMU_INTEG_RATE 250
--- a/ROMFS/px4fmu_common/init.d-posix/px4-rc.sihsim
+++ b/ROMFS/px4fmu_common/init.d-posix/px4-rc.sihsim
@ -0,0 +1,38 @@
+#!/bin/sh
+
+echo "INFO  [init] SIH simulator"
+
+if [ -n "${PX4_HOME_LAT}" ]; then
+	param set SIH_LOC_LAT0 ${PX4_HOME_LAT}
+fi
+
+if [ -n "${PX4_HOME_LON}" ]; then
+	param set SIH_LOC_LON0 ${PX4_HOME_LON}
+fi
+if [ -n "${PX4_HOME_ALT}" ]; then
+	param set SIH_LOC_H0 ${PX4_HOME_ALT}
+fi
+
+if simulator_sih start; then
+
+	if param compare -s SENS_EN_BAROSIM 1
+	then
+		sensor_baro_sim start
+	fi
+	if param compare -s SENS_EN_GPSSIM 1
+	then
+		sensor_gps_sim start
+	fi
+	if param compare -s SENS_EN_MAGSIM 1
+	then
+		sensor_mag_sim start
+	fi
+	if param compare -s SENS_EN_AGPSIM 1
+	then
+		sensor_agp_sim start
+	fi
+
+else
+	echo "ERROR [init] simulator_sih failed to start"
+	exit 1
+fi
--- a/ROMFS/px4fmu_common/init.d-posix/px4-rc.simulator
+++ b/ROMFS/px4fmu_common/init.d-posix/px4-rc.simulator
@ -8,203 +8,18 @@ param set-default IMU_INTEG_RATE 250
 param set-default COM_MODE_ARM_CHK 1

 if [ "$PX4_SIMULATOR" = "sihsim" ] || [ "$(param show -q SYS_AUTOSTART)" -eq "0" ]; then
-
-	echo "INFO  [init] SIH simulator"
-
-	if [ -n "${PX4_HOME_LAT}" ]; then
-		param set SIH_LOC_LAT0 ${PX4_HOME_LAT}
-	fi
-
-	if [ -n "${PX4_HOME_LON}" ]; then
-		param set SIH_LOC_LON0 ${PX4_HOME_LON}
-	fi
-	if [ -n "${PX4_HOME_ALT}" ]; then
-		param set SIH_LOC_H0 ${PX4_HOME_ALT}
-	fi
-
-	if simulator_sih start; then
-
-		if param compare -s SENS_EN_BAROSIM 1
-		then
-			sensor_baro_sim start
-		fi
-		if param compare -s SENS_EN_GPSSIM 1
-		then
-			sensor_gps_sim start
-		fi
-		if param compare -s SENS_EN_MAGSIM 1
-		then
-			sensor_mag_sim start
-		fi
-		if param compare -s SENS_EN_AGPSIM 1
-		then
-			sensor_agp_sim start
-		fi
-
-	else
-		echo "ERROR [init] simulator_sih failed to start"
-		exit 1
-	fi
+    # Run SIH
+    . px4-rc.sihsim

 elif [ "$PX4_SIMULATOR" = "gz" ] || [ "$(param show -q SIM_GZ_EN)" = "1" ]; then
-	# Use Gazebo
-
-	echo "INFO  [init] Gazebo simulator"
-
-	# Only start up Gazebo if PX4_GZ_STANDALONE is not set.
-	if [ -z "${PX4_GZ_STANDALONE}" ]; then
-
-		# "gz sim" only available in Garden and later
-		GZ_SIM_VERSIONS=$(gz sim --versions 2>&1)
-		if [ $? -eq 0 ] && [ "${GZ_SIM_VERSIONS}" != "" ]
-		then
-			# "gz sim" from Garden on
-			gz_command="gz"
-			gz_sub_command="sim"
-
-			# Specify render engine if `GZ_SIM_RENDER_ENGINE` is set
-			# (for example, if you want to use Ogre 1.x instead of Ogre 2.x):
-			if [ -n "${PX4_GZ_SIM_RENDER_ENGINE}" ]; then
-				echo "INFO  [init] Setting Gazebo render engine to '${PX4_GZ_SIM_RENDER_ENGINE}'!"
-				gz_sub_command="${gz_sub_command} --render-engine ${PX4_GZ_SIM_RENDER_ENGINE}"
-			fi
-		else
-			echo "ERROR [init] Gazebo gz please install gz-garden"
-			exit 1
-		fi
-
-		# look for running ${gz_command} gazebo world
-		gz_world=$( ${gz_command} topic -l | grep -m 1 -e "^/world/.*/clock" | sed 's/\/world\///g; s/\/clock//g' )
-
-		# shellcheck disable=SC2153
-		if [ -z "${gz_world}" ] && [ -n "${PX4_GZ_WORLD}" ]; then
-
-			# source generated gz_env.sh for GZ_SIM_RESOURCE_PATH
-			if [ -f ./gz_env.sh ]; then
-				. ./gz_env.sh
-
-			elif [ -f ../gz_env.sh ]; then
-				. ../gz_env.sh
-			fi
-
-			echo "INFO  [init] starting gazebo with world: ${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf"
-
-			${gz_command} ${gz_sub_command} --verbose=1 -r -s "${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf" &
-
-			if [ -z "${HEADLESS}" ]; then
-				# HEADLESS not set, starting gui
-				${gz_command} ${gz_sub_command} -g &
-			fi
-
-		else
-			# Gazebo is already running, do not start the simulator, nor the GUI
-			echo "INFO  [init] gazebo already running world: ${gz_world}"
-			PX4_GZ_WORLD=${gz_world}
-		fi
-	else
-		echo "INFO  [init] Standalone PX4 launch, waiting for Gazebo"
-	fi
-
-	# start gz_bridge
-	if [ -n "${PX4_SIM_MODEL#*gz_}" ] && [ -z "${PX4_GZ_MODEL_NAME}" ]; then
-		# model specified, gz_bridge will spawn model
-
-		if [ -n "${PX4_GZ_MODEL_POSE}" ]; then
-			# model pose provided: [x, y, z, roll, pitch, yaw]
-
-			# Clean potential input line formatting.
-			model_pose="$( echo "${PX4_GZ_MODEL_POSE}" | sed -e 's/^[ \t]*//; s/[ \t]*$//; s/,/ /g; s/  / /g; s/ /,/g' )"
-			echo "INFO  [init] PX4_GZ_MODEL_POSE set, spawning at: ${model_pose}"
-
-		else
-			# model pose not provided, origin will be used
-
-			echo "WARN  [init] PX4_GZ_MODEL_POSE not set, spawning at origin."
-			model_pose="0,0,0,0,0,0"
-		fi
-
-		# start gz bridge with pose arg.
-		if ! gz_bridge start -p "${model_pose}" -m "${PX4_SIM_MODEL#*gz_}" -w "${PX4_GZ_WORLD}" -i "${px4_instance}"; then
-			echo "ERROR [init] gz_bridge failed to start and spawn model"
-			exit 1
-		fi
-
-	elif [ -n "${PX4_GZ_MODEL_NAME}" ]; then
-		# model name specificed, gz_bridge will attach to existing model
-
-		echo "INFO  [init] PX4_GZ_MODEL_NAME set, PX4 will attach to existing model"
-		if ! gz_bridge start -n "${PX4_GZ_MODEL_NAME}" -w "${PX4_GZ_WORLD}"; then
-			echo "ERROR [init] gz_bridge failed to start and attach to existing model"
-			exit 1
-		fi
-
-	else
-		echo "ERROR [init] failed to pass only PX4_GZ_MODEL_NAME or PX4_SIM_MODEL"
-		exit 1
-	fi
-
-	# Start the sensor simulator modules
-	if param compare -s SENS_EN_BAROSIM 1
-	then
-		sensor_baro_sim start
-	fi
-	if param compare -s SENS_EN_GPSSIM 1
-	then
-		sensor_gps_sim start
-	fi
-	if param compare -s SENS_EN_MAGSIM 1
-	then
-		sensor_mag_sim start
-	fi
-	if param compare -s SENS_EN_ARSPDSIM 1
-	then
-		sensor_airspeed_sim start
-	fi
-	if param compare -s SENS_EN_AGPSIM 1
-	then
-		sensor_agp_sim start
-	fi
+    # Run Gazebo (gz)
+    . px4-rc.gzsim

 elif [ "$PX4_SIM_MODEL" = "jmavsim_iris" ] || [ "$(param show -q SYS_AUTOSTART)" -eq "10017" ]; then
-
-	echo "INFO  [init] jMAVSim simulator"
-
-	if jps | grep -i jmavsim; then
-		kill "$(jps | grep -i jmavsim | awk '{print $1}')" || true
-		sleep 1
-	fi
-
-	param set IMU_INTEG_RATE 250
-	./jmavsim_run.sh -l -r 250 &
-
-	simulator_mavlink start -h localhost $((4560+px4_instance))
+    # Run jMAVSim
+    . px4-rc.jmavsim

 else
-	# otherwise start simulator (mavlink) module
-
-	# EKF2 specifics
-	param set-default EKF2_GPS_DELAY 10
-	param set-default EKF2_MULTI_IMU 3
-	param set-default SENS_IMU_MODE 0
-
-	simulator_tcp_port=$((4560+px4_instance))
-
-	# Check if PX4_SIM_HOSTNAME environment variable is empty
-	# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
-	# If both are empty use localhost for simulator
-	if [ -z "${PX4_SIM_HOSTNAME}" ]; then
-
-		if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
-			echo "INFO  [init] PX4_SIM_HOSTNAME: localhost"
-			simulator_mavlink start -c $simulator_tcp_port
-		else
-			echo "INFO  [init] PX4_SIM_HOSTNAME: ${PX4_SIM_HOST_ADDR}"
-			simulator_mavlink start -t "${PX4_SIM_HOST_ADDR}" "${simulator_tcp_port}"
-		fi
-
-	else
-		echo "INFO  [init] PX4_SIM_HOSTNAME: ${PX4_SIM_HOSTNAME}"
-		simulator_mavlink start -h "${PX4_SIM_HOSTNAME}" "${simulator_tcp_port}"
-	fi
-
+    # Run simulator_mavlink module for interface with gazebo-classic
+    . px4-rc.mavlinksim
 fi
--- a/ROMFS/px4fmu_common/init.d-posix/rcS
+++ b/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))
@ -227,9 +236,6 @@ then
 	exit 1
 fi

-#user defined params for instances can be in PATH
-. px4-rc.params
-
 dataman start

 # only start the simulator if not in replay mode, as both control the lockstep time
@ -289,10 +295,15 @@ then
 	# for multi intances setup, add namespace prefix
 	uxrce_dds_ns="-n px4_$px4_instance"
 fi
-if [ -n "$PX4_UXRCE_DDS_NS" ]
-then
-	# Override namespace if environment variable is defined
-	uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
+if [ "${PX4_UXRCE_DDS_NS+x}" ]; then
+	# Override, as variable is set (empty or not)
+	if [ -n "$PX4_UXRCE_DDS_NS" ]; then
+		# Override namespace if environment variable is non-empty
+		uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
+	else
+		# Clear namespace if variable is empty
+		uxrce_dds_ns=""
+	fi
 fi
 if [ -n "$ROS_DOMAIN_ID" ]
 then
--- a/ROMFS/px4fmu_common/init.d/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d/CMakeLists.txt
@ -69,15 +69,6 @@ if(CONFIG_MODULES_MC_RATE_CONTROL)
 	)
 endif()

-if(CONFIG_MODULES_ROVER_POS_CONTROL)
-	px4_add_romfs_files(
-		rc.rover_apps
-		rc.rover_defaults
-
-		rc.boat_defaults # hack
-	)
-endif()
-
 if(CONFIG_MODULES_ROVER_DIFFERENTIAL)
 	px4_add_romfs_files(
 		rc.rover_differential_apps
--- a/ROMFS/px4fmu_common/init.d/airframes/4019_x500_v2
+++ b/ROMFS/px4fmu_common/init.d/airframes/4019_x500_v2
@ -22,11 +22,6 @@ param set-default MC_PITCHRATE_I 0.3
 param set-default MC_ROLLRATE_D 0.004
 param set-default MC_PITCHRATE_D 0.004

-param set-default PWM_MAIN_FUNC1 101
-param set-default PWM_MAIN_FUNC2 102
-param set-default PWM_MAIN_FUNC3 103
-param set-default PWM_MAIN_FUNC4 104
-
 # Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
 param set-default CA_ROTOR0_PX 1
--- a/ROMFS/px4fmu_common/init.d/airframes/4020_holybro_px4vision_v1_5
+++ b/ROMFS/px4fmu_common/init.d/airframes/4020_holybro_px4vision_v1_5
@ -7,6 +7,7 @@
 #
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
+# @board px4_fmu-v6x exclude
 #

 . ${R}etc/init.d/rc.mc_defaults
--- a/ROMFS/px4fmu_common/init.d/airframes/50000_generic_rover_differential
+++ b/ROMFS/px4fmu_common/init.d/airframes/50000_generic_rover_differential
@ -5,8 +5,5 @@
 # @type Rover
 # @class Rover
 #
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#

 . ${R}etc/init.d/rc.rover_differential_defaults
--- a/ROMFS/px4fmu_common/init.d/airframes/50001_aion_robotics_r1_rover
+++ b/ROMFS/px4fmu_common/init.d/airframes/50001_aion_robotics_r1_rover
@ -7,9 +7,6 @@
 # @type Rover
 # @class Rover
 #
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#

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

@ -26,7 +23,6 @@ param set-default NAV_ACC_RAD 0.5

 # Differential Parameters
 param set-default RD_WHEEL_TRACK 0.3
-param set-default RD_MAX_THR_YAW_R 0.7
 param set-default RD_TRANS_DRV_TRN 0.785398
 param set-default RD_TRANS_TRN_DRV 0.139626

@ -37,19 +33,21 @@ param set-default RO_JERK_LIM 5
 param set-default RO_MAX_THR_SPEED 1.9

 # Rover Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
+param set-default RO_YAW_RATE_I 0.1
 param set-default RO_YAW_RATE_P 0.1
 param set-default RO_YAW_RATE_LIM 250
 param set-default RO_YAW_ACCEL_LIM 600
 param set-default RO_YAW_DECEL_LIM 600
+param set-default RO_YAW_RATE_CORR 2.7

 # Rover Attitude Control Parameters
-param set-default RO_YAW_P 5
+param set-default RO_YAW_P 2.5

-# Rover Position Control Parameters
+# Rover Velocity Control Parameters
 param set-default RO_SPEED_LIM 1.6
 param set-default RO_SPEED_I 0.01
 param set-default RO_SPEED_P 0.1
+param set-default RO_SPEED_RED 1

 # Pure Pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1
--- a/ROMFS/px4fmu_common/init.d/airframes/51000_generic_rover_ackermann
+++ b/ROMFS/px4fmu_common/init.d/airframes/51000_generic_rover_ackermann
@ -5,8 +5,5 @@
 # @type Rover
 # @class Rover
 #
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#

 . ${R}etc/init.d/rc.rover_ackermann_defaults
--- a/ROMFS/px4fmu_common/init.d/airframes/51001_axial_scx10_2_trail_honcho
+++ b/ROMFS/px4fmu_common/init.d/airframes/51001_axial_scx10_2_trail_honcho
@ -7,9 +7,6 @@
 # @type Rover
 # @class Rover
 #
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#

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

@ -30,17 +27,19 @@ param set-default RO_JERK_LIM 20
 param set-default RO_MAX_THR_SPEED 2.8

 # Rover Rate Control Parameters
-param set-default RO_YAW_RATE_I 0
-param set-default RO_YAW_RATE_P 0
-param set-default RO_YAW_RATE_LIM 0
+param set-default RO_YAW_RATE_I 0.1
+param set-default RO_YAW_RATE_P 0.1
+param set-default RO_YAW_RATE_LIM 120
+param set-default RO_YAW_RATE_CORR 1

 # Rover Attitude Control Parameters
-param set-default RO_YAW_P 0
+param set-default RO_YAW_P 2.5

-# Rover Position Control Parameters
+# Rover Velocity Control Parameters
 param set-default RO_SPEED_LIM 2.5
 param set-default RO_SPEED_I 0.01
 param set-default RO_SPEED_P 0.1
+param set-default RO_SPEED_RED 1

 # Pure pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1
--- a/ROMFS/px4fmu_common/init.d/airframes/52000_generic_rover_mecanum
+++ b/ROMFS/px4fmu_common/init.d/airframes/52000_generic_rover_mecanum
@ -5,8 +5,5 @@
 # @type Rover
 # @class Rover
 #
-# @board px4_fmu-v2 exclude
-# @board bitcraze_crazyflie exclude
-#

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

 param set-default CA_AIRFRAME 14
-param set-default MAV_TYPE 99
+param set-default MAV_TYPE 45

 param set-default CA_THRUSTER_CNT 8
 param set-default CA_R_REV 0
--- a/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
@ -158,14 +158,6 @@ if(CONFIG_MODULES_ROVER_MECANUM)
 	)
 endif()

-if(CONFIG_MODULES_ROVER_POS_CONTROL)
-	px4_add_romfs_files(
-		# [59000, 59999] Rover position control (deprecated)
-		59000_generic_ground_vehicle
-		59001_nxpcup_car_dfrobot_gpx
-	)
-endif()
-
 if(CONFIG_MODULES_UUV_ATT_CONTROL)
 	px4_add_romfs_files(
 		# [60000, 61000] (Unmanned) Underwater Robots
--- a/ROMFS/px4fmu_common/init.d/rc.fw_apps
+++ b/ROMFS/px4fmu_common/init.d/rc.fw_apps
@ -15,7 +15,8 @@ control_allocator start
 #
 fw_rate_control start
 fw_att_control start
-fw_pos_control start
+fw_mode_manager start
+fw_lat_lon_control start
 airspeed_selector start

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

 param set-default COM_POS_LOW_EPH 50
--- a/ROMFS/px4fmu_common/init.d/rc.mc_defaults
+++ b/ROMFS/px4fmu_common/init.d/rc.mc_defaults
@ -20,7 +20,5 @@ param set-default NAV_ACC_RAD 2
 param set-default RTL_RETURN_ALT 30
 param set-default RTL_DESCEND_ALT 10

-param set-default GPS_UBX_DYNMODEL 6
-
 # lower RNG_FOG since MC are expected to fly closer over obstacles
 param set-default EKF2_RNG_FOG 1.0
--- a/ROMFS/px4fmu_common/init.d/rc.rover_apps
+++ b/ROMFS/px4fmu_common/init.d/rc.rover_apps
@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Standard apps for unmanned ground vehicles (UGV).
-#
-# NOTE: Script variables are declared/initialized/unset in the rcS script.
-#
-
-#
-# Start Control Allocator
-#
-control_allocator start
-
-#
-# Start attitude controllers.
-#
-rover_pos_control start
-
-#
-# Start Land Detector.
-#
-land_detector start rover
--- a/ROMFS/px4fmu_common/init.d/rc.rover_defaults
+++ b/ROMFS/px4fmu_common/init.d/rc.rover_defaults
@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# UGV default parameters.
-#
-# NOTE: Script variables are declared/initialized/unset in the rcS script.
-#
-
-set VEHICLE_TYPE rover
-
-# MAV_TYPE_GROUND_ROVER 10
-param set-default MAV_TYPE 10
-
-param set-default MIS_TAKEOFF_ALT 0.01
-
-param set-default NAV_ACC_RAD 2
-param set-default NAV_LOITER_RAD 2
-
-# Temporary.
-param set-default NAV_FW_ALT_RAD 1000
--- a/ROMFS/px4fmu_common/init.d/rc.sc_defaults
+++ b/ROMFS/px4fmu_common/init.d/rc.sc_defaults
@ -3,10 +3,10 @@
 # NOTE: Script variables are declared/initialized/unset in the rcS script.
 #

-set VEHICLE_TYPE sc
+set VEHICLE_TYPE spacecraft

-# MAV_TYPE_QUADROTOR 2
-#param set-default MAV_TYPE 12
+# 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
--- a/ROMFS/px4fmu_common/init.d/rc.sensors
+++ b/ROMFS/px4fmu_common/init.d/rc.sensors
@ -71,12 +71,6 @@ then
 fi


-# Heater driver for temperature regulated IMUs.
-if param compare -s SENS_EN_THERMAL 1
-then
-	heater start
-fi
-
 # Teraranger one tof sensor
 if param greater -s SENS_EN_TRANGER 0
 then
@ -232,15 +226,17 @@ then

 	# compasses
 	hmc5883 -T -X -q start
+	iis2mdc -X -q start
 	ist8308 -X -q start
 	ist8310 -X -q start
-	lis2mdl -X -q start
 	if ! lis3mdl -X -q start
 	then
 		lis3mdl -X -q -a 0x1c start
 	fi
 	qmc5883l -X -q start
+	qmc5883p -X -q start
 	rm3100 -X -q start
+	bmm350 -X -q start

 	# start last (wait for possible icm20948 passthrough mode)
 	ak09916 -X -q start
--- a/ROMFS/px4fmu_common/init.d/rc.vehicle_setup
+++ b/ROMFS/px4fmu_common/init.d/rc.vehicle_setup
@ -68,6 +68,15 @@ then
 	. ${R}etc/init.d/rc.vtol_apps
 fi

+#
+# Spapcecraft setup.
+#
+if [ $VEHICLE_TYPE = spacecraft ]
+then
+	# Start standard multicopter apps.
+	. ${R}etc/init.d/rc.sc_apps
+fi
+
 #
 # Airship setup.
 #
--- a/ROMFS/px4fmu_common/init.d/rc.vtol_apps
+++ b/ROMFS/px4fmu_common/init.d/rc.vtol_apps
@ -27,7 +27,8 @@ fi

 fw_rate_control start vtol
 fw_att_control start vtol
-fw_pos_control start vtol
+fw_mode_manager start
+fw_lat_lon_control start vtol
 fw_autotune_attitude_control start vtol

 # Start Land Detector
--- a/ROMFS/px4fmu_common/init.d/rc.vtol_defaults
+++ b/ROMFS/px4fmu_common/init.d/rc.vtol_defaults
@ -10,9 +10,6 @@ set VEHICLE_TYPE vtol
 # MAV_TYPE_VTOL_FIXEDROTOR 22
 param set-default MAV_TYPE 22

-# there is a 2.5 factor applied on COM_POS_FS_EPH if for invalidation
-param set-default COM_POS_FS_EPH 50
-
 param set-default COM_POS_LOW_EPH 50

 param set-default MIS_TAKEOFF_ALT 20
--- a/Show More
+++ b/Show More