ci: fix docker context

Signed-off-by: Ramon Roche <mrpollo@gmail.com>
ci: dont enter sitl
2026-05-31 12:00:04 +08:00 · 2025-07-03 21:22:49 +00:00 · 2025-07-03 18:59:02 +00:00 · 2025-07-03 18:59:02 +00:00 · 2025-07-03 18:59:02 +00:00 · 2025-07-03 18:59:02 +00:00
1033 changed files with 8920 additions and 6936 deletions
@@ -0,0 +1,7 @@
+FROM gcr.io/oss-fuzz-base/base-builder:v1
+COPY . $SRC/PX4-Autopilot
+RUN apt-get install -y libjpeg8-dev zlib1g-dev
+RUN pip3 install --upgrade pip
+RUN python3 -m pip install -r $SRC/PX4-Autopilot/Tools/setup/requirements.txt
+WORKDIR $SRC/PX4-Autopilot
+COPY ./.clusterfuzzlite/build.sh $SRC/
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash -eu
+
+PX4_FUZZ=1 make px4_sitl
+cp build/px4_sitl_default/bin/px4 $OUT/px4
@@ -0,0 +1 @@
+language: c++
@@ -5,6 +5,6 @@


 # Add 'Documentation' label to any changes within 'docs' folder or any subfolders
