MPC: LAND: create Stop motion primitive to also be used elsewhere

.github/workflows/dev_container.yml

@@ -17,7 +17,7 @@ on:
 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]
+    runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu22-full-x64,"run-id=${{ github.run_id }}",spot=false]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -52,7 +52,13 @@ jobs:
             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
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=ref,event=branch,value=${{ steps.px4-tag.outputs.tag }},priority=700
+            type=ref,event=branch,suffix=-{{date 'YYYY-MM-DD'}},priority=600
+            type=ref,event=branch,suffix=,priority=500
+            type=ref,event=pr
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -96,6 +102,6 @@ jobs:
           platforms: |
             linux/amd64
           provenance: mode=max
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max

.github/workflows/flash_analysis.yml

@@ -1,10 +1,5 @@
 name: FLASH usage analysis
 
-permissions:
-  contents: read
-  pull-requests: write
-  issues: write
-
 on:
   push:
     branches:
@@ -88,63 +83,59 @@ jobs:
           echo '${{ steps.bloaty-step.outputs.bloaty-summary-map }}' >> $GITHUB_OUTPUT
           echo "$EOF" >> $GITHUB_OUTPUT
 
-  # TODO:
-  # This part of the workflow is causing errors, we should find a way to fix this and enable this test again
-  # 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]
-    #needs: [analyze_flash]
-    #env:
-      #V5X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-absolute) }}
-      #V5X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-percentage) }}
-      #V6X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-absolute) }}
-      #V6X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-percentage) }}
-    #if: ${{ github.event.pull_request }}
-    #steps:
-      #- name: Find Comment
-        #uses: peter-evans/find-comment@v3
-        #id: fc
-        #with:
-          #issue-number: ${{ github.event.pull_request.number }}
-          #comment-author: 'github-actions[bot]'
-          #body-includes: FLASH Analysis
+  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]
+    needs: [analyze_flash]
+    env:
+      V5X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-absolute) }}
+      V5X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-summary-map).vm-percentage) }}
+      V6X-SUMMARY-MAP-ABS: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-absolute) }}
+      V6X-SUMMARY-MAP-PERC: ${{ fromJSON(fromJSON(needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-summary-map).vm-percentage) }}
+    if: ${{ github.event.pull_request }}
+    steps:
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: FLASH Analysis
 
-      #- name: Set Build Time
-        #id: bt
-        #run: |
-          #echo "timestamp=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_OUTPUT
+      - name: Set Build Time
+        id: bt
+        run: |
+          echo "timestamp=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_OUTPUT
 
-      #- name: Create or update comment
-        ## This can't be moved to the job-level conditions, as GH actions don't allow a job-level if condition to access the env.
-        #if: |
-          #steps.fc.outputs.comment-id != '' ||
-          #env.V5X-SUMMARY-MAP-ABS >= fromJSON(env.MIN_FLASH_POS_DIFF_FOR_COMMENT) ||
-          #env.V5X-SUMMARY-MAP-ABS <= fromJSON(env.MIN_FLASH_NEG_DIFF_FOR_COMMENT) ||
-          #env.V6X-SUMMARY-MAP-ABS >= fromJSON(env.MIN_FLASH_POS_DIFF_FOR_COMMENT) ||
-          #env.V6X-SUMMARY-MAP-ABS <= fromJSON(env.MIN_FLASH_NEG_DIFF_FOR_COMMENT)
-        #uses: peter-evans/create-or-update-comment@v4
-        #with:
-          #comment-id: ${{ steps.fc.outputs.comment-id }}
-          #issue-number: ${{ github.event.pull_request.number }}
-          #body: |
-            ### 🔎 FLASH Analysis
-            #<details>
-              #<summary>px4_fmu-v5x [Total VM Diff: ${{ env.V5X-SUMMARY-MAP-ABS }} byte (${{ env.V5X-SUMMARY-MAP-PERC}} %)]</summary>
+      - name: Create or update comment
+        # This can't be moved to the job-level conditions, as GH actions don't allow a job-level if condition to access the env.
+        if: |
+          steps.fc.outputs.comment-id != '' ||
+          env.V5X-SUMMARY-MAP-ABS >= fromJSON(env.MIN_FLASH_POS_DIFF_FOR_COMMENT) ||
+          env.V5X-SUMMARY-MAP-ABS <= fromJSON(env.MIN_FLASH_NEG_DIFF_FOR_COMMENT) ||
+          env.V6X-SUMMARY-MAP-ABS >= fromJSON(env.MIN_FLASH_POS_DIFF_FOR_COMMENT) ||
+          env.V6X-SUMMARY-MAP-ABS <= fromJSON(env.MIN_FLASH_NEG_DIFF_FOR_COMMENT)
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ## 🔎 FLASH Analysis
+            <details>
+              <summary>px4_fmu-v5x [Total VM Diff: ${{ env.V5X-SUMMARY-MAP-ABS }} byte (${{ env.V5X-SUMMARY-MAP-PERC}} %)]</summary>
 
-              #```
-              #${{ needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-output }}
-              #```
-            #</details>
+              ```
+              ${{ needs.analyze_flash.outputs.px4_fmu-v5x-bloaty-output }}
+              ```
+            </details>
 
-            #<details>
-              #<summary>px4_fmu-v6x [Total VM Diff: ${{ env.V6X-SUMMARY-MAP-ABS }} byte (${{ env.V6X-SUMMARY-MAP-PERC }} %)]</summary>
+            <details>
+              <summary>px4_fmu-v6x [Total VM Diff: ${{ env.V6X-SUMMARY-MAP-ABS }} byte (${{ env.V6X-SUMMARY-MAP-PERC }} %)]</summary>
 
-              #```
-              #${{ needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-output }}
-              #```
-            #</details>
+              ```
+              ${{ needs.analyze_flash.outputs.px4_fmu-v6x-bloaty-output }}
+              ```
+            </details>
 
-            #**Updated: _${{ steps.bt.outputs.timestamp }}_**
-          #edit-mode: replace
+            **Updated: _${{ steps.bt.outputs.timestamp }}_**
+          edit-mode: replace

.github/workflows/ros_translation_node.yml

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

.vscode/cmake-variants.yaml

@@ -131,11 +131,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_can-flow_canbootloader
-    ark_can-flow-mr_canbootloader:
-      short: ark_can-flow-mr_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-flow-mr_canbootloader
     ark_can-gps_default:
       short: ark_can-gps_default
       buildType: MinSizeRel
@@ -171,11 +166,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_septentrio-gps_canbootloader
-    ark_teseo-gps_canbootloader:
-      short: ark_teseo-gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_teseo-gps_canbootloader
     ark_cannode_default:
       short: ark_cannode_default
       buildType: MinSizeRel
@@ -311,11 +301,6 @@ CONFIG:
       buildType: MiniSizeRel
       settings:
         CONFIG: matek_gnss-m9n-f4_default
-    micoair_h743_bootloader:
-      short: micoair_h743_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: micoair_h743_bootloader
     micoair_h743_default:
       short: micoair_h743
       buildType: MinSizeRel
@@ -331,16 +316,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: micoair_h743-aio_default
-    micoair_h743-v2_bootloader:
-      short: micoair_h743-v2_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: micoair_h743-v2_bootloader
-    micoair_h743-v2_default:
-      short: micoair_h743-v2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: micoair_h743-v2_default
     modalai_fc-v1_default:
       short: modalai_fc-v1
       buildType: MinSizeRel

.vscode/settings.json

@@ -129,4 +129,5 @@
         "yaml.schemas": {
                 "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
         },
+        "ros.distro": "humble"
 }

CMakeLists.txt

@@ -99,7 +99,7 @@
 #
 #=============================================================================
 
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.9 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)

Jenkinsfile

@@ -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('cp msg/versioned/*.msg px4_msgs/msg/ || true')
+              sh('mkdir -p px4_msgs/msg/versioned && cp msg/versioned/*.msg px4_msgs/msg/versioned/')
               sh('cp srv/*.srv px4_msgs/srv/')
-              sh('cp srv/versioned/*.srv px4_msgs/srv/ || true')
+              sh('mkdir -p px4_msgs/srv/versioned && cp srv/versioned/*.srv px4_msgs/srv/versioned/')
               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')

Kconfig

@@ -73,6 +73,13 @@ 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"

MAINTAINERS.md

