TiltrotorEffectiveness: limit thrust axis tilt to z effectiveness scaling

During transition to FF, only allow update thrust axis up to 45° as with a high tilt angle
the effectiveness of the thrust axis in z is apporaching 0, and by that is increasing
the motor output to max.
Transition to HF: disable thrust axis tilting, and assume motors are vertical. This is to avoid
a thrust spike when the transition is initiated (as then the tilt is fully forward).

Signed-off-by: Silvan Fuhrer <silvan@auterion.com>

.ackrc

@@ -0,0 +1 @@
+--ignore-dir=Documentation

.ci/Jenkinsfile-compile

@@ -9,7 +9,7 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2023-06-26",
+            armhf: "px4io/px4-dev-armhf:2022-08-12",
             arm64: "px4io/px4-dev-aarch64:2022-08-12",
             base: "px4io/px4-dev-ros2-foxy:2022-08-12",
             nuttx: "px4io/px4-dev-nuttx-focal:2022-08-12",
@@ -40,16 +40,16 @@ pipeline {
                      "ark_can-flow_default",
                      "ark_can-gps_canbootloader",
                      "ark_can-gps_default",
-                     "ark_can-rtk-gps_canbootloader",
-                     "ark_can-rtk-gps_default",
                      "ark_cannode_canbootloader",
                      "ark_cannode_default",
+                     "ark_can-rtk-gps_canbootloader",
+                     "ark_can-rtk-gps_default",
                      "ark_fmu-v6x_bootloader",
                      "ark_fmu-v6x_default",
                      "atl_mantis-edu_default",
                      "av_x-v1_default",
-                     "bitcraze_crazyflie21_default",
                      "bitcraze_crazyflie_default",
+                     "bitcraze_crazyflie21_default",
                      "cuav_can-gps-v1_canbootloader",
                      "cuav_can-gps-v1_default",
                      "cuav_nora_default",
@@ -66,8 +66,8 @@ pipeline {
                      "holybro_durandal-v1_default",
                      "holybro_kakutef7_default",
                      "holybro_kakuteh7_default",
-                     "holybro_kakuteh7mini_default",
                      "holybro_kakuteh7v2_default",
+                     "holybro_kakuteh7mini_default",
                      "holybro_pix32v5_default",
                      "matek_gnss-m9n-f4_canbootloader",
                      "matek_gnss-m9n-f4_default",
@@ -77,8 +77,8 @@ pipeline {
                      "modalai_fc-v1_default",
                      "modalai_fc-v2_default",
                      "mro_ctrl-zero-classic_default",
-                     "mro_ctrl-zero-f7-oem_default",
                      "mro_ctrl-zero-f7_default",
+                     "mro_ctrl-zero-f7-oem_default",
                      "mro_ctrl-zero-h7-oem_default",
                      "mro_ctrl-zero-h7_default",
                      "mro_pixracerpro_default",
@@ -88,6 +88,7 @@ pipeline {
                      "nxp_fmuk66-e_socketcan",
                      "nxp_fmuk66-v3_default",
                      "nxp_fmuk66-v3_socketcan",
+                     "nxp_fmurt1062-v1_default",
                      "nxp_mr-canhubk3_default",
                      "nxp_ucans32k146_canbootloader",
                      "nxp_ucans32k146_default",
@@ -104,28 +105,19 @@ pipeline {
                      "px4_fmu-v5_debug",
                      "px4_fmu-v5_default",
                      "px4_fmu-v5_lto",
-                     "px4_fmu-v5_rover",
                      "px4_fmu-v5_stackcheck",
                      "px4_fmu-v5_uavcanv0periph",
                      "px4_fmu-v5x_default",
-                     "px4_fmu-v5x_rover",
                      "px4_fmu-v6c_default",
-                     "px4_fmu-v6c_rover",
                      "px4_fmu-v6u_default",
-                     "px4_fmu-v6u_rover",
                      "px4_fmu-v6x_default",
-                     "px4_fmu-v6x_rover",
-                     "px4_fmu-v6xrt_bootloader",
-                     "px4_fmu-v6xrt_default",
-                     "px4_fmu-v6xrt_rover",
                      "px4_io-v2_default",
                      "raspberrypi_pico_default",
-                     "siyi_n7_default",
                      "sky-drones_smartap-airlink_default",
                      "spracing_h7extreme_default",
                      "thepeach_k1_default",
                      "thepeach_r1_default",
-                     "uvify_core_default",
+                     "uvify_core_default"
             ],
             image: docker_images.nuttx,
             archive: true
@@ -177,7 +169,7 @@ pipeline {
   }
   options {
     buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
-    timeout(time: 120, unit: 'MINUTES')
+    timeout(time: 90, unit: 'MINUTES')
   }
 }
 

.ci/Jenkinsfile-hardware

@@ -12,7 +12,7 @@ pipeline {
             stage("build cubepilot_cubeorange_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -91,7 +91,7 @@ pipeline {
             stage("build cuav_x7pro_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -165,7 +165,7 @@ pipeline {
             stage("build px4_fmu-v4_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -238,7 +238,7 @@ pipeline {
             stage("build px4_fmu-v4pro_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -312,7 +312,7 @@ pipeline {
             stage("build px4_fmu-v5_debug") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -362,7 +362,7 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_stress"'
 
                     // test dataman
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests dataman" --ignore-stdout-errors'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests dataman"'
 
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests file" || true'
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
@@ -403,7 +403,7 @@ pipeline {
             stage("build px4_fmu-v5_stackcheck") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -449,7 +449,7 @@ pipeline {
                     sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
 
                     // test dataman
-                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests dataman" --ignore-stdout-errors'
+                    sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests dataman"'
                   }
                 }
                 stage("status") {
@@ -486,7 +486,7 @@ pipeline {
             stage("build px4_fmu-v5_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }
@@ -560,7 +560,7 @@ pipeline {
             stage("build nxp_fmuk66-v3_test") {
               agent {
                 docker {
-                  image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+                  image 'px4io/px4-dev-nuttx-focal:2021-09-08'
                   args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
                 }
               }

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
 {
 	"name": "px4-dev-nuttx",
-	"image": "px4io/px4-dev-nuttx-focal:2022-08-12",
+	"image": "px4io/px4-dev-nuttx-focal:2021-09-08",
 
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
 
@@ -29,8 +29,7 @@
 		"twxs.cmake",
 		"uavcan.dsdl",
 		"wholroyd.jinja",
-		"zixuanwang.linkerscript",
-		"ms-vscode.makefile-tools"
+		"zixuanwang.linkerscript"
 	],
 
 	"containerUser": "user",

.editorconfig

@@ -1,14 +0,0 @@
-root = true
-
-[*]
-insert_final_newline = false
-
-[{*.{c,cpp,cc,h,hpp},CMakeLists.txt,Kconfig}]
-indent_style = tab
-tab_width = 8
-# Not in the official standard, but supported by many editors
-max_line_length = 120
-
-[*.yaml]
-indent_style = space
-indent_size = 2

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -0,0 +1,34 @@
+---
+name: 🐛 Bug report
+about: Create a report to help us improve
+labels: bug-report
+
+---
+
+## Describe the bug
+A clear and concise description of the bug.
+
+## To Reproduce
+Steps to reproduce the behavior:
+1. Drone switched on '...'
+2. Uploaded mission '....' (attach QGC mission file)
+3. Took off '....'
+4. See error
+
+## Expected behavior
+A clear and concise description of what you expected to happen.
+
+## Log Files and Screenshots
+*Always* provide a link to the flight log file:
+- Download the flight log file from the vehicle ([tutorial](https://docs.px4.io/main/en/getting_started/flight_reporting.html)).
+- Upload the log to the [PX4 Flight Review](http://logs.px4.io/)
+- Share the link to the log (Copy and paste the URL of the log)
+
+Add screenshots to help explain your problem.
+
+## Drone (please complete the following information):
+- Describe the type of drone.
+- Photo of the IMU / autopilot setup if possible.
+
+## Additional context
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -0,0 +1,20 @@
+---
+name: 🚀 Feature Request
+about: Suggest an idea for this project
+labels: feature-request
+
+---
+
+For general questions please use [PX4 Discuss](http://discuss.px4.io/) or Discord (you can find an invite link on this project README).
+
+## Describe problem solved by the proposed feature
+A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...
+
+## Describe your preferred solution
+A clear and concise description of what you want to happen.
+
+## Describe possible alternatives
+A clear and concise description of alternative solutions or features you've considered.
+
+## Additional context
+Add any other context or screenshots for the feature request here.

.github/ISSUE_TEMPLATE/3_Support_question.md

@@ -0,0 +1,13 @@
+---
+name: ⛔ Support Question
+about: See http://discuss.px4.io/ for questions about using PX4.
+
+---
+
+## Attention! Please read the note below
+
+We use GitHub issues only to discuss PX4 bugs and new features.
+
+**For questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).**
+
+Thanks!

.github/ISSUE_TEMPLATE/4_Documentation_issue.md

@@ -0,0 +1,11 @@
+---
+name: ⛔ Documentation Issue
+about: See https://github.com/PX4/px4_user_guide for documentation issues
+
+---
+
+## Attention! Please read the note below
+
+**Please submit the documentation issue to the [User Guide](https://github.com/PX4/px4_user_guide) repository.**
+
+Thanks!

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Support Question
-    url: https://docs.px4.io/main/en/contribute/support.html#forums-and-chat
-    about: For questions about using PX4 or related components, please use the discuss forum and discord server
-  - name: Documentation Issue
-    url: https://github.com/PX4/PX4-user_guide/issues
-    about: If you found an issue in documentation, please submit it directly to the docs repository issues

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,35 +0,0 @@
-name: 🚀 Feature Request
-description: Suggest an idea for this project
-labels: ["feature-request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Please note that feature requests are not 'fire and forget'
-        It is a lot more likely that the feature you would like to have will be implemented if you keep watching your feature request, and provide more details to developers looking into implementing your feature, and help them with testing.
-
-  - type: textarea
-    attributes:
-      label: Describe problem solved by the proposed feature
-      description: A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Describe your preferred solution
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Describe possible alternatives
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots for the feature request here.

.github/slack.svg

@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20">
+  <linearGradient id="smooth" x2="0" y2="100%">
+    <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+    <stop offset="1" stop-opacity=".1"/>
+  </linearGradient>
+
+  <mask id="round">
+    <rect width="90" height="20" rx="3" fill="#fff"/>
+  </mask>
+
+  <g mask="url(#round)">
+    <rect width="42" height="20" fill="#555"/>
+    <rect x="42" width="48" height="20" fill="#E01563"/>
+    <rect width="90" height="20" fill="url(#smooth)"/>
+  </g>
+
+  <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+    <text x="22" y="15" fill="#010101" fill-opacity=".3">slack</text>
+    <text x="22" y="14">slack</text>
+    <text x="65" y="15" fill="#010101" fill-opacity=".3">Join us!</text>
+    <text x="65" y="14">Join us!</text>
+  </g>
+</svg>
+

.github/stale.yml

@@ -0,0 +1,15 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed, or `false` to disable
+daysUntilClose: false
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/checks.yml

@@ -28,7 +28,7 @@ jobs:
           "parameters_metadata",
         ]
     container:
-      image: px4io/px4-dev-nuttx-focal:2022-08-12
+      image: px4io/px4-dev-nuttx-focal:2021-09-08
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1

.github/workflows/compile_linux.yml

@@ -1,12 +1,9 @@
-name: Compile Linux Targets
+name: Linux Targets
 
 on:
   push:
     branches:
     - 'main'
-    - 'stable'
-    - 'beta'
-    - 'release/*'
   pull_request:
     branches:
     - '*'
@@ -14,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2023-06-26
+    container: px4io/px4-dev-armhf:2021-09-08
     strategy:
       matrix:
         config: [
@@ -27,8 +24,7 @@ jobs:
     - uses: actions/checkout@v1
       with:
         token: ${{secrets.ACCESS_TOKEN}}
-    - name: ownership workaround
-      run: git config --system --add safe.directory '*'
+
     - name: Prepare ccache timestamp
       id: ccache_cache_timestamp
       shell: cmake -P {0}

.github/workflows/compile_linux_arm64.yml

@@ -1,12 +1,9 @@
-name: Compile Linux ARM64 Targets
+name: Linux ARM64 Targets
 
 on:
   push:
     branches:
     - 'main'
-    - 'stable'
-    - 'beta'
-    - 'release/*'
   pull_request:
     branches:
     - '*'
@@ -14,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-aarch64:2022-08-12
+    container: px4io/px4-dev-aarch64:2021-09-08
     strategy:
       matrix:
         config: [

.github/workflows/compile_macos.yml

@@ -10,19 +10,15 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     strategy:
       matrix:
         config: [
           px4_fmu-v5_default,
           px4_sitl
+          #tests, # includes px4_sitl
           ]
     steps:
-    - name: install Python 3.10
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-
     - uses: actions/checkout@v1
       with:
         token: ${{secrets.ACCESS_TOKEN}}

.github/workflows/compile_nuttx.yml

@@ -1,12 +1,9 @@
-name: Compile Nuttx Targets
+name: Nuttx Targets
 
 on:
   push:
     branches:
     - 'main'
-    - 'stable'
-    - 'beta'
-    - 'release/*'
   pull_request:
     branches:
     - '*'
@@ -14,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2022-08-12
+    container: px4io/px4-dev-nuttx-focal:2021-09-08
     strategy:
       fail-fast: false
       matrix:
@@ -25,7 +22,6 @@ jobs:
           ark_can-rtk-gps,
           ark_cannode,
           ark_fmu-v6x,
-          ark_septentrio-gps,
           atl_mantis-edu,
           av_x-v1,
           bitcraze_crazyflie,
@@ -49,7 +45,6 @@ jobs:
           matek_h743-slim,
           modalai_fc-v1,
           modalai_fc-v2,
-          mro_ctrl-zero-classic,
           mro_ctrl-zero-f7,
           mro_ctrl-zero-f7-oem,
           mro_ctrl-zero-h7,
@@ -59,6 +54,7 @@ jobs:
           mro_x21-777,
           nxp_fmuk66-e,
           nxp_fmuk66-v3,
+          nxp_fmurt1062-v1,
           nxp_mr-canhubk3,
           nxp_ucans32k146,
           omnibus_f4sd,
@@ -71,12 +67,10 @@ jobs:
           px4_fmu-v6c,
           px4_fmu-v6u,
           px4_fmu-v6x,
-          px4_fmu-v6xrt,
           raspberrypi_pico,
           sky-drones_smartap-airlink,
           spracing_h7extreme,
-          uvify_core,
-          siyi_n7
+          uvify_core
           ]
     steps:
     - uses: actions/checkout@v1

.github/workflows/deploy_all.yml

@@ -24,15 +24,12 @@ jobs:
     needs: enumerate_targets
     strategy:
       matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
-    container: ${{ matrix.container }}
+    container: px4io/px4-dev-${{ matrix.container }}:2021-09-08
     steps:
     - uses: actions/checkout@v1
       with:
         token: ${{secrets.ACCESS_TOKEN}}
 
-    - name: ownership workaround
-      run: git config --system --add safe.directory '*'
-
     - name: make ${{matrix.target}}
       run: make ${{matrix.target}}
 

.github/workflows/failsafe_sim.yml

@@ -21,7 +21,7 @@ jobs:
           "failsafe_web",
         ]
     container:
-      image: px4io/px4-dev-nuttx-focal:2022-08-12
+      image: px4io/px4-dev-nuttx-focal:2021-09-08
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v1

.github/workflows/metadata.yml

@@ -103,7 +103,7 @@ jobs:
 
   uorb_graph:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2022-08-12
+    container: px4io/px4-dev-nuttx-focal:2021-09-08
     steps:
     - uses: actions/checkout@v1
       with:
@@ -128,6 +128,4 @@ jobs:
       run: |
         git clone https://github.com/PX4/px4_msgs.git
         rm px4_msgs/msg/*.msg
-        rm px4_msgs/srv/*.srv
         cp msg/*.msg px4_msgs/msg/
-        cp srv/*.srv px4_msgs/srv/

.github/workflows/nuttx_env_config.yml

@@ -1,32 +0,0 @@
-name: Nuttx Target with extra env config
-
-on:
-  push:
-    branches:
-    - 'main'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-nuttx-focal:2022-08-12
-    strategy:
-      matrix:
-        config: [
-          px4_fmu-v5,
-          ]
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: make ${{matrix.config}}
-      env:
-        PX4_EXTRA_NUTTX_CONFIG: "CONFIG_NSH_LOGIN_PASSWORD=\"test\";CONFIG_NSH_CONSOLE_LOGIN=y"
-      run: |
-        echo "PX4_EXTRA_NUTTX_CONFIG: $PX4_EXTRA_NUTTX_CONFIG"
-        make ${{matrix.config}} nuttx_context
-        # Check that the config option is set
-        grep CONFIG_NSH_LOGIN_PASSWORD build/${{matrix.config}}_default/NuttX/nuttx/.config

.github/workflows/stale.yml

@@ -1,16 +0,0 @@
-name: 'Handle stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          days-before-stale: 30
-          days-before-close: -1
-          stale-issue-label: 'stale'
-          stale-pr-label: 'stale'
-          remove-stale-when-updated: true

.github_changelog_generator

@@ -0,0 +1,33 @@
+# How to install:
+#   gem install github_changelog_generator
+# How to run:
+#   github_changelog_generator -u PX4 -p Firmware
+# Description:
+#   The following params are sensible defaults for the PX4 project,
+#   if you want to do a changelog before a release you need to update since-tag and future-releases,
+
+# Params:
+#   github_changelog_generator --help for all options
+
+# max-issues
+#   max threshold for github api queries
+#   make sure you set your CHANGELOG_GITHUB_TOKEN before
+#   running
+max-issues=1500
+
+# exclude-tags-regex
+#   excludes release candidates
+exclude-tags-regex=rc[0-9]{1,}|beta[0-9]{1,}
+
+# since-tag
+#   version of last stable release
+#   you need to change this depending on what you need
+#   if you want a changelog between versions this is the lowest version
+since-tag=1.6.5
+
+# future-release
+#   version you are about to release
+#   if you want a changelog between a version and all unreleased changes grouped as a release
+#     eg: v1.6.5 to v1.7.0
+future-release=v1.7.0
+

.gitmodules

@@ -21,7 +21,7 @@
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-10.3.0+
+	branch = px4_firmware_nuttx-10.3.0+-v1.14
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
 	url = https://github.com/PX4/NuttX-apps.git
@@ -62,24 +62,3 @@
 	path = src/modules/uxrce_dds_client/Micro-XRCE-DDS-Client
 	url = https://github.com/PX4/Micro-XRCE-DDS-Client.git
 	branch = px4
-[submodule "src/lib/cdrstream/cyclonedds"]
-	path = src/lib/cdrstream/cyclonedds
-	url = https://github.com/px4/cyclonedds
-[submodule "src/lib/cdrstream/rosidl"]
-	path = src/lib/cdrstream/rosidl
-	url = https://github.com/px4/rosidl
-[submodule "src/modules/zenoh/zenoh-pico"]
-	path = src/modules/zenoh/zenoh-pico
-	url = https://github.com/px4/zenoh-pico
-	branch = pr-zubf-werror-fix
-[submodule "src/lib/heatshrink/heatshrink"]
-	path = src/lib/heatshrink/heatshrink
-	url = https://github.com/PX4/heatshrink.git
-	branch = px4
-[submodule "Tools/simulation/gz"]
-	path = Tools/simulation/gz
-	url = https://github.com/PX4/PX4-gazebo-models.git
-	branch = main
-[submodule "boards/modalai/voxl2/libfc-sensor-api"]
-	path = boards/modalai/voxl2/libfc-sensor-api
-	url = https://gitlab.com/voxl-public/voxl-sdk/core-libs/libfc-sensor-api.git

.travis.yml

@@ -0,0 +1,35 @@
+language: cpp
+
+git:
+  depth: 100
+  submodules: false
+
+matrix:
+  fast_finish: true
+  include:
+    - os: linux
+      dist: xenial
+      # In order to stay under the coverity rate limit, we only run this weekly
+      # and not on push which is configured in travis-ci settings.
+      if: branch = main
+
+before_install:
+    - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+
+install:
+    - export PATH=$HOME/.local/bin:$PATH
+    - pip install --user --upgrade pip
+    - pip install --user -r Tools/setup/requirements.txt
+
+script:
+    - make
+
+addons:
+  coverity_scan:
+    project:
+      name: "PX4/Firmware"
+      description: "Build submitted via Travis CI"
+    notification_email: ci@px4.io
+    build_command_prepend: "make distclean"
+    build_command: "make px4_sitl_default"
+    branch_pattern: coverity_scan

.vscode/cmake-variants.yaml

@@ -71,26 +71,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: px4_fmu-v5x_default
-    px4_fmu-v6c_default:
-      short: px4_fmu-v6c
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6c_default
-    px4_fmu-v6c_bootloader:
-      short: px4_fmu-v6c_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6c_bootloader
-    px4_fmu-v6u_default:
-      short: px4_fmu-v6u
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6u_default
-    px4_fmu-v6u_bootloader:
-      short: px4_fmu-v6u_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6u_bootloader
     px4_fmu-v6x_default:
       short: px4_fmu-v6x
       buildType: MinSizeRel
@@ -101,16 +81,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: px4_fmu-v6x_bootloader
-    px4_fmu-v6xrt_default:
-      short: px4_fmu-v6xrt
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6xrt_default
-    px4_fmu-v6xrt_bootloader:
-      short: px4_fmu-v6xrt_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v6xrt_bootloader
     airmind_mindpx-v2_default:
       short: airmind_mindpx-v2
       buildType: MinSizeRel
@@ -151,16 +121,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: ark_can-rtk-gps_canbootloader
-    ark_septentrio_gps_default:
-      short: ark_septentrio_gps_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_septentrio_gps_default
-    ark_septentrio_gps_canbootloader:
-      short: ark_septentrio_gps_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_septentrio_gps_canbootloader
     ark_cannode_default:
       short: ark_cannode_default
       buildType: MinSizeRel
@@ -221,11 +181,6 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: cubepilot_cubeorange_test
-    cubepilot_cubeorangeplus_test:
-      short: cubepilot_cubeorangeplus
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cubepilot_cubeorangeplus_test
     emlid_navio2_default:
       short: emlid_navio2
       buildType: MinSizeRel

.vscode/extensions.json

@@ -18,7 +18,6 @@
         "twxs.cmake",
         "uavcan.dsdl",
         "wholroyd.jinja",
-        "zixuanwang.linkerscript",
-        "ms-vscode.makefile-tools"
+        "zixuanwang.linkerscript"
     ]
 }

.vscode/settings.json

@@ -127,6 +127,5 @@
         "terminal.integrated.scrollback": 15000,
         "yaml.schemas": {
                 "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
-        },
-        "ros.distro": "humble"
+        }
 }

.ycm_extra_conf.py

@@ -0,0 +1,172 @@
+# This file is NOT licensed under the GPLv3, which is the license for the rest
+# of YouCompleteMe.
+#
+# Here's the license text for this file:
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <http://unlicense.org/>
+
+import os
+import ycm_core
+
+# These are the compilation flags that will be used in case there's no
+# compilation database set (by default, one is not set).
+# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR.
+flags = [
+'-Wall',
+'-Wextra',
+'-Werror',
+#'-Wc++98-compat',
+'-Wno-long-long',
+'-Wno-variadic-macros',
+'-fexceptions',
+'-DNDEBUG',
+# You 100% do NOT need -DUSE_CLANG_COMPLETER in your flags; only the YCM
+# source code needs it.
+#'-DUSE_CLANG_COMPLETER',
+# THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
+# language to use when compiling headers. So it will guess. Badly. So C++
+# headers will be compiled as C headers. You don't want that so ALWAYS specify
+# a "-std=<something>".
+# For a C project, you would set this to something like 'c99' instead of
+# 'c++14'.
+'-std=c++14',
+# ...and the same thing goes for the magic -x option which specifies the
+# language that the files to be compiled are written in. This is mostly
+# relevant for c++ headers.
+# For a C project, you would set this to 'c' instead of 'c++'.
+'-x',
+'c++',
+'-undef', # get rid of standard definitions to allow us to include arm math header
+'-I', os.path.join(os.path.expanduser("~"),'gcc-arm-none-eabi-4_7-2013q3/arm-none-eabi/include'),
+'-I', 'Build/px4_io-v2_default.build/nuttx-export/include/',
+'-I', './NuttX/nuttx/arch/arm/include',
+'-include', './src/include/visibility.h',
+'-I', './src',
+'-I', './src/modules',
+'-I', './src/include',
+'-I', './src/lib',
+'-I', './NuttX',
+]
+
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = ''
+
+if os.path.exists( compilation_database_folder ):
+  database = ycm_core.CompilationDatabase( compilation_database_folder )
+else:
+  database = None
+
+SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
+
+def DirectoryOfThisScript():
+  return os.path.dirname( os.path.abspath( __file__ ) )
+
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+  if not working_directory:
+    return list( flags )
+  new_flags = []
+  make_next_absolute = False
+  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+  for flag in flags:
+    new_flag = flag
+
+    if make_next_absolute:
+      make_next_absolute = False
+      if not flag.startswith( '/' ):
+        new_flag = os.path.join( working_directory, flag )
+
+    for path_flag in path_flags:
+      if flag == path_flag:
+        make_next_absolute = True
+        break
+
+      if flag.startswith( path_flag ):
+        path = flag[ len( path_flag ): ]
+        new_flag = path_flag + os.path.join( working_directory, path )
+        break
+
+    if new_flag:
+      new_flags.append( new_flag )
+  return new_flags
+
+
+def IsHeaderFile( filename ):
+  extension = os.path.splitext( filename )[ 1 ]
+  return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
+
+
+def GetCompilationInfoForFile( filename ):
+  # The compilation_commands.json file generated by CMake does not have entries
+  # for header files. So we do our best by asking the db for flags for a
+  # corresponding source file, if any. If one exists, the flags for that file
+  # should be good enough.
+  if IsHeaderFile( filename ):
+    basename = os.path.splitext( filename )[ 0 ]
+    for extension in SOURCE_EXTENSIONS:
+      replacement_file = basename + extension
+      if os.path.exists( replacement_file ):
+        compilation_info = database.GetCompilationInfoForFile(
+          replacement_file )
+        if compilation_info.compiler_flags_:
+          return compilation_info
+    return None
+  return database.GetCompilationInfoForFile( filename )
+
+
+def FlagsForFile( filename, **kwargs ):
+  if database:
+    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+    # python list, but a "list-like" StringVec object
+    compilation_info = GetCompilationInfoForFile( filename )
+    if not compilation_info:
+      return None
+
+    final_flags = MakeRelativePathsInFlagsAbsolute(
+      compilation_info.compiler_flags_,
+      compilation_info.compiler_working_dir_ )
+
+    # NOTE: This is just for YouCompleteMe; it's highly likely that your project
+    # does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR
+    # ycm_extra_conf IF YOU'RE NOT 100% SURE YOU NEED IT.
+    #try:
+    #  final_flags.remove( '-stdlib=libc++' )
+    #except ValueError:
+    #  pass
+  else:
+    relative_to = DirectoryOfThisScript()
+    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+  return {
+    'flags': final_flags,
+    'do_cache': True
+  }

CMakeLists.txt

@@ -148,7 +148,6 @@ define_property(GLOBAL PROPERTY PX4_MODULE_PATHS
                  BRIEF_DOCS "PX4 module paths"
                  FULL_DOCS "List of paths to all PX4 modules"
                  )
-
 define_property(GLOBAL PROPERTY PX4_SRC_FILES
                  BRIEF_DOCS "src files from all PX4 modules & libs"
                  FULL_DOCS "SRC files from px4_add_{module,library}"
@@ -415,8 +414,6 @@ endif()
 #
 add_library(parameters_interface INTERFACE)
 add_library(kernel_parameters_interface INTERFACE)
-add_library(events_interface INTERFACE)
-add_library(kernel_events_interface INTERFACE)
 
 include(px4_add_library)
 add_subdirectory(src/lib EXCLUDE_FROM_ALL)
@@ -443,11 +440,8 @@ add_subdirectory(src/lib/parameters EXCLUDE_FROM_ALL)
 if(${PX4_PLATFORM} STREQUAL "nuttx" AND NOT CONFIG_BUILD_FLAT)
 	target_link_libraries(parameters_interface INTERFACE usr_parameters)
 	target_link_libraries(kernel_parameters_interface INTERFACE parameters)
-	target_link_libraries(events_interface INTERFACE usr_events)
-	target_link_libraries(kernel_events_interface INTERFACE events)
 else()
 	target_link_libraries(parameters_interface INTERFACE parameters)
-	target_link_libraries(events_interface INTERFACE events)
 endif()
 
 # firmware added last to generate the builtin for included modules

Firmware.sublime-project

@@ -0,0 +1,83 @@
+{
+	"folders":
+	[
+		{
+			"path": ".",
+			"file_exclude_patterns":
+			[
+				"*.o",
+				"*.a",
+				"*.d",
+				".built",
+				".context",
+				".depend",
+				".config",
+				".version",
+				"Make.dep",
+				".configured",
+				"*.sublime-project",
+				"*.sublime-workspace",
+				".project",
+				".cproject",
+				"cscope.out"
+			],
+			"folder_exclude_patterns":
+			[
+				".settings",
+				"nuttx/arch/arm/src/board",
+				"nuttx/arch/arm/src/chip",
+				"build_*"
+			]
+		}
+	],
+	"settings":
+	{
+		"tab_size": 8,
+		"translate_tabs_to_spaces": false,
+		"highlight_line": true,
+		"AStyleFormatter":
+		{
+			"options_c":
+			{
+				"use_only_additional_options": true,
+				"additional_options_file": "${project_path}/Tools/astyle/astylerc"
+			},
+			"options_c++":
+			{
+				"use_only_additional_options": true,
+				"additional_options_file": "${project_path}/Tools/astyle/astylerc"
+			}
+		}
+	},
+	"build_systems":
+	[
+		{
+			"name": "PX4: make all",
+			"working_dir": "${project_path}",
+			"file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
+			"cmd": ["make"],
+			"shell": true
+		},
+		{
+			"name": "PX4: make and upload",
+			"working_dir": "${project_path}",
+			"file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
+			"cmd": ["make upload px4_fmu-v2_default -j8"],
+			"shell": true
+		},
+		{
+			"name": "PX4: make posix",
+			"working_dir": "${project_path}",
+			"file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
+			"cmd": ["make posix"],
+			"shell": true
+		},
+		{
+			"name": "MindPX_V2: make and upload",
+			"working_dir": "${project_path}",
+			"file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
+			"cmd": ["make upload mindpx-v2_default -j8"],
+			"shell": true
+		}
+	]
+}

Jenkinsfile

@@ -94,7 +94,7 @@ pipeline {
 
         stage('failsafe docs') {
           agent {
-            docker { image 'px4io/px4-dev-nuttx-focal:2022-08-12' }
+            docker { image 'px4io/px4-dev-nuttx-focal:2021-08-18' }
           }
           steps {
             sh '''#!/bin/bash -l
@@ -105,7 +105,6 @@ pipeline {
             ./emsdk activate latest;
             cd ..;
             . ./_emscripten_sdk/emsdk_env.sh;
-            git fetch --all --tags;
             make failsafe_web;
             cd build/px4_sitl_default_failsafe_web;
             mkdir -p failsafe_sim;
@@ -126,7 +125,7 @@ pipeline {
         stage('uORB graphs') {
           agent {
             docker {
-              image 'px4io/px4-dev-nuttx-focal:2022-08-12'
+              image 'px4io/px4-dev-nuttx-focal:2021-08-18'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -231,9 +230,7 @@ pipeline {
               sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
               // 'main' branch
               sh('rm -f px4_msgs/msg/*.msg')
-              sh('rm -f px4_msgs/srv/*.srv')
               sh('cp msg/*.msg px4_msgs/msg/')
-              sh('cp srv/*.srv px4_msgs/srv/')
               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

@@ -205,5 +205,3 @@ menu "platforms"
 depends on PLATFORM_QURT || PLATFORM_POSIX
 source "platforms/common/Kconfig"
 endmenu
-
-source "src/lib/*/Kconfig"

Makefile

@@ -266,6 +266,7 @@ px4fmu_firmware: \
 
 misc_qgc_extra_firmware: \
 	check_nxp_fmuk66-v3_default \
+	check_nxp_fmurt1062-v1_default \
 	check_mro_x21_default \
 	check_bitcraze_crazyflie_default \
 	check_bitcraze_crazyflie21_default \
@@ -483,9 +484,7 @@ validate_module_configs:
 	@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f \
 	-not -path "$(SRC_DIR)/src/lib/mixer_module/*" \
 	-not -path "$(SRC_DIR)/src/modules/uxrce_dds_client/dds_topics.yaml" \
-	-not -path "$(SRC_DIR)/src/modules/zenoh/zenoh-pico/*" \
 	-not -path "$(SRC_DIR)/src/lib/events/libevents/*" \
-	-not -path "$(SRC_DIR)/src/lib/cdrstream/*" \
 	-not -path "$(SRC_DIR)/src/lib/crypto/libtommath/*" -print0 | \
 	xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml
 

README.md

@@ -114,7 +114,7 @@ These boards are maintained to be compatible with PX4-Autopilot by the Manufactu
 
 ### Community supported
 
-These boards don't fully comply industry standards, and thus is solely maintained by the PX4 public community members.
+These boards don't fully comply industry standards, and thus is solely maintained by the PX4 publc community members.
 
 ### Experimental
 

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

@@ -22,17 +22,18 @@ param set-default CBRK_SUPPLY_CHK 894281
 # - without safety switch
 param set-default CBRK_IO_SAFETY 22027
 
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
 param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
 param set-default CA_ROTOR3_KM -0.05
 
 param set-default PWM_MAIN_FUNC1 101

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

@@ -26,7 +26,7 @@ param set-default CBRK_IO_SAFETY 22027
 
 param set-default BAT_N_CELLS 3
 
-param set-default SIH_T_MAX 6
+param set-default SIH_T_MAX 6.0
 param set-default SIH_MASS 0.3
 param set-default SIH_IXX 0.00402
 param set-default SIH_IYY 0.0144
@@ -45,9 +45,9 @@ param set-default CA_ROTOR_COUNT 1
 param set-default CA_SV_CS_COUNT 3
 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_TRQ_P 1.0
 param set-default CA_SV_CS1_TYPE 3
-param set-default CA_SV_CS2_TRQ_Y 1
+param set-default CA_SV_CS2_TRQ_Y 1.0
 param set-default CA_SV_CS2_TYPE 4
 param set-default PWM_MAIN_FUNC3 201
 param set-default PWM_MAIN_FUNC4 202

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

@@ -35,14 +35,14 @@ param set-default CBRK_IO_SAFETY 22027
 
 param set-default BAT_N_CELLS 3
 
-param set-default SIH_T_MAX 2
+param set-default SIH_T_MAX 2.0
 param set-default SIH_Q_MAX 0.0165
 param set-default SIH_MASS 0.2
 # IXX and IZZ are inverted from the thesis as the body frame is pitched by 90 deg
 param set-default SIH_IXX 0.00354
 param set-default SIH_IYY 0.000625
 param set-default SIH_IZZ 0.00300
-param set-default SIH_IXZ 0
+param set-default SIH_IXZ 0.0
 param set-default SIH_KDV 0.2
 param set-default SIH_L_ROLL 0.145
 

ROMFS/px4fmu_common/init.d-posix/airframes/1010_gazebo-classic_iris_opt_flow

@@ -31,7 +31,6 @@ param set-default PWM_MAIN_FUNC4 104
 
 # EKF2
 param set-default EKF2_GPS_CTRL 0
-param set-default EKF2_HGT_REF 0
 param set-default EKF2_EVP_NOISE 0.05
 param set-default EKF2_EVA_NOISE 0.05
 param set-default EKF2_OF_CTRL 1
@@ -40,12 +39,9 @@ param set-default EKF2_OF_CTRL 1
 param set-default LPE_FUSION 242
 param set-default LPE_FAKE_ORIGIN 1
 
-# Commander
-# param set-default COM_HOME_EN 0 # Disable setting of home position
-
 param set-default MPC_ALT_MODE 2
 
 param set-default SENS_FLOW_ROT 6
 param set-default SENS_FLOW_MINHGT 0.7
-param set-default SENS_FLOW_MAXHGT 3
+param set-default SENS_FLOW_MAXHGT 3.0
 param set-default SENS_FLOW_MAXR 2.5

ROMFS/px4fmu_common/init.d-posix/airframes/1015_gazebo-classic_iris_depth_camera

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor with a depth camera (forward-facing)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10015_gazebo-classic_iris

ROMFS/px4fmu_common/init.d-posix/airframes/1016_gazebo-classic_iris_downward_depth_camera

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor with a depth camera (downward-facing)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10015_gazebo-classic_iris

ROMFS/px4fmu_common/init.d-posix/airframes/1021_gazebo-classic_uuv_hippocampus

@@ -8,34 +8,34 @@
 param set-default CA_AIRFRAME 7
 param set-default CA_ROTOR_COUNT 4
 param set-default CA_R_REV 255
-param set-default CA_ROTOR0_AX 1
-param set-default CA_ROTOR0_AY 0
-param set-default CA_ROTOR0_AZ 0
-param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PX 0
-param set-default CA_ROTOR0_PY -0.3
-param set-default CA_ROTOR0_PZ -0.3
-param set-default CA_ROTOR1_AX 1
-param set-default CA_ROTOR1_AY 0
-param set-default CA_ROTOR1_AZ 0
-param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PX 0
-param set-default CA_ROTOR1_PY 0.3
-param set-default CA_ROTOR1_PZ -0.3
-param set-default CA_ROTOR2_AX 1
-param set-default CA_ROTOR2_AY 0
-param set-default CA_ROTOR2_AZ 0
-param set-default CA_ROTOR2_KM 0
-param set-default CA_ROTOR2_PX 0
-param set-default CA_ROTOR2_PY 0.3
-param set-default CA_ROTOR2_PZ 0.3
-param set-default CA_ROTOR3_AX 1
-param set-default CA_ROTOR3_AY 0
-param set-default CA_ROTOR3_AZ 0
-param set-default CA_ROTOR3_KM 0
-param set-default CA_ROTOR3_PX 0
-param set-default CA_ROTOR3_PY -0.3
-param set-default CA_ROTOR3_PZ 0.3
+param set-default CA_ROTOR0_AX 1.0000
+param set-default CA_ROTOR0_AY 0.0000
+param set-default CA_ROTOR0_AZ 0.0000
+param set-default CA_ROTOR0_KM 0.0000
+param set-default CA_ROTOR0_PX 0.0000
+param set-default CA_ROTOR0_PY -0.3000
+param set-default CA_ROTOR0_PZ -0.3000
+param set-default CA_ROTOR1_AX 1.0000
+param set-default CA_ROTOR1_AY 0.0000
+param set-default CA_ROTOR1_AZ 0.0000
+param set-default CA_ROTOR1_KM 0.0000
+param set-default CA_ROTOR1_PX 0.0000
+param set-default CA_ROTOR1_PY 0.3000
+param set-default CA_ROTOR1_PZ -0.3000
+param set-default CA_ROTOR2_AX 1.0000
+param set-default CA_ROTOR2_AY 0.0000
+param set-default CA_ROTOR2_AZ 0.0000
+param set-default CA_ROTOR2_KM 0.0000
+param set-default CA_ROTOR2_PX 0.0000
+param set-default CA_ROTOR2_PY 0.3000
+param set-default CA_ROTOR2_PZ 0.3000
+param set-default CA_ROTOR3_AX 1.0000
+param set-default CA_ROTOR3_AY 0.0000
+param set-default CA_ROTOR3_AZ 0.0000
+param set-default CA_ROTOR3_KM 0.0000
+param set-default CA_ROTOR3_PX 0.0000
+param set-default CA_ROTOR3_PY -0.3000
+param set-default CA_ROTOR3_PZ 0.3000
 
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102

ROMFS/px4fmu_common/init.d-posix/airframes/1022_gazebo-classic_uuv_bluerov2_heavy

@@ -9,49 +9,49 @@ param set-default CA_AIRFRAME 7
 
 param set-default CA_ROTOR_COUNT 8
 param set-default CA_R_REV 255
-param set-default CA_ROTOR0_AX 1
-param set-default CA_ROTOR0_AY -1
-param set-default CA_ROTOR0_AZ 0
-param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PX 0.5
-param set-default CA_ROTOR0_PY 0.3
-param set-default CA_ROTOR0_PZ 0.2
-param set-default CA_ROTOR1_AX 1
-param set-default CA_ROTOR1_AY 1
-param set-default CA_ROTOR1_AZ 0
-param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PX 0.5
-param set-default CA_ROTOR1_PY -0.3
-param set-default CA_ROTOR1_PZ 0.2
-param set-default CA_ROTOR2_AX 1
-param set-default CA_ROTOR2_AY 1
-param set-default CA_ROTOR2_AZ 0
-param set-default CA_ROTOR2_KM 0
-param set-default CA_ROTOR2_PX -0.5
-param set-default CA_ROTOR2_PY 0.3
-param set-default CA_ROTOR2_PZ 0.2
-param set-default CA_ROTOR3_AX 1
-param set-default CA_ROTOR3_AY -1
-param set-default CA_ROTOR3_AZ 0
-param set-default CA_ROTOR3_KM 0
-param set-default CA_ROTOR3_PX -0.5
-param set-default CA_ROTOR3_PY -0.3
-param set-default CA_ROTOR3_PZ 0.2
-param set-default CA_ROTOR4_AZ -1
-param set-default CA_ROTOR4_KM 0
-param set-default CA_ROTOR4_PX 0.5
-param set-default CA_ROTOR4_PY 0.5
-param set-default CA_ROTOR5_AZ 1
-param set-default CA_ROTOR5_KM 0
-param set-default CA_ROTOR5_PX 0.5
-param set-default CA_ROTOR5_PY -0.5
-param set-default CA_ROTOR6_AZ 1
-param set-default CA_ROTOR6_KM 0
-param set-default CA_ROTOR6_PX -0.5
-param set-default CA_ROTOR6_PY 0.5
-param set-default CA_ROTOR7_KM 0
-param set-default CA_ROTOR7_PX -0.5
-param set-default CA_ROTOR7_PY -0.5
+param set-default CA_ROTOR0_AX 1.0000
+param set-default CA_ROTOR0_AY -1.0000
+param set-default CA_ROTOR0_AZ 0.0000
+param set-default CA_ROTOR0_KM 0.0000
+param set-default CA_ROTOR0_PX 0.5000
+param set-default CA_ROTOR0_PY 0.3000
+param set-default CA_ROTOR0_PZ 0.2000
+param set-default CA_ROTOR1_AX 1.0000
+param set-default CA_ROTOR1_AY 1.0000
+param set-default CA_ROTOR1_AZ 0.0000
+param set-default CA_ROTOR1_KM 0.0000
+param set-default CA_ROTOR1_PX 0.5000
+param set-default CA_ROTOR1_PY -0.3000
+param set-default CA_ROTOR1_PZ 0.2000
+param set-default CA_ROTOR2_AX 1.0000
+param set-default CA_ROTOR2_AY 1.0000
+param set-default CA_ROTOR2_AZ 0.0000
+param set-default CA_ROTOR2_KM 0.0000
+param set-default CA_ROTOR2_PX -0.5000
+param set-default CA_ROTOR2_PY 0.3000
+param set-default CA_ROTOR2_PZ 0.2000
+param set-default CA_ROTOR3_AX 1.0000
+param set-default CA_ROTOR3_AY -1.0000
+param set-default CA_ROTOR3_AZ 0.0000
+param set-default CA_ROTOR3_KM 0.0000
+param set-default CA_ROTOR3_PX -0.5000
+param set-default CA_ROTOR3_PY -0.3000
+param set-default CA_ROTOR3_PZ 0.2000
+param set-default CA_ROTOR4_AZ -1.0000
+param set-default CA_ROTOR4_KM 0.0000
+param set-default CA_ROTOR4_PX 0.5000
+param set-default CA_ROTOR4_PY 0.5000
+param set-default CA_ROTOR5_AZ 1.0000
+param set-default CA_ROTOR5_KM 0.0000
+param set-default CA_ROTOR5_PX 0.5000
+param set-default CA_ROTOR5_PY -0.5000
+param set-default CA_ROTOR6_AZ 1.0000
+param set-default CA_ROTOR6_KM 0.0000
+param set-default CA_ROTOR6_PX -0.5000
+param set-default CA_ROTOR6_PY 0.5000
+param set-default CA_ROTOR7_KM 0.0000
+param set-default CA_ROTOR7_PX -0.5000
+param set-default CA_ROTOR7_PY -0.5000
 
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102

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

@@ -54,9 +54,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -57,9 +57,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -57,9 +57,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -42,9 +42,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -42,9 +42,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -40,9 +40,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -42,9 +42,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -48,9 +48,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -55,9 +55,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -47,9 +47,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -8,6 +8,7 @@
 
 
 param set-default FW_LND_ANG 8
+param set-default FW_THR_LND_MAX 0
 
 param set-default NPFG_PERIOD 12
 
@@ -35,6 +36,7 @@ param set-default NAV_DLL_ACT 2
 
 param set-default RWTO_TKOFF 1
 
+#param set-default SYS_CTRL_ALLOC 1
 param set-default CA_AIRFRAME 1
 
 param set-default CA_ROTOR_COUNT 1
@@ -45,9 +47,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10
@@ -59,3 +61,7 @@ param set-default PWM_MAIN_FUNC7 202
 param set-default PWM_MAIN_FUNC8 203
 param set-default PWM_MAIN_FUNC9 206
 param set-default PWM_MAIN_REV 256
+
+
+set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix
+set MIXER custom

ROMFS/px4fmu_common/init.d-posix/airframes/1040_gazebo-classic_standard_vtol

@@ -27,8 +27,8 @@ 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_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
 param set-default CA_ROTOR4_PX 0.2
 
 param set-default CA_SV_CS_COUNT 3
@@ -37,7 +37,7 @@ param set-default CA_SV_CS0_TRQ_R -0.5
 param set-default CA_SV_CS1_TYPE 2
 param set-default CA_SV_CS1_TRQ_R 0.5
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1
+param set-default CA_SV_CS2_TRQ_P 1.0
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
 param set-default PWM_MAIN_FUNC3 103
@@ -47,8 +47,6 @@ param set-default PWM_MAIN_FUNC6 201
 param set-default PWM_MAIN_FUNC7 202
 param set-default PWM_MAIN_FUNC8 203
 
-param set-default FW_AIRSPD_MAX 25
-param set-default FW_THR_ASPD_MAX 0.4
 param set-default NPFG_PERIOD 12
 param set-default FW_PR_FF 0.2
 param set-default FW_PR_P 0.9
@@ -64,18 +62,19 @@ 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_ROLL_P 4
 param set-default MC_ROLLRATE_P 0.3
 param set-default MC_YAW_P 1.6
-param set-default MC_YAWRATE_P 0.3
-
 
 param set-default MIS_TAKEOFF_ALT 10
 
+param set-default MPC_XY_P 0.8
+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 NAV_ACC_RAD 5
 
 param set-default VT_FWD_THRUST_EN 4
-param set-default VT_FWD_THRUST_SC 1
 param set-default VT_F_TRANS_THR 0.75
 param set-default VT_TYPE 2
 

ROMFS/px4fmu_common/init.d-posix/airframes/1041_gazebo-classic_tailsitter

@@ -50,11 +50,11 @@ param set-default SENS_IMU_MODE 1
 
 param set-default FW_P_TC 0.6
 
-param set-default FW_PR_FF 0.0
+param set-default FW_PR_FF 0.1
 param set-default FW_PSP_OFF 2
 param set-default FW_RR_FF 0.1
 param set-default FW_RR_I 0.2
-param set-default FW_RR_P 0.5
+param set-default FW_RR_P 0.3
 param set-default FW_THR_TRIM 0.35
 param set-default FW_THR_MAX 0.8
 param set-default FW_THR_MIN 0.05
@@ -66,6 +66,8 @@ param set-default FW_T_SINK_MIN 1.6
 param set-default MC_AIRMODE 1
 param set-default MC_ROLL_P 3
 param set-default MC_PITCH_P 3
+param set-default MC_ROLLRATE_P 0.3
+param set-default MC_PITCHRATE_P 0.3
 
 param set-default VT_ARSP_TRANS 10
 param set-default VT_B_TRANS_DUR 5

ROMFS/px4fmu_common/init.d-posix/airframes/1042_gazebo-classic_tiltrotor

@@ -31,7 +31,7 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
 param set-default CA_SV_CS_COUNT 3
 param set-default CA_SV_TL_COUNT 2

ROMFS/px4fmu_common/init.d-posix/airframes/1043_gazebo-classic_standard_vtol_drop

@@ -27,8 +27,8 @@ 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_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
 param set-default CA_ROTOR4_PX 0.2
 
 param set-default CA_SV_CS_COUNT 3
@@ -37,7 +37,7 @@ param set-default CA_SV_CS0_TRQ_R -0.5
 param set-default CA_SV_CS1_TYPE 2
 param set-default CA_SV_CS1_TRQ_R 0.5
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1
+param set-default CA_SV_CS2_TRQ_P 1.0
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 102
 param set-default PWM_MAIN_FUNC3 103

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

@@ -57,9 +57,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

ROMFS/px4fmu_common/init.d-posix/airframes/1060_gazebo-classic_rover

@@ -22,7 +22,7 @@ param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2
 
 param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 2
+param set-default GND_WHEEL_BASE 2.0
 
 param set-default CA_AIRFRAME 5
 

ROMFS/px4fmu_common/init.d-posix/airframes/1061_gazebo-classic_r1_rover

@@ -4,9 +4,31 @@
 # @type Rover
 # @class Rover
 
-. ${R}etc/init.d/rc.rover_differential_defaults
+. ${R}etc/init.d/rc.rover_defaults
 
+param set-default GND_L1_DIST 5
+param set-default GND_SP_CTRL_MODE 1
+param set-default GND_SPEED_D 3
+param set-default GND_SPEED_I 0.001
+param set-default GND_SPEED_IMAX 0.125
+param set-default GND_SPEED_P 0.25
+param set-default GND_SPEED_THR_SC 1
+param set-default GND_SPEED_TRIM 4
+param set-default GND_THR_CRUISE 0.3
+param set-default GND_THR_MAX 0.5
+param set-default GND_THR_MIN 0
+
+param set-default NAV_ACC_RAD 0.5
+param set-default NAV_LOITER_RAD 2
+
+param set-default GND_MAX_ANG 0.6
+param set-default GND_WHEEL_BASE 2.0
+
+param set-default CA_AIRFRAME 6
+
+param set-default CA_R_REV 3
 param set-default PWM_MAIN_FUNC1 101
 param set-default PWM_MAIN_FUNC2 101
 param set-default PWM_MAIN_FUNC6 102
 param set-default PWM_MAIN_FUNC7 102
+

ROMFS/px4fmu_common/init.d-posix/airframes/1062_flightgear_tf-r1

@@ -29,7 +29,7 @@ param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2
 
 param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 3
+param set-default GND_WHEEL_BASE 3.0
 
 param set-default CA_AIRFRAME 5
 

ROMFS/px4fmu_common/init.d-posix/airframes/1070_gazebo-classic_boat

@@ -22,7 +22,7 @@ param set-default NAV_ACC_RAD 0.5
 param set-default NAV_LOITER_RAD 2
 
 param set-default GND_MAX_ANG 0.6
-param set-default GND_WHEEL_BASE 2
+param set-default GND_WHEEL_BASE 2.0
 
 param set-default CA_AIRFRAME 9
 

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

@@ -14,7 +14,7 @@
 
 param set-default FW_AIRSPD_STALL 8
 
-param set-default FW_P_RMAX_NEG 20
+param set-default FW_P_RMAX_NEG 20.0
 param set-default FW_W_RMAX 10
 param set-default FW_W_EN 1
 
@@ -37,7 +37,7 @@ param set-default FW_P_LIM_MAX 25
 param set-default FW_P_LIM_MIN -5
 param set-default FW_R_LIM 30
 
-param set-default FW_MAN_R_MAX 30
+param set-default FW_MAN_R_MAX 30.0
 
 param set-default FW_THR_TRIM 0.8
 param set-default FW_THR_IDLE 0

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

@@ -14,7 +14,7 @@
 
 param set-default FW_AIRSPD_STALL 5
 
-param set-default FW_P_RMAX_NEG 20
+param set-default FW_P_RMAX_NEG 20.0
 param set-default FW_W_RMAX 10
 param set-default FW_W_EN 1
 
@@ -29,9 +29,9 @@ param set-default NAV_LOITER_RAD 50
 # Parameters related to autogyro takeoff PR
 #param set-default AG_TKOFF 1
 #param set-default AG_PROT_TYPE 1
-#param set-default AG_PROT_MIN_RPM 50
-#param set-default AG_PROT_TRG_RPM 900
-#param set-defoult AG_ROTOR_RPM 900
+#param set-default AG_PROT_MIN_RPM 50.0
+#param set-default AG_PROT_TRG_RPM 900.0
+#param set-defoult AG_ROTOR_RPM 900.0
 
 param set-default FW_ARSP_SCALE_EN 0
 
@@ -42,7 +42,7 @@ param set-default FW_P_LIM_MAX 25
 param set-default FW_P_LIM_MIN -5
 param set-default FW_R_LIM 30
 
-param set-default FW_MAN_R_MAX 30
+param set-default FW_MAN_R_MAX 30.0
 
 param set-default FW_THR_CRUISE 0.8
 param set-default FW_THR_IDLE 0

ROMFS/px4fmu_common/init.d-posix/airframes/2507_gazebo-classic_cloudship

@@ -14,21 +14,21 @@
 param set-default CA_AIRFRAME 9
 
 param set-default CA_ROTOR_COUNT 3
-param set-default CA_ROTOR0_AX 1
-param set-default CA_ROTOR0_AZ 0
-param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PY 2
-param set-default CA_ROTOR1_AX 1
-param set-default CA_ROTOR1_AZ 0
-param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PY -2
-param set-default CA_ROTOR2_AY -1
-param set-default CA_ROTOR2_AZ 0
-param set-default CA_ROTOR2_KM 0
-param set-default CA_ROTOR2_PX -10
+param set-default CA_ROTOR0_AX 1.0000
+param set-default CA_ROTOR0_AZ 0.0000
+param set-default CA_ROTOR0_KM 0.0000
+param set-default CA_ROTOR0_PY 2.0000
+param set-default CA_ROTOR1_AX 1.0000
+param set-default CA_ROTOR1_AZ 0.0000
+param set-default CA_ROTOR1_KM 0.0000
+param set-default CA_ROTOR1_PY -2.0000
+param set-default CA_ROTOR2_AY -1.0000
+param set-default CA_ROTOR2_AZ 0.0000
+param set-default CA_ROTOR2_KM 0.0000
+param set-default CA_ROTOR2_PX -10.0000
 
 param set-default CA_SV_CS_COUNT 1
-param set-default CA_SV_CS0_TRQ_P 1
+param set-default CA_SV_CS0_TRQ_P 1.0000
 
 param set-default CA_R_REV 7
 

ROMFS/px4fmu_common/init.d-posix/airframes/3011_jsbsim_hexarotor_x

@@ -13,9 +13,9 @@ param set-default MAV_TYPE 13
 
 param set-default MC_PITCHRATE_P 0.1
 param set-default MC_PITCHRATE_I 0.05
-param set-default MC_PITCH_P 6
+param set-default MC_PITCH_P 6.0
 param set-default MC_ROLLRATE_I 0.1
-param set-default MC_ROLL_P 6
+param set-default MC_ROLL_P 6.0
 param set-default MPC_XY_VEL_I_ACC 4
 param set-default MPC_XY_VEL_P_ACC 3
 
@@ -27,11 +27,11 @@ param set-default MNT_MODE_IN 4
 param set-default MNT_DO_STAB 2
 
 
-param set-default CA_ROTOR0_PX 0
-param set-default CA_ROTOR0_PY 1
+param set-default CA_ROTOR0_PX 0.0
+param set-default CA_ROTOR0_PY 1.0
 param set-default CA_ROTOR0_KM -0.05
-param set-default CA_ROTOR1_PX 0
-param set-default CA_ROTOR1_PY -1
+param set-default CA_ROTOR1_PX 0.0
+param set-default CA_ROTOR1_PY -1.0
 param set-default CA_ROTOR1_KM 0.05
 param set-default CA_ROTOR2_PX 0.866025
 param set-default CA_ROTOR2_PY -0.5

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

@@ -70,9 +70,9 @@ 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_CS4_TYPE 9
 param set-default CA_SV_CS5_TYPE 10

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

@@ -40,8 +40,8 @@ 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_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
 param set-default CA_ROTOR4_PX 0.2
 
 param set-default SIM_GZ_EC_FUNC1 101
@@ -66,6 +66,7 @@ param set-default SIM_GZ_SV_FUNC2 202
 param set-default SIM_GZ_SV_FUNC3 203
 
 param set-default COM_RC_IN_MODE 1
+param set-default ASPD_PRIMARY 1
 
 param set-default CA_SV_CS_COUNT 3
 param set-default CA_SV_CS0_TYPE 1
@@ -73,9 +74,9 @@ param set-default CA_SV_CS0_TRQ_R -0.5
 param set-default CA_SV_CS1_TYPE 2
 param set-default CA_SV_CS1_TRQ_R 0.5
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1
+param set-default CA_SV_CS2_TRQ_P 1.0
 
-param set-default NPFG_PERIOD 12
+param set-default FW_L1_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

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

@@ -52,8 +52,12 @@ param set-default MAV_1_MODE 9
 # param set-default SER_TEL1_BAUD 921600	Not found
 
 # Vehicle attitude PID tuning
+param set-default MC_ACRO_EXPO 0
+param set-default MC_ACRO_EXPO_Y 0
 param set-default MC_ACRO_P_MAX 200
 param set-default MC_ACRO_R_MAX 200
+param set-default MC_ACRO_SUPEXPO 0
+param set-default MC_ACRO_SUPEXPOY 0
 param set-default MC_ACRO_Y_MAX 150
 param set-default MC_PITCHRATE_D 0.0015
 param set-default MC_ROLLRATE_D 0.0015
@@ -105,19 +109,31 @@ param set-default CBRK_IO_SAFETY 22027
 
 param set-default THR_MDL_FAC 0.3
 
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
 param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
 param set-default CA_ROTOR3_KM -0.05
 
+# Outputs
+# 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_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 SIM_GZ_EC_FUNC1 101
 param set-default SIM_GZ_EC_FUNC2 102
 param set-default SIM_GZ_EC_FUNC3 103
@@ -132,3 +148,5 @@ param set-default SIM_GZ_EC_MAX1 1100
 param set-default SIM_GZ_EC_MAX2 1100
 param set-default SIM_GZ_EC_MAX3 1100
 param set-default SIM_GZ_EC_MAX4 1100
+
+

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

@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-# @name Advanced Plane SITL
-#
-
-. ${R}etc/init.d/rc.fw_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-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
-param set-default NPFG_PERIOD 12
-
-param set-default FW_MAN_P_MAX 30
-param set-default FW_PR_P 0.9
-param set-default FW_PR_FF 0.5
-param set-default FW_PR_I 0.5
-
-param set-default FW_PSP_OFF 2
-param set-default FW_P_LIM_MAX 32
-param set-default FW_P_LIM_MIN -15
-
-param set-default FW_RR_FF 0.5
-param set-default FW_RR_P 0.3
-param set-default FW_RR_I 0.5
-
-param set-default FW_YR_FF 0.5
-param set-default FW_YR_P 0.6
-param set-default FW_YR_I 0.5
-
-param set-default FW_SPOILERS_LND 0.4
-
-param set-default FW_THR_MIN 0.05
-param set-default FW_THR_TRIM 0.25
-
-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 FW_W_EN 1
-
-param set-default MIS_TAKEOFF_ALT 30
-
-param set-default NAV_ACC_RAD 15
-param set-default NAV_DLL_ACT 2
-
-param set-default RWTO_TKOFF 1
-
-param set-default CA_AIRFRAME 1
-
-param set-default CA_ROTOR_COUNT 1
-param set-default CA_ROTOR0_PX 0.3
-
-param set-default CA_SV_CS_COUNT 6
-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_CS3_TRQ_Y 1
-param set-default CA_SV_CS3_TYPE 4
-param set-default CA_SV_CS4_TYPE 9
-param set-default CA_SV_CS5_TYPE 10
-
-param set-default SIM_GZ_EC_FUNC1 101
-param set-default SIM_GZ_EC_MIN1 10
-param set-default SIM_GZ_EC_MAX1 1600
-
-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_FUNC6 206

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

@@ -1,31 +0,0 @@
-#!/bin/sh
-# @name Aion Robotics R1 Rover
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_differential_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=r1_rover}
-
-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 1
-
-# Actuator mapping
-param set-default SIM_GZ_WH_FUNC1 101 # right wheel
-param set-default SIM_GZ_WH_MIN1 0
-param set-default SIM_GZ_WH_MAX1 200
-param set-default SIM_GZ_WH_DIS1 100
-
-param set-default SIM_GZ_WH_FUNC2 102 # left wheel
-param set-default SIM_GZ_WH_MIN2 0
-param set-default SIM_GZ_WH_MAX2 200
-param set-default SIM_GZ_WH_DIS2 100
-
-param set-default SIM_GZ_WH_REV 1 # reverse right wheel

ROMFS/px4fmu_common/init.d-posix/airframes/4010_gz_x500_mono_cam

@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @name Gazebo x500 mono cam
-#
-# @type Quadrotor
-#
-
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500_mono_cam}
-
-. ${R}etc/init.d-posix/airframes/4001_gz_x500

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

@@ -1,80 +0,0 @@
-#!/bin/sh
-# @name Gazebo lawnmower
-# @type Rover
-# @class Rover
-
-. ${R}etc/init.d/rc.rover_differential_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_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 1
-# We can arm and drive in manual mode when it slides and GPS check fails:
-param set-default COM_ARM_WO_GPS 1
-
-# Set Differential Drive Kinematics Library parameters:
-param set RDD_WHEEL_BASE 0.9
-param set RDD_WHEEL_RADIUS 0.22
-param set RDD_WHEEL_SPEED 10.0	# Maximum wheel speed rad/s, approx 8 km/h
-
-# Actuator mapping - set SITL motors/servos output parameters:
-
-# "Motors" - motor channels 0 (Right) and 1 (Left) - via Wheels GZ bridge:
-param set-default SIM_GZ_WH_FUNC1 101 # right wheel
-#param set-default SIM_GZ_WH_MIN1 0
-#param set-default SIM_GZ_WH_MAX1 200
-#param set-default SIM_GZ_WH_DIS1 100
-#param set-default SIM_GZ_WH_FAIL1 100
-
-param set-default SIM_GZ_WH_FUNC2 102 # left wheel
-#param set-default SIM_GZ_WH_MIN2 0
-#param set-default SIM_GZ_WH_MAX2 200
-#aram set-default SIM_GZ_WH_DIS2 100
-#param set-default SIM_GZ_WH_FAIL2 100
-
-param set-default SIM_GZ_WH_REV 0 # no need to reverse any wheels
-
-# Note: The servo configurations ( SIM_GZ_SV_FUNC*) outlined below are intended for educational purposes in this simulation. 
-# They do not have physical effects in the simulated environment, except for actuating the joints. Their definitions are meant to demonstrate 
-# how actuators could be mapped and configured in a real-world application, providing a foundation for understanding and implementing actuator 
-# 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_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_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[]:
-
-# Strobes, PCA9685 servo channel 5, "Servo 5" (205) - flashing indicates Mission mode:
-#param set-default SIM_GZ_SV_FUNC5 205
-#param set-default SIM_GZ_SV_MIN5 1000
-#param set-default SIM_GZ_SV_MAX5 2000
-#param set-default SIM_GZ_SV_DIS5 1000
-#param set-default SIM_GZ_SV_FAIL5 1000
-
-# Horn, PCA9685 servo channel 6, "Servo 6" (206) - for alarms like GPS failure:
-#param set-default SIM_GZ_SV_FUNC6 206
-
-# Spare PCA9685 servo channel 7 on "RC AUX2" (408) - right knob, or "Servo 7" (207):
-#param set-default SIM_GZ_SV_FUNC7 207
-
-# Spare PCA9685 servo channel 8 - "Servo 8" (208):
-#param set-default SIM_GZ_SV_FUNC8 208

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

@@ -9,14 +9,14 @@
 
 param set-default MAV_TYPE 13
 
-param set-default MC_PITCHRATE_P 0.08
-param set-default MC_PITCHRATE_I 0.04
-param set-default MC_PITCHRATE_D 0.001
-param set-default MC_PITCH_P 9
-param set-default MC_ROLLRATE_P 0.08
-param set-default MC_ROLLRATE_I 0.04
-param set-default MC_ROLLRATE_D 0.001
-param set-default MC_ROLL_P 9
+param set-default MC_PITCHRATE_P 0.0800
+param set-default MC_PITCHRATE_I 0.0400
+param set-default MC_PITCHRATE_D 0.0010
+param set-default MC_PITCH_P 9.0
+param set-default MC_ROLLRATE_P 0.0800
+param set-default MC_ROLLRATE_I 0.0400
+param set-default MC_ROLLRATE_D 0.0010
+param set-default MC_ROLL_P 9.0
 param set-default MPC_XY_VEL_I_ACC 4
 param set-default MPC_XY_VEL_P_ACC 3
 
@@ -31,11 +31,11 @@ param set-default MAV_PROTO_VER 2
 param set-default CA_AIRFRAME 0
 param set-default CA_ROTOR_COUNT 6
 
-param set-default CA_ROTOR0_PX 0
-param set-default CA_ROTOR0_PY 1
+param set-default CA_ROTOR0_PX 0.0
+param set-default CA_ROTOR0_PY 1.0
 param set-default CA_ROTOR0_KM -0.05
-param set-default CA_ROTOR1_PX 0
-param set-default CA_ROTOR1_PY -1
+param set-default CA_ROTOR1_PX 0.0
+param set-default CA_ROTOR1_PY -1.0
 param set-default CA_ROTOR1_KM 0.05
 param set-default CA_ROTOR2_PX 0.866025
 param set-default CA_ROTOR2_PY -0.5

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

@@ -1,122 +0,0 @@
-#!/bin/sh
-#
-# @name 6DoF Omnicopter SITL
-#
-# @type Quadrotor Wide
-#
-# @maintainer Jaeyoung Lim <jalim@ethz.ch>
-#
-
-. ${R}etc/init.d/rc.mc_defaults
-
-PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
-PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=omnicopter}
-
-param set-default CA_AIRFRAME 0
-
-param set-default CA_ROTOR_COUNT 8
-param set-default CA_R_REV 255
-
-param set-default CA_ROTOR0_PX 0.14435
-param set-default CA_ROTOR0_PY -0.14435
-param set-default CA_ROTOR0_PZ -0.14435
-param set-default CA_ROTOR0_KM 0.05 # CCW
-param set-default CA_ROTOR0_AX -0.788675
-param set-default CA_ROTOR0_AY -0.211325
-param set-default CA_ROTOR0_AZ -0.57735
-
-param set-default CA_ROTOR1_PX -0.14435
-param set-default CA_ROTOR1_PY -0.14435
-param set-default CA_ROTOR1_PZ -0.14435
-param set-default CA_ROTOR1_KM 0.05
-param set-default CA_ROTOR1_AX 0.211325
-param set-default CA_ROTOR1_AY -0.788675
-param set-default CA_ROTOR1_AZ 0.57735
-
-param set-default CA_ROTOR2_PX 0.14435
-param set-default CA_ROTOR2_PY 0.14435
-param set-default CA_ROTOR2_PZ -0.14435
-param set-default CA_ROTOR2_KM 0.05
-param set-default CA_ROTOR2_AX -0.211325
-param set-default CA_ROTOR2_AY 0.788675
-param set-default CA_ROTOR2_AZ 0.57735
-
-param set-default CA_ROTOR3_PX -0.14435
-param set-default CA_ROTOR3_PY 0.14435
-param set-default CA_ROTOR3_PZ -0.14435
-param set-default CA_ROTOR3_KM 0.05
-param set-default CA_ROTOR3_AX 0.788675
-param set-default CA_ROTOR3_AY 0.211325
-param set-default CA_ROTOR3_AZ -0.57735
-
-param set-default CA_ROTOR4_PX 0.14435
-param set-default CA_ROTOR4_PY -0.14435
-param set-default CA_ROTOR4_PZ 0.14435
-param set-default CA_ROTOR4_KM 0.05
-param set-default CA_ROTOR4_AX 0.788675
-param set-default CA_ROTOR4_AY 0.211325
-param set-default CA_ROTOR4_AZ -0.57735
-
-param set-default CA_ROTOR5_PX -0.14435
-param set-default CA_ROTOR5_PY -0.14435
-param set-default CA_ROTOR5_PZ 0.14435
-param set-default CA_ROTOR5_KM 0.05
-param set-default CA_ROTOR5_AX -0.211325
-param set-default CA_ROTOR5_AY 0.788675
-param set-default CA_ROTOR5_AZ 0.57735
-
-param set-default CA_ROTOR6_PX 0.14435
-param set-default CA_ROTOR6_PY 0.14435
-param set-default CA_ROTOR6_PZ 0.14435
-param set-default CA_ROTOR6_KM 0.05
-param set-default CA_ROTOR6_AX 0.211325
-param set-default CA_ROTOR6_AY -0.788675
-param set-default CA_ROTOR6_AZ 0.57735
-
-param set-default CA_ROTOR7_PX -0.14435
-param set-default CA_ROTOR7_PY 0.14435
-param set-default CA_ROTOR7_PZ 0.14435
-param set-default CA_ROTOR7_KM 0.05
-param set-default CA_ROTOR7_AX -0.788675
-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
-param set-default SIM_GZ_EC_FUNC3 103
-param set-default SIM_GZ_EC_FUNC4 104
-param set-default SIM_GZ_EC_FUNC5 105
-param set-default SIM_GZ_EC_FUNC6 106
-param set-default SIM_GZ_EC_FUNC7 107
-param set-default SIM_GZ_EC_FUNC8 108
-
-param set-default SIM_GZ_EC_MIN1 0
-param set-default SIM_GZ_EC_MIN2 0
-param set-default SIM_GZ_EC_MIN3 0
-param set-default SIM_GZ_EC_MIN4 0
-param set-default SIM_GZ_EC_MIN5 0
-param set-default SIM_GZ_EC_MIN6 0
-param set-default SIM_GZ_EC_MIN7 0
-param set-default SIM_GZ_EC_MIN8 0
-
-param set-default SIM_GZ_EC_MAX1 1100
-param set-default SIM_GZ_EC_MAX2 1100
-param set-default SIM_GZ_EC_MAX3 1100
-param set-default SIM_GZ_EC_MAX4 1100
-param set-default SIM_GZ_EC_MAX5 1100
-param set-default SIM_GZ_EC_MAX6 1100
-param set-default SIM_GZ_EC_MAX7 1100
-param set-default SIM_GZ_EC_MAX8 1100
-# disable MC desaturation which improves attitude tracking
-param set-default CA_METHOD 0
-
-# disable attitude failure detection
-param set-default FD_FAIL_P 0
-param set-default FD_FAIL_R 0
-

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

@@ -39,10 +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
+	1015_gazebo-classic_iris_obs_avoid
+	1015_gazebo-classic_iris_obs_avoid.post
 	1017_gazebo-classic_iris_opt_flow_mockup
 	1019_gazebo-classic_iris_dual_gps
 	1021_gazebo-classic_uuv_hippocampus
@@ -79,16 +77,10 @@ px4_add_romfs_files(
 	4004_gz_standard_vtol
 	4005_gz_x500_vision
 	4006_gz_px4vision
-	4008_gz_advanced_plane
-	4009_gz_r1_rover
-	4010_gz_x500_mono_cam
-	4011_gz_lawnmower
 
 	6011_gazebo-classic_typhoon_h480
 	6011_gazebo-classic_typhoon_h480.post
 
-	8011_gz_omnicopter
-
 	10015_gazebo-classic_iris
 	10016_none_iris
 	10017_jmavsim_iris
@@ -102,6 +94,4 @@ px4_add_romfs_files(
 
 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2
-
-	# [22000, 22999] Reserve for custom models
 )

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

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

ROMFS/px4fmu_common/init.d-posix/rcS

@@ -153,6 +153,7 @@ fi
 
 param set-default BAT1_N_CELLS 4
 
+param set-default CBRK_AIRSPD_CHK 0
 param set-default CBRK_SUPPLY_CHK 894281
 
 # disable check, no CPU load reported on posix yet
@@ -164,6 +165,10 @@ param set-default COM_RC_IN_MODE 1
 # Speedup SITL startup
 param set-default EKF2_REQ_GPS_H 0.5
 
+# Multi-EKF
+param set-default EKF2_MULTI_IMU 3
+param set-default SENS_IMU_MODE 0
+
 param set-default IMU_GYRO_FFT_EN 1
 param set-default MAV_PROTO_VER 2 # Ensures QGC does not drop the first few packets after a SITL restart due to MAVLINK 1 packets
 
@@ -182,11 +187,6 @@ param set-default SYS_FAILURE_EN 1
 # does not go below 50% by default, but failure injection can trigger failsafes.
 param set-default COM_LOW_BAT_ACT 2
 
-# Allow to override SYS_MC_EST_GROUP via env
-if [ -n "$SYS_MC_EST_GROUP" ]; then
-	param set SYS_MC_EST_GROUP $SYS_MC_EST_GROUP
-fi
-
 # Adapt timeout parameters if simulation runs faster or slower than realtime.
 if [ -n "$PX4_SIM_SPEED_FACTOR" ]; then
 	COM_DL_LOSS_T_LONGER=$(echo "$PX4_SIM_SPEED_FACTOR * 10" | bc)
@@ -244,12 +244,7 @@ then
 fi
 
 load_mon start
-
-if param compare SIM_BAT_ENABLE 1
-then
-	battery_simulator start
-fi
-
+battery_simulator start
 tone_alarm start
 rc_update start
 manual_control start

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -34,79 +34,26 @@
 add_subdirectory(airframes)
 
 px4_add_romfs_files(
-
+	rc.airship_apps
+	rc.airship_defaults
 	rc.autostart_ext
-
-	rcS
-	rc.sensors
-	rc.vehicle_setup
-
-	# TODO
 	rc.balloon_apps
 	rc.balloon_defaults
+	rc.boat_defaults
+	rc.fw_apps
+	rc.fw_defaults
+	rc.heli_defaults
+	rc.logging
+	rc.mc_apps
+	rc.mc_defaults
+	rcS
+	rc.sensors
+	rc.thermal_cal
+	rc.rover_apps
+	rc.rover_defaults
+	rc.uuv_apps
+	rc.uuv_defaults
+	rc.vehicle_setup
+	rc.vtol_apps
+	rc.vtol_defaults
 )
-
-if(CONFIG_MODULES_AIRSHIP_ATT_CONTROL)
-	px4_add_romfs_files(
-		rc.airship_apps
-		rc.airship_defaults
-	)
-endif()
-
-if(CONFIG_MODULES_FW_RATE_CONTROL)
-	px4_add_romfs_files(
-		rc.fw_apps
-		rc.fw_defaults
-	)
-endif()
-
-if(CONFIG_MODULES_MC_RATE_CONTROL)
-	px4_add_romfs_files(
-		rc.heli_defaults
-		rc.mc_apps
-		rc.mc_defaults
-	)
-endif()
-
-if(CONFIG_MODULES_ROVER_POS_CONTROL)
-	px4_add_romfs_files(
-		rc.rover_apps
-		rc.rover_defaults
-
-		rc.boat_defaults # hack
-	)
-endif()
-
-if(CONFIG_MODULES_DIFFERENTIAL_DRIVE)
-	px4_add_romfs_files(
-		rc.rover_differential_apps
-		rc.rover_differential_defaults
-	)
-endif()
-
-if(CONFIG_MODULES_UUV_ATT_CONTROL)
-	px4_add_romfs_files(
-		rc.uuv_apps
-		rc.uuv_defaults
-	)
-endif()
-
-if(CONFIG_MODULES_VTOL_ATT_CONTROL)
-	px4_add_romfs_files(
-		rc.vtol_apps
-		rc.vtol_defaults
-	)
-endif()
-
-
-if(CONFIG_MODULES_LOGGER)
-	px4_add_romfs_files(
-		rc.logging
-	)
-endif()
-
-if(CONFIG_MODULES_TEMPERATURE_COMPENSATION)
-	px4_add_romfs_files(
-		rc.thermal_cal
-	)
-endif()

ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil

@@ -11,30 +11,30 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+
 param set SYS_HITL 1
 
 param set UAVCAN_ENABLE 0
 
-# disable some checks to allow to fly
-# - without real battery
-param set-default CBRK_SUPPLY_CHK 894281
-# - without safety switch
-param set-default CBRK_IO_SAFETY 22027
-
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
 param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
 param set-default CA_ROTOR3_KM -0.05
 
 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
+
+# disable some checks to allow to fly
+# - without real battery
+param set-default CBRK_SUPPLY_CHK 894281
+# - without safety switch
+param set-default CBRK_IO_SAFETY 22027

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

@@ -14,6 +14,7 @@
 
 . ${R}etc/init.d/rc.vtol_defaults
 
+
 param set-default BAT1_N_CELLS 3
 
 param set-default COM_RC_IN_MODE 1
@@ -54,29 +55,26 @@ param set-default VT_TYPE 2
 
 param set-default CA_AIRFRAME 2
 param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
-param set-default CA_ROTOR4_PX 0.2
-
-# Square quadrotor X PX4 numbering
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
 param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
 param set-default CA_ROTOR3_KM -0.05
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
+param set-default CA_ROTOR4_PX 0.2
 
 param set-default CA_SV_CS_COUNT 3
 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
 
 param set-default HIL_ACT_FUNC1 101
@@ -100,3 +98,5 @@ param set-default CBRK_SUPPLY_CHK 894281
 param set-default CBRK_IO_SAFETY 22027
 
 param set-default MAV_TYPE 22
+
+

ROMFS/px4fmu_common/init.d/airframes/1100_rc_quad_x_sih.hil

@@ -12,8 +12,26 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
+
 param set UAVCAN_ENABLE 0
 
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
+
+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
+
 # set SYS_HITL to 2 to start the SIH and avoid sensors startup
 param set SYS_HITL 2
 
@@ -24,21 +42,3 @@ param set-default CBRK_SUPPLY_CHK 894281
 param set-default CBRK_IO_SAFETY 22027
 
 param set SIH_VEHICLE_TYPE 0
-
-# Square quadrotor X PX4 numbering
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
-param set-default CA_ROTOR3_KM -0.05
-
-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

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

@@ -21,9 +21,9 @@ param set-default CA_ROTOR0_PX 0.3
 param set-default CA_SV_CS_COUNT 4
 param set-default CA_SV_CS0_TRQ_R 0.5
 param set-default CA_SV_CS0_TYPE 2
-param set-default CA_SV_CS1_TRQ_P 1
+param set-default CA_SV_CS1_TRQ_P 1.0
 param set-default CA_SV_CS1_TYPE 3
-param set-default CA_SV_CS2_TRQ_Y 1
+param set-default CA_SV_CS2_TRQ_Y 1.0
 param set-default CA_SV_CS2_TYPE 4
 param set-default CA_SV_CS3_TYPE 10
 
@@ -46,7 +46,7 @@ param set-default CBRK_IO_SAFETY 22027
 
 param set-default BAT_N_CELLS 3
 
-param set SIH_T_MAX 6
+param set SIH_T_MAX 6.0
 param set SIH_MASS 0.3
 param set SIH_IXX 0.00402
 param set SIH_IYY 0.0144

ROMFS/px4fmu_common/init.d/airframes/1102_tailsitter_duo_sih.hil

@@ -71,7 +71,7 @@ param set SIH_MASS 0.2
 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_IXZ 0.0
 param set SIH_KDV 0.2
 param set SIH_L_ROLL 0.145
 

ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard

@@ -14,21 +14,6 @@
 
 param set-default CA_AIRFRAME 2
 param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
-param set-default CA_SV_CS_COUNT 4
-param set-default CA_SV_CS0_TYPE 1
-param set-default CA_SV_CS0_TRQ_R -0.5
-param set-default CA_SV_CS1_TYPE 2
-param set-default CA_SV_CS1_TRQ_R 0.5
-param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1
-param set-default CA_SV_CS3_TRQ_Y 1
-param set-default CA_SV_CS3_TYPE 4
-param set-default VT_TYPE 2
-param set-default MAV_TYPE 22
-
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR0_PX 1
 param set-default CA_ROTOR0_PY 1
 param set-default CA_ROTOR1_PX -1
@@ -39,3 +24,16 @@ param set-default CA_ROTOR2_KM -0.05
 param set-default CA_ROTOR3_PX -1
 param set-default CA_ROTOR3_PY 1
 param set-default CA_ROTOR3_KM -0.05
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
+param set-default CA_SV_CS_COUNT 4
+param set-default CA_SV_CS0_TYPE 1
+param set-default CA_SV_CS0_TRQ_R -0.5
+param set-default CA_SV_CS1_TYPE 2
+param set-default CA_SV_CS1_TRQ_R 0.5
+param set-default CA_SV_CS2_TYPE 3
+param set-default CA_SV_CS2_TRQ_P 1.0
+param set-default CA_SV_CS3_TRQ_Y 1.0
+param set-default CA_SV_CS3_TYPE 4
+param set-default VT_TYPE 2
+param set-default MAV_TYPE 22

ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad

@@ -28,13 +28,13 @@ param set-default BAT1_CAPACITY 23000
 param set-default BAT1_N_CELLS 4
 param set-default BAT1_R_INTERNAL 0.0025
 
-param set-default SYS_HAS_NUM_ASPD 0
+param set-default CBRK_AIRSPD_CHK 162128
 param set-default CBRK_IO_SAFETY 22027
 
 param set-default EKF2_GPS_POS_X -0.12
 param set-default EKF2_IMU_POS_X -0.12
 
-param set-default FW_USE_AIRSPD 0
+param set-default FW_ARSP_MODE 1
 param set-default NPFG_PERIOD 25
 param set-default FW_PR_FF 0.7
 param set-default FW_PR_I 0.18
@@ -120,8 +120,8 @@ 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_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
 param set-default CA_ROTOR4_PX 0.2
 
 param set-default CA_SV_CS_COUNT 3
@@ -130,4 +130,4 @@ param set-default CA_SV_CS0_TRQ_R -0.5
 param set-default CA_SV_CS1_TYPE 2
 param set-default CA_SV_CS1_TRQ_R 0.5
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS2_TRQ_P 1
+param set-default CA_SV_CS2_TRQ_P 1.0

ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark

@@ -80,10 +80,6 @@ param set-default VT_TYPE 2
 
 param set-default CA_AIRFRAME 2
 param set-default CA_ROTOR_COUNT 5
-param set-default CA_ROTOR4_AX 1
-param set-default CA_ROTOR4_AZ 0
-
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR0_PX 1
 param set-default CA_ROTOR0_PY 1
 param set-default CA_ROTOR1_PX -1
@@ -94,16 +90,18 @@ param set-default CA_ROTOR2_KM -0.05
 param set-default CA_ROTOR3_PX -1
 param set-default CA_ROTOR3_PY 1
 param set-default CA_ROTOR3_KM -0.05
+param set-default CA_ROTOR4_AX 1.0
+param set-default CA_ROTOR4_AZ 0.0
 
 param set-default CA_SV_CS_COUNT 3
 param set-default CA_SV_CS0_TYPE 15
-param set-default CA_SV_CS0_TRQ_R 1
-param set-default CA_SV_CS1_TRQ_P 0.5
-param set-default CA_SV_CS1_TRQ_R 0
-param set-default CA_SV_CS1_TRQ_Y -0.5
+param set-default CA_SV_CS0_TRQ_R 1.0
+param set-default CA_SV_CS1_TRQ_P 0.5000
+param set-default CA_SV_CS1_TRQ_R 0.0000
+param set-default CA_SV_CS1_TRQ_Y -0.5000
 param set-default CA_SV_CS1_TYPE 13
-param set-default CA_SV_CS2_TRQ_P 0.5
-param set-default CA_SV_CS2_TRQ_Y 0.5
+param set-default CA_SV_CS2_TRQ_P 0.5000
+param set-default CA_SV_CS2_TRQ_Y 0.5000
 param set-default CA_SV_CS2_TYPE 14
 
 param set-default PWM_MAIN_FUNC1 201

ROMFS/px4fmu_common/init.d/airframes/13030_generic_vtol_quad_tiltrotor

@@ -19,30 +19,30 @@ param set-default MAV_TYPE 21
 param set-default VT_TYPE 1
 
 param set-default CA_AIRFRAME 3
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
 param set-default CA_ROTOR0_TILT 1
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
 param set-default CA_ROTOR1_TILT 2
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM -0.05
 param set-default CA_ROTOR2_TILT 3
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
+param set-default CA_ROTOR3_KM -0.05
 param set-default CA_ROTOR3_TILT 4
 param set-default CA_SV_CS_COUNT 4
 param set-default CA_SV_CS0_TYPE 1
 param set-default CA_SV_CS0_TRQ_R -0.5
 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4
 param set-default CA_SV_TL_COUNT 4
 
-# Square quadrotor X PX4 numbering
-param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
-param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
-param set-default CA_ROTOR3_KM -0.05
+

ROMFS/px4fmu_common/init.d/airframes/13100_generic_vtol_tiltrotor

@@ -12,22 +12,19 @@
 . ${R}etc/init.d/rc.vtol_defaults
 
 param set-default CA_AIRFRAME 3
-param set-default CA_ROTOR0_TILT 2
-param set-default CA_ROTOR2_TILT 1
-
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
 param set-default CA_ROTOR0_PX 1
 param set-default CA_ROTOR0_PY 1
+param set-default CA_ROTOR0_TILT 2
 param set-default CA_ROTOR1_PX -1
 param set-default CA_ROTOR1_PY -1
 param set-default CA_ROTOR2_PX 1
 param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR2_TILT 1
 param set-default CA_ROTOR2_KM -0.05
 param set-default CA_ROTOR3_PX -1
 param set-default CA_ROTOR3_PY 1
 param set-default CA_ROTOR3_KM -0.05
-
 param set-default CA_SV_CS_COUNT 4
 param set-default CA_SV_CS0_TYPE 1
 param set-default CA_SV_CS0_TRQ_R -0.5

ROMFS/px4fmu_common/init.d/airframes/14001_generic_mc_with_tilt

@@ -20,16 +20,16 @@ param set-default MAV_TYPE 15
 
 param set-default CA_AIRFRAME 8
 # Tricopter
-param set-default CA_ROTOR0_PX 0.25
-param set-default CA_ROTOR0_PY 0.433
-param set-default CA_ROTOR1_PX 0.25
-param set-default CA_ROTOR1_PY -0.43
-param set-default CA_ROTOR2_PX -0.5
-param set-default CA_ROTOR2_PY 0
+param set-default CA_ROTOR0_PX 0.2500
+param set-default CA_ROTOR0_PY 0.4330
+param set-default CA_ROTOR1_PX 0.2500
+param set-default CA_ROTOR1_PY -0.4300
+param set-default CA_ROTOR2_PX -0.5000
+param set-default CA_ROTOR2_PY 0.0000
 param set-default CA_ROTOR2_TILT 1
 param set-default CA_ROTOR_COUNT 3
-param set-default CA_SV_TL0_MAXA 45
-param set-default CA_SV_TL0_MINA -45
+param set-default CA_SV_TL0_MAXA 45.0000
+param set-default CA_SV_TL0_MINA -45.0000
 param set-default CA_SV_TL0_TD 90
 param set-default CA_SV_TL_COUNT 1
 

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

@@ -18,7 +18,7 @@ param set-default CA_SV_CS0_TYPE 1
 param set-default CA_SV_CS0_TRQ_R -0.5
 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_TRQ_P 1.0
 param set-default CA_SV_CS2_TYPE 3
-param set-default CA_SV_CS3_TRQ_Y 1
+param set-default CA_SV_CS3_TRQ_Y 1.0
 param set-default CA_SV_CS3_TYPE 4

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

@@ -17,7 +17,6 @@
 # @maintainer Andreas Antener <andreas@uaventure.com>
 #
 # @board bitcraze_crazyflie exclude
-# @board diatone_mamba-f405-mk2 exclude
 #
 
 . ${R}etc/init.d/rc.fw_defaults
@@ -35,17 +34,17 @@ param set-default FW_W_RMAX 0
 param set-default CA_AIRFRAME 1
 param set-default CA_ROTOR_COUNT 1
 param set-default CA_SV_CS_COUNT 7
-param set-default CA_SV_CS0_TRQ_R -0.5
+param set-default CA_SV_CS0_TRQ_R -0.5000
 param set-default CA_SV_CS0_TYPE 1 #left aileron
-param set-default CA_SV_CS1_TRQ_R 0.5
+param set-default CA_SV_CS1_TRQ_R 0.5000
 param set-default CA_SV_CS1_TYPE 2 #right aileron
-param set-default CA_SV_CS2_TRQ_P 0.5
-param set-default CA_SV_CS2_TRQ_Y -0.5
+param set-default CA_SV_CS2_TRQ_P 0.5000
+param set-default CA_SV_CS2_TRQ_Y -0.5000
 param set-default CA_SV_CS2_TYPE 13 #left A-tail
-param set-default CA_SV_CS3_TRQ_P 0.5
-param set-default CA_SV_CS3_TRQ_Y 0.5
+param set-default CA_SV_CS3_TRQ_P 0.5000
+param set-default CA_SV_CS3_TRQ_Y 0.5000
 param set-default CA_SV_CS3_TYPE 14 #right A-tail
-param set-default CA_SV_CS4_TRQ_Y 1
+param set-default CA_SV_CS4_TRQ_Y 1.0000
 param set-default CA_SV_CS4_TYPE 12
 param set-default CA_SV_CS5_TYPE 9 #left flap
 param set-default CA_SV_CS6_TYPE 10 #right flap

ROMFS/px4fmu_common/init.d/airframes/2507_cloudship

@@ -21,21 +21,21 @@ param set-default CBRK_IO_SAFETY 22027
 param set-default CA_AIRFRAME 9
 
 param set-default CA_ROTOR_COUNT 3
-param set-default CA_ROTOR0_AX 1
-param set-default CA_ROTOR0_AZ 0
-param set-default CA_ROTOR0_KM 0
-param set-default CA_ROTOR0_PY 2
-param set-default CA_ROTOR1_AX 1
-param set-default CA_ROTOR1_AZ 0
-param set-default CA_ROTOR1_KM 0
-param set-default CA_ROTOR1_PY -2
-param set-default CA_ROTOR2_AY -1
-param set-default CA_ROTOR2_AZ 0
-param set-default CA_ROTOR2_KM 0
-param set-default CA_ROTOR2_PX -10
+param set-default CA_ROTOR0_AX 1.0000
+param set-default CA_ROTOR0_AZ 0.0000
+param set-default CA_ROTOR0_KM 0.0000
+param set-default CA_ROTOR0_PY 2.0000
+param set-default CA_ROTOR1_AX 1.0000
+param set-default CA_ROTOR1_AZ 0.0000
+param set-default CA_ROTOR1_KM 0.0000
+param set-default CA_ROTOR1_PY -2.0000
+param set-default CA_ROTOR2_AY -1.0000
+param set-default CA_ROTOR2_AZ 0.0000
+param set-default CA_ROTOR2_KM 0.0000
+param set-default CA_ROTOR2_PX -10.0000
 
 param set-default CA_SV_CS_COUNT 1
-param set-default CA_SV_CS0_TRQ_P 1
+param set-default CA_SV_CS0_TRQ_P 1.0000
 
 param set-default CA_R_REV 7
 

ROMFS/px4fmu_common/init.d/airframes/4001_quad_x

@@ -10,15 +10,15 @@
 
 . ${R}etc/init.d/rc.mc_defaults
 
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
 param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
 param set-default CA_ROTOR3_KM -0.05
+

ROMFS/px4fmu_common/init.d/airframes/4014_s500

@@ -18,15 +18,14 @@ param set-default MC_PITCHRATE_P 0.18
 param set-default MC_ROLLRATE_I 0.15
 param set-default MC_PITCHRATE_I 0.15
 
-# Square quadrotor X PX4 numbering
 param set-default CA_ROTOR_COUNT 4
-param set-default CA_ROTOR0_PX 1
-param set-default CA_ROTOR0_PY 1
-param set-default CA_ROTOR1_PX -1
-param set-default CA_ROTOR1_PY -1
-param set-default CA_ROTOR2_PX 1
-param set-default CA_ROTOR2_PY -1
+param set-default CA_ROTOR0_PX 0.15
+param set-default CA_ROTOR0_PY 0.15
+param set-default CA_ROTOR1_PX -0.15
+param set-default CA_ROTOR1_PY -0.15
+param set-default CA_ROTOR2_PX 0.15
+param set-default CA_ROTOR2_PY -0.15
 param set-default CA_ROTOR2_KM -0.05
-param set-default CA_ROTOR3_PX -1
-param set-default CA_ROTOR3_PY 1
+param set-default CA_ROTOR3_PX -0.15
+param set-default CA_ROTOR3_PY 0.15
 param set-default CA_ROTOR3_KM -0.05