-"Documentation 📑":
+"Documentation+📑":
 - changed-files:
  - any-glob-to-any-file: docs/**
@@ -0,0 +1,44 @@
+name: Build PX4 SITL AppImage
+
+on:
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+  actions: write
+
+jobs:
+  build-appimage:
+    name: "AppImage ${{ matrix.arch }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: amd64
+            runner: x64
+          - arch: arm64
+            runner: arm64
+    runs-on: [runs-on,"runner=4cpu-linux-${{ matrix.runner }}","image=ubuntu22-full-${{ matrix.runner }}","run-id=${{ github.run_id }}"]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: ./Tools/setup/ubuntu.sh
+
+      - name: Build PX4 SITL and AppImage
+        env:
+          # avoid FUSE by extracting the AppImage in‐place
+          APPIMAGE_EXTRACT_AND_RUN: "1"
+        run: |
+          make appimage
+
+      - name: Upload AppImage artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: px4-sitl-appimage-${{ matrix.arch }}
+          path: build/*.AppImage
@@ -18,7 +18,7 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+      - '*'
    paths-ignore:
      - 'docs/**'

@@ -0,0 +1,34 @@
+name: ClusterFuzzLite batch fuzzing
+on:
+  schedule:
+    - cron: '0 6 * * *'  # UTC 6am every day.
+permissions: read-all
+jobs:
+  BatchFuzzing:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer:
+        - address
+        - undefined
+        - memory
+    steps:
+    - name: Build Fuzzers (${{ matrix.sanitizer }})
+      id: build
+      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+      with:
+        sanitizer: ${{ matrix.sanitizer }}
+    - name: Run Fuzzers (${{ matrix.sanitizer }})
+      id: run
+      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        fuzz-seconds: 1800 # 30 mins
+        mode: 'batch'
+        sanitizer: ${{ matrix.sanitizer }}
+        # Optional but recommended: For storing certain artifacts from fuzzing.
+        # See later section on "Git repo for storage".
+        # storage-repo: https://${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/OWNER/STORAGE-REPO-NAME.git
+        # storage-repo-branch: main   # Optional. Defaults to "main"
+        # storage-repo-branch-coverage: gh-pages  # Optional. Defaults to "gh-pages".
@@ -8,14 +8,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -43,7 +39,7 @@ jobs:
      - name: Building [${{ matrix.check }}]
        uses: addnab/docker-run-action@v3
        with:
-          image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+          image: px4io/px4-dev-nuttx-focal:2022-08-12
          options: -v ${{ github.workspace }}:/workspace
          run: |
            cd /workspace
@@ -8,7 +8,7 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'
 jobs:
@@ -8,14 +8,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    runs-on: macos-latest
@@ -11,17 +11,13 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+      - '*'
    paths-ignore:
      - 'docs/**'

 env:
  RUNS_IN_DOCKER: true

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build_and_test:
    name: Build and Test
@@ -11,7 +11,7 @@ on:
      - 'v*'
  pull_request:
    branches:
-      - '**'
+      - '*'
    paths:
      - '.github/workflows/dev_container.yml'
      - 'Tools/setup/ubuntu.sh'
@@ -30,10 +30,6 @@ on:
        type: boolean
        default: false

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  setup:
    name: Set Tags and Variables
@@ -9,7 +9,7 @@ on:
      - 'docs/en/**'
  pull_request:
    branches:
-      - '**'
+      - '*'
    paths:
      - 'docs/en/**'

@@ -80,7 +80,7 @@ jobs:
      - 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
+          # make it an orphan branch      
          cd docs.px4.io
          CURRENT_DATETIME=$(date +'%Y%m%d_%H_%M')
          git checkout --orphan "${CURRENT_DATETIME}_main"
@@ -3,15 +3,10 @@ name: EKF Change Indicator
 on:
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-# If two events are triggered within a short time in the same PR, cancel the run of the oldest event
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
 jobs:
  unit_tests:
    runs-on: ubuntu-latest
@@ -23,7 +18,7 @@ jobs:
    - name: main test
      uses: addnab/docker-run-action@v3
      with:
-        image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+        image: px4io/px4-dev-base-focal:2021-09-08
        options: -v ${{ github.workspace }}:/workspace
        run: |
          cd /workspace
@@ -19,7 +19,7 @@ jobs:
    - name: main test
      uses: addnab/docker-run-action@v3
      with:
-        image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+        image: px4io/px4-dev-base-focal:2021-09-08
        options: -v ${{ github.workspace }}:/workspace
        run: |
          cd /workspace
@@ -8,14 +8,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -13,7 +13,7 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+      - '*'
    paths-ignore:
      - 'docs/**'

@@ -1,38 +0,0 @@
-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
@@ -11,14 +11,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+      - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  check_itcm:
    name: Checking ${{ matrix.target }}
@@ -8,14 +8,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -24,6 +20,7 @@ jobs:
      matrix:
        config:
          - {vehicle: "iris",          mission: "MC_mission_box"}
+          - {vehicle: "rover",         mission: "rover_mission_1"}

    steps:
    - uses: actions/checkout@v4
@@ -8,14 +8,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -8,14 +8,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -8,7 +8,7 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-      - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

@@ -17,10 +17,6 @@ on:
    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]
@@ -7,17 +7,12 @@ on:
      - '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
@@ -0,0 +1,189 @@
+name: SITL Container
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'stable'
+      - 'beta'
+      - 'release/**'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - '**'
+  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
+
+jobs:
+  setup:
+    name: Set Tags and Variables
+    permissions:
+      contents: read
+    runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",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
+
+      # If manual dispatch, take the user‐provided input
+      - name: Set PX4 Tag Version
+        id: px4_version
+        run: |
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo "px4_version=${{ github.event.inputs.px4_version }}" >> $GITHUB_OUTPUT
+          else
+            echo "px4_version=$(git describe --tags --match 'v[0-9]*')" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/PX4/px4-sitl
+            px4io/px4-sitl
+          tags: |
+            type=raw,enable=true,value=${{ steps.px4_version.outputs.px4_version }},priority=1000
+
+  build:
+    name: Build (${{ 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: Install PX4 Dependencies
+        run: ./Tools/setup/ubuntu.sh
+
+      - name: Build PX4 SITL
+        run: make px4_sitl_default
+
+      - 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: .
+          file: Tools/sitl-container/Dockerfile
+          tags: |
+            ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
+            px4io/px4-sitl:${{ 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
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Verify Images Exist Before Creating Manifest
+        run: |
+          docker manifest inspect px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}-arm64 || echo "⚠️ Warning: No ARM64 image found!"
+          docker manifest inspect px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}-amd64 || echo "⚠️ Warning: No AMD64 image found!"
+          docker manifest inspect ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-arm64 || echo "⚠️ Warning: No ARM64 image found!"
+          docker manifest inspect ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-amd64 || echo "⚠️ Warning: No AMD64 image found!"
+
+      - name: Create and Push Multi-Arch Manifest for Docker Hub
+        run: |
+          docker manifest create px4io/px4-sitl:${{ needs.setup.outputs.px4_version }} \
+            --amend px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}-arm64 \
+            --amend px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}-amd64
+
+          docker manifest annotate px4io/px4-sitl:${{ needs.setup.outputs.px4_version }} px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}-arm64 --arch arm64
+          docker manifest annotate px4io/px4-sitl:${{ needs.setup.outputs.px4_version }} px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}-amd64 --arch amd64
+
+          docker manifest push px4io/px4-sitl:${{ needs.setup.outputs.px4_version }}
+
+      - name: Create and Push Multi-Arch Manifest for GHCR
+        run: |
+          docker manifest create ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }} \
+            --amend ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-arm64 \
+            --amend ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-amd64
+
+          docker manifest annotate ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }} ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-arm64 --arch arm64
+          docker manifest annotate ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }} ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}-amd64 --arch amd64
+
+          docker manifest push ghcr.io/px4/px4-sitl:${{ needs.setup.outputs.px4_version }}
@@ -13,14 +13,10 @@ on:
      - 'docs/**'
  pull_request:
    branches:
-    - '**'
+    - '*'
    paths-ignore:
      - 'docs/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    name: Testing PX4 ${{ matrix.config.model }}
@@ -89,6 +89,3 @@
 [submodule "src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan"]
 	path = src/drivers/uavcan/libdronecan/libuavcan/dsdl_compiler/pydronecan
 	url = https://github.com/dronecan/pydronecan
-[submodule "test/fuzztest"]
-	path = test/fuzztest
-	url = https://github.com/google/fuzztest.git
@@ -334,33 +334,6 @@ if(NOT PX4_CHIP)
 	message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP")
 endif()

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

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

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

 # Pick up specific Python path if set
@@ -259,6 +264,42 @@ px4fmu_firmware: \
 	check_px4_fmu-v5x_default \
 	sizes

+# Create a one-file AppImage for PX4 SITL
+PX4_VERSION := $(shell git describe --tags --match "v[0-9]*" 2>/dev/null || echo "v0.0.0")
+.PHONY: AppImage
+appimage: build/px4_sitl_default/bin/px4 build/px4_sitl_default/romfs_files.tar
+
+	@$(MAKE) px4_sitl_default
+	@$(RM) -rf build/px4.AppDir
+
+	@mkdir -p \
+		build/px4.AppDir/usr/bin \
+		build/px4.AppDir/usr/lib \
+		build/px4.AppDir/usr/share/px4/romfs/etc \
+		build/px4.AppDir/usr/share/px4/romfs/bin
+	@cp build/px4_sitl_default/bin/px4 build/px4.AppDir/usr/bin/
+	@echo "${PX4_VERSION}" > build/px4.AppDir/version.txt
+
+	# bundle required Gazebo transport libs (arch‐agnostic lookup)
+	echo "→ Gathering shared-lib dependencies for px4..."
+	@ldd build/px4_sitl_default/bin/px4 \
+		| awk '/=>/ { print $$3 }' \
+		| grep -E '^/' \
+		| grep -Ev '/lib(c|gcc|stdc\+\+)\.so' \
+		| sort -u \
+		| while read lib; do \
+			echo "	→ bundling $$lib"; \
+			cp "$$lib" build/px4.AppDir/usr/lib/; \
+		done
+
+	@tar xf build/px4_sitl_default/romfs_files.tar -C build/px4.AppDir/usr/share/px4/romfs/etc
+	@cp build/px4_sitl_default/bin/px4-* build/px4.AppDir/usr/share/px4/romfs/bin/
+	@cp Tools/appimage/px4.desktop build/px4.AppDir/
+	@cp Tools/appimage/px4.svg build/px4.AppDir/
+	@cp Tools/appimage/AppRun build/px4.AppDir/
+	@chmod +x build/px4.AppDir/AppRun
+	@cd build && appimagetool px4.AppDir
+
 misc_qgc_extra_firmware: \
 	check_nxp_fmuk66-v3_default \
 	check_mro_x21_default \
@@ -405,18 +446,11 @@ tests:
 	$(eval UBSAN_OPTIONS += color=always)
 	$(call cmake-build,px4_sitl_test)

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


 rostest: px4_sitl_default
@@ -46,22 +46,3 @@ param set-default PWM_MAIN_FUNC3 203
 param set-default PWM_MAIN_FUNC4 101

 param set-default EKF2_GPS_DELAY 0
-
-# Rate controllers
-param set-default FW_RR_P 0.0500
-param set-default FW_RR_I 2.0000
-param set-default FW_RR_D 0.0000
-param set-default FW_RR_FF 0.0000
-param set-default FW_RR_IMAX 1.0000
-
-param set-default FW_PR_P 0.0800
-param set-default FW_PR_I 2.5000
-param set-default FW_PR_D 0.0000
-param set-default FW_PR_FF 0.0000
-param set-default FW_PR_IMAX 1.0000
-
-param set-default FW_YR_P 0.0500
-param set-default FW_YR_I 3.0000
-param set-default FW_YR_D 0.0000
-param set-default FW_YR_FF 0.0000
-param set-default FW_YR_IMAX 1.0000
@@ -1,72 +0,0 @@
-#!/bin/sh
-# @name Rover Ackermann
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_ackermann_defaults
-
-set VEHICLE_TYPE rover_ackermann
-param set-default CA_AIRFRAME 5         # Rover (Ackermann)
-param set-default CA_R_REV 1            # Motor is assumed to be reversible
-param set-default EKF2_MAG_TYPE 1       # Make sure magnetometer is fused even when not driving
-param set-default NAV_ACC_RAD 0.5       # Waypoint acceptance radius
-param set-default EKF2_GBIAS_INIT 0.01
-param set-default EKF2_ANGERR_INIT 0.01
-
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_ackermann}
-
-param set-default SIH_VEHICLE_TYPE 5 # sih as rover ackermann
-
-param set-default PWM_MAIN_FUNC1 201 # Steering
-param set-default PWM_MAIN_FUNC2 101 # Throttle
-param set-default SIH_MASS 20
-param set-default SIH_IXX 0.4333
-param set-default SIH_IYY 1.6833
-param set-default SIH_IZZ 2.0833
-param set-default SIH_IXZ 0
-param set-default SIH_KDV 50
-param set-default SIH_KDW 10
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-
-# Ackermann Parameters
-param set-default RA_WHEEL_BASE 0.321
-param set-default RA_ACC_RAD_GAIN 2
-param set-default RA_ACC_RAD_MAX 3
-param set-default RA_MAX_STR_ANG 0.5236
-param set-default RA_STR_RATE_LIM 360
-
-# Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.01
-param set-default RO_YAW_RATE_P 0.25
-param set-default RO_YAW_RATE_LIM 180
-param set-default RO_YAW_ACCEL_LIM 400
-param set-default RO_YAW_DECEL_LIM 800
-param set-default RO_YAW_RATE_CORR 1
-
-# Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Velocity Control Parameters
-param set-default RO_ACCEL_LIM 3
-param set-default RO_DECEL_LIM 3
-param set-default RO_JERK_LIM 10
-param set-default RO_MAX_THR_SPEED 3.2
-param set-default RO_SPEED_LIM 3
-param set-default RO_SPEED_I 0.001
-param set-default RO_SPEED_P 0.001
-param set-default RO_SPEED_RED 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
-param set-default PP_LOOKAHD_MAX 10
-param set-default PP_LOOKAHD_MIN 1
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# @name Rover
+#
+
+. ${R}etc/init.d/rc.rover_defaults
+
+param set-default GND_L1_DIST 5
+param set-default GND_L1_PERIOD 10
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_D 0.001
+param set-default GND_SPEED_I 3
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_THR_SC 1
+param set-default GND_SPEED_TRIM 4
+param set-default GND_THR_CRUISE 0.3
+param set-default GND_THR_MAX 0.5
+param set-default GND_THR_MIN 0
+
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2
+
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 2
+
+param set-default CA_AIRFRAME 5
+
+param set-default CA_R_REV 1
+param set-default PWM_MAIN_FUNC1 201
+param set-default PWM_MAIN_FUNC2 201
+param set-default PWM_MAIN_FUNC6 101
+param set-default PWM_MAIN_FUNC7 101
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# @name Aion Robotics R1 Rover
+# @type Rover
+# @class Rover
+
+. ${R}etc/init.d/rc.rover_differential_defaults
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 101
+param set-default PWM_MAIN_FUNC6 102
+param set-default PWM_MAIN_FUNC7 102
@@ -62,6 +62,8 @@ px4_add_romfs_files(
 	1043_gazebo-classic_standard_vtol_drop
 	1044_gazebo-classic_plane_lidar
 	1045_gazebo-classic_quadtailsitter
+	1060_gazebo-classic_rover
+	1061_gazebo-classic_r1_rover
 	1062_flightgear_tf-r1
 	1070_gazebo-classic_boat

@@ -108,7 +110,6 @@ px4_add_romfs_files(
 	10042_sihsim_xvert
 	10043_sihsim_standard_vtol
 	10044_sihsim_hex
-	10045_sihsim_rover_ackermann

 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2
@@ -69,6 +69,15 @@ if(CONFIG_MODULES_MC_RATE_CONTROL)
 	)
 endif()

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

+if(CONFIG_MODULES_ROVER_POS_CONTROL)
+	px4_add_romfs_files(
+		# [59000, 59999] Rover position control (deprecated)
+		59000_generic_ground_vehicle
+		59001_nxpcup_car_dfrobot_gpx
+	)
+endif()
+
 if(CONFIG_MODULES_UUV_ATT_CONTROL)
 	px4_add_romfs_files(
 		# [60000, 61000] (Unmanned) Underwater Robots
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Standard apps for unmanned ground vehicles (UGV).
+#
+# NOTE: Script variables are declared/initialized/unset in the rcS script.
+#
+
+#
+# Start Control Allocator
+#
+control_allocator start
+
+#
+# Start attitude controllers.
+#
+rover_pos_control start
+
+#
+# Start Land Detector.
+#
+land_detector start rover
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# UGV default parameters.
+#
+# NOTE: Script variables are declared/initialized/unset in the rcS script.
+#
+
+set VEHICLE_TYPE rover
+
+# MAV_TYPE_GROUND_ROVER 10
+param set-default MAV_TYPE 10
+
+param set-default MIS_TAKEOFF_ALT 0.01
+
+param set-default NAV_ACC_RAD 2
+param set-default NAV_LOITER_RAD 2
+
+# Temporary.
+param set-default NAV_FW_ALT_RAD 1000
@@ -236,7 +236,6 @@ then
 	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
@@ -224,7 +224,7 @@ else
 		# Look for airframe in ROMFS
 		. ${R}etc/init.d/rc.autostart

-		if [ ${VEHICLE_TYPE} = none ]
+		if [ ${VEHICLE_TYPE} == none ]
 		then
 			# Use external startup file
 			if [ $STORAGE_AVAILABLE = yes ]
@@ -235,7 +235,7 @@ else
 			fi
 		fi

-		if [ ${VEHICLE_TYPE} = none ]
+		if [ ${VEHICLE_TYPE} == none ]
 		then
 			echo "ERROR [init] No airframe file found for SYS_AUTOSTART value"
 			param set SYS_AUTOSTART 0
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+set -e
+
+DEBUG=false
+for arg; do
+  case "$arg" in
+  --debug)
+    DEBUG=true
+    shift
+    ;;
+  *)
+    break
+    ;;
+  esac
+done
+
+if $DEBUG; then
+  echo "[DEBUG] Running in debug mode" >&2
+fi
+
+CUR_VER=$(<"$APPDIR/version.txt")
+$DEBUG && echo "[DEBUG] PX4_VERSION = $CUR_VER" >&2
+
+# figure out a stable logs directory
+STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
+DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+ROMFS_DIR="$DATA_HOME/px4/romfs"
+mkdir -p "$DATA_HOME/px4" "$STATE_HOME/px4"
+
+$DEBUG && echo "[DEBUG] STATE_HOME = $STATE_HOME" >&2
+$DEBUG && echo "[DEBUG] DATA_HOME = $STATE_HOME" >&2
+
+# Read last unpacked version
+LAST_VER_FILE="$STATE_HOME/px4/version"
+LAST_VER=""
+[ -f "$LAST_VER_FILE" ] && LAST_VER=$(<"$LAST_VER_FILE")
+
+# if versions differ, refresh the payload
+if [ "$CUR_VER" != "$LAST_VER" ]; then
+  $DEBUG && echo "[DEBUG] Version changed ($LAST_VER → $CUR_VER); updating ROMFS..." >&2
+  rm -fr "$ROMFS_DIR"
+  mkdir -p "$ROMFS_DIR"
+  cp -a "$APPDIR/usr/share/px4/romfs/." "$ROMFS_DIR"
+  echo "$CUR_VER" > "$LAST_VER_FILE"
+else
+  if $DEBUG; then
+    echo "[DEBUG] Using cached ROMFS version $CUR_VER" >&2
+  fi
+fi
+
+LOG_DIR="$STATE_HOME/px4/logs"
+mkdir -p "$LOG_DIR"
+$DEBUG && echo "[DEBUG] LOG_DIR = $LOG_DIR" >&2
+
+# pick up bundled libs first
+export LD_LIBRARY_PATH="$APPDIR/usr/lib:$LD_LIBRARY_PATH"
+export PATH="$ROMFS_DIR/bin:$ROMFS_DIR:$PATH"
+
+
+$DEBUG && echo "[DEBUG] Launching: $APPDIR/usr/bin/px4 -w $ROMFS_DIR $*" >&2
+exec "$APPDIR/usr/bin/px4" -w "$ROMFS_DIR" "$@"
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=PX4 Autopilot SITL
+Exec=px4 %F
+Icon=px4
+Categories=Development;
@@ -43,7 +43,7 @@ fi

 # install git pre-commit hook
 HOOK_FILE="$DIR/../../.git/hooks/pre-commit"
-if [[ ! -f "$HOOK_FILE" && "$CI" != "true" && $- == *i* ]]; then
+if [ ! -f $HOOK_FILE ] && [ "$CI" != "true" ] && [ $- == *i* ]; then
 	echo ""
 	echo -e "\033[31mNinja tip: add a git pre-commit hook to automatically check code style\033[0m"
 	echo -e "Would you like to install one now? (\033[94mcp ./Tools/astyle/pre-commit .git/hooks/pre-commit\033[0m): [y/\033[1mN\033[0m]"
@@ -24,7 +24,6 @@ exec find boards msg src platforms test \
    -path src/modules/ekf2/EKF/yaw_estimator/derivation/generated -prune -o \
    -path src/modules/gyro_fft/CMSIS_5 -prune -o \
    -path src/modules/mavlink/mavlink -prune -o \
-    -path test/fuzztest -prune -o \
    -path test/mavsdk_tests/catch2 -prune -o \
    -path src/lib/crypto/monocypher -prune -o \
    -path src/lib/crypto/libtomcrypt -prune -o \
@@ -1,19 +0,0 @@
-#!/bin/bash
-# This script runs the fuzz tests from a given binary for a certain amount of time
-set -e
-
-if [[ "$1" == "--help" || "$1" == "-h" || -z "$1" ]]; then
-  echo "Usage: $0 <binary> [<duration>]"
-  echo "duration can be for example 5m or 5h"
-  exit 0
-fi
-
-binary="$1"
-duration="$2"
-[[ -z "$duration" ]] && duration="1m"
-
-# Iterate over all available fuzz tests in the binary
-for t in $("$binary" --fuzz=__non_existent__ 2>&1 | sed '1,/^Valid tests:$/d' | tr -d ' '); do
-  echo "Running $t"
-  "$binary" --fuzz="$t" --fuzz_for="$duration"
-done
@@ -1,18 +1,5 @@
 #! /bin/bash

-if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	echo "guessing PX4_DOCKER_REPO based on input";
-	if [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
-		# clang tools
-		PX4_DOCKER_REPO="px4io/px4-dev-clang:2021-02-04"
-	elif [[ $@ =~ .*tests* ]]; then
-		# run all tests with simulation
-		PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2021-12-11"
-	fi
-else
-	echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
-fi
-
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	PX4_DOCKER_REPO="px4io/px4-dev:v1.16.0-rc1-258-g0369abd556"
@@ -5,7 +5,7 @@
 set SERIAL_DEV none
 {% for serial_device in serial_devices -%}
 if param compare "$PRT" {{ serial_device.index }}; then
-	if [ "$PRT_{{ serial_device.tag }}_" = "" ]; then
+	if [ "x$PRT_{{ serial_device.tag }}_" = "x" ]; then
 		set SERIAL_DEV {{ serial_device.device }}
 		set BAUD_PARAM SER_{{ serial_device.tag }}_BAUD
 		set PRT_{{ serial_device.tag }}_ 1
@@ -126,9 +126,11 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
 		genromfs \
 		gettext \
 		gperf \
+		fuse \
 		kconfig-frontends \
 		libelf-dev \
 		libexpat-dev \
+		libfuse2 \
 		libgmp-dev \
 		libisl-dev \
 		libmpc-dev \
@@ -156,6 +158,11 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
 			gcc-arm-none-eabi \
 			gcc-multilib \
 			;
+
+		# Install the appimagetool for building AppImages
+		sudo wget -O /usr/local/bin/appimagetool \
+			https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+		sudo chmod +x /usr/local/bin/appimagetool
 	fi

 	if [[ "${INSTALL_ARCH}" == "aarch64" ]]; then
@@ -163,6 +170,10 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
 			g++-aarch64-linux-gnu \
 			g++-arm-linux-gnueabihf \
 			;
+		# Install the appimagetool for building AppImages
+		sudo wget -O /usr/local/bin/appimagetool \
+			https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-aarch64.AppImage
+		sudo chmod +x /usr/local/bin/appimagetool
 	fi

 	if [ -n "$USER" ]; then
@@ -0,0 +1,55 @@
+FROM ubuntu:24.04
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gnupg \
+    lsb-release \
+    libbsd0 \
+    libcom-err2 \
+    libc6 \
+    libgcc-s1 \
+    libgssapi-krb5-2 \
+    libk5crypto3 \
+    libkeyutils1 \
+    libkrb5-3 \
+    libkrb5support0 \
+    libmd0 \
+    libnorm1 \
+    libpgm-5.3-0 \
+    libprotobuf32 \
+    libprotobuf-lite32t64 \
+    libsodium23 \
+    libstdc++6 \
+    libuuid1 \
+    libzmq5 \
+    wget \
+    zlib1g \
+  && rm -fr /var/lib/apt/lists/*
+
+RUN curl -sSL https://packages.osrfoundation.org/gazebo.key \
+  | gpg --dearmor -o /usr/share/keyrings/gazebo-archive-keyring.gpg \
+  && echo "deb  [signed-by=/usr/share/keyrings/gazebo-archive-keyring.gpg] \
+    http://packages.osrfoundation.org/gazebo/ubuntu-stable \
+    $(lsb_release -cs) main" \
+    > /etc/apt/sources.list.d/gazebo-stable.list \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+    libgz-msgs10 \
+    libgz-transport13 \
+    libgz-utils2 \
+  && rm -fr /var/lib/apt/lists/*
+
+COPY build/px4_sitl_default/bin /opt/px4/bin
+COPY build/px4_sitl_default/etc /opt/px4/etc
+
+WORKDIR /opt/px4
+
+COPY Tools/sitl-container/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+EXPOSE 14540/udp 14550/udp 8888/udp
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD []
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+sudo docker run \
+  --rm -it \
+  --device /dev/fuse --cap-add SYS_ADMIN \
+  -p 14540:14540/udp \
+  -p 14550:14550/udp \
+  -p 8888:8888/udp \
+  px4-sitl:local
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+PX4_BIN=/opt/px4/bin/px4
+
+# if no args passed, default to SITL none
+if [ $# -eq 0 ]; then
+  exec "$PX4_BIN"
+else
+  exec "$PX4_BIN" "$@"
+fi
@@ -62,6 +62,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -67,6 +67,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -79,6 +79,7 @@ CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_NUM_MISSION_ITMES_SUPPORTED=1000
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
@@ -18,6 +18,7 @@ CONFIG_COMMON_INS=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
 CONFIG_DATAMAN_PERSISTENT_STORAGE=n
+CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM350=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_DRIVERS_ROBOCLAW=y
@@ -63,6 +63,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -51,6 +51,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_BATTERY_SIMULATOR=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_MAVLINK=y
@@ -57,6 +57,7 @@ CONFIG_MODULES_MC_ATT_CONTROL=y
 CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
 CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
 CONFIG_SYSTEMCMDS_BSONDUMP=y
 CONFIG_SYSTEMCMDS_DYN=y
@@ -67,6 +67,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -53,6 +53,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_BATTERY_SIMULATOR=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_MAVLINK=y
@@ -60,6 +60,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
@@ -62,6 +62,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
@@ -63,6 +63,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -66,6 +66,7 @@ CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_NUM_MISSION_ITMES_SUPPORTED=1000
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -66,6 +66,7 @@ CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_NUM_MISSION_ITMES_SUPPORTED=1000
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_PWM_OUT_SIM=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -66,6 +66,7 @@ CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_NUM_MISSION_ITMES_SUPPORTED=1000
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -71,6 +71,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -70,6 +70,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -61,6 +61,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
@@ -66,6 +66,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -65,6 +65,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -65,6 +65,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -62,6 +62,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -63,6 +63,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -63,6 +63,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -66,6 +66,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_UUV_ATT_CONTROL=y
@@ -67,6 +67,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -68,6 +68,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -69,6 +69,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -52,6 +52,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
@@ -39,6 +39,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
 CONFIG_SYSTEMCMDS_ACTUATOR_TEST=y
@@ -43,6 +43,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
 CONFIG_MODULES_ZENOH=y
@@ -25,6 +25,7 @@ CONFIG_COMMON_INS=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM350=y
 CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
@@ -71,6 +72,7 @@ CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODE_NAVIGATOR_VTOL_TAKEOFF=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
@@ -138,9 +138,6 @@
 #define CONFIG_FLEXIO1_CLK          1
 #define CONFIG_FLEXIO1_PRED_DIVIDER 5
 #define CONFIG_FLEXIO1_PODF_DIVIDER 1
-#define CONFIG_FLEXIO2_CLK          1
-#define CONFIG_FLEXIO2_PRED_DIVIDER 5
-#define CONFIG_FLEXIO2_PODF_DIVIDER 1
 #define CONFIG_PLL3_PFD2_FRAC       16
 #define BOARD_FLEXIO_PREQ           108000000

@@ -301,20 +301,6 @@ void imxrt_flexio_clocking(void)
 	reg |= CCM_CDCDR_FLEXIO1_CLK_PRED
 	       (CCM_PRED_FROM_DIVISOR(CONFIG_FLEXIO1_PRED_DIVIDER));
 	putreg32(reg, IMXRT_CCM_CDCDR);
-
-	reg = getreg32(IMXRT_CCM_CSCMR2);
-	reg &= ~(CCM_CSCMR2_FLEXIO2_CLK_SEL_MASK);
-	reg |= CCM_CSCMR2_FLEXIO2_CLK_SEL(CONFIG_FLEXIO2_CLK);
-	putreg32(reg, IMXRT_CCM_CSCMR2);
-
-	reg = getreg32(IMXRT_CCM_CS1CDR);
-	reg &= ~(CCM_CS1CDR_FLEXIO2_CLK_PRED_MASK |
-		 CCM_CS1CDR_FLEXIO2_CLK_PODF_MASK);
-	reg |= CCM_CS1CDR_FLEXIO2_CLK_PODF
-	       (CCM_PODF_FROM_DIVISOR(CONFIG_FLEXIO2_PODF_DIVIDER));
-	reg |= CCM_CS1CDR_FLEXIO2_CLK_PRED
-	       (CCM_PRED_FROM_DIVISOR(CONFIG_FLEXIO2_PRED_DIVIDER));
-	putreg32(reg, IMXRT_CCM_CS1CDR);
 }


@@ -77,22 +77,19 @@
 constexpr io_timers_t io_timers[MAX_IO_TIMERS] = {
 	initIOPWMDshot(PWM::FlexPWM2, PWM::Submodule0), // PWM_1, PMW_5
 	initIOPWMDshot(PWM::FlexPWM2, PWM::Submodule1), // PWM_0
-	initIOPWMDshot(PWM::FlexPWM2, PWM::Submodule2), // PWM_4
+	initIOPWM(PWM::FlexPWM2, PWM::Submodule2), // PWM_4
 	initIOPWMDshot(PWM::FlexPWM4, PWM::Submodule2), // PWM_2, PWM_3
 };

 #define FXIO_IOMUX  (IOMUX_SLEW_FAST | IOMUX_DRIVE_130OHM | IOMUX_PULL_UP_47K | IOMUX_SCHMITT_TRIGGER)

-//TODO: distinguish between the different FlexIO instances
-//
 constexpr timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = {
-	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_A, PWM::Submodule0}, IOMUX::Pad::GPIO_EMC_06, GPIO_FLEXIO1_FLEXIO06_1 | FXIO_IOMUX, IMXRT_FLEXIO1_BASE, 6), /* RevA. PWM_1 RevB. PWM1 */
-	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_B, PWM::Submodule0}, IOMUX::Pad::GPIO_EMC_07, GPIO_FLEXIO1_FLEXIO07_1 | FXIO_IOMUX, IMXRT_FLEXIO1_BASE, 7), /* RevA. PWM_5 RevB. PWM2 */
-	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_A, PWM::Submodule1}, IOMUX::Pad::GPIO_EMC_08, GPIO_FLEXIO1_FLEXIO08_1 | FXIO_IOMUX, IMXRT_FLEXIO1_BASE, 8), /* RevA. PWM_0 RevB. PWM3 */
-	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_B, PWM::Submodule2}, IOMUX::Pad::GPIO_B0_11,  GPIO_FLEXIO2_FLEXIO11_1 | FXIO_IOMUX, IMXRT_FLEXIO2_BASE, 11),  /* RevA. PWM_4 RevB. PWM4 */
-	initIOTimerChannelDshot(io_timers, {PWM::PWM4_PWM_A, PWM::Submodule2}, IOMUX::Pad::GPIO_EMC_04, GPIO_FLEXIO1_FLEXIO04_1 | FXIO_IOMUX, IMXRT_FLEXIO1_BASE, 4), /* RevA. PWM_3 RevB. PWM5 */
-	initIOTimerChannelDshot(io_timers, {PWM::PWM4_PWM_B, PWM::Submodule2}, IOMUX::Pad::GPIO_EMC_05, GPIO_FLEXIO1_FLEXIO05_1 | FXIO_IOMUX, IMXRT_FLEXIO1_BASE, 5), /* RevA. PWM_2 RevB. PWM6 */
-
+	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_A, PWM::Submodule0}, IOMUX::Pad::GPIO_EMC_06, GPIO_FLEXIO1_FLEXIO06_1 | FXIO_IOMUX, 6), /* RevA. PWM_1 RevB. PWM1 */
+	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_B, PWM::Submodule0}, IOMUX::Pad::GPIO_EMC_07, GPIO_FLEXIO1_FLEXIO07_1 | FXIO_IOMUX, 7), /* RevA. PWM_5 RevB. PWM2 */
+	initIOTimerChannelDshot(io_timers, {PWM::PWM2_PWM_A, PWM::Submodule1}, IOMUX::Pad::GPIO_EMC_08, GPIO_FLEXIO1_FLEXIO08_1 | FXIO_IOMUX, 8), /* RevA. PWM_0 RevB. PWM3 */
+	initIOTimerChannel(io_timers, {PWM::PWM2_PWM_B, PWM::Submodule2}, IOMUX::Pad::GPIO_B0_11),  /* RevA. PWM_4 RevB. PWM4 */
+	initIOTimerChannelDshot(io_timers, {PWM::PWM4_PWM_A, PWM::Submodule2}, IOMUX::Pad::GPIO_EMC_04, GPIO_FLEXIO1_FLEXIO04_1 | FXIO_IOMUX, 4), /* RevA. PWM_3 RevB. PWM5 */
+	initIOTimerChannelDshot(io_timers, {PWM::PWM4_PWM_B, PWM::Submodule2}, IOMUX::Pad::GPIO_EMC_05, GPIO_FLEXIO1_FLEXIO05_1 | FXIO_IOMUX, 5), /* RevA. PWM_2 RevB. PWM6 */
 };

 constexpr io_timers_channel_mapping_t io_timers_channel_mapping =