@@ -1,42 +0,0 @@
-Maintainers
-===========
-
-See [the documentation on Maintainers](https://docs.px4.io/main/en/contribute/maintainers.html) to learn about the role of the maintainers and the process to become one.
-
-**Active Maintainers**
-
-| 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>
-
-
-**Documentation Maintainers**
-
-| Name | GitHub | Chat | email
-|------|--------|------|----------------------
-| Hamish Willee  | [hamishwillee][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>
-
-**Retired Maintainers**
-
-| Name | GitHub | Chat | email
-|------|--------|------|----------------------
-|  |  |  |

Makefile

@@ -344,7 +344,6 @@ bootloaders_update: \
 	matek_h743-slim_bootloader \
         micoair_h743_bootloader \
         micoair_h743-aio_bootloader \
-	micoair_h743-v2_bootloader \
 	modalai_fc-v2_bootloader \
 	mro_ctrl-zero-classic_bootloader \
 	mro_ctrl-zero-h7_bootloader \
@@ -404,7 +403,7 @@ check_newlines:
 
 # Testing
 # --------------------------------------------------------------------
-.PHONY: tests tests_coverage tests_mission tests_mission_coverage tests_offboard
+.PHONY: tests tests_coverage tests_mission tests_mission_coverage tests_offboard tests_avoidance
 .PHONY: rostest python_coverage
 
 tests:
@@ -457,6 +456,10 @@ tests_offboard: rostest
 	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_offboard_posctl.test
 	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_offboard_rpyrt_ctl.test
 
+tests_avoidance: rostest
+	@"$(SRC_DIR)"/test/rostest_avoidance_run.sh mavros_posix_test_avoidance.test
+	@"$(SRC_DIR)"/test/rostest_avoidance_run.sh mavros_posix_test_safe_landing.test
+
 python_coverage:
 	@mkdir -p "$(SRC_DIR)"/build/python_coverage
 	@cd "$(SRC_DIR)"/build/python_coverage && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=px4_sitl_default -DPYTHON_COVERAGE=ON

README.md

@@ -17,19 +17,17 @@ 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, Spacecraft, etc)
+  * many more experimental types (Blimps, Boats, Submarines, High altitude balloons, 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.
 
@@ -37,7 +35,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/).
 
@@ -46,17 +44,96 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://docs.px4.io/main/en/con
 
 ## Maintenance Team
 
-See the latest list of maintainers on [MAINTAINERS](MAINTAINERS.md) file at the root of the project.
+Note: This is the source of truth for the active maintainers of PX4 ecosystem.
 
-For the latest stats on contributors please see the latest stats for the Dronecode ecosystem in our project dashboard under [LFX Insights](https://insights.lfx.linuxfoundation.org/foundation/dronecode). For information on how to update your profile and affiliations please see the following support link on how to [Complete Your LFX Profile](https://docs.linuxfoundation.org/lfx/my-profile/complete-your-lfx-profile). Dronecode publishes a yearly snapshot of contributions and achievements on its [website under the Reports section](https://dronecode.org).
+| Sector | Maintainer |
+|---|---|
+| Founder | [Lorenz Meier](https://github.com/LorenzMeier) |
+| Architecture | [Daniel Agar](https://github.com/dagar) / [Beat Küng](https://github.com/bkueng)|
+| State Estimation | [Mathieu Bresciani](https://github.com/bresch) / [Paul Riseborough](https://github.com/priseborough) |
+| OS/NuttX | [David Sidrane](https://github.com/davids5) |
+| Drivers | [Daniel Agar](https://github.com/dagar) |
+| Simulation | [Jaeyoung Lim](https://github.com/Jaeyoung-Lim) |
+| ROS2 | [Beniamino Pozzan](https://github.com/beniaminopozzan) |
+| Community QnA Call | [Ramon Roche](https://github.com/mrpollo) |
+| [Documentation](https://docs.px4.io/main/en/) | [Hamish Willee](https://github.com/hamishwillee) |
+
+| Vehicle Type | Maintainer |
+|---|---|
+| Multirotor | [Matthias Grob](https://github.com/MaEtUgR) |
+| Fixed Wing | [Thomas Stastny](https://github.com/tstastny) |
+| Hybrid VTOL | [Silvan Fuhrer](https://github.com/sfuhrer) |
+| Rover | [Christian Friedrich](https://github.com/chfriedrich98) |
+| Boat | x |
+
+
+See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/PX4-Autopilot/graphs/contributors) (Github). However it may be not up to date.
 
 ## Supported Hardware
 
-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 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).
 
 ## 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://dronecode.org/wp-content/uploads/sites/24/2020/08/dronecode_logo_default-1.png" alt="Dronecode Logo" width="110px"/></a>
+<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>
 <div style="padding:10px">&nbsp;</div>

ROMFS/performance-test/init.d/rcS

@@ -1,68 +0,0 @@
-#!/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 ""

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

@@ -16,6 +16,10 @@ param set-default SENS_EN_GPSSIM 1
 param set-default SENS_EN_BAROSIM 1
 param set-default SENS_EN_MAGSIM 1
 
+# disable some checks to allow to fly:
+# - without real battery
+param set-default CBRK_SUPPLY_CHK 894281
+
 # Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
 param set-default CA_ROTOR0_PX 1

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

@@ -16,6 +16,12 @@ param set-default SENS_EN_BAROSIM 1
 param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1
 
+# disable some checks to allow to fly:
+# - with usb
+param set-default CBRK_USB_CHK 197848
+# - without real battery
+param set-default CBRK_SUPPLY_CHK 894281
+
 param set-default SIH_T_MAX 6
 param set-default SIH_MASS 0.3
 param set-default SIH_IXX 0.00402
@@ -27,19 +33,18 @@ param set-default SIH_KDV 0.2
 param set-default SIH_VEHICLE_TYPE 1 	# sih as fixed wing
 param set-default RWTO_TKOFF 1  # enable takeoff from runway (as opposed to launched)
 
+
 param set-default CA_AIRFRAME 1
+
 param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
 
-# SIH for now hardcodes this configuration which we need to match in the airframe files.
 param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TRQ_R 1
-param set-default CA_SV_CS0_TYPE 15  # single channel aileron
+param set-default CA_SV_CS0_TRQ_R -0.5
+param set-default CA_SV_CS0_TYPE 1
 param set-default CA_SV_CS1_TRQ_P 1
-param set-default CA_SV_CS1_TYPE 3  # elevator
+param set-default CA_SV_CS1_TYPE 3
 param set-default CA_SV_CS2_TRQ_Y 1
-param set-default CA_SV_CS2_TYPE 4  # rudder
-
+param set-default CA_SV_CS2_TYPE 4
 param set-default PWM_MAIN_FUNC1 201
 param set-default PWM_MAIN_FUNC2 202
 param set-default PWM_MAIN_FUNC3 203

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

@@ -28,6 +28,10 @@ param set-default MC_PITCH_P 5
 
 param set-default MAV_TYPE 19
 
+# disable some checks to allow to fly:
+# - without real battery
+param set-default CBRK_SUPPLY_CHK 894281
+
 param set-default SIH_T_MAX 2
 param set-default SIH_Q_MAX 0.0165
 param set-default SIH_MASS 0.2

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

@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# @name SIH Standard VTOL
-#
-# @type Simulation
-# @class VTOL
-#
-# @output Motor1 MC motor front right
-# @output Motor2 MC motor back left
-# @output Motor3 MC motor front left
-# @output Motor4 MC motor back right
-# @output Motor5 Forward thrust motor
-# @output Servo1 Ailerons (single channel)
-# @output Servo2 Elevator
-# @output Servo3 Rudder
-#
-# @board px4_fmu-v2 exclude
-#
-
-. ${R}etc/init.d/rc.vtol_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=standard_vtol}
-
-param set-default SENS_EN_GPSSIM 1
-param set-default SENS_EN_BAROSIM 1
-param set-default SENS_EN_MAGSIM 1
-param set-default SENS_EN_ARSPDSIM 1
-
-param set-default EKF2_GPS_DELAY 0
-
-param set-default VT_TYPE 2
-param set-default MPC_MAN_Y_MAX 60
-param set-default MC_PITCH_P 5
-
-param set-default CA_AIRFRAME 2
-param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR0_PX 0.2
-param set-default CA_ROTOR0_PY 0.2
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR1_PX -0.2
-param set-default CA_ROTOR1_PY -0.2
-param set-default CA_ROTOR2_PX 0.2
-param set-default CA_ROTOR2_PY -0.2
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.2
-param set-default CA_ROTOR3_PY 0.2
-param set-default CA_ROTOR3_KM -0.05
-param set-default CA_ROTOR4_PX -0.3
-param set-default CA_ROTOR4_KM 0.05
-param set-default CA_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
-
-# SIH for now hardcodes this configuration which we need to match in the airframe files.
-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TRQ_R 1
-param set-default CA_SV_CS0_TYPE 15  # single channel aileron
-param set-default CA_SV_CS1_TRQ_P 1
-param set-default CA_SV_CS1_TYPE 3  # elevator
-param set-default CA_SV_CS2_TRQ_Y 1
-param set-default CA_SV_CS2_TYPE 4  # rudder
-
-param set-default FW_AIRSPD_MIN 7
-param set-default FW_AIRSPD_TRIM 10
-param set-default FW_AIRSPD_MAX 12
-
-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 201
-param set-default PWM_MAIN_FUNC6 202
-param set-default PWM_MAIN_FUNC7 203
-param set-default PWM_MAIN_FUNC8 105
-
-param set-default MAV_TYPE 22
-
-# set SYS_HITL to 2 to start the SIH and avoid sensors startup
-# param set-default SYS_HITL 2
-
-param set-default SENS_DPRES_OFF 0.001
-
-param set SIH_T_MAX 2.0
-param set SIH_Q_MAX 0.0165
-param set SIH_MASS 0.2
-# IXX and IZZ are inverted from the thesis as the body frame is pitched by 90 deg
-param set SIH_IXX 0.00354
-param set SIH_IYY 0.000625
-param set SIH_IZZ 0.00300
-param set SIH_IXZ 0
-param set SIH_KDV 0.2
-param set SIH_L_ROLL 0.2
-
-# sih as standard vtol
-param set SIH_VEHICLE_TYPE 3

ROMFS/px4fmu_common/init.d-posix/airframes/1014_gazebo-classic_iris_obs_avoid

@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Obstacle Avoidance)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_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 COM_OBS_AVOID 1

ROMFS/px4fmu_common/init.d-posix/airframes/1014_gazebo-classic_iris_obs_avoid.post

@@ -0,0 +1,2 @@
+# shellcheck disable=SC2154
+mavlink start -x -u 14558 -r 4000000 -m onboard -o 14541 -p # add mavlink stream for SDK

ROMFS/px4fmu_common/init.d-posix/airframes/4001_gz_x500

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

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

@@ -12,8 +12,13 @@ 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

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

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

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

@@ -14,7 +14,12 @@ 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_OBS_AVOID 0
 param set-default COM_DISARM_LAND 0.5
 
 # EKF2 parameters

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

@@ -11,6 +11,8 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=advanced_plane}
 
 param set-default SIM_GZ_EN 1
 
+param set-default SENS_EN_GPSSIM 1
+param set-default SENS_EN_MAGSIM 1
 param set-default SENS_EN_ARSPDSIM 1
 
 param set-default FW_LND_ANG 8

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

@@ -11,39 +11,35 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover}
 
 param set-default SIM_GZ_EN 1 # Gazebo bridge
 
-param set-default NAV_ACC_RAD 0.5
-
-# Differential Parameters
+# Rover parameters
 param set-default RD_WHEEL_TRACK 0.3
+param set-default RD_MAX_ACCEL 5
+param set-default RD_MAX_DECEL 10
+param set-default RD_MAX_JERK 30
 param set-default RD_MAX_THR_YAW_R 1.5
+param set-default RD_YAW_RATE_P 0.25
+param set-default RD_YAW_RATE_I 0.01
+param set-default RD_YAW_P 5
+param set-default RD_YAW_I 0.1
+param set-default RD_MAX_SPEED 2
+param set-default RD_MAX_THR_SPD 2.15
+param set-default RD_SPEED_P 0.1
+param set-default RD_SPEED_I 0.01
+param set-default RD_MAX_YAW_RATE 180
 param set-default RD_TRANS_DRV_TRN 0.349066
 param set-default RD_TRANS_TRN_DRV 0.174533
+param set-default RD_MAX_YAW_ACCEL 1000
 
-# Rover Control Parameters
-param set-default RO_ACCEL_LIM 5
-param set-default RO_DECEL_LIM 10
-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.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 120
-param set-default RO_YAW_DECEL_LIM 1000
-
-# Rover Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Rover Position Control Parameters
-param set-default RO_SPEED_LIM 2
-param set-default RO_SPEED_I 0.5
-param set-default RO_SPEED_P 1
-
-# Pure Pursuit parameters
+# 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
+
+# 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

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

@@ -11,6 +11,11 @@ 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
 # We can arm and drive in manual mode when it slides and GPS check fails:
 param set-default COM_ARM_WO_GPS 1
 
@@ -55,25 +60,19 @@ param set-default SIM_GZ_WH_REV 0 # no need to reverse any wheels
 # controls in practical scenarios.
 
 # Cutter deck blades clutch, PCA9685 servo channel 3,  "RC FLAPS" (406) - leftmost switch, or "Servo 3" (203):
-param set-default SIM_GZ_SV_FUNC1 201
-param set-default SIM_GZ_SV_MIN1 0
-param set-default SIM_GZ_SV_MAX1 1000
-param set-default SIM_GZ_SV_DIS1 500
-param set-default SIM_GZ_SV_FAIL1 500
-param set-default SIM_GZ_SV_MAXA1 90
-param set-default SIM_GZ_SV_MINA1 -90
+param set-default SIM_GZ_SV_FUNC3 203
+param set-default SIM_GZ_SV_MIN3 0
+param set-default SIM_GZ_SV_MAX3 1000
+param set-default SIM_GZ_SV_DIS3 500
+param set-default SIM_GZ_SV_FAIL3 500
 
 # Gas engine throttle, PCA9685 servo channel 4, "RC AUX1" (407) - left knob, or "Servo 4" (204):
 #    - on minimum when disarmed or failed:
-param set-default SIM_GZ_SV_FUNC2 202
-param set-default SIM_GZ_SV_MIN2 0
-param set-default SIM_GZ_SV_MAX2 1000
-param set-default SIM_GZ_SV_DIS2 500
-param set-default SIM_GZ_SV_FAIL2 500
-param set-default SIM_GZ_SV_MAXA2 90
-param set-default SIM_GZ_SV_MINA2 -90
-
-param set-default CA_SV_CS_COUNT 2
+param set-default SIM_GZ_SV_FUNC4 204
+param set-default SIM_GZ_SV_MIN4 0
+param set-default SIM_GZ_SV_MAX4 1000
+param set-default SIM_GZ_SV_DIS4 500
+param set-default SIM_GZ_SV_FAIL4 500
 
 # Controlling PCA9685 servos 5,6,7,8 directly via "Servo 5..8" setting, by publishing actuator_servos.control[]:
 

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

@@ -11,39 +11,35 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=rover_ackermann}
 
 param set-default SIM_GZ_EN 1 # Gazebo bridge
 
+# Rover parameters
 param set-default NAV_ACC_RAD 0.5
-
-# 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_LAT_ACCEL_I 0.01
+param set-default RA_LAT_ACCEL_P 0.1
+param set-default RA_MAX_ACCEL 3
+param set-default RA_MAX_DECEL 6
+param set-default RA_MAX_JERK 15
+param set-default RA_MAX_LAT_ACCEL 4
+param set-default RA_MAX_SPEED 3
 param set-default RA_MAX_STR_ANG 0.5236
-param set-default RA_STR_RATE_LIM 360
-
-# Rover Control Parameters
-param set-default RO_ACCEL_LIM 3
-param set-default RO_DECEL_LIM 6
-param set-default RO_JERK_LIM 15
-param set-default RO_MAX_THR_SPEED 3.1
-
-# Rover Rate Control Parameters
-param set-default RO_YAW_RATE_I 0.1
-param set-default RO_YAW_RATE_P 1
-param set-default RO_YAW_RATE_LIM 180
-
-# Rover Attitude Control Parameters
-param set-default RO_YAW_P 3
-
-# Rover Position Control Parameters
-param set-default RO_SPEED_LIM 3
-param set-default RO_SPEED_I 0.1
-param set-default RO_SPEED_P 1
+param set-default RA_MAX_STR_RATE 360
+param set-default RA_MAX_THR_SPEED 3.1
+param set-default RA_SPEED_I 0.01
+param set-default RA_SPEED_P 0.1
+param set-default RA_WHEEL_BASE 0.321
 
 # 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
@@ -51,8 +47,5 @@ param set-default SIM_GZ_WH_MAX1 200
 param set-default SIM_GZ_WH_DIS1 100
 
 # Steering
-param set-default SIM_GZ_SV_MAXA1 30
-param set-default SIM_GZ_SV_MINA1 -30
-param set-default CA_SV_CS_COUNT 1
 param set-default SIM_GZ_SV_FUNC1 201
 param set-default SIM_GZ_SV_REV 1

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

@@ -11,41 +11,34 @@ PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover_mecanum}
 
 param set-default SIM_GZ_EN 1 # Gazebo bridge
 
-param set-default NAV_ACC_RAD 0.5
-
-# Mecanum Parameters
+# 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_MISS_SPD_GAIN 1
+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
 
-# 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
-
-# Rover Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Rover Position Control Parameters
-param set-default RO_SPEED_LIM 2
-param set-default RO_SPEED_I 0.5
-param set-default RO_SPEED_P 1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 0.5
+# Pure pursuit parameters
 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

ROMFS/px4fmu_common/init.d-posix/airframes/4018_gz_quadtailsitter

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

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

@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo x500 gimbal
-#
-# @type Quadrotor
-#
-
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_gimbal}
-
-. ${R}etc/init.d-posix/airframes/4001_gz_x500
-
-# Gimbal settings
-param set-default MNT_MODE_IN 4
-param set-default MNT_MODE_OUT 2
-param set-default MNT_RC_IN_MODE 1
-
-param set-default MNT_MAN_ROLL 1
-param set-default MNT_MAN_PITCH 2
-param set-default MNT_MAN_YAW 3
-
-param set-default MNT_RANGE_ROLL 180
-param set-default MNT_RANGE_PITCH 180
-param set-default MNT_RANGE_YAW 720

ROMFS/px4fmu_common/init.d-posix/airframes/4020_gz_tiltrotor

@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# @name VTOL Tiltrotor
-#
-# @type VTOL Tiltrotor
-#
-
-. ${R}etc/init.d/rc.vtol_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=tiltrotor}
-
-param set-default SIM_GZ_EN 1 # Gazebo bridge
-
-param set-default MAV_TYPE 21
-
-param set-default CA_AIRFRAME 3
-
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 0.1515
-param set-default CA_ROTOR0_PY 0.245
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR1_PX -0.1515
-param set-default CA_ROTOR1_PY -0.1875
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR2_PX 0.1515
-param set-default CA_ROTOR2_PY -0.245
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.1515
-param set-default CA_ROTOR3_PY 0.1875
-param set-default CA_ROTOR3_KM -0.05
-
-param set-default CA_ROTOR0_TILT 1
-param set-default CA_ROTOR2_TILT 2
-param set-default CA_SV_TL0_MAXA 90
-param set-default CA_SV_TL0_MINA 0
-param set-default CA_SV_TL0_TD 0
-param set-default CA_SV_TL0_CT 1
-param set-default CA_SV_TL1_MAXA 90
-param set-default CA_SV_TL1_MINA 0
-param set-default CA_SV_TL1_TD 0
-param set-default CA_SV_TL1_CT 1
-
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS2_TRQ_P 1
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_TL_COUNT 2
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_FUNC2 102
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_FUNC4 104
-
-param set-default SIM_GZ_EC_MIN1 10
-param set-default SIM_GZ_EC_MIN2 10
-param set-default SIM_GZ_EC_MIN3 10
-param set-default SIM_GZ_EC_MIN4 10
-
-param set-default SIM_GZ_EC_MAX1 1500
-param set-default SIM_GZ_EC_MAX2 1500
-param set-default SIM_GZ_EC_MAX3 1500
-param set-default SIM_GZ_EC_MAX4 1500
-
-param set-default SIM_GZ_SV_FUNC1 201
-param set-default SIM_GZ_SV_FUNC2 202
-param set-default SIM_GZ_SV_FUNC3 203
-param set-default SIM_GZ_SV_FUNC4 204
-param set-default SIM_GZ_SV_FUNC5 205
-
-param set-default SIM_GZ_SV_MAXA4 90
-param set-default SIM_GZ_SV_MINA4 0
-param set-default SIM_GZ_SV_MAXA5 90
-param set-default SIM_GZ_SV_MINA5 0
-
-param set-default NPFG_PERIOD 12
-param set-default FW_PR_FF 0.2
-param set-default FW_PR_P 0.9
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MIN -15
-param set-default FW_RR_FF 0.1
-param set-default FW_RR_P 0.3
-param set-default FW_THR_TRIM 0.38
-param set-default FW_THR_MAX 0.6
-param set-default FW_THR_MIN 0.05
-param set-default FW_T_CLMB_MAX 8
-param set-default FW_T_SINK_MAX 2.7
-param set-default FW_T_SINK_MIN 2.2
-
-param set-default MC_AIRMODE 1
-param set-default MC_YAWRATE_P 0.4
-param set-default MC_YAWRATE_I 0.1
-
-param set-default MPC_XY_VEL_P_ACC 3
-param set-default MPC_XY_VEL_I_ACC 4
-param set-default MPC_XY_VEL_D_ACC 0.1
-
-param set-default MIS_TAKEOFF_ALT 10
-
-param set-default VT_FWD_THRUST_EN 4
-param set-default VT_FWD_THRUST_SC 0.6
-param set-default VT_TILT_TRANS 0.6
-param set-default VT_TYPE 1

ROMFS/px4fmu_common/init.d-posix/airframes/4021_gz_x500_flow

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

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

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

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

ROMFS/px4fmu_common/init.d-posix/airframes/8011_gz_omnicopter

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

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

@@ -39,6 +39,8 @@ px4_add_romfs_files(
 	1012_gazebo-classic_iris_rplidar
 	1013_gazebo-classic_iris_vision
 	1013_gazebo-classic_iris_vision.post
+	1014_gazebo-classic_iris_obs_avoid
+	1014_gazebo-classic_iris_obs_avoid.post
 	1015_gazebo-classic_iris_depth_camera
 	1016_gazebo-classic_iris_downward_depth_camera
 	1017_gazebo-classic_iris_opt_flow_mockup
@@ -89,9 +91,6 @@ px4_add_romfs_files(
 	4016_gz_x500_lidar_down
 	4017_gz_x500_lidar_front
 	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,13 +107,9 @@ px4_add_romfs_files(
 	10040_sihsim_quadx
 	10041_sihsim_airplane
 	10042_sihsim_xvert
-	10043_sihsim_standard_vtol
 
 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2
 
-	71001_gazebo-classic_spacecraft_dart
-	71002_gz_spacecraft_2d
-
 	# [22000, 22999] Reserve for custom models
 )

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

@@ -4,9 +4,6 @@
 # Simulator IMU data provided at 250 Hz
 param set-default IMU_INTEG_RATE 250
 
-# For simulation, allow registering modes while armed for developer convenience
-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"
@@ -73,13 +70,13 @@ elif [ "$PX4_SIMULATOR" = "gz" ] || [ "$(param show -q SIM_GZ_EN)" = "1" ]; then
 			exit 1
 		fi
 
-		# Look for an already running world
+		# 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
 
-			# Setup gz environment variables
+			# source generated gz_env.sh for GZ_SIM_RESOURCE_PATH
 			if [ -f ./gz_env.sh ]; then
 				. ./gz_env.sh
 
@@ -87,125 +84,62 @@ elif [ "$PX4_SIMULATOR" = "gz" ] || [ "$(param show -q SIM_GZ_EN)" = "1" ]; then
 				. ../gz_env.sh
 			fi
 
-			echo "INFO  [init] Starting gazebo with world: ${PX4_GZ_WORLDS}/${PX4_GZ_WORLD}.sdf"
+			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" &
+			${gz_command} ${gz_sub_command} --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 &
+				# HEADLESS not set, starting gui
+				${gz_command} ${gz_sub_command} -g &
 			fi
+
 		else
-			# Gazebo is already running
+			# 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 - either spawn a model or connect to existing one
+	# start gz_bridge
 	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}"
+		# model specified, gz_bridge will spawn model
 
-		POSE_ARG=""
 		if [ -n "${PX4_GZ_MODEL_POSE}" ]; then
-			pos_x=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $1}')
-			pos_y=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $2}')
-			pos_z=$(echo "${PX4_GZ_MODEL_POSE}" | awk -F',' '{print $3}')
-			pos_x=${pos_x:-0}
-			pos_y=${pos_y:-0}
-			pos_z=${pos_z:-0}
+			# model pose provided: [x, y, z, roll, pitch, yaw]
 
-			POSE_ARG=", pose: { position: { x: ${pos_x}, y: ${pos_y}, z: ${pos_z} } }"
-			echo "INFO  [init] Spawning model at position: ${pos_x} ${pos_y} ${pos_z}"
+			# 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
 
-		echo "INFO  [init] Spawning model"
-		# Spawn model
-		${gz_command} service -s "/world/${PX4_GZ_WORLD}/create" --reqtype gz.msgs.EntityFactory \
-				--reptype gz.msgs.Boolean --timeout 5000 \
-				--req "sdf_filename: \"${PX4_GZ_MODELS}/${MODEL_NAME}\", name: \"${MODEL_NAME_INSTANCE}\", allow_renaming: false${POSE_ARG}" > /dev/null 2>&1
-
-		# Start gz_bridge
-		if ! gz_bridge start -w "${PX4_GZ_WORLD}" -n "${MODEL_NAME_INSTANCE}"; then
+		# 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
 
-		# Set physics parameters for faster-than-realtime simulation if needed
-		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
-
-		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
-
-			# Wait for model to spawn
-			sleep 1
-
-			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
+		# 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 -w "${PX4_GZ_WORLD}" -n "${PX4_GZ_MODEL_NAME}"; then
+		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 either PX4_GZ_MODEL_NAME or PX4_SIM_MODEL"
+		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

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -153,6 +153,8 @@ fi
 
 param set-default BAT1_N_CELLS 4
 
+param set-default CBRK_SUPPLY_CHK 894281
+
 # disable check, no CPU load reported on posix yet
 param set-default COM_CPU_MAX -1
 param set-default COM_RAM_MAX -1
@@ -245,8 +247,6 @@ then
 	battery_simulator start
 fi
 
-system_power_simulator start
-
 tone_alarm start
 rc_update start
 manual_control start
@@ -337,11 +337,6 @@ then
 	payload_deliverer start
 fi
 
-if param compare -s ICE_EN 1
-then
-	internal_combustion_engine_control start
-fi
-
 #user defined mavlink streams for instances can be in PATH
 . px4-rc.mavlink
 

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -92,13 +92,6 @@ if(CONFIG_MODULES_ROVER_ACKERMANN)
 	)
 endif()
 
-if(CONFIG_MODULES_SPACECRAFT)
-	px4_add_romfs_files(
-		rc.sc_apps
-		rc.sc_defaults
-	)
-endif()
-
 if(CONFIG_MODULES_ROVER_MECANUM)
 	px4_add_romfs_files(
 		rc.rover_mecanum_apps

ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil

@@ -5,15 +5,6 @@
 # @type Standard VTOL
 # @class VTOL
 #
-# @output Motor1 MC motor front right
-# @output Motor2 MC motor back left
-# @output Motor3 MC motor front left
-# @output Motor4 MC motor back right
-# @output Motor5 Forward thrust motor
-# @output Servo1 Aileron
-# @output Servo2 Elevator
-# @output Servo3 Rudder
-#
 # @maintainer Roman Bapst <roman@auterion.com>
 #
 # @board px4_fmu-v2 exclude

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

@@ -17,16 +17,15 @@ param set UAVCAN_ENABLE 0
 param set-default CA_AIRFRAME 1
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_ROTOR0_PX 0.3
-
-# SIH for now hardcodes this configuration which we need to match in the airframe files.
 param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TRQ_R 1
-param set-default CA_SV_CS0_TYPE 15  # single channel aileron
+param set-default CA_SV_CS0_TRQ_R -0.5
+param set-default CA_SV_CS0_TYPE 1
 param set-default CA_SV_CS1_TRQ_P 1
-param set-default CA_SV_CS1_TYPE 3  # elevator
+param set-default CA_SV_CS1_TYPE 3
 param set-default CA_SV_CS2_TRQ_Y 1
-param set-default CA_SV_CS2_TYPE 4  # rudder
+param set-default CA_SV_CS2_TYPE 4
 
+param set HIL_ACT_REV 1
 param set HIL_ACT_FUNC1 201
 param set HIL_ACT_FUNC2 202
 param set HIL_ACT_FUNC3 203

ROMFS/px4fmu_common/init.d/airframes/1103_standard_vtol_sih.hil

@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# @name SIH Standard VTOL QuadPlane
-#
-# @type Simulation
-# @class VTOL
-#
-# @output Motor1 MC motor front right
-# @output Motor2 MC motor back left
-# @output Motor3 MC motor front left
-# @output Motor4 MC motor back right
-# @output Motor5 Forward thrust motor
-# @output Servo1 Ailerons (single channel)
-# @output Servo2 Elevator
-# @output Servo3 Rudder
-#
-# @board px4_fmu-v2 exclude
-#
-
-. ${R}etc/init.d/rc.vtol_defaults
-
-param set UAVCAN_ENABLE 0
-
-param set-default VT_TYPE 2
-param set-default MPC_MAN_Y_MAX 60
-param set-default MC_PITCH_P 5
-
-param set-default CA_AIRFRAME 2
-param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR0_KM 0.05
-param set-default CA_ROTOR0_PX 0.2
-param set-default CA_ROTOR0_PY 0.2
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR1_PX -0.2
-param set-default CA_ROTOR1_PY -0.2
-param set-default CA_ROTOR2_PX 0.2
-param set-default CA_ROTOR2_PY -0.2
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -0.2
-param set-default CA_ROTOR3_PY 0.2
-param set-default CA_ROTOR3_KM -0.05
-param set-default CA_ROTOR4_PX -0.3
-param set-default CA_ROTOR4_KM 0.05
-param set-default CA_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
-
-# SIH for now hardcodes this configuration which we need to match in the airframe files.
-param set-default CA_SV_CS_COUNT 3
-param set-default CA_SV_CS0_TRQ_R 1
-param set-default CA_SV_CS0_TYPE 15  # single channel aileron
-param set-default CA_SV_CS1_TRQ_P 1
-param set-default CA_SV_CS1_TYPE 3  # elevator
-param set-default CA_SV_CS2_TRQ_Y 1
-param set-default CA_SV_CS2_TYPE 4  # rudder
-
-param set-default FW_AIRSPD_MIN 7
-param set-default FW_AIRSPD_TRIM 10
-param set-default FW_AIRSPD_MAX 12
-
-param set-default HIL_ACT_FUNC1 101
-param set-default HIL_ACT_FUNC2 102
-param set-default HIL_ACT_FUNC3 103
-param set-default HIL_ACT_FUNC4 104
-param set-default HIL_ACT_FUNC5 201
-param set-default HIL_ACT_FUNC6 202
-param set-default HIL_ACT_FUNC7 203
-param set-default HIL_ACT_FUNC8 105
-
-param set-default MAV_TYPE 22
-
-# set SYS_HITL to 2 to start the SIH and avoid sensors startup
-param set-default SYS_HITL 2
-
-# disable some checks to allow to fly:
-# - without real battery
-param set-default CBRK_SUPPLY_CHK 894281
-
-param set-default SENS_DPRES_OFF 0.001
-
-param set SIH_T_MAX 2.0
-param set SIH_Q_MAX 0.0165
-param set SIH_MASS 0.2
-# IXX and IZZ are inverted from the thesis as the body frame is pitched by 90 deg
-param set SIH_IXX 0.00354
-param set SIH_IYY 0.000625
-param set SIH_IZZ 0.00300
-param set SIH_IXZ 0
-param set SIH_KDV 0.2
-param set SIH_L_ROLL 0.2
-
-# sih as standard vtol
-param set SIH_VEHICLE_TYPE 3

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

@@ -12,6 +12,7 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 # Commander Parameters
+param set-default COM_OBS_AVOID 1
 param set-default COM_DISARM_LAND 0.5
 
 # EKF2 parameters

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

@@ -12,6 +12,7 @@
 . ${R}etc/init.d/rc.mc_defaults
 
 # Commander Parameters
+param set-default COM_OBS_AVOID 1
 param set-default COM_DISARM_LAND 0.5
 
 # EKF2 parameters

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

@@ -21,37 +21,26 @@ param set-default RBCLW_FUNC1 101
 param set-default RBCLW_FUNC2 102
 param set-default RBCLW_REV 1 # reverse right wheels
 
-
-param set-default NAV_ACC_RAD 0.5
-
-# Differential Parameters
+# Rover parameters
 param set-default RD_WHEEL_TRACK 0.3
+param set-default RD_MAX_ACCEL 3
+param set-default RD_MAX_DECEL 4
+param set-default RD_MAX_JERK 5
+param set-default RD_MAX_SPEED 1.6
+param set-default RD_MAX_THR_SPD 1.9
 param set-default RD_MAX_THR_YAW_R 0.7
+param set-default RD_MAX_YAW_ACCEL 600
+param set-default RD_MAX_YAW_RATE 250
+param set-default RD_SPEED_P 0.1
+param set-default RD_SPEED_I 0.01
 param set-default RD_TRANS_DRV_TRN 0.785398
 param set-default RD_TRANS_TRN_DRV 0.139626
+param set-default RD_YAW_P 5
+param set-default RD_YAW_I 0.1
+param set-default RD_YAW_RATE_P 0.1
+param set-default RD_YAW_RATE_I 0.01
 
-# Rover Control Parameters
-param set-default RO_ACCEL_LIM 3
-param set-default RO_DECEL_LIM 4
-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_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
-
-# Rover Attitude Control Parameters
-param set-default RO_YAW_P 5
-
-# Rover Position Control Parameters
-param set-default RO_SPEED_LIM 1.6
-param set-default RO_SPEED_I 0.01
-param set-default RO_SPEED_P 0.1
-
-# Pure Pursuit parameters
-param set-default PP_LOOKAHD_GAIN 1
+# Pure pursuit parameters
 param set-default PP_LOOKAHD_MAX 10
 param set-default PP_LOOKAHD_MIN 1
+param set-default PP_LOOKAHD_GAIN 1

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

@@ -14,33 +14,24 @@
 . ${R}etc/init.d/rc.rover_ackermann_defaults
 
 param set-default BAT1_N_CELLS 3
-param set-default NAV_ACC_RAD 0.5
 
-# Ackermann Parameters
-param set-default RA_WHEEL_BASE 0.321
+# Rover parameters
+param set-default NAV_ACC_RAD 0.5
 param set-default RA_ACC_RAD_GAIN 2
 param set-default RA_ACC_RAD_MAX 3
+param set-default RA_LAT_ACCEL_I 0.01
+param set-default RA_LAT_ACCEL_P 0.1
+param set-default RA_MAX_ACCEL 1.5
+param set-default RA_MAX_DECEL 10
+param set-default RA_MAX_JERK 20
+param set-default RA_MAX_LAT_ACCEL 3
+param set-default RA_MAX_SPEED 2.5
 param set-default RA_MAX_STR_ANG 0.5236
-param set-default RA_STR_RATE_LIM 270
-
-# Rover Control Parameters
-param set-default RO_ACCEL_LIM 1.5
-param set-default RO_DECEL_LIM 10
-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
-
-# Rover Attitude Control Parameters
-param set-default RO_YAW_P 0
-
-# Rover Position Control Parameters
-param set-default RO_SPEED_LIM 2.5
-param set-default RO_SPEED_I 0.01
-param set-default RO_SPEED_P 0.1
+param set-default RA_MAX_STR_RATE 270
+param set-default RA_MAX_THR_SPEED 2.8
+param set-default RA_SPEED_I 0.01
+param set-default RA_SPEED_P 0.1
+param set-default RA_WHEEL_BASE 0.321
 
 # Pure pursuit parameters
 param set-default PP_LOOKAHD_GAIN 1

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

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

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

@@ -48,7 +48,6 @@ if(CONFIG_MODULES_SIMULATION_PWM_OUT_SIM)
 		1100_rc_quad_x_sih.hil
 		1101_rc_plane_sih.hil
 		1102_tailsitter_duo_sih.hil
-		1103_standard_vtol_sih.hil
 	)
 endif()
 

ROMFS/px4fmu_common/init.d/rc.fw_defaults

@@ -24,6 +24,7 @@ param set-default COM_DISARM_PRFLT -1
 
 param set-default EKF2_ARSP_THR 8
 param set-default EKF2_FUSE_BETA 1
+param set-default EKF2_GPS_CHECK 21
 param set-default EKF2_MAG_ACCLIM 0
 param set-default EKF2_REQ_EPH 10
 param set-default EKF2_REQ_EPV 10

ROMFS/px4fmu_common/init.d/rc.heli_defaults

@@ -12,7 +12,6 @@ param set-default MAV_TYPE 4
 
 param set-default COM_PREARM_MODE 2
 param set-default COM_SPOOLUP_TIME 10
-param set-default COM_DISARM_PRFLT 60
 
 # No need for minimum collective pitch (or airmode) to keep torque authority
 param set-default MPC_MANTHR_MIN 0

ROMFS/px4fmu_common/init.d/rc.mc_defaults

@@ -21,6 +21,3 @@ param set-default RTL_RETURN_ALT 30
 param set-default RTL_DESCEND_ALT 10
 
 param set-default GPS_UBX_DYNMODEL 6
-
-# lower RNG_FOG since MC are expected to fly closer over obstacles
-param set-default EKF2_RNG_FOG 1.0

ROMFS/px4fmu_common/init.d/rc.sc_apps

@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Standard apps for sr. Attitude/Position estimator, Attitude/Position control.
-#
-# NOTE: Script variables are declared/initialized/unset in the rcS script.
-#
-
-# Start Spacecraft App
-spacecraft start
-
-# Estimator Group Selection
-# ekf2 start &
-
-# Start MicroDDS Client
-# uxrce_dds_client start -t udp -h 192.168.0.1 -n spacebot2
-# uxrce_dds_client start -t udp -p 8888
-
-#
-# Start Control Allocator
-#
-# sc_control_allocator start
-
-#
-# Start Spacecraft Rate Controller.
-#
-# sc_rate_control start
-
-#
-# Start Spacecraft Attitude Controller.
-#
-# sc_att_control start
-
-#
-# Start Spacecraft Position Controller.
-#
-# sc_pos_control start

ROMFS/px4fmu_common/init.d/rc.sc_defaults

@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# NOTE: Script variables are declared/initialized/unset in the rcS script.
-#
-
-set VEHICLE_TYPE sc
-
-# MAV_TYPE_QUADROTOR 2
-#param set-default MAV_TYPE 12
-
-# Set micro-dds-client to use ethernet and IP-address 192.168.0.1
-param set-default UXRCE_DDS_AG_IP -1062731775
-
-# Disable preflight disarm to not interfere with external launching
-param set-default COM_DISARM_PRFLT -1
-param set-default CBRK_SUPPLY_CHK 894281
-param set-default COM_ARM_HFLT_CHK 0
-
-#Missing params
-param set-default CP_DIST -1.0
-
-# Default to MoCap fusion
-param set-default ATT_EXT_HDG_M 2
-param set-default EKF2_EV_CTRL 15
-param set-default EKF2_EV_DELAY 5
-param set-default EKF2_GPS_CTRL 0
-param set-default EKF2_HGT_REF 3

ROMFS/px4fmu_common/init.d/rcS

@@ -302,75 +302,6 @@ else
 		. $FCONFIG
 	fi
 
-
-	#
-	# Sensors System (start before Commander so Preflight checks are properly run).
-	#
-	if param greater SYS_HITL 0
-	then
-		sensors start -h
-
-		# disable GPS
-		param set GPS_1_CONFIG 0
-
-		# start the simulator in hardware if needed
-		if param compare SYS_HITL 2
-		then
-			simulator_sih start
-			sensor_baro_sim start
-			sensor_mag_sim start
-			sensor_gps_sim start
-			sensor_agp_sim start
-		fi
-
-	else
-		#
-		# board sensors: rc.sensors
-		#
-		set BOARD_RC_SENSORS ${R}etc/init.d/rc.board_sensors
-		if [ -f $BOARD_RC_SENSORS ]
-		then
-			echo "Board sensors: ${BOARD_RC_SENSORS}"
-			. $BOARD_RC_SENSORS
-		fi
-		unset BOARD_RC_SENSORS
-
-		. ${R}etc/init.d/rc.sensors
-
-		if param compare -s BAT1_SOURCE 2
-		then
-			esc_battery start
-		fi
-
-		if ! param compare BAT1_SOURCE 1
-		then
-			battery_status start
-		fi
-
-		sensors start
-	fi
-
-	#
-	# state estimator selection
-	#
-	if param compare -s EKF2_EN 1
-	then
-		ekf2 start &
-	fi
-
-	if param compare -s LPE_EN 1
-	then
-		local_position_estimator start
-	fi
-
-	if param compare -s ATT_EN 1
-	then
-		attitude_estimator_q start
-	fi
-
-	#
-	# px4io
-	#
 	if px4io supported
 	then
 	# Check if PX4IO present and update firmware if needed.
@@ -423,11 +354,6 @@ else
 	then
 		pps_capture start
 	fi
-	# RPM capture driver
-	if param greater -s RPM_CAP_ENABLE 0
-	then
-		rpm_capture start
-	fi
 	# Camera capture driver
 	if param greater -s CAM_CAP_FBACK 0
 	then
@@ -438,24 +364,79 @@ else
 	fi
 
 	#
-	# Commander
+	# Sensors System (start before Commander so Preflight checks are properly run).
+	# Commander needs to be this early for in-air-restarts.
 	#
 	if param greater SYS_HITL 0
 	then
-		commander start -h
-
 		if ! pwm_out_sim start -m hil
 		then
 			tune_control play error
 		fi
 
+		sensors start -h
+		commander start -h
+		# disable GPS
+		param set GPS_1_CONFIG 0
+
+		# start the simulator in hardware if needed
+		if param compare SYS_HITL 2
+		then
+			simulator_sih start
+			sensor_baro_sim start
+			sensor_mag_sim start
+			sensor_gps_sim start
+			sensor_agp_sim start
+		fi
+
 	else
+		#
+		# board sensors: rc.sensors
+		#
+		set BOARD_RC_SENSORS ${R}etc/init.d/rc.board_sensors
+		if [ -f $BOARD_RC_SENSORS ]
+		then
+			echo "Board sensors: ${BOARD_RC_SENSORS}"
+			. $BOARD_RC_SENSORS
+		fi
+		unset BOARD_RC_SENSORS
+
+		. ${R}etc/init.d/rc.sensors
+
+		if param compare -s BAT1_SOURCE 2
+		then
+			esc_battery start
+		fi
+
+		if ! param compare BAT1_SOURCE 1
+		then
+			battery_status start
+		fi
+
+		sensors start
 		commander start
 
 		dshot start
 		pwm_out start
 	fi
 
+	#
+	# state estimator selection
+	if param compare -s EKF2_EN 1
+	then
+		ekf2 start &
+	fi
+
+	if param compare -s LPE_EN 1
+	then
+		local_position_estimator start
+	fi
+
+	if param compare -s ATT_EN 1
+	then
+		attitude_estimator_q start
+	fi
+
 	#
 	# Configure vehicle type specific parameters.
 	# Note: rc.vehicle_setup is the entry point for all vehicle type specific setup.
@@ -488,14 +469,11 @@ else
 	rc_input start $RC_INPUT_ARGS
 
 	# Manages USB interface
-	if param greater -s SYS_USB_AUTO -1
+	if ! cdcacm_autostart start
 	then
-		if ! cdcacm_autostart start
-		then
-			sercon
-			echo "Starting MAVLink on /dev/ttyACM0"
-			mavlink start -d /dev/ttyACM0
-		fi
+		sercon
+		echo "Starting MAVLink on /dev/ttyACM0"
+		mavlink start -d /dev/ttyACM0
 	fi
 
 	#
@@ -558,11 +536,6 @@ else
 		payload_deliverer start
 	fi
 
-	if param compare -s ICE_EN 1
-	then
-		internal_combustion_engine_control start
-	fi
-
 	#
 	# Optional board supplied extras: rc.board_extras
 	#

Tools/HIL/run_tests.py

@@ -136,6 +136,9 @@ class TestHardwareMethods(unittest.TestCase):
     def test_atomic_bitset(self):
         self.assertTrue(do_test(self.TEST_DEVICE, self.TEST_BAUDRATE, "atomic_bitset"))
 
+    def test_bezier(self):
+        self.assertTrue(do_test(self.TEST_DEVICE, self.TEST_BAUDRATE, "bezier"))
+
     def test_bitset(self):
         self.assertTrue(do_test(self.TEST_DEVICE, self.TEST_BAUDRATE, "bitset"))
 

Tools/astyle/files_to_check_code_style.sh

@@ -8,12 +8,10 @@ if [ $# -gt 0 ]; then
 fi
 
 exec find boards msg src platforms test \
-    -path msg/translation_node -prune -o \
     -path platforms/nuttx/NuttX -prune -o \
     -path platforms/qurt/dspal -prune -o \
     -path src/drivers/ins/vectornav/libvnc -prune -o \
     -path src/drivers/uavcan/libdronecan -prune -o \
-    -path src/drivers/uavcan/libuavcan -prune -o \
     -path src/drivers/uavcan/uavcan_drivers/kinetis/driver/include/uavcan_kinetis -prune -o \
     -path src/drivers/cyphal/libcanard -prune -o \
     -path src/lib/crypto/monocypher -prune -o \

Tools/ci/check_msg_versioning.sh

@@ -1,76 +0,0 @@
-#! /bin/bash
-# Copy a git diff between two commits if msg versioning is added
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-PX4_SRC_DIR="$DIR/.."
-
-BASE_COMMIT="$1"
-HEAD_COMMIT="$2"
-if [ -z "${BASE_COMMIT}" ] || [ -z "${HEAD_COMMIT}" ]
-then
-  echo "Usage: $0 <base_commit> <head_commit>"
-  exit 1
-fi
-
-failed=0
-
-# Iterate git diff files between BASE_COMMIT and HEAD_COMMIT
-modified_files="$(git --no-pager diff --no-color --name-only --diff-filter=M "${BASE_COMMIT}"..."${HEAD_COMMIT}")"
-all_files="$(     git --no-pager diff --no-color --name-only                 "${BASE_COMMIT}"..."${HEAD_COMMIT}")"
-for file in ${modified_files}
-do
-  if [[ "$file" == msg/versioned/*.msg ]]; then
-    echo "Modified msg file: ${file}"
-    # A modified versioned .msg file requires:
-    # - Incrementing the version
-    # - An old .msg version exists
-    # - A translation header exists and is included
-
-    # Ignore changes to comments or constants
-    content_a=$(git show "${BASE_COMMIT}:${file}" | grep -o '^[^#]*' | grep -v =)
-    content_b=$(git show "${HEAD_COMMIT}:${file}" | grep -o '^[^#]*' | grep -v =)
-    if [ "${content_a}" == "${content_b}" ]; then
-      echo "No version update required for ${file}"
-      continue
-    fi
-
-    diff=$(git --no-pager diff --no-color --diff-filter=M "${BASE_COMMIT}"..."${HEAD_COMMIT}" -- "${file}")
-    old_version=$(echo "${diff}" | sed -n 's/^-uint32 MESSAGE_VERSION = \([0-9]*\).*/\1/p')
-    new_version=$(echo "${diff}" | sed -n 's/^+uint32 MESSAGE_VERSION = \([0-9]*\).*/\1/p')
-
-    # Check that the version is incremented
-    if [ -z "${new_version}" ] || [ -z "${old_version}" ]; then
-      echo "ERROR: Missing version update for ${file}"
-      failed=1
-    else
-      if [ $((new_version-old_version)) -ne 1 ]; then
-        echo "ERROR: Version not incremented by +1 for ${file}"
-        failed=1
-      fi
-    fi
-
-    # Check that an old version exists
-    filename=$(basename -- "$file")
-    filename="${filename%.*}"
-    old_version_file="px4_msgs_old/msg/${filename}V${old_version}.msg"
-    if [[ "${all_files}" != *"${old_version_file}"* ]]; then
-      echo "ERROR: Old message version does not exist for ${file} (missing ${old_version_file})"
-      failed=1
-    fi
-
-    # Check that a translation header got added by checking for a modification to all_translations.h
-    # If it is changed, we assume a new header got added too, so we don't explicitly check for that
-    if [[ "${modified_files}" != *"translations/all_translations.h"* ]]; then
-      echo "ERROR: missing modification to translations/all_translations.h"
-      failed=1
-    fi
-  fi
-done
-
-if [ ${failed} -ne 0 ]; then
-  echo ""
-  echo "ERROR: missing message versioning due to changed .msg file(s) (see above)"
-  echo "Check the documentation under https://docs.px4.io/main/en/ros2/px4_ros2_msg_translation_node.html for how to add a new version"
-  exit 1
-fi

Tools/ci/generate_board_targets_json.py

@@ -69,7 +69,7 @@ def process_target(px4board_file, target_name):
     group = None
 
     if px4board_file.endswith("default.px4board") or \
-        px4board_file.endswith("performance-test.px4board") or \
+        px4board_file.endswith("recovery.px4board") or \
         px4board_file.endswith("bootloader.px4board"):
         kconf.load_config(px4board_file, replace=True)
     else: # Merge config with default.px4board

Tools/copy_to_ros_ws.sh

@@ -1,33 +0,0 @@
-#! /bin/bash
-# Copy msgs and the message translation node into a ROS workspace directory
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-PX4_SRC_DIR="$DIR/.."
-
-WS_DIR="$1"
-if [ ! -e "${WS_DIR}" ]
-then
-	echo "Usage: $0 <ros_ws_dir>"
-	exit 1
-fi
-WS_DIR="$WS_DIR"/src
-if [ ! -e "${WS_DIR}" ]
-then
-	echo "'src' directory not found inside ROS workspace (${WS_DIR})"
-	exit 1
-fi
-
-cp -ar "${PX4_SRC_DIR}"/msg/translation_node "${WS_DIR}"
-cp -ar "${PX4_SRC_DIR}"/msg/px4_msgs_old "${WS_DIR}"
-PX4_MSGS_DIR="${WS_DIR}"/px4_msgs
-if [ ! -e "${PX4_MSGS_DIR}" ]
-then
-  git clone https://github.com/PX4/px4_msgs.git "${PX4_MSGS_DIR}"
-  rm -rf "${PX4_MSGS_DIR}"/msg/*.msg
-  rm -rf "${PX4_MSGS_DIR}"/msg/versioned/*.msg
-  rm -rf "${PX4_MSGS_DIR}"/srv/*.srv
-fi
-cp -ar "${PX4_SRC_DIR}"/msg/*.msg "${PX4_MSGS_DIR}"/msg
-cp -ar "${PX4_SRC_DIR}"/msg/versioned/*.msg "${PX4_MSGS_DIR}"/msg
-cp -ar "${PX4_SRC_DIR}"/srv/*.srv "${PX4_MSGS_DIR}"/srv

Tools/docker_run.sh

@@ -47,7 +47,6 @@ CCACHE_DIR=${HOME}/.ccache
 mkdir -p "${CCACHE_DIR}"
 
 docker run -it --rm -w "${SRC_DIR}" \
-	--user="$(id -u):$(id -g)" \
 	--env=AWS_ACCESS_KEY_ID \
 	--env=AWS_SECRET_ACCESS_KEY \
 	--env=BRANCH_NAME \
@@ -55,6 +54,7 @@ docker run -it --rm -w "${SRC_DIR}" \
 	--env=CI \
 	--env=CODECOV_TOKEN \
 	--env=COVERALLS_REPO_TOKEN \
+	--env=LOCAL_USER_ID="$(id -u)" \
 	--env=PX4_ASAN \
 	--env=PX4_MSAN \
 	--env=PX4_TSAN \

Tools/kconfig/allyesconfig.py

@@ -40,7 +40,6 @@ exception_list = [
     'DRIVERS_DISTANCE_SENSOR_SRF05', # Requires hardcoded GPIO_ULTRASOUND
     'DRIVERS_PPS_CAPTURE', # Requires PPS GPIO config
     'DRIVERS_PWM_INPUT', # Requires PWM config
-    'DRIVERS_RPM_CAPTURE', # Requires PPS GPIO config
     'DRIVERS_TEST_PPM', # PIN config not portable
     'DRIVERS_TATTU_CAN', # Broken needs fixing
     'MODULES_REPLAY', # Fails on NuttX targets maybe force POSIX dependency?
@@ -53,7 +52,6 @@ exception_list = [
     'SYSTEMCMDS_I2C_LAUNCHER', #  undefined reference to `system',
     'MODULES_MUORB_APPS', # Weird QURT/Posix package doesn't work on x86 px4 sitl
     'MODULES_SIMULATION_SIMULATOR_SIH', # Causes compile errors
-    'MODULES_SPACECRAFT', # Clashes with Control Allocation (mom's spaghetti code)
 ]
 
 exception_list_sitl = [
@@ -74,8 +72,6 @@ exception_list_sitl = [
     'SYSTEMCMDS_I2CDETECT', # Not supported in SITL
     'SYSTEMCMDS_DMESG', # Not supported in SITL
     'SYSTEMCMDS_USB_CONNECTED', # Not supported in SITL
-    'SYSTEMCMDS_MFT_CFG', # Not supported in SITL
-    'MODULES_SPACECRAFT', # Clashes with Control Allocation (mom's spaghetti code)
 ]
 
 def main():

Tools/px_uploader.py

@@ -189,7 +189,7 @@ class uploader:
     GET_CHIP        = b'\x2c'     # rev5+  , get chip version
     SET_BOOT_DELAY  = b'\x2d'     # rev5+  , set boot delay
     GET_CHIP_DES    = b'\x2e'     # rev5+  , get chip description in ASCII
-    GET_VERSION     = b'\x2f'     # rev5+  , get bootloader version in ASCII
+    GET_VERSION     = b'\x2f'     # rev5+  , get chip description in ASCII
     CHIP_FULL_ERASE = b'\x40'     # full erase of flash, rev6+
     MAX_DES_LENGTH  = 20
 
@@ -201,6 +201,7 @@ class uploader:
     INFO_BOARD_ID   = b'\x02'        # board type
     INFO_BOARD_REV  = b'\x03'        # board revision
     INFO_FLASH_SIZE = b'\x04'        # max firmware size in bytes
+    BL_VERSION      = b'\x07'        # get bootloader version, e.g. major.minor.patch.githash (up to 20 chars)
 
     PROG_MULTI_MAX  = 252            # protocol max is 255, must be multiple of 4
     READ_MULTI_MAX  = 252            # protocol max is 255
@@ -708,7 +709,7 @@ class uploader:
                 # https://github.com/PX4/Firmware/blob/master/src/drivers/boards/common/stm32/board_mcu_version.c#L125-L144
 
                 if self.fw_maxsize > fw.property('image_maxsize') and not force:
-                    print(f"WARNING: Board can accept larger flash images ({self.fw_maxsize} bytes) than board config ({fw.property('image_maxsize')} bytes)")
+                    raise RuntimeError(f"Board can accept larger flash images ({self.fw_maxsize} bytes) than board config ({fw.property('image_maxsize')} bytes). Please use the correct board configuration to avoid lacking critical functionality.")
         else:
             # If we're still on bootloader v4 on a Pixhawk, we don't know if we
             # have the silicon errata and therefore need to flash px4_fmu-v2

Tools/setup/docker-entrypoint.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+echo "[docker-entrypoint.sh] Starting entrypoint"
 # Start virtual X server in the background
 # - DISPLAY default is :99, set in dockerfile
 # - Users can override with `-e DISPLAY=` in `docker run` command to avoid
@@ -16,4 +17,17 @@ if [ -n "${ROS_DISTRO}" ]; then
 	source "/opt/ros/$ROS_DISTRO/setup.bash"
 fi
 
-exec "$@"
+echo "[docker-entrypoint.sh] Working Directory: ${pwd}"
+
+# Use the LOCAL_USER_ID if passed in at runtime
+if [ -n "${LOCAL_USER_ID}" ]; then
+	echo "[docker-entrypoint.sh] Starting with: $LOCAL_USER_ID:user"
+	# modify existing user's id
+	usermod -u $LOCAL_USER_ID user
+
+	# run as user
+	# exec gosu user "$@"
+	exec "$@"
+else
+	exec "$@"
+fi

Tools/setup/ubuntu.sh

@@ -116,7 +116,6 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
 		binutils-dev \
 		bison \
 		build-essential \
-		curl \
 		flex \
 		g++-multilib \
 		gcc-arm-none-eabi \

Tools/simulation/gazebo-classic/sitl_gazebo-classic

@@ -1 +1 @@
-Subproject commit fbd8e9e6bbd2188de81677494f15885dead99c48
+Subproject commit c0e0751341d46108377bbae2ae1bb6da8a5d4106

Tools/simulation/gz

@@ -1 +1 @@
-Subproject commit 6c18846a4c7f9fe786840a29bf4e3237f908611b
+Subproject commit 019f63e2d50763862b8f8d40cce77371b3260c52

boards/3dr/ctrl-zero-h7-oem-revg/src/init.c

@@ -107,13 +107,8 @@ __EXPORT void board_on_reset(int status)
 		px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
 	}
 
-	/*
-	 * On resets invoked from system (not boot) ensure we establish a low
-	 * output state on PWM pins to disarm the ESC and prevent the reset from potentially
-	 * spinning up the motors.
-	 */
 	if (status >= 0) {
-		up_mdelay(100);
+		up_mdelay(6);
 	}
 }
 

boards/ark/can-flow-mr/canbootloader.px4board

@@ -1,5 +0,0 @@
-CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
-CONFIG_BOARD_ARCHITECTURE="cortex-m4"
-CONFIG_BOARD_ROMFSROOT=""
-CONFIG_BOARD_CONSTRAINED_MEMORY=y
-CONFIG_DRIVERS_BOOTLOADERS=y

boards/ark/can-flow-mr/firmware.prototype

@@ -1,13 +0,0 @@
-{
-    "board_id": 88,
-    "magic": "PX4FWv1",
-    "description": "Firmware for the ARK Flow MR board",
-    "image": "",
-    "build_time": 0,
-    "summary": "ARKFLOWMR",
-    "version": "0.1",
-    "image_size": 0,
-    "image_maxsize": 2080768,
-    "git_identity": "",
-    "board_revision": 0
-}

boards/ark/can-flow-mr/init/rc.board_sensors

@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# board sensors init
-#------------------------------------------------------------------------------
-
-param set-default IMU_GYRO_RATEMAX 1000
-param set-default SENS_FLOW_RATE 150
-param set-default SENS_IMU_CLPNOTI 0
-
-param set-default SENS_AFBR_S_RATE 25
-param set-default SENS_AFBR_L_RATE 10
-param set-default SENS_AFBR_THRESH 8
-param set-default SENS_AFBR_HYSTER 2
-
-# Internal SPI
-paa3905 -s start -Y 180
-
-iim42653 -R 0 -s start
-
-afbrs50 start

boards/ark/can-flow-mr/nuttx-config/canbootloader/defconfig

@@ -1,57 +0,0 @@
-#
-# This file is autogenerated: PLEASE DO NOT EDIT IT.
-#
-# You can use "make menuconfig" to make any modifications to the installed .config file.
-# You can then do "make savedefconfig" to generate a new defconfig file that includes your
-# modifications.
-#
-CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-flow-mr/nuttx-config"
-CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
-CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
-CONFIG_ARCH_CHIP="stm32"
-CONFIG_ARCH_CHIP_STM32=y
-CONFIG_ARCH_CHIP_STM32F412CE=y
-CONFIG_ARCH_INTERRUPTSTACK=4096
-CONFIG_ARMV7M_MEMCPY=y
-CONFIG_ARMV7M_USEBASEPRI=y
-CONFIG_BINFMT_DISABLE=y
-CONFIG_BOARDCTL=y
-CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DEBUG_FULLOPT=y
-CONFIG_DEBUG_SYMBOLS=y
-CONFIG_DEBUG_TCBINFO=y
-CONFIG_DEFAULT_SMALL=y
-CONFIG_DISABLE_MOUNTPOINT=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_FDCLONE_DISABLE=y
-CONFIG_FDCLONE_STDIO=y
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-CONFIG_IDLETHREAD_STACKSIZE=4096
-CONFIG_INIT_STACKSIZE=4096
-CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_LIBC_LONG_LONG=y
-CONFIG_LIBC_STRERROR=y
-CONFIG_MM_REGIONS=2
-CONFIG_NAME_MAX=0
-CONFIG_NUNGET_CHARS=0
-CONFIG_PREALLOC_TIMERS=0
-CONFIG_PTHREAD_STACK_MIN=512
-CONFIG_RAM_SIZE=262144
-CONFIG_RAM_START=0x20010000
-CONFIG_RAW_BINARY=y
-CONFIG_SIG_DEFAULT=y
-CONFIG_SIG_SIGALRM_ACTION=y
-CONFIG_SIG_SIGUSR1_ACTION=y
-CONFIG_SIG_SIGUSR2_ACTION=y
-CONFIG_STACK_COLORATION=y
-CONFIG_START_DAY=30
-CONFIG_START_MONTH=11
-CONFIG_STDIO_DISABLE_BUFFERING=y
-CONFIG_STM32_FLASH_CONFIG_G=y
-CONFIG_STM32_NOEXT_VECTORS=y
-CONFIG_STM32_TIM8=y
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_USEC_PER_TICK=1000

boards/ark/can-flow-mr/nuttx-config/include/board.h

@@ -1,136 +0,0 @@
-/************************************************************************************
- * configs/px4fmu/include/board.h
- * include/arch/board/board.h
- *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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.
- *
- ************************************************************************************/
-#include "board_dma_map.h"
-
-#ifndef __ARCH_BOARD_BOARD_H
-#define __ARCH_BOARD_BOARD_H
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-#include <stm32.h>
-
-/* HSI - 8 MHz RC factory-trimmed
- * LSI - 32 KHz RC
- * HSE - 8  MHz Crystal
- * LSE - not installed
- */
-#define STM32_BOARD_USEHSE      1
-#define STM32_BOARD_XTAL        8000000
-#define STM32_HSE_FREQUENCY     STM32_BOARD_XTAL
-
-#define STM32_HSI_FREQUENCY     16000000ul
-#define STM32_LSI_FREQUENCY     32000
-
-/* Main PLL Configuration */
-#define STM32_PLLCFG_PLLM       RCC_PLLCFG_PLLM(8)
-#define STM32_PLLCFG_PLLN       RCC_PLLCFG_PLLN(384)
-#define STM32_PLLCFG_PLLP       RCC_PLLCFG_PLLP_4
-#define STM32_PLLCFG_PLLQ       RCC_PLLCFG_PLLQ(8)
-#define STM32_PLLCFG_PLLR       RCC_PLLCFG_PLLR(2)
-
-#define STM32_RCC_PLLI2SCFGR_PLLI2SM RCC_PLLI2SCFGR_PLLI2SM(16)
-#define STM32_RCC_PLLI2SCFGR_PLLI2SN RCC_PLLI2SCFGR_PLLI2SN(192)
-#define STM32_RCC_PLLI2SCFGR_PLLI2SQ RCC_PLLI2SCFGR_PLLI2SQ(2)
-#define STM32_RCC_PLLI2SCFGR_PLLI2SR RCC_PLLI2SCFGR_PLLI2SR(2)
-#define STM32_RCC_PLLI2SCFGR_PLLI2SSRC RCC_PLLI2SCFGR_PLLI2SSRC(0) /* HSE or HSI depending on PLLSRC of PLLCFGR*/
-
-#define STM32_RCC_DCKCFGR2_CK48MSEL RCC_DCKCFGR2_CK48MSEL_PLL
-#define STM32_RCC_DCKCFGR2_FMPI2C1SEL RCC_DCKCFGR2_FMPI2C1SEL_APB
-#define STM32_RCC_DCKCFGR2_SDIOSEL RCC_DCKCFGR2_SDIOSEL_48MHZ
-
-#define STM32_SYSCLK_FREQUENCY  96000000ul
-
-/* AHB clock (HCLK) is SYSCLK (96MHz) */
-#define STM32_RCC_CFGR_HPRE     RCC_CFGR_HPRE_SYSCLK      /* HCLK  = SYSCLK / 1 */
-#define STM32_HCLK_FREQUENCY    STM32_SYSCLK_FREQUENCY
-#define STM32_BOARD_HCLK        STM32_HCLK_FREQUENCY      /* Same as above, to satisfy compiler */
-
-/* APB1 clock (PCLK1) is HCLK/2 (48MHz) */
-#define STM32_RCC_CFGR_PPRE1    RCC_CFGR_PPRE1_HCLKd2     /* PCLK1 = HCLK / 2 */
-#define STM32_PCLK1_FREQUENCY   (STM32_HCLK_FREQUENCY/2)
-
-/* Timers driven from APB1 will be twice PCLK1 (see page 112 of reference manual) */
-#define STM32_APB1_TIM2_CLKIN   (2*STM32_PCLK1_FREQUENCY)
-#define STM32_APB1_TIM3_CLKIN   (2*STM32_PCLK1_FREQUENCY)
-#define STM32_APB1_TIM4_CLKIN   (2*STM32_PCLK1_FREQUENCY)
-#define STM32_APB1_TIM5_CLKIN   (2*STM32_PCLK1_FREQUENCY)
-#define STM32_APB1_TIM12_CLKIN  (2*STM32_PCLK1_FREQUENCY)
-#define STM32_APB1_TIM13_CLKIN  (2*STM32_PCLK1_FREQUENCY)
-#define STM32_APB1_TIM14_CLKIN  (2*STM32_PCLK1_FREQUENCY)
-
-/* APB2 clock (PCLK2) is HCLK (96MHz) */
-#define STM32_RCC_CFGR_PPRE2    RCC_CFGR_PPRE2_HCLK       /* PCLK2 = HCLK */
-#define STM32_PCLK2_FREQUENCY   (STM32_HCLK_FREQUENCY)
-
-/* Timers driven from APB2 will be PCLK2 since no prescale division */
-#define STM32_APB2_TIM1_CLKIN   (STM32_PCLK2_FREQUENCY)
-#define STM32_APB2_TIM8_CLKIN   (STM32_PCLK2_FREQUENCY)
-#define STM32_APB2_TIM9_CLKIN   (STM32_PCLK2_FREQUENCY)
-#define STM32_APB2_TIM10_CLKIN  (STM32_PCLK2_FREQUENCY)
-#define STM32_APB2_TIM11_CLKIN  (STM32_PCLK2_FREQUENCY)
-
-/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx otherwise frequency is 2xAPBx. */
-#define BOARD_TIM2_FREQUENCY    (2 * STM32_PCLK1_FREQUENCY)
-#define BOARD_TIM3_FREQUENCY    (2 * STM32_PCLK1_FREQUENCY)
-#define BOARD_TIM4_FREQUENCY    (2 * STM32_PCLK1_FREQUENCY)
-#define BOARD_TIM5_FREQUENCY    (2 * STM32_PCLK1_FREQUENCY)
-#define BOARD_TIM6_FREQUENCY    (2 * STM32_PCLK1_FREQUENCY)
-#define BOARD_TIM7_FREQUENCY    (2 * STM32_PCLK1_FREQUENCY)
-#define BOARD_TIM8_FREQUENCY    (2 * STM32_PCLK2_FREQUENCY)
-
-/* Alternate function pin selections ************************************************/
-
-/* UARTs */
-#define GPIO_USART2_RX	GPIO_USART2_RX_1
-#define GPIO_USART2_TX	GPIO_USART2_TX_1
-
-/* CAN */
-#define GPIO_CAN1_RX	GPIO_CAN1_RX_1
-#define GPIO_CAN1_TX	GPIO_CAN1_TX_1
-
-/* SPI */
-#define GPIO_SPI1_MISO  GPIO_SPI1_MISO_1
-#define GPIO_SPI1_MOSI  GPIO_SPI1_MOSI_1
-#define GPIO_SPI1_SCK   GPIO_SPI1_SCK_1
-
-#define GPIO_SPI2_MISO  GPIO_SPI2_MISO_1 /* PB14 */
-#define GPIO_SPI2_MOSI  GPIO_SPI2_MOSI_1 /* PB15 */
-#define GPIO_SPI2_SCK   GPIO_SPI2_SCK_1  /* PB10 */
-
-#endif /* __ARCH_BOARD_BOARD_H */

boards/ark/can-flow-mr/nuttx-config/include/board_dma_map.h

@@ -1,44 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2021 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.
- *
- ****************************************************************************/
-
-#pragma once
-
-// DMA1 Channel/Stream Selections
-//--------------------------------------------//---------------------------//----------------
-#define DMACHAN_SPI2_RX    DMAMAP_SPI2_RX   // DMA1, Stream 3, Channel 0
-#define DMACHAN_SPI2_TX    DMAMAP_SPI2_TX   // DMA1, Stream 4, Channel 0
-
-//  DMA2 Channel/Stream Selections
-//--------------------------------------------//---------------------------//----------------
-#define DMACHAN_SPI1_RX    DMAMAP_SPI1_RX_2   // DMA2, Stream 2, Channel 3
-#define DMACHAN_SPI1_TX    DMAMAP_SPI1_TX_2   // DMA2, Stream 5, Channel 3

boards/ark/can-flow-mr/nuttx-config/nsh/defconfig

@@ -1,149 +0,0 @@
-#
-# This file is autogenerated: PLEASE DO NOT EDIT IT.
-#
-# You can use "make menuconfig" to make any modifications to the installed .config file.
-# You can then do "make savedefconfig" to generate a new defconfig file that includes your
-# modifications.
-#
-# CONFIG_DISABLE_ENVIRON is not set
-# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_DISABLESCRIPT is not set
-# CONFIG_NSH_DISABLE_CAT is not set
-# CONFIG_NSH_DISABLE_CD is not set
-# CONFIG_NSH_DISABLE_CP is not set
-# CONFIG_NSH_DISABLE_DATE is not set
-# CONFIG_NSH_DISABLE_DF is not set
-# CONFIG_NSH_DISABLE_ECHO is not set
-# CONFIG_NSH_DISABLE_ENV is not set
-# CONFIG_NSH_DISABLE_EXEC is not set
-# CONFIG_NSH_DISABLE_EXPORT is not set
-# CONFIG_NSH_DISABLE_FREE is not set
-# CONFIG_NSH_DISABLE_GET is not set
-# CONFIG_NSH_DISABLE_HELP is not set
-# CONFIG_NSH_DISABLE_ITEF is not set
-# CONFIG_NSH_DISABLE_KILL is not set
-# CONFIG_NSH_DISABLE_LOOPS is not set
-# CONFIG_NSH_DISABLE_LS is not set
-# CONFIG_NSH_DISABLE_MKDIR is not set
-# CONFIG_NSH_DISABLE_MOUNT is not set
-# CONFIG_NSH_DISABLE_MV is not set
-# CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_NSH_DISABLE_PSSTACKUSAGE is not set
-# CONFIG_NSH_DISABLE_PWD is not set
-# CONFIG_NSH_DISABLE_RM is not set
-# CONFIG_NSH_DISABLE_RMDIR is not set
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-# CONFIG_NSH_DISABLE_SET is not set
-# CONFIG_NSH_DISABLE_SLEEP is not set
-# CONFIG_NSH_DISABLE_SOURCE is not set
-# CONFIG_NSH_DISABLE_TEST is not set
-# CONFIG_NSH_DISABLE_TIME is not set
-# CONFIG_NSH_DISABLE_UMOUNT is not set
-# CONFIG_NSH_DISABLE_UNSET is not set
-# CONFIG_NSH_DISABLE_USLEEP is not set
-CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-flow-mr/nuttx-config"
-CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
-CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
-CONFIG_ARCH_CHIP="stm32"
-CONFIG_ARCH_CHIP_STM32=y
-CONFIG_ARCH_CHIP_STM32F412CE=y
-CONFIG_ARCH_INTERRUPTSTACK=768
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_MEMCPY=y
-CONFIG_ARMV7M_USEBASEPRI=y
-CONFIG_BOARDCTL_RESET=y
-CONFIG_BOARD_ASSERT_RESET_VALUE=0
-CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOARD_RESET_ON_ASSERT=2
-CONFIG_BUILTIN=y
-CONFIG_DEBUG_FULLOPT=y
-CONFIG_DEBUG_HARDFAULT_ALERT=y
-CONFIG_DEBUG_SYMBOLS=y
-CONFIG_DEBUG_TCBINFO=y
-CONFIG_DEFAULT_SMALL=y
-CONFIG_FDCLONE_STDIO=y
-CONFIG_FS_CROMFS=y
-CONFIG_FS_ROMFS=y
-CONFIG_GRAN=y
-CONFIG_GRAN_INTR=y
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INIT_STACKSIZE=2624
-CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_LIBC_LONG_LONG=y
-CONFIG_LIBC_MAX_EXITFUNS=1
-CONFIG_MEMSET_64BIT=y
-CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_REGIONS=2
-CONFIG_NAME_MAX=40
-CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_CROMFSETC=y
-CONFIG_NSH_LINELEN=128
-CONFIG_NSH_MAXARGUMENTS=15
-CONFIG_NSH_NESTDEPTH=8
-CONFIG_NSH_QUOTE=y
-CONFIG_NSH_ROMFSETC=y
-CONFIG_NSH_ROMFSSECTSIZE=128
-CONFIG_NSH_VARS=y
-CONFIG_PREALLOC_TIMERS=50
-CONFIG_PTHREAD_MUTEX_ROBUST=y
-CONFIG_PTHREAD_STACK_MIN=512
-CONFIG_RAM_SIZE=262144
-CONFIG_RAM_START=0x20000000
-CONFIG_RAW_BINARY=y
-CONFIG_READLINE_CMD_HISTORY=y
-CONFIG_READLINE_TABCOMPLETION=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_HPWORKPRIORITY=254
-CONFIG_SCHED_HPWORKSTACKSIZE=3000
-CONFIG_SCHED_INSTRUMENTATION=y
-CONFIG_SCHED_INSTRUMENTATION_EXTERNAL=y
-CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
-CONFIG_SCHED_WAITPID=y
-CONFIG_SERIAL_TERMIOS=y
-CONFIG_SIG_DEFAULT=y
-CONFIG_SIG_SIGALRM_ACTION=y
-CONFIG_SIG_SIGUSR1_ACTION=y
-CONFIG_SIG_SIGUSR2_ACTION=y
-CONFIG_SIG_SIGWORK=4
-CONFIG_STACK_COLORATION=y
-CONFIG_START_DAY=30
-CONFIG_START_MONTH=11
-CONFIG_STDIO_BUFFER_SIZE=32
-CONFIG_STM32_ADC1=y
-CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
-CONFIG_STM32_DMA1=y
-CONFIG_STM32_DMA2=y
-CONFIG_STM32_FLASH_CONFIG_G=y
-CONFIG_STM32_FLASH_PREFETCH=y
-CONFIG_STM32_FLOWCONTROL_BROKEN=y
-CONFIG_STM32_JTAG_SW_ENABLE=y
-CONFIG_STM32_PWR=y
-CONFIG_STM32_SERIALBRK_BSDCOMPAT=y
-CONFIG_STM32_SERIAL_DISABLE_REORDERING=y
-CONFIG_STM32_SPI1=y
-CONFIG_STM32_SPI1_DMA=y
-CONFIG_STM32_SPI1_DMA_BUFFER=2048
-CONFIG_STM32_SPI2=y
-CONFIG_STM32_SPI2_DMA=y
-CONFIG_STM32_SPI2_DMA_BUFFER=2048
-CONFIG_STM32_TIM8=y
-CONFIG_STM32_USART2=y
-CONFIG_STM32_USART_BREAKS=y
-CONFIG_STM32_WWDG=y
-CONFIG_SYSTEM_NSH=y
-CONFIG_TASK_NAME_SIZE=24
-CONFIG_USART2_BAUD=57600
-CONFIG_USART2_RXBUFSIZE=600
-CONFIG_USART2_SERIAL_CONSOLE=y
-CONFIG_USART2_TXBUFSIZE=1100
-CONFIG_USEC_PER_TICK=1000

boards/ark/can-flow-mr/nuttx-config/scripts/canbootloader_script.ld

@@ -1,134 +0,0 @@
-/****************************************************************************
- * nuttx-config/scripts/canbootloader_script.ld
- *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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.
- *
- ****************************************************************************/
-
-/* The STM32F412 has 1M of FLASH beginning at address 0x0800:0000 and
- * 256Kb of SRAM. SRAM is split up into three blocks:
- *
- * 1) 112Kb of SRAM beginning at address 0x2000:0000
- * 2)  16Kb of SRAM beginning at address 0x2001:c000
- * 3)  64Kb of SRAM beginning at address 0x2002:0000
- * 4)  64Kb of TCM SRAM beginning at address 0x1000:0000
- *
- * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000
- * where the code expects to begin execution by jumping to the entry point in
- * the 0x0800:0000 address range.
- *
- * The first 0x10000 of flash is reserved for the bootloader.
- */
-
-MEMORY
-{
-    flash (rx)   : ORIGIN = 0x08000000, LENGTH = 32K
-    sram (rwx)   : ORIGIN = 0x20000000, LENGTH = 192K
-}
-
-OUTPUT_ARCH(arm)
-
-ENTRY(__start)		/* treat __start as the anchor for dead code stripping */
-EXTERN(_vectors)	/* force the vectors to be included in the output */
-
-/*
- * Ensure that abort() is present in the final object.  The exception handling
- * code pulled in by libgcc.a requires it (and that code cannot be easily avoided).
- */
-EXTERN(abort)
-SECTIONS
-{
-	.text : {
-		_stext = ABSOLUTE(.);
-		*(.vectors)
-		*(.text .text.*)
-		*(.fixup)
-		*(.gnu.warning)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.t.*)
-		*(.got)
-		*(.gcc_except_table)
-		*(.gnu.linkonce.r.*)
-		_etext = ABSOLUTE(.);
-	} > flash
-
-	/*
-	 * Init functions (static constructors and the like)
-	 */
-        .init_section : {
-                _sinit = ABSOLUTE(.);
-                KEEP(*(.init_array .init_array.*))
-                _einit = ABSOLUTE(.);
-        } > flash
-
-	.ARM.extab : {
-		*(.ARM.extab*)
-	} > flash
-
-	__exidx_start = ABSOLUTE(.);
-	.ARM.exidx : {
-		*(.ARM.exidx*)
-	} > flash
-	__exidx_end = ABSOLUTE(.);
-
-	_eronly = ABSOLUTE(.);
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > sram AT > flash
-
-	.bss : {
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		. = ALIGN(4);
-		_ebss = ABSOLUTE(.);
-	} > sram
-
-	/* Stabs debugging sections. */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}

boards/ark/can-flow-mr/nuttx-config/scripts/script.ld

@@ -1,146 +0,0 @@
-/****************************************************************************
- * scripts/ld.script
- *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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.
- *
- ****************************************************************************/
-
-/* The STM32F412 has 1M of FLASH beginning at address 0x0800:0000 and
- * 256Kb of SRAM. SRAM is split up into three blocks:
- *
- * 1) 112Kb of SRAM beginning at address 0x2000:0000
- * 2)  16Kb of SRAM beginning at address 0x2001:c000
- * 3)  64Kb of SRAM beginning at address 0x2002:0000
- * 4)  64Kb of TCM SRAM beginning at address 0x1000:0000
- *
- * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000
- * where the code expects to begin execution by jumping to the entry point in
- * the 0x0800:0000 address range.
- *
- * The first 0x10000 of flash is reserved for the bootloader.
- */
-
-MEMORY
-{
-    flash (rx)   : ORIGIN = 0x08010000, LENGTH = 928K
-    sram (rwx)   : ORIGIN = 0x20000000, LENGTH = 192K
-}
-
-OUTPUT_ARCH(arm)
-
-ENTRY(__start)		/* treat __start as the anchor for dead code stripping */
-EXTERN(_vectors)	/* force the vectors to be included in the output */
-
-/*
- * Ensure that abort() is present in the final object.  The exception handling
- * code pulled in by libgcc.a requires it (and that code cannot be easily avoided).
- */
-EXTERN(abort)
-EXTERN(_bootdelay_signature)
-
-SECTIONS
-{
-	.text : {
-		_stext = ABSOLUTE(.);
-		*(.vectors)
-		. = ALIGN(8);
-		/*
-		* This section positions the app_descriptor_t used
-		* by the make_can_boot_descriptor.py tool to set
-		* the application image's descriptor so that the
-		* uavcan bootloader has the ability to validate the
-		* image crc, size etc
-		*/
-		KEEP(*(.app_descriptor))
-		*(.text .text.*)
-		*(.fixup)
-		*(.gnu.warning)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.t.*)
-		*(.got)
-		*(.gcc_except_table)
-		*(.gnu.linkonce.r.*)
-		_etext = ABSOLUTE(.);
-	} > flash
-
-	/*
-	 * Init functions (static constructors and the like)
-	 */
-        .init_section : {
-                _sinit = ABSOLUTE(.);
-                KEEP(*(.init_array .init_array.*))
-                _einit = ABSOLUTE(.);
-        } > flash
-
-
-	.ARM.extab : {
-		*(.ARM.extab*)
-	} > flash
-
-	__exidx_start = ABSOLUTE(.);
-	.ARM.exidx : {
-		*(.ARM.exidx*)
-	} > flash
-	__exidx_end = ABSOLUTE(.);
-
-	_eronly = ABSOLUTE(.);
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > sram AT > flash
-
-	.bss : {
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		. = ALIGN(4);
-		_ebss = ABSOLUTE(.);
-	} > sram
-
-	/* Stabs debugging sections. */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}

boards/ark/can-flow-mr/src/CMakeLists.txt

@@ -1,65 +0,0 @@
-############################################################################
-#
-#   Copyright (c) 2020 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.
-#
-############################################################################
-
-if("${PX4_BOARD_LABEL}" STREQUAL  "canbootloader")
-
-	add_library(drivers_board
-		boot_config.h
-		boot.c
-		led.c
-	)
-	target_link_libraries(drivers_board
-		PRIVATE
-			nuttx_arch
-			nuttx_drivers
-			canbootloader
-	)
-	target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/canbootloader)
-
-else()
-	add_library(drivers_board
-		can.c
-		init.c
-		led.c
-		spi.cpp
-	)
-
-	target_link_libraries(drivers_board
-		PRIVATE
-			arch_spi
-			drivers__led # drv_led_start
-			nuttx_arch
-			nuttx_drivers
-			px4_layer
-	)
-endif()

boards/ark/can-flow-mr/src/board_config.h

@@ -1,95 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2021 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.
- *
- ****************************************************************************/
-
-/**
- * @file board_config.h
- *
- * board internal definitions
- */
-
-#pragma once
-
-#include <px4_platform_common/px4_config.h>
-#include <nuttx/compiler.h>
-#include <stdint.h>
-
-/* CAN  Silent mode control */
-#define GPIO_CAN1_SILENT_S0   /* PB11 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN11)
-
-/* CAN termination software control */
-#define GPIO_CAN1_TERMINATION /* PB13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN13)
-#define GPIO_CAN_TERM                    GPIO_CAN1_TERMINATION
-
-/* Boot config */
-#define GPIO_BOOT_CONFIG      /* PC15 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN15|GPIO_EXTI)
-
-/* LEDs are driven with open drain to support Anode to 5V or 3.3V */
-#define GPIO_TIM1_CH1         /* PA8  */ (GPIO_TIM1_CH1_1|GPIO_OPENDRAIN|GPIO_SPEED_2MHz)
-#define GPIO_TIM1_CH2         /* PA9  */ (GPIO_TIM1_CH2_1|GPIO_OPENDRAIN|GPIO_SPEED_2MHz)
-#define GPIO_TIM1_CH3         /* PA10 */ (GPIO_TIM1_CH3_1|GPIO_OPENDRAIN|GPIO_SPEED_2MHz)
-
-#define BROADCOM_AFBR_S50_S2PI_SPI_BUS 2
-#define BROADCOM_AFBR_S50_S2PI_CS   /* PB12 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN12)
-#define BROADCOM_AFBR_S50_S2PI_IRQ  /* PB4  */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN4|GPIO_EXTI)
-#define BROADCOM_AFBR_S50_S2PI_CLK  /* PB10 */  GPIO_SPI2_SCK_1
-#define BROADCOM_AFBR_S50_S2PI_MOSI /* PB15 */  GPIO_SPI2_MOSI_1
-#define BROADCOM_AFBR_S50_S2PI_MISO /* PB14 */  GPIO_SPI2_MISO_1
-
-#define FLASH_BASED_PARAMS
-
-/* High-resolution timer */
-#define HRT_TIMER                    3  /* use timer 3 for the HRT */
-#define HRT_TIMER_CHANNEL            4  /* use capture/compare channel 4 */
-
-#define PX4_GPIO_INIT_LIST { \
-		GPIO_BOOT_CONFIG,                 \
-		GPIO_CAN1_TX,                     \
-		GPIO_CAN1_RX,                     \
-		GPIO_CAN1_SILENT_S0,              \
-		GPIO_CAN1_TERMINATION,            \
-	}
-
-__BEGIN_DECLS
-
-#define BOARD_HAS_N_S_RGB_LED       1
-#define BOARD_MAX_LEDS              BOARD_HAS_N_S_RGB_LED
-
-#ifndef __ASSEMBLY__
-
-extern void stm32_spiinitialize(void);
-
-#include <px4_platform_common/board_common.h>
-
-#endif /* __ASSEMBLY__ */
-
-__END_DECLS

boards/ark/can-flow-mr/src/boot.c

@@ -1,188 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2021 PX4 Development Team. All rights reserved.
- *       Author: Ben Dyer <ben_dyer@mac.com>
- *               Pavel Kirienko <pavel.kirienko@zubax.com>
- *               David Sidrane <david_s5@nscdg.com>
- *
- * 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <px4_config.h>
-#include <stdint.h>
-#include "boot_config.h"
-#include "board.h"
-
-#include <debug.h>
-#include <string.h>
-#include <arch/board/board.h>
-
-#include <nuttx/board.h>
-#include "led.h"
-
-/************************************************************************************
- * Name: stm32_boardinitialize
- *
- * Description:
- *   All STM32 architectures must provide the following entry point.  This entry point
- *   is called early in the initialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
- *
- ************************************************************************************/
-
-__EXPORT void stm32_boardinitialize(void)
-{
-	putreg32(getreg32(STM32_RCC_APB1ENR) | RCC_APB1ENR_CAN1EN, STM32_RCC_APB1ENR);
-	stm32_configgpio(GPIO_CAN1_RX);
-	stm32_configgpio(GPIO_CAN1_TX);
-	stm32_configgpio(GPIO_CAN1_SILENT_S0);
-	stm32_configgpio(GPIO_CAN1_TERMINATION);
-	putreg32(getreg32(STM32_RCC_APB1RSTR) | RCC_APB1RSTR_CAN1RST, STM32_RCC_APB1RSTR);
-	putreg32(getreg32(STM32_RCC_APB1RSTR) & ~RCC_APB1RSTR_CAN1RST, STM32_RCC_APB1RSTR);
-
-#if defined(OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO)
-	stm32_configgpio(GPIO_GETNODEINFO_JUMPER);
-#endif
-
-}
-
-/************************************************************************************
- * Name: board_deinitialize
- *
- * Description:
- *   This function is called by the bootloader code prior to booting
- *   the application. Is should place the HW into an benign initialized state.
- *
- ************************************************************************************/
-
-void board_deinitialize(void)
-{
-	putreg32(getreg32(STM32_RCC_APB1RSTR) | RCC_APB1RSTR_CAN1RST, STM32_RCC_APB1RSTR);
-}
-
-/****************************************************************************
- * Name: board_get_product_name
- *
- * Description:
- *   Called to retrieve the product name. The returned value is a assumed
- *   to be written to a pascal style string that will be length prefixed
- *   and not null terminated
- *
- * Input Parameters:
- *    product_name - A pointer to a buffer to write the name.
- *    maxlen       - The maximum number of charter that can be written
- *
- * Returned Value:
- *   The length of characters written to the buffer.
- *
- ****************************************************************************/
-
-uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
-{
-	DEBUGASSERT(maxlen > UAVCAN_STRLEN(HW_UAVCAN_NAME));
-	memcpy(product_name, HW_UAVCAN_NAME, UAVCAN_STRLEN(HW_UAVCAN_NAME));
-	return UAVCAN_STRLEN(HW_UAVCAN_NAME);
-}
-
-/****************************************************************************
- * Name: board_get_hardware_version
- *
- * Description:
- *   Called to retrieve the hardware version information. The function
- *   will first initialize the the callers struct to all zeros.
- *
- * Input Parameters:
- *    hw_version - A pointer to a uavcan_hardwareversion_t.
- *
- * Returned Value:
- *   Length of the unique_id
- *
- ****************************************************************************/
-
-size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
-{
-	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
-
-	hw_version->major = HW_VERSION_MAJOR;
-	hw_version->minor = HW_VERSION_MINOR;
-
-	return board_get_mfguid(*(mfguid_t *) hw_version->unique_id);
-}
-
-/****************************************************************************
- * Name: board_indicate
- *
- * Description:
- *   Provides User feedback to indicate the state of the bootloader
- *   on board specific  hardware.
- *
- * Input Parameters:
- *    indication - A member of the uiindication_t
- *
- * Returned Value:
- *   None
- *
- ****************************************************************************/
-#define led(n, code, r , g , b, h) {.red = (r),.green = (g), .blue = (b),.hz = (h)}
-
-typedef begin_packed_struct struct led_t {
-	uint8_t red;
-	uint8_t green;
-	uint8_t blue;
-	uint8_t hz;
-} end_packed_struct led_t;
-
-static const  led_t i2l[] = {
-
-	led(0, off,                             0,     0,     0,     0),
-	led(1, reset,                          128,   128,   128,   30),
-	led(2, autobaud_start,                  0,   128,     0,     1),
-	led(3, autobaud_end,                    0,   128,     0,     2),
-	led(4, allocation_start,                0,     0,    64,     2),
-	led(5, allocation_end,                  0,   128,    64,     3),
-	led(6, fw_update_start,                32,   128,    64,     3),
-	led(7, fw_update_erase_fail,           32,   128,    32,     3),
-	led(8, fw_update_invalid_response,     64,     0,     0,     1),
-	led(9, fw_update_timeout,              64,     0,     0,     2),
-	led(a, fw_update_invalid_crc,          64,     0,     0,     4),
-	led(b, jump_to_app,                     0,   128,     0,    10),
-
-};
-
-void board_indicate(uiindication_t indication)
-{
-	rgb_led(i2l[indication].red,
-		i2l[indication].green,
-		i2l[indication].blue,
-		i2l[indication].hz);
-}

boards/ark/can-flow-mr/src/boot_config.h

@@ -1,130 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2021 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.
- *
- ****************************************************************************/
-
-/*
- * @file boot_config.h
- *
- * bootloader definitions that configures the behavior and options
- * of the Boot loader
- * This file is relies on the parent folder's boot_config.h file and defines
- * different usages of the hardware for bootloading
- */
-
-#pragma once
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-/* Bring in the board_config.h definitions
- * todo:make this be pulled in from a targed's build
- * files in nuttx*/
-
-#include "board_config.h"
-#include "uavcan.h"
-#include <nuttx/compiler.h>
-
-#include <stdint.h>
-
-#include <stm32_flash.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define OPT_PREFERRED_NODE_ID ANY_NODE_ID
-
-//todo:wrap OPT_x in in ifdefs for command line definitions
-#define OPT_TBOOT_MS                    3000
-#define OPT_NODE_STATUS_RATE_MS         800
-#define OPT_NODE_INFO_RATE_MS           50
-#define OPT_BL_NUMBER_TIMERS            7
-
-/*
- *  This Option set is set to 1 ensure a provider of firmware has an
- *  opportunity update the node's firmware.
- *  This Option is the default policy and can be overridden by
- *  a jumper
- *  When this Policy is set, the node will ignore tboot and
- *  wait indefinitely for a GetNodeInfo request before booting.
- *
- *  OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO_INVERT is used to allow
- *  the polarity of the jumper to be True Active
- *
- *  wait  OPT_WAIT_FOR_GETNODEINFO  OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO
- *                                                 Jumper
- *   yes           1                       0         x
- *   yes           1                       1       Active
- *   no            1                       1       Not Active
- *   no            0                       0         X
- *   yes           0                       1       Active
- *   no            0                       1       Not Active
- *
- */
-#define OPT_WAIT_FOR_GETNODEINFO                    0
-#define OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO        1
-#define OPT_WAIT_FOR_GETNODEINFO_JUMPER_GPIO_INVERT 1
-
-#define OPT_ENABLE_WD           1
-
-#define OPT_RESTART_TIMEOUT_MS          20000
-
-/* Reserved for the Booloader */
-#define OPT_BOOTLOADER_SIZE_IN_K        (1024*64)
-
-/* Reserved for the application out of the total
- * system flash minus the BOOTLOADER_SIZE_IN_K
- */
-#define OPT_APPLICATION_RESERVER_IN_K    0
-
-#define OPT_APPLICATION_IMAGE_OFFSET    OPT_BOOTLOADER_SIZE_IN_K
-#define OPT_APPLICATION_IMAGE_LENGTH    (FLASH_SIZE-(OPT_BOOTLOADER_SIZE_IN_K+OPT_APPLICATION_RESERVER_IN_K))
-
-
-#define FLASH_BASE              STM32_FLASH_BASE
-#define FLASH_SIZE              STM32_FLASH_SIZE
-
-#define APPLICATION_LOAD_ADDRESS (FLASH_BASE + OPT_APPLICATION_IMAGE_OFFSET)
-#define APPLICATION_SIZE (FLASH_SIZE-OPT_APPLICATION_IMAGE_OFFSET)
-#define APPLICATION_LAST_8BIT_ADDRRESS  ((uint8_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint8_t)))
-#define APPLICATION_LAST_32BIT_ADDRRESS ((uint32_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint32_t)))
-#define APPLICATION_LAST_64BIT_ADDRRESS ((uint64_t *)((APPLICATION_LOAD_ADDRESS+APPLICATION_SIZE)-sizeof(uint64_t)))
-
-/* If this board uses big flash that have large sectors */
-
-#define OPT_USE_YIELD
-
-/* Bootloader Option*****************************************************************
- *
- */
-#define GPIO_GETNODEINFO_JUMPER (GPIO_BOOT_CONFIG & ~GPIO_EXTI)

boards/ark/can-flow-mr/src/can.c

@@ -1,130 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2021 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.
- *
- ****************************************************************************/
-
-/**
- * @file can.c
- *
- * Board-specific CAN functions.
- */
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <px4_platform_common/px4_config.h>
-
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/can/can.h>
-#include <arch/board/board.h>
-
-#include "chip.h"
-#include "arm_internal.h"
-
-#include "stm32.h"
-#include "stm32_can.h"
-#include "board_config.h"
-
-#ifdef CONFIG_CAN
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-/* Configuration ********************************************************************/
-
-#if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2)
-#  warning "Both CAN1 and CAN2 are enabled.  Assuming only CAN1."
-#  undef CONFIG_STM32_CAN2
-#endif
-
-#ifdef CONFIG_STM32_CAN1
-#  define CAN_PORT 1
-#else
-#  define CAN_PORT 2
-#endif
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-int can_devinit(void);
-
-/************************************************************************************
- * Name: can_devinit
- *
- * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/can.
- *
- ************************************************************************************/
-
-int can_devinit(void)
-{
-	static bool initialized = false;
-	struct can_dev_s *can;
-	int ret;
-
-	/* Check if we have already initialized */
-
-	if (!initialized) {
-		/* Call stm32_caninitialize() to get an instance of the CAN interface */
-
-		can = stm32_caninitialize(CAN_PORT);
-
-		if (can == NULL) {
-			canerr("ERROR:  Failed to get CAN interface\n");
-			return -ENODEV;
-		}
-
-		/* Register the CAN driver at "/dev/can0" */
-
-		ret = can_register("/dev/can0", can);
-
-		if (ret < 0) {
-			canerr("ERROR: can_register failed: %d\n", ret);
-			return ret;
-		}
-
-		/* Now we are initialized */
-
-		initialized = true;
-	}
-
-	return OK;
-}
-
-#endif

boards/ark/can-flow-mr/src/init.c

@@ -1,147 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2021 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.
- *
- ****************************************************************************/
-
-/**
- * @file init.c
- *
- * board specific early startup code.  This file implements the
- * board_app_initialize() function that is called early by nsh during startup.
- *
- * Code here is run before the rcS script is invoked; it should start required
- * subsystems and perform board-specific initialization.
- */
-
-#include <px4_platform_common/px4_config.h>
-#include <px4_platform_common/tasks.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <debug.h>
-#include <errno.h>
-#include <syslog.h>
-
-#include <nuttx/board.h>
-
-#include <stm32.h>
-#include "board_config.h"
-#include "led.h"
-#include <stm32_uart.h>
-
-#include <arch/board/board.h>
-
-#include <drivers/drv_hrt.h>
-#include <drivers/drv_board_led.h>
-#include <drivers/drv_watchdog.h>
-
-#include <systemlib/px4_macros.h>
-
-#include <px4_platform_common/init.h>
-#include <px4_platform/gpio.h>
-
-# if defined(FLASH_BASED_PARAMS)
-#  include <parameters/flashparams/flashfs.h>
-#endif
-
-/************************************************************************************
- * Name: stm32_boardinitialize
- *
- * Description:
- *   All STM32 architectures must provide the following entry point.  This entry point
- *   is called early in the initialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
- *
- ************************************************************************************/
-
-__EXPORT void stm32_boardinitialize(void)
-{
-	watchdog_init();
-
-	/* configure pins */
-	const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
-	px4_gpio_init(gpio, arraySize(gpio));
-
-	// Configure SPI all interfaces GPIO & enable power.
-	stm32_spiinitialize();
-}
-
-/****************************************************************************
- * Name: board_app_initialize
- *
- * Description:
- *   Perform application specific initialization.  This function is never
- *   called directly from application code, but only indirectly via the
- *   (non-standard) boardctl() interface using the command BOARDIOC_INIT.
- *
- * Input Parameters:
- *   arg - The boardctl() argument is passed to the board_app_initialize()
- *         implementation without modification.  The argument has no
- *         meaning to NuttX; the meaning of the argument is a contract
- *         between the board-specific initalization logic and the the
- *         matching application logic.  The value cold be such things as a
- *         mode enumeration value, a set of DIP switch switch settings, a
- *         pointer to configuration data read from a file or serial FLASH,
- *         or whatever you would like to do with it.  Every implementation
- *         should accept zero/NULL as a default configuration.
- *
- * Returned Value:
- *   Zero (OK) is returned on success; a negated errno value is returned on
- *   any failure to indicate the nature of the failure.
- *
- ****************************************************************************/
-
-__EXPORT int board_app_initialize(uintptr_t arg)
-{
-	px4_platform_init();
-
-#if defined(FLASH_BASED_PARAMS)
-	static sector_descriptor_t params_sector_map[] = {
-		{2, 16 * 1024, 0x08008000},
-		{3, 16 * 1024, 0x0800C000},
-		{0, 0, 0},
-	};
-
-	/* Initialize the flashfs layer to use heap allocated memory */
-	int result = parameter_flashfs_init(params_sector_map, NULL, 0);
-
-	if (result != OK) {
-		syslog(LOG_ERR, "[boot] FAILED to init params in FLASH %d\n", result);
-	}
-
-#endif // FLASH_BASED_PARAMS
-
-	/* Configure the HW based on the manifest */
-	//px4_platform_configure();
-
-	return OK;
-}

boards/ark/can-flow-mr/src/led.c

@@ -1,124 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2021 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.
- *
- ****************************************************************************/
-
-/**
- * @file led.c
- *
- * LED backend.
- */
-
-#include <px4_platform_common/px4_config.h>
-
-#include <stdbool.h>
-
-#include "chip.h"
-#include "stm32_gpio.h"
-#include "board_config.h"
-
-#include <nuttx/board.h>
-#include <arch/board/board.h>
-
-#include "led.h"
-
-#define TMR_BASE        STM32_TIM1_BASE
-#define TMR_FREQUENCY   STM32_APB2_TIM1_CLKIN
-#define TMR_REG(o)      (TMR_BASE+(o))
-
-void rgb_led(int r, int g, int b, int freqs)
-{
-
-	long fosc = TMR_FREQUENCY;
-	long prescale = 2048;
-	long p1s = fosc / prescale;
-	long p0p5s  = p1s / 2;
-	uint16_t val;
-	static bool once = 0;
-
-	if (!once) {
-		once = 1;
-
-		/* Enabel Clock to Block */
-		modifyreg32(STM32_RCC_APB2ENR, 0, RCC_APB2ENR_TIM1EN);
-
-		/* Reload */
-
-		val = getreg16(TMR_REG(STM32_BTIM_EGR_OFFSET));
-		val |= ATIM_EGR_UG;
-		putreg16(val, TMR_REG(STM32_BTIM_EGR_OFFSET));
-
-		/* Set Prescaler STM32_TIM_SETCLOCK */
-
-		putreg16(prescale, TMR_REG(STM32_BTIM_PSC_OFFSET));
-
-		/* Enable STM32_TIM_SETMODE*/
-
-		putreg16(ATIM_CR1_CEN | ATIM_CR1_ARPE, TMR_REG(STM32_BTIM_CR1_OFFSET));
-
-
-		putreg16((ATIM_CCMR_MODE_PWM1 << ATIM_CCMR1_OC1M_SHIFT) | ATIM_CCMR1_OC1PE |
-			 (ATIM_CCMR_MODE_PWM1 << ATIM_CCMR1_OC2M_SHIFT) | ATIM_CCMR1_OC2PE, TMR_REG(STM32_GTIM_CCMR1_OFFSET));
-		putreg16((ATIM_CCMR_MODE_PWM1 << ATIM_CCMR2_OC3M_SHIFT) | ATIM_CCMR2_OC3PE, TMR_REG(STM32_GTIM_CCMR2_OFFSET));
-		putreg16(ATIM_CCER_CC3E | ATIM_CCER_CC3P |
-			 ATIM_CCER_CC2E | ATIM_CCER_CC2P |
-			 ATIM_CCER_CC1E | ATIM_CCER_CC1P, TMR_REG(STM32_GTIM_CCER_OFFSET));
-
-
-		stm32_configgpio(GPIO_TIM1_CH1);
-		stm32_configgpio(GPIO_TIM1_CH2);
-		stm32_configgpio(GPIO_TIM1_CH3);
-
-		/* master output enable = on */
-		putreg16(ATIM_BDTR_MOE, (TMR_REG(STM32_ATIM_BDTR_OFFSET)));
-	}
-
-	long p  = freqs == 0 ? p1s : p1s / freqs;
-	putreg32(p, TMR_REG(STM32_BTIM_ARR_OFFSET));
-
-	p  = freqs == 0 ? p1s + 1 : p0p5s / freqs;
-
-	putreg32((r * p) / 255, TMR_REG(STM32_GTIM_CCR1_OFFSET));
-	putreg32((g * p) / 255, TMR_REG(STM32_GTIM_CCR2_OFFSET));
-	putreg32((b * p) / 255, TMR_REG(STM32_GTIM_CCR3_OFFSET));
-
-	val = getreg16(TMR_REG(STM32_BTIM_CR1_OFFSET));
-
-	if (freqs == 0) {
-		val &= ~ATIM_CR1_CEN;
-
-	} else {
-		val |= ATIM_CR1_CEN;
-	}
-
-	putreg16(val, TMR_REG(STM32_BTIM_CR1_OFFSET));
-
-}

boards/ark/can-flow-mr/src/led.h

@@ -1,37 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2015 PX4 Development Team. All rights reserved.
- *   Author: David Sidrane<david_s5@nscdg.com>
- *
- * 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.
- *
- ****************************************************************************/
-
-__BEGIN_DECLS
-void rgb_led(int r, int g, int b, int freqs);
-__END_DECLS

boards/ark/can-flow-mr/src/spi.cpp

@@ -1,48 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2021 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.
- *
- ****************************************************************************/
-
-#include <px4_arch/spi_hw_description.h>
-#include <drivers/drv_sensor.h>
-#include <nuttx/spi/spi.h>
-
-constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = {
-	initSPIBus(SPI::Bus::SPI1, {
-		initSPIDevice(DRV_IMU_DEVTYPE_IIM42653, SPI::CS{GPIO::PortB, GPIO::Pin0}, SPI::DRDY{GPIO::PortB, GPIO::Pin1}),
-		initSPIDevice(DRV_FLOW_DEVTYPE_PAA3905, SPI::CS{GPIO::PortB, GPIO::Pin5}, SPI::DRDY{GPIO::PortB, GPIO::Pin2}),
-	}),
-	initSPIBus(SPI::Bus::SPI2, {
-		initSPIDevice(DRV_DEVTYPE_UNUSED, SPI::CS{GPIO::PortB, GPIO::Pin12}, SPI::DRDY{GPIO::PortB, GPIO::Pin4}),
-	}),
-};
-
-static constexpr bool unused = validateSPIConfig(px4_spi_buses);

boards/ark/can-flow-mr/uavcan_board_identity

@@ -1,17 +0,0 @@
-# UAVCAN boot loadable Module ID
-set(uavcanblid_sw_version_major ${PX4_VERSION_MAJOR})
-set(uavcanblid_sw_version_minor ${PX4_VERSION_MINOR})
-add_definitions(
-	-DAPP_VERSION_MAJOR=${uavcanblid_sw_version_major}
-	-DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor}
-)
-
-set(uavcanblid_hw_version_major 0)
-set(uavcanblid_hw_version_minor 88)
-set(uavcanblid_name "\"org.ark.can-flow-mr\"")
-
-add_definitions(
-	-DHW_UAVCAN_NAME=${uavcanblid_name}
-	-DHW_VERSION_MAJOR=${uavcanblid_hw_version_major}
-	-DHW_VERSION_MINOR=${uavcanblid_hw_version_minor}
-)

boards/ark/can-flow/init/rc.board_sensors

@@ -4,7 +4,6 @@
 #------------------------------------------------------------------------------
 
 param set-default IMU_GYRO_RATEMAX 1000
-param set-default SENS_FLOW_RATE 150
 param set-default SENS_IMU_CLPNOTI 0
 
 # Internal SPI

boards/ark/can-gps/init/rc.board_defaults

@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------
 
 param set-default CBRK_IO_SAFETY 0
-param set-default MBE_ENABLE 0
+param set-default MBE_ENABLE 1
 param set-default SENS_IMU_CLPNOTI 0
 
 safety_button start

boards/ark/can-rtk-gps/init/rc.board_defaults

@@ -7,7 +7,7 @@ param set-default CBRK_IO_SAFETY 0
 param set-default CANNODE_SUB_MBD 1
 param set-default CANNODE_SUB_RTCM 1
 param set-default GPS_1_GNSS 63
-param set-default MBE_ENABLE 0
+param set-default MBE_ENABLE 1
 param set-default SENS_IMU_CLPNOTI 0
 
 safety_button start

boards/ark/cannode/init/rc.board_defaults

@@ -3,7 +3,6 @@
 # board specific defaults
 #------------------------------------------------------------------------------
 
-param set-default MBE_ENABLE 0
 param set-default SENS_IMU_CLPNOTI 0
 
 pwm_out start

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