@@ -71,6 +71,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -72,6 +72,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -68,6 +68,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -22,6 +22,7 @@ CONFIG_MODULES_ESC_BATTERY=n
 CONFIG_MODULES_GIMBAL=n
 CONFIG_MODULES_GYRO_CALIBRATION=n
 CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=n
+CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=n
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
 CONFIG_MODULES_UUV_ATT_CONTROL=n
@@ -74,6 +74,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y
 CONFIG_MODULES_MC_RATE_CONTROL=y
 CONFIG_MODULES_NAVIGATOR=y
 CONFIG_MODULES_RC_UPDATE=y
+CONFIG_MODULES_ROVER_POS_CONTROL=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
@@ -19,6 +19,7 @@ CONFIG_MODULES_FW_ATT_CONTROL=n
 CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=n
 CONFIG_MODULES_FW_MODE_MANAGER=n
 CONFIG_MODULES_FW_LATERAL_LONGITUDINAL_CONTROL=n
+CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=n
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
 CONFIG_MODULES_UUV_ATT_CONTROL=n
@@ -36,6 +36,7 @@ CONFIG_MODULES_GIMBAL=n
 CONFIG_MODULES_GYRO_CALIBRATION=n
 CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=n
 CONFIG_MODULES_MAG_BIAS_ESTIMATOR=n
+CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=n
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
 CONFIG_MODULES_UUV_ATT_CONTROL=n
@@ -11,6 +11,7 @@ CONFIG_DRIVERS_PCA9685_PWM_OUT=n
 CONFIG_DRIVERS_UAVCAN=n
 CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=n
 CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=n
+CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=n
 CONFIG_BOARD_TESTING=y
 CONFIG_DRIVERS_TEST_PPM=y
@@ -17,6 +17,7 @@ CONFIG_MODULES_CAMERA_FEEDBACK=n
 CONFIG_MODULES_ESC_BATTERY=n
 CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=n
 CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=n
+CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=n
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
 CONFIG_MODULES_UUV_ATT_CONTROL=n
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ramon Roche	ad8f95cdcf	ci: fix docker context Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 21:22:49 +00:00
Ramon Roche	34ca76b63c	ci: dont enter sitl Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	cde7ffe7f9	container: px4-sitl image Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	9d98581675	AppImage: XDG compliant paths for romfs contents Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	68d8a7ce4c	tools: appimage cleanup on exit Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	7cb36ce47d	make: bundle relevant libraries into appimage Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	c1069dcd2a	ci: run on aws infra Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	2f56d44e6f	make: copy bundled libraries Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	b4ad8bbaa0	ci: try to bundle missing libraries Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:02 +00:00
Ramon Roche	11318ab861	make: fix build target for appimage Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	035a829dc5	ci: matrix includes Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	a25d90777e	AppImage: adds debug mode Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	254251f4a6	make: remove unnecessary steps in AppImage	2025-07-03 18:59:01 +00:00
Ramon Roche	b93eefcee7	ci: build x86 and arm64 AppImages Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	5e602788d7	ci: run the actual ubuntu setup script silly me Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	b709b2bb29	ci: remov git ownership hack Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	5b209cf5f4	ci: build on oldest supported architecture This makes it so its usable in ubuntu 22.04 & 24.04, otherwise we start running into dependency issues in the system for example: ``` /tmp/.mount_PX4_AuYR3Xk1/usr/bin/px4: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.38' not found (required by /tmp/.mount_PX4_AuYR3Xk1/usr/bin/px4) /tmp/.mount_PX4_AuYR3Xk1/usr/bin/px4: /lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.32' not found (required by /tmp/.mount_PX4_AuYR3Xk1/usr/bin/px4) ``` Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	32fe48a02b	ci: properly format yml Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	d94939b489	ci: extact image instead of mounting in CI avoids security issues in the runner Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	bc96acb6b3	ci: run modprobe on additional step Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	68b22f16cf	ci: inline install Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	cc384d44c7	ci: adds missing fuse dep Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	89cd709952	ci: needs libfuse2 Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	5db88fb2bc	ci: not sure why i left this here Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	5e1e2c9e29	ci: fix actions permissions scope Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	ce85cffbee	ci: update tools and fix git ownership Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	f1a8606e74	tools: adds appimagetool to setup/ubuntu.sh Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	aec1fddc8a	ci: create image on ci Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	b35ffa99bb	tools: container for all Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00
Ramon Roche	6ac80069c2	build: make appimage Signed-off-by: Ramon Roche <mrpollo@gmail.com>	2025-07-03 18:59:01 +00:00