@@ -3,8 +3,6 @@
 # board specific defaults
 #------------------------------------------------------------------------------
 
-param set-default EKF2_MULTI_IMU 0
-
 # Mavlink ethernet (CFG 1000)
 param set-default MAV_2_CONFIG 1000
 param set-default MAV_2_BROADCAST 1
@@ -19,7 +17,6 @@ param set-default SENS_EN_INA228 0
 param set-default SENS_EN_INA226 1
 
 param set-default SENS_EN_THERMAL 1
-param set-default SENS_IMU_MODE 1
 param set-default SENS_IMU_TEMP 10.0
 #param set-default SENS_IMU_TEMP_FF 0.0
 #param set-default SENS_IMU_TEMP_I 0.025

boards/ark/fmu-v6x/nuttx-config/nsh/defconfig

@@ -145,11 +145,10 @@ CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=8
 CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
-CONFIG_NETMAN_FALLBACK_IPADDR=0xC0A80004
+CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_IPADDR=0xC0A80004
-CONFIG_NETINIT_DNSIPADDR=0xC0A800FE
-CONFIG_NETINIT_DRIPADDR=0xC0A80001
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49

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

@@ -150,13 +150,8 @@ __EXPORT void board_on_reset(int status)
 		px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
 	}
 
-	/*
-	 * On resets invoked from system (not boot) ensure we establish a low
-	 * output state on PWM pins to disarm the ESC and prevent the reset from potentially
-	 * spinning up the motors.
-	 */
 	if (status >= 0) {
-		up_mdelay(100);
+		up_mdelay(6);
 	}
 }
 

boards/ark/fpv/default.px4board

@@ -18,7 +18,6 @@ CONFIG_DRIVERS_IMU_INVENSENSE_IIM42653=y
 CONFIG_DRIVERS_IMU_MURATA_SCH16T=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
-CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_COMMON_RC=y
 CONFIG_DRIVERS_UAVCAN=y
@@ -36,7 +35,6 @@ CONFIG_MODULES_FW_ATT_CONTROL=y
 CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y
 CONFIG_MODULES_FW_POS_CONTROL=y
 CONFIG_MODULES_FW_RATE_CONTROL=y
-CONFIG_MODULES_GIMBAL=y
 CONFIG_MODULES_GYRO_CALIBRATION=y
 CONFIG_MODULES_GYRO_FFT=y
 CONFIG_MODULES_LAND_DETECTOR=y

boards/ark/fpv/src/board_config.h

@@ -176,9 +176,6 @@
 
 #define BOARD_BATTERY1_V_DIV	 (21.0f) // (20k + 1k) / 1k = 21
 
-#define BOARD_BATTERY_ADC_VOLTAGE_FILTER_S 0.075f
-#define BOARD_BATTERY_ADC_CURRENT_FILTER_S 0.125f
-
 #define ADC_SCALED_PAYLOAD_SENSE ADC_SCALED_12V_CHANNEL
 
 /* HW has to large of R termination on ADC todo:change when HW value is chosen */

boards/ark/fpv/src/init.c

@@ -145,13 +145,8 @@ __EXPORT void board_on_reset(int status)
 		px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
 	}
 
-	/*
-	 * On resets invoked from system (not boot) ensure we establish a low
-	 * output state on PWM pins to disarm the ESC and prevent the reset from potentially
-	 * spinning up the motors.
-	 */
 	if (status >= 0) {
-		up_mdelay(100);
+		up_mdelay(6);
 	}
 }
 

boards/ark/pi6x/init/rc.board_defaults

@@ -32,11 +32,10 @@ then
 	param set-default SENS_TEMP_ID 2490378
 fi
 
-param set-default EKF2_MULTI_IMU 0
+param set-default EKF2_MULTI_IMU 2
 param set-default EKF2_OF_CTRL 1
 param set-default EKF2_OF_N_MIN 0.05
 param set-default EKF2_RNG_A_HMAX 25
 param set-default EKF2_RNG_QLTY_T 0.1
 
 param set-default SENS_FLOW_RATE 150
-param set-default SENS_IMU_MODE 1

boards/ark/pi6x/nuttx-config/bootloader/defconfig

@@ -32,7 +32,7 @@ CONFIG_BOARD_LOOPSPERMSEC=95150
 CONFIG_BOARD_RESET_ON_ASSERT=2
 CONFIG_CDCACM=y
 CONFIG_CDCACM_IFLOWCONTROL=y
-CONFIG_CDCACM_PRODUCTID=0x003A
+CONFIG_CDCACM_PRODUCTID=0x0039
 CONFIG_CDCACM_PRODUCTSTR="ARK BL Pi6X.x"
 CONFIG_CDCACM_RXBUFSIZE=600
 CONFIG_CDCACM_TXBUFSIZE=12000

boards/ark/pi6x/nuttx-config/nsh/defconfig

@@ -76,7 +76,7 @@ CONFIG_BOARD_RESET_ON_ASSERT=2
 CONFIG_BUILTIN=y
 CONFIG_CDCACM=y
 CONFIG_CDCACM_IFLOWCONTROL=y
-CONFIG_CDCACM_PRODUCTID=0x003A
+CONFIG_CDCACM_PRODUCTID=0x0039
 CONFIG_CDCACM_PRODUCTSTR="ARK Pi6X.x"
 CONFIG_CDCACM_RXBUFSIZE=600
 CONFIG_CDCACM_TXBUFSIZE=12000

boards/ark/pi6x/src/init.c

@@ -141,13 +141,8 @@ __EXPORT void board_on_reset(int status)
 		px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
 	}
 
-	/*
-	 * On resets invoked from system (not boot) ensure we establish a low
-	 * output state on PWM pins to disarm the ESC and prevent the reset from potentially
-	 * spinning up the motors.
-	 */
 	if (status >= 0) {
-		up_mdelay(100);
+		up_mdelay(6);
 	}
 }