init.d-posix: make all simulation airframes simulator specific

boards/cubepilot/cubeorange: initialize all I2C pins immediately
ak09916: enable retries and reset perf count
2026-05-26 21:30:10 +08:00 · 2022-09-01 22:00:22 -04:00 · 2022-09-01 20:46:09 -04:00 · 2022-09-01 20:45:20 -04:00 · 2022-09-01 20:42:21 -04:00 · 2022-09-01 20:40:37 -04:00
518 changed files with 33941 additions and 9125 deletions
@@ -794,7 +794,7 @@ void resetParameters() {
 void runTests() {

  // test loading a range of airframes
-  sh './Tools/HIL/test_airframes.sh `find /dev/serial -name *usb-*` 2100 3000 4001 6001 8001 10016'
+  sh './Tools/HIL/test_airframes.sh `find /dev/serial -name *usb-*` 2100 3000 4001 6001 8001'

  resetParameters()

@@ -81,7 +81,7 @@ jobs:
      env:
        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
        DONT_RUN: 1
-      run: make px4_sitl_default gazebo mavsdk_tests
+      run: make px4_sitl_default sitl_gazebo mavsdk_tests
    - name: ccache post-run mavsdk_tests
      run: ccache -s

@@ -6,12 +6,12 @@
 	path = src/drivers/uavcan/libuavcan
 	url = https://github.com/dronecan/libuavcan.git
 	branch = main
-[submodule "Tools/jMAVSim"]
-	path = Tools/jMAVSim
+[submodule "Tools/simulation/jmavsim/jMAVSim"]
+	path = Tools/simulation/jmavsim/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
 	branch = master
-[submodule "Tools/sitl_gazebo"]
-	path = Tools/sitl_gazebo
+[submodule "Tools/simulation/gazebo/sitl_gazebo"]
+	path = Tools/simulation/gazebo/sitl_gazebo
 	url = https://github.com/PX4/PX4-SITL_gazebo.git
 	branch = master
 [submodule "src/drivers/gps/devices"]
@@ -31,10 +31,10 @@
 	url = https://github.com/PX4/NuttX-apps.git
 	branch = px4_firmware_nuttx-10.1.0+
 [submodule "Tools/flightgear_bridge"]
-	path = Tools/flightgear_bridge
+	path = Tools/simulation/flightgear/flightgear_bridge
 	url = https://github.com/PX4/PX4-FlightGear-Bridge.git
-[submodule "Tools/jsbsim_bridge"]
-	path = Tools/jsbsim_bridge
+[submodule "Tools/simulation/jsbsim/jsbsim_bridge"]
+	path = Tools/simulation/jsbsim/jsbsim_bridge
 	url = https://github.com/PX4/px4-jsbsim-bridge.git
 [submodule "src/drivers/cyphal/libcanard"]
 	path = src/drivers/cyphal/libcanard
@@ -53,9 +53,6 @@
 [submodule "src/lib/events/libevents"]
 	path = src/lib/events/libevents
 	url = https://github.com/mavlink/libevents.git
-[submodule "Tools/simulation-ignition"]
-	path = Tools/simulation-ignition
-	url = https://github.com/PX4/px4-simulation-ignition.git
 [submodule "src/lib/crypto/libtomcrypt"]
 	path = src/lib/crypto/libtomcrypt
 	url = https://github.com/PX4/libtomcrypt.git
@@ -2,10 +2,15 @@ CONFIG:
  default: px4_sitl_default
  choices:
    px4_sitl_default:
-      short: px4_sitl
+      short: px4_sitl_default
      buildType: RelWithDebInfo
      settings:
        CONFIG: px4_sitl_default
+    px4_sitl_ign:
+      short: px4_sitl_ign
+      buildType: RelWithDebInfo
+      settings:
+        CONFIG: px4_sitl_ign
    px4_sitl_rtps:
      short: px4_sitl_rtps
      buildType: RelWithDebInfo
@@ -49,61 +49,6 @@
                "group": "test"
            }
        },
-        {
-            "label": "jmavsim build",
-            "type": "shell",
-            "command": "ant create_run_jar copy_res",
-            "options": {
-                "cwd": "${workspaceFolder}/Tools/jMAVSim"
-            },
-            "problemMatcher": [],
-            "presentation":{
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false,
-            }
-        },
-        {
-            "label": "jmavsim",
-            "type": "shell",
-            "dependsOn": "jmavsim build",
-            "command": "java -Djava.ext.dirs= -jar jmavsim_run.jar -r 250 -lockstep -tcp localhost:4560 -qgc",
-            "options": {
-                "cwd": "${workspaceFolder}/Tools/jMAVSim/out/production",
-                "env": {
-                    "PX4_SIM_SPEED_FACTOR": "1"
-                }
-            },
-            "isBackground": true,
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
        {
            "label": "jmavsim kill",
            "type": "shell",
@@ -116,7 +61,8 @@
                "showReuseMessage": false,
                "clear": false
            },
-            "problemMatcher": []
+            "problemMatcher": [],
+            "dependsOn":["px4_sitl_cleanup"]
        },
        {
            "label": "gazebo build",
@@ -143,11 +89,11 @@
                "cwd": "${workspaceFolder}",
                "env": {
                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/sitl_gazebo/models",
+                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/models",
                    "PX4_SIM_SPEED_FACTOR": "1"
                }
            },
-            "command": "gzserver --verbose ${workspaceFolder}/Tools/sitl_gazebo/worlds/${input:gazeboWorld}.world",
+            "command": "gzserver --verbose ${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/worlds/${input:gazeboWorld}.world",
            "isBackground": true,
            "presentation": {
                "echo": true,
@@ -183,11 +129,11 @@
                "cwd": "${workspaceFolder}",
                "env": {
                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/sitl_gazebo/models",
+                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/models",
                    "PX4_SIM_SPEED_FACTOR": "1"
                }
            },
-            "command": "gz model --verbose --spawn-file=${workspaceFolder}/Tools/sitl_gazebo/models/${input:vehicleModel}/${input:vehicleModel}.sdf --model-name=${input:vehicleModel} -x 1.01 -y 0.98 -z 0.83",
+            "command": "gz model --verbose --spawn-file=${workspaceFolder}/Tools/simulation/gazebo/sitl_gazebo/models/${input:gazeboModel}/${input:gazeboModel}.sdf --model-name=${input:gazeboModel} -x 1.01 -y 0.98 -z 0.83",
            "isBackground": false,
            "presentation": {
                "echo": true,
@@ -216,26 +162,26 @@
            ]
        },
        {
-            "label": "gazebo client",
+            "label": "ign gazebo",
            "type": "shell",
-            "dependsOn": "gazebo build",
            "options": {
                "cwd": "${workspaceFolder}",
                "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/sitl_gazebo/models",
+                    "IGN_GAZEBO_RESOURCE_PATH": "${workspaceFolder}/Tools/simulation/ignition/models",
                    "PX4_SIM_SPEED_FACTOR": "1"
                }
            },
-            "command": "gzclient --verbose",
+            "command": "ign gazebo -v 4 -r ${workspaceFolder}/Tools/simulation/ignition/worlds/${input:ignWorld}.sdf",
            "isBackground": true,
            "presentation": {
                "echo": true,
                "reveal": "never",
+                "revealProblems": "onProblem",
                "focus": false,
-                "panel": "shared",
+                "panel": "dedicated",
                "showReuseMessage": false,
-                "clear": false
+                "clear": false,
+                "close": true
            },
            "problemMatcher": [
                {
@@ -258,29 +204,51 @@
        {
            "label": "gazebo kill",
            "type": "shell",
-            "command": "killall gzserver",
+            "command": "pkill -9 -f gzserver || true",
            "presentation": {
                "echo": true,
-                "reveal": "silent",
+                "reveal": "never",
+                "revealProblems": "onProblem",
                "focus": false,
-                "panel": "shared",
+                "panel": "dedicated",
                "showReuseMessage": false,
-                "clear": false
+                "clear": false,
+                "close": true
            },
            "problemMatcher": [],
            "dependsOn":["px4_sitl_cleanup"]
        },
        {
-            "label": "px4_sitl_cleanup",
+            "label": "ign gazebo kill",
            "type": "shell",
-            "command": "rm -rfv /tmp/px4*",
+            "command": "pkill -9 -f ign || true",
            "presentation": {
                "echo": true,
-                "reveal": "silent",
+                "reveal": "never",
+                "revealProblems": "onProblem",
                "focus": false,
-                "panel": "shared",
+                "panel": "dedicated",
                "showReuseMessage": false,
-                "clear": false
+                "clear": false,
+                "close": true
+            },
+            "problemMatcher": [],
+            "dependsOn":["px4_sitl_cleanup"]
+        },
+
+        {
+            "label": "px4_sitl_cleanup",
+            "type": "shell",
+            "command": "rm -rfv /tmp/px4* || true",
+            "presentation": {
+                "echo": true,
+                "reveal": "never",
+                "revealProblems": "onProblem",
+                "focus": false,
+                "panel": "dedicated",
+                "showReuseMessage": false,
+                "clear": false,
+                "close": true
            },
            "problemMatcher": [],
            "dependsOn":["px4_kill"]
@@ -288,14 +256,16 @@
        {
            "label": "px4_kill",
            "type": "shell",
-            "command": "killall px4 || true",
+            "command": "pkill -9 px4 || true",
            "presentation": {
                "echo": true,
-                "reveal": "silent",
+                "reveal": "never",
+                "revealProblems": "onProblem",
                "focus": false,
-                "panel": "shared",
+                "panel": "dedicated",
                "showReuseMessage": false,
-                "clear": false
+                "clear": false,
+                "close": true
            },
            "problemMatcher": []
        },
@@ -337,7 +307,16 @@
    "inputs": [
        {
            "type": "pickString",
-            "id": "vehicleModel",
+            "id": "ignWorld",
+            "description": "Ignition world",
+            "options": [
+                "default"
+            ],
+            "default": "default"
+        },
+        {
+            "type": "pickString",
+            "id": "gazeboModel",
            "description": "gazebo model",
            "options": [
              "iris",
@@ -296,7 +296,10 @@ if(${PX4_PLATFORM} STREQUAL "posix")
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 	set(CMAKE_ENABLE_EXPORTS ON)

-	include(coverage)
+	if(CMAKE_BUILD_TYPE MATCHES "Coverage")
+		include(coverage)
+	endif()
+
 	include(sanitizers)

 	# Define GNU standard installation directories
@@ -26,15 +26,15 @@ pipeline {
        //       echo $0;
        //       mkdir -p catkin_ws/src;
        //       cd catkin_ws;
-        //       git -C ${WORKSPACE}/catkin_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo
-        //       git clone --recursive ${WORKSPACE}/catkin_ws/src/Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo;
+        //       git -C ${WORKSPACE}/catkin_ws/src/Firmware submodule update --init --recursive --force Tools/simulation/gazebo/sitl_gazebo
+        //       git clone --recursive ${WORKSPACE}/catkin_ws/src/Firmware/Tools/simulation/gazebo/sitl_gazebo src/mavlink_sitl_gazebo;
        //       git -C ${WORKSPACE}/catkin_ws/src/Firmware fetch --tags;
        //       source /opt/ros/melodic/setup.bash;
        //       export PYTHONPATH=/opt/ros/$ROS_DISTRO/lib/python2.7/dist-packages:/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/dist-packages;
        //       catkin init;
        //       catkin build -j$(nproc) -l$(nproc);
        //     '''
-        //     // test if the binary was correctly installed and runs using 'mavros_posix_silt.launch'
+        //     // test if the binary was correctly installed and runs using 'mavros_posix_sitl.launch'
        //     sh '''#!/bin/bash -l
        //       echo $0;
        //       source catkin_ws/devel/setup.bash;
@@ -68,7 +68,7 @@ pipeline {
              unset ROS_DISTRO;
              mkdir -p colcon_ws/src;
              cd colcon_ws;
-              git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo;
+              git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/simulation/gazebo/sitl_gazebo;
              git -C ${WORKSPACE}/colcon_ws/src/Firmware fetch --tags;
              source /opt/ros/foxy/setup.sh;
              colcon build --event-handlers console_direct+ --symlink-install;
@@ -129,57 +129,59 @@ else
 	BUILD_DIR_SUFFIX :=
 endif

+CMAKE_ARGS ?=
+
 # additional config parameters passed to cmake
 ifdef EXTERNAL_MODULES_LOCATION
-	CMAKE_ARGS += -DEXTERNAL_MODULES_LOCATION:STRING=$(EXTERNAL_MODULES_LOCATION)
+	override CMAKE_ARGS += -DEXTERNAL_MODULES_LOCATION:STRING=$(EXTERNAL_MODULES_LOCATION)
 endif

 ifdef PX4_CMAKE_BUILD_TYPE
-	CMAKE_ARGS += -DCMAKE_BUILD_TYPE=${PX4_CMAKE_BUILD_TYPE}
+	override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=${PX4_CMAKE_BUILD_TYPE}
 else

 	# Address Sanitizer
 	ifdef PX4_ASAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=AddressSanitizer
+		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=AddressSanitizer
 	endif

 	# Memory Sanitizer
 	ifdef PX4_MSAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=MemorySanitizer
+		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=MemorySanitizer
 	endif

 	# Thread Sanitizer
 	ifdef PX4_TSAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=ThreadSanitizer
+		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=ThreadSanitizer
 	endif

 	# Undefined Behavior Sanitizer
 	ifdef PX4_UBSAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=UndefinedBehaviorSanitizer
+		override CMAKE_ARGS += -DCMAKE_BUILD_TYPE=UndefinedBehaviorSanitizer
 	endif

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

 endif

 # Pick up specific Python path if set
 ifdef PYTHON_EXECUTABLE
-	CMAKE_ARGS += -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
+	override CMAKE_ARGS += -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
 endif

 # Check if the microRTPS agent is to be built
 ifdef BUILD_MICRORTPS_AGENT
-  CMAKE_ARGS += -DBUILD_MICRORTPS_AGENT=ON
+  override CMAKE_ARGS += -DBUILD_MICRORTPS_AGENT=ON
 endif

 # Functions
 # --------------------------------------------------------------------
 # describe how to build a cmake config
 define cmake-build
-	$(eval CMAKE_ARGS += -DCONFIG=$(1))
+	$(eval override CMAKE_ARGS += -DCONFIG=$(1))
 	@$(eval BUILD_DIR = "$(SRC_DIR)/build/$(1)")
 	@# check if the desired cmake configuration matches the cache then CMAKE_CACHE_CHECK stays empty
 	@$(call cmake-cache-check)
@@ -314,7 +316,9 @@ uorb_graphs:
 	@$(MAKE) --no-print-directory px4_fmu-v5_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph

-px4io_update: px4_io-v2_default cubepilot_io-v2_default
+px4io_update:
+	@$(MAKE) --no-print-directory px4_io-v2_default
+	@$(MAKE) --no-print-directory cubepilot_io-v2_default
 	# px4_io-v2_default
 	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/durandal-v1/extras/px4_io-v2_default.bin
 	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/pix32v5/extras/px4_io-v2_default.bin
@@ -381,7 +385,7 @@ format:
 .PHONY: rostest python_coverage

 tests:
-	$(eval CMAKE_ARGS += -DTESTFILTER=$(TESTFILTER))
+	$(eval override CMAKE_ARGS += -DTESTFILTER=$(TESTFILTER))
 	$(eval ARGS += test_results)
 	$(eval ASAN_OPTIONS += color=always:check_initialization_order=1:detect_stack_use_after_return=1)
 	$(eval UBSAN_OPTIONS += color=always)
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL
+#
+# @type Quadrotor Wide
+#
+# @maintainer Julian Oes <julian@oes.ch>
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=jmavsim}
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (foggy_lidar)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+param set-default EKF2_RNG_A_HMAX 10
+
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (foggy_lidar)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-param set-default EKF2_RNG_A_HMAX 10
-
@@ -9,6 +9,8 @@

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

+PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=quadx}

 # disable some checks to allow to fly:
 # - with usb
@@ -39,4 +41,3 @@ param set-default PWM_MAIN_FUNC3 103
 param set-default PWM_MAIN_FUNC4 104

 param set SIH_VEHICLE_TYPE 0
-
@@ -8,6 +8,8 @@

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

+PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=airplane}

 # disable some checks to allow to fly:
 # - with usb
@@ -8,6 +8,9 @@

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

+PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=xvert}
+
 param set-default VT_ELEV_MC_LOCK 0
 param set-default VT_TYPE 0
 param set-default VT_FW_DIFTHR_EN 1
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Optical Flow)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+# EKF2
+param set-default EKF2_AID_MASK 2
+param set-default EKF2_GPS_CTRL 0
+param set-default EKF2_EVP_NOISE 0.05
+param set-default EKF2_EVA_NOISE 0.05
+
+# LPE: Flow-only mode
+param set-default LPE_FUSION 242
+param set-default LPE_FAKE_ORIGIN 1
+
+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.0
+param set-default SENS_FLOW_MAXR 2.5
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Optical Flow)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-# EKF2
-param set-default EKF2_AID_MASK 2
-param set-default EKF2_EVP_NOISE 0.05
-param set-default EKF2_EVA_NOISE 0.05
-
-# LPE: Flow-only mode
-param set-default LPE_FUSION 242
-param set-default LPE_FAKE_ORIGIN 1
-
-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.0
-param set-default SENS_FLOW_MAXR 2.5
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (irlock)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+# enable fusion of landing target velocity
+param set-default LTEST_MODE 1
+param set-default PLD_HACC_RAD 0.1
+param set-default RTL_PLD_MD 2
+
+# Start up Landing Target Estimator module
+landing_target_estimator start
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (irlock)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-# enable fusion of landing target velocity
-param set-default LTEST_MODE 1
-param set-default PLD_HACC_RAD 0.1
-param set-default RTL_PLD_MD 2
-
-# Start up Landing Target Estimator module
-landing_target_estimator start
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (rplidar)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+param set-default LPE_FUSION 242
+
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (rplidar)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-param set-default LPE_FUSION 242
-
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Vision)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+# EKF2: Vision position and heading
+param set-default EKF2_AID_MASK 24
+param set-default EKF2_EV_DELAY 5
+param set-default EKF2_GPS_CTRL 0
+
+# LPE: Vision + baro
+param set-default LPE_FUSION 132
+
+# AEQ: External heading set to use vision input
+param set-default ATT_EXT_HDG_M 1
+
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Vision)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-# EKF2: Vision position and heading
-param set-default EKF2_AID_MASK 24
-param set-default EKF2_EV_DELAY 5
-
-# LPE: Vision + baro
-param set-default LPE_FUSION 132
-
-# AEQ: External heading set to use vision input
-param set-default ATT_EXT_HDG_M 1
-
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Obstacle Avoidance)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+param set-default COM_OBS_AVOID 1
+param set-default MPC_XY_CRUISE 5.0
+
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Obstacle Avoidance)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-param set-default COM_OBS_AVOID 1
-param set-default MPC_XY_CRUISE 5.0
-
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Optical Flow)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+# EKF2
+param set-default EKF2_AID_MASK 2
+param set-default EKF2_GPS_CTRL 0
+
+# LPE: Flow-only mode
+param set-default LPE_FUSION 242
+param set-default LPE_FAKE_ORIGIN 1
+
+param set-default MPC_ALT_MODE 2
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Optical Flow)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-# EKF2
-param set-default EKF2_AID_MASK 2
-
-# LPE: Flow-only mode
-param set-default LPE_FUSION 242
-param set-default LPE_FAKE_ORIGIN 1
-
-param set-default MPC_ALT_MODE 2
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Vision Velocity)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-# EKF2: Vision velocity and heading
-param set-default EKF2_AID_MASK 272
-param set-default EKF2_EV_DELAY 5
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# @name 3DR Iris Quadrotor SITL (Dual GPS)
+#
+# @type Quadrotor Wide
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+
+param set-default CA_AIRFRAME 0
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+
+# EKF2: Multi GPS blending
+param set-default SENS_GPS_MASK 7
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Dual GPS)
-#
-# @type Quadrotor Wide
-#
-
-. ${R}etc/init.d-posix/airframes/10016_iris
-
-# EKF2: Multi GPS blending
-param set-default SENS_GPS_MASK 7
@@ -0,0 +1,81 @@
+#!/bin/sh
+#
+# @name Plane SITL with camera
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default EKF2_MAG_ACCLIM 0
+param set-default EKF2_MAG_YAWLIM 0
+
+param set-default FW_LND_AIRSPD_SC 1
+param set-default FW_LND_ANG 8
+
+param set-default FW_L1_PERIOD 12
+
+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 TRIM_PITCH -0.15
+
+param set-default FW_PSP_OFF 2
+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_MAX 0.6
+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_LTRMIN_ALT 30
+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.0
+param set-default CA_SV_CS2_TYPE 3
+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
+param set-default PWM_MAIN_FUNC3 204
+param set-default PWM_MAIN_FUNC4 205
+param set-default PWM_MAIN_FUNC5 101
+param set-default PWM_MAIN_FUNC6 201
+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
+
+# Camera trigger interface is MAVLink
+param set-default TRIG_INTERFACE 3
+
+# Distance trigger mode enabled
+param set-default TRIG_MODE 4
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with camera
-#
-
-. ${R}etc/init.d-posix/airframes/1030_plane
-
-# Camera trigger interface is MAVLink
-param set-default TRIG_INTERFACE 3
-
-# Distance trigger mode enabled
-param set-default TRIG_MODE 4
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# @name Plane SITL with catapult
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default EKF2_MAG_ACCLIM 0
+param set-default EKF2_MAG_YAWLIM 0
+
+param set-default FW_LND_AIRSPD_SC 1
+param set-default FW_LND_ANG 8
+
+param set-default FW_L1_PERIOD 12
+
+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 TRIM_PITCH -0.15
+
+param set-default FW_PSP_OFF 2
+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_MAX 0.6
+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_LTRMIN_ALT 30
+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.0
+param set-default CA_SV_CS2_TYPE 3
+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
+param set-default PWM_MAIN_FUNC3 204
+param set-default PWM_MAIN_FUNC4 205
+param set-default PWM_MAIN_FUNC5 101
+param set-default PWM_MAIN_FUNC6 201
+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
+
+param set-default RWTO_TKOFF 0
+
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with catapult
-#
-
-. ${R}etc/init.d-posix/airframes/1030_plane
-
-param set-default RWTO_TKOFF 0
-
@@ -63,4 +63,3 @@ 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
-
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# @name Plane SITL with catapult
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default EKF2_MAG_ACCLIM 0
+param set-default EKF2_MAG_YAWLIM 0
+
+param set-default FW_LND_AIRSPD_SC 1
+param set-default FW_LND_ANG 8
+
+param set-default FW_L1_PERIOD 12
+
+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 TRIM_PITCH -0.15
+
+param set-default FW_PSP_OFF 2
+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_MAX 0.6
+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_LTRMIN_ALT 30
+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.0
+param set-default CA_SV_CS2_TYPE 3
+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
+param set-default PWM_MAIN_FUNC3 204
+param set-default PWM_MAIN_FUNC4 205
+param set-default PWM_MAIN_FUNC5 101
+param set-default PWM_MAIN_FUNC6 201
+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
+
+param set-default FW_THR_TRIM 0.0
+param set-default RWTO_TKOFF 0
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with catapult
-#
-
-. ${R}etc/init.d-posix/airframes/1030_plane
-
-param set-default FW_THR_TRIM 0.0
-param set-default RWTO_TKOFF 0
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# @name Plane SITL
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default FW_LND_AIRSPD_SC 1.1
+param set-default FW_LND_ANG 5
+param set-default FW_LND_FL_PMIN 9.5
+param set-default FW_LND_FL_PMAX 20
+param set-default FW_LND_FLALT 5
+
+param set-default FW_L1_PERIOD 25
+
+param set-default FW_PR_FF 0.40
+param set-default FW_PR_I 0.05
+param set-default FW_PR_P 0.05
+
+param set-default FW_R_TC 0.45
+param set-default FW_RR_FF 0.40
+param set-default FW_RR_I 0.132
+param set-default FW_RR_P 0.085
+
+param set-default FW_W_EN 1
+
+param set-default MIS_LTRMIN_ALT 30
+param set-default MIS_TAKEOFF_ALT 20
+param set-default MIS_DIST_1WP 2500
+param set-default MIS_DIST_WPS 10000
+
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+
+param set-default RWTO_TKOFF 1
+
+param set-default RWTO_MAX_PITCH 20
+
+param set-default RWTO_PSP 8
+param set-default RWTO_AIRSPD_SCL 1.8
+
+param set-default CA_AIRFRAME 1
+
+param set-default CA_ROTOR_COUNT 1
+param set-default CA_ROTOR0_PX 0.3
+
+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.0
+param set-default CA_SV_CS2_TYPE 3
+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
+param set-default PWM_MAIN_FUNC3 204
+param set-default PWM_MAIN_FUNC4 205
+param set-default PWM_MAIN_FUNC5 101
+param set-default PWM_MAIN_FUNC6 201
+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
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# @name Standard VTOL
+#
+# @type Standard VTOL
+#
+
+. ${R}etc/init.d/rc.vtol_defaults
+
+# TODO: Enable motor failure detection when the
+# VTOL no longer reports 0A for all ESCs in SITL
+param set-default FD_ACT_EN 0
+param set-default FD_ACT_MOT_TOUT 500
+
+param set-default CA_AIRFRAME 2
+
+param set-default CA_ROTOR_COUNT 5
+param set-default CA_ROTOR0_PX 0.1515
+param set-default CA_ROTOR0_PY 0.245
+param set-default CA_ROTOR0_KM 0.05
+param set-default CA_ROTOR1_PX -0.1515
+param set-default CA_ROTOR1_PY -0.1875
+param set-default CA_ROTOR1_KM 0.05
+param set-default CA_ROTOR2_PX 0.1515
+param set-default CA_ROTOR2_PY -0.245
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.1515
+param set-default CA_ROTOR3_PY 0.1875
+param set-default CA_ROTOR3_KM -0.05
+param set-default CA_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_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 PWM_MAIN_FUNC1 101
+param set-default PWM_MAIN_FUNC2 102
+param set-default PWM_MAIN_FUNC3 103
+param set-default PWM_MAIN_FUNC4 104
+param set-default PWM_MAIN_FUNC5 105
+param set-default PWM_MAIN_FUNC6 201
+param set-default PWM_MAIN_FUNC7 202
+param set-default PWM_MAIN_FUNC8 203
+
+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
+param set-default FW_P_LIM_MIN -15
+param set-default FW_RR_FF 0.1
+param set-default FW_RR_P 0.3
+param set-default FW_THR_TRIM 0.25
+param set-default FW_THR_MAX 0.6
+param set-default FW_THR_MIN 0.05
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+
+param set-default MC_ROLLRATE_P 0.3
+param set-default MC_YAW_P 1.6
+
+param set-default MIS_TAKEOFF_ALT 10
+
+param set-default MPC_ACC_HOR_MAX 2
+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_F_TRANS_THR 0.75
+param set-default VT_MOT_ID 1234
+param set-default VT_FW_MOT_OFFID 1234
+param set-default VT_B_TRANS_DUR 8
+param set-default VT_TYPE 2
+
+
+# Gimbal
+param set-default PWM_MAIN_FUNC9 420
+param set-default PWM_MAIN_FUNC10 421
+param set-default PWM_MAIN_FUNC11 422
+
+param set-default RC_MAP_AUX1 8
+param set-default RC_MAP_AUX2 9
+param set-default RC_MAP_AUX3 10
+
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# @name Standard VTOL
-#
-# @type Standard VTOL
-#
-
-. ${R}etc/init.d-posix/airframes/1040_standard_vtol
-
-# Gimbal
-param set-default PWM_MAIN_FUNC9 420
-param set-default PWM_MAIN_FUNC10 421
-param set-default PWM_MAIN_FUNC11 422
-
-param set-default RC_MAP_AUX1 8
-param set-default RC_MAP_AUX2 9
-param set-default RC_MAP_AUX3 10
-
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# @name Plane SITL with downward facing LIDAR.
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+param set-default EKF2_MAG_ACCLIM 0
+param set-default EKF2_MAG_YAWLIM 0
+
+param set-default FW_LND_AIRSPD_SC 1
+param set-default FW_LND_ANG 8
+
+param set-default FW_L1_PERIOD 12
+
+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 TRIM_PITCH -0.15
+
+param set-default FW_PSP_OFF 2
+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_MAX 0.6
+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_LTRMIN_ALT 30
+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.0
+param set-default CA_SV_CS2_TYPE 3
+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
+param set-default PWM_MAIN_FUNC3 204
+param set-default PWM_MAIN_FUNC4 205
+param set-default PWM_MAIN_FUNC5 101
+param set-default PWM_MAIN_FUNC6 201
+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
+
+
+param set-default FW_LND_USETER 1
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# @name Plane SITL with downward facing LIDAR.
-#
-
-. ${R}etc/init.d-posix/airframes/1030_plane
-
-param set-default FW_LND_USETER 1
-
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# @name Ignition Gazebo X3
+#
+# @type Quadrotor
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=ignition}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=x500}
+PX4_SIM_WORLD=${PX4_SIM_WORLD:=default}
+
+param set-default SYS_CTRL_ALLOC 1
+
+param set-default CA_AIRFRAME 0
+param set-default CA_ROTOR_COUNT 4
+
+param set-default CA_ROTOR0_PX 0.13
+param set-default CA_ROTOR0_PY 0.22
+param set-default CA_ROTOR0_KM  0.05
+
+param set-default CA_ROTOR1_PX -0.13
+param set-default CA_ROTOR1_PY -0.20
+param set-default CA_ROTOR1_KM  0.05
+
+param set-default CA_ROTOR2_PX 0.13
+param set-default CA_ROTOR2_PY -0.22
+param set-default CA_ROTOR2_KM -0.05
+
+param set-default CA_ROTOR3_PX -0.13
+param set-default CA_ROTOR3_PY 0.20
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default SIM_IGN_FUNC1 101
+param set-default SIM_IGN_FUNC2 102
+param set-default SIM_IGN_FUNC3 103
+param set-default SIM_IGN_FUNC4 104
+
+param set-default SIM_IGN_MIN1 150
+param set-default SIM_IGN_MIN2 150
+param set-default SIM_IGN_MIN3 150
+param set-default SIM_IGN_MIN4 150
+
+param set-default SIM_IGN_MAX1 1000
+param set-default SIM_IGN_MAX2 1000
+param set-default SIM_IGN_MAX3 1000
+param set-default SIM_IGN_MAX4 1000
+
+param set-default MPC_THR_HOVER 0.60
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# @name Ignition Gazebo X4
+#
+# @type Quadrotor
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=ignition}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=x4}
+PX4_SIM_WORLD=${PX4_SIM_WORLD:=default}
+
+param set-default SYS_CTRL_ALLOC 1
+
+param set-default CA_AIRFRAME 0
+param set-default CA_ROTOR_COUNT 6
+
+param set-default CA_ROTOR0_PX  0.25
+param set-default CA_ROTOR0_PY -0.15
+param set-default CA_ROTOR0_KM  0.05
+
+param set-default CA_ROTOR1_PX  0.00
+param set-default CA_ROTOR1_PY -0.29
+param set-default CA_ROTOR1_KM -0.05
+
+param set-default CA_ROTOR2_PX -0.25
+param set-default CA_ROTOR2_PY -0.15
+param set-default CA_ROTOR2_KM  0.05
+
+param set-default CA_ROTOR3_PX -0.25
+param set-default CA_ROTOR3_PY  0.15
+param set-default CA_ROTOR3_KM -0.05
+
+param set-default CA_ROTOR4_PX  0.00
+param set-default CA_ROTOR4_PY  0.29
+param set-default CA_ROTOR4_KM  0.05
+
+param set-default CA_ROTOR5_PX  0.25
+param set-default CA_ROTOR5_PY  0.15
+param set-default CA_ROTOR5_KM -0.05
+
+param set-default SIM_IGN_FUNC1 101
+param set-default SIM_IGN_FUNC2 102
+param set-default SIM_IGN_FUNC3 103
+param set-default SIM_IGN_FUNC4 104
+param set-default SIM_IGN_FUNC5 105
+param set-default SIM_IGN_FUNC6 106
+
+param set-default SIM_IGN_MIN1 150
+param set-default SIM_IGN_MIN2 150
+param set-default SIM_IGN_MIN3 150
+param set-default SIM_IGN_MIN4 150
+param set-default SIM_IGN_MIN5 150
+param set-default SIM_IGN_MIN6 150
+
+param set-default SIM_IGN_MAX1 1000
+param set-default SIM_IGN_MAX2 1000
+param set-default SIM_IGN_MAX3 1000
+param set-default SIM_IGN_MAX4 1000
+param set-default SIM_IGN_MAX5 1000
+param set-default SIM_IGN_MAX6 1000
+
+
+param set-default MC_PITCHRATE_D 0.0016
+param set-default MC_PITCHRATE_I 0.2500
+param set-default MC_PITCHRATE_P 0.1831
+param set-default MC_PITCH_P 5.216
+
+param set-default MC_ROLLRATE_D 0.0022
+param set-default MC_ROLLRATE_I 0.2095
+param set-default MC_ROLLRATE_P 0.1570
+param set-default MC_ROLL_P 6.081
+
+param set-default MC_YAWRATE_D 0.0009
+param set-default MC_YAWRATE_I 0.1800
+param set-default MC_YAWRATE_P 0.1773
+param set-default MC_YAW_P 5.386490
+
+param set-default MPC_THR_HOVER 0.61
@@ -32,49 +32,58 @@
 ############################################################################

 px4_add_romfs_files(
-	10016_iris
-	10018_iris_foggy_lidar
-	10019_omnicopter
-	10030_px4vision
-	10040_quadx
-	10041_airplane
-	10042_xvert
-	1010_iris_opt_flow
-	1010_iris_opt_flow.post
-	1011_iris_irlock
-	1012_iris_rplidar
-	1013_iris_vision
-	1013_iris_vision.post
-	1015_iris_obs_avoid
-	1015_iris_obs_avoid.post
-	1017_iris_opt_flow_mockup
-	1018_iris_vision_velocity
-	1019_iris_dual_gps
-	1021_uuv_hippocampus
-	1022_uuv_bluerov2_heavy
-	1030_plane
-	1031_plane_cam
-	1032_plane_catapult
-	1033_rascal
-	1034_rascal-electric
-	1035_techpod
-	1036_malolo
-	1037_believer
-	1038_glider
-	1040_standard_vtol
-	1041_tailsitter
-	1042_tiltrotor
-	1043_standard_vtol_drop
-	1044_plane_lidar
-	1060_rover
-	1061_r1_rover
-	1062_tf-r1
-	1070_boat
-	3010_quadrotor_x
-	3011_hexarotor_x
-	17001_tf-g1
-	17002_tf-g2
-	2507_cloudship
-	6011_typhoon_h480
-	6011_typhoon_h480.post
+	1010_gazebo_iris_opt_flow
+	1010_gazebo_iris_opt_flow.post
+	1011_gazebo_iris_irlock
+	1012_gazebo_iris_rplidar
+	1013_gazebo_iris_vision
+	1013_gazebo_iris_vision.post
+	1015_gazebo_iris_obs_avoid
+	1015_gazebo_iris_obs_avoid.post
+	1017_gazebo_iris_opt_flow_mockup
+	1019_gazebo_iris_dual_gps
+	1021_gazebo_uuv_hippocampus
+	1022_gazebo_uuv_bluerov2_heavy
+	1030_gazebo_plane
+	1031_gazebo_plane_cam
+	1032_gazebo_plane_catapult
+	1033_jsbsim_rascal
+	1034_flightgear_rascal-electric
+	1035_gazebo_techpod
+	1036_jsbsim_malolo
+	1037_gazebo_believer
+	1038_gazebo_glider
+	1039_flightgear_rascal
+	1040_gazebo_standard_vtol
+	1041_gazebo_tailsitter
+	1042_gazebo_tiltrotor
+	1043_gazebo_standard_vtol_drop
+	1044_gazebo_plane_lidar
+	1060_gazebo_rover
+	1061_gazebo_r1_rover
+	1062_flightgear_tf-r1
+	1070_gazebo_boat
+
+	2507_gazebo_cloudship
+
+	3010_jsbsim_quadrotor_x
+	3011_jsbsim_hexarotor_x
+
+	4001_ign_x500
+
+	6001_ign_x4
+	6011_gazebo_typhoon_h480
+	6011_gazebo_typhoon_h480.post
+
+	10016_gazebo_iris
+	10017_jmavsim_iris
+	10018_gazebo_iris_foggy_lidar
+	10019_gazebo_omnicopter
+	10030_gazebo_px4vision
+	10040_sihsim_quadx
+	10041_sihsim_airplane
+	10042_sihsim_xvert
+
+	17001_flightgear_tf-g1
+	17002_flightgear_tf-g2
 )
@@ -32,7 +32,7 @@ mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $ud
 mavlink start -x -u $udp_onboard_gimbal_port_local -r 400000 -m gimbal -o $udp_onboard_gimbal_port_remote

 # To display for SIH sitl
-if [ "$SIM_MODE" = "sihsim" ]; then
+if [ "$PX4_SIMULATOR" = "sihsim" ]; then
 	udp_sihsim_port_local=$((19450+px4_instance))
 	udp_sihsim_port_remote=$((19410+px4_instance))
 	mavlink start -x -u $udp_sihsim_port_local -r 400000 -m custom -o $udp_sihsim_port_remote
@@ -1,20 +1,85 @@
 #!/bin/sh
 # shellcheck disable=SC2154

-simulator_tcp_port=$((4560+px4_instance))
+# Simulator IMU data provided at 250 Hz
+param set-default IMU_INTEG_RATE 250
+
+if [ "$PX4_SIMULATOR" = "sihsim" ] || [ "$(param show -q SYS_AUTOSTART)" -eq "0" ]; then
+
+	echo "INFO  [init] SIH simulator"
+
+	if ! simulator_sih start; then
+		echo "ERROR  [init] simulator_sih failed to start"
+		exit 1
+	fi
+
+elif [ "$PX4_SIMULATOR" = "ignition" ]; then
+
+	echo "INFO  [init] Ignition Gazebo simulator"
+
+	# source generated gazebo_env.sh for IGN_GAZEBO_RESOURCE_PATH
+	if [ -f gazebo_env.sh ]; then
+		. ./gazebo_env.sh
+	elif [ -f ../gazebo_env.sh ]; then
+		. ../gazebo_env.sh
+	fi
+
+	if ! ign service --info --service /world/${PX4_SIM_WORLD}/create | grep "ignition.msgs.EntityFactory"; then
+		# starting ign gazebo with ${PX4_SIM_WORLD} world
+		echo "INFO  [init] starting ign gazebo"
+
+		if [ -z $HEADLESS ]; then
+			ign gazebo --verbose=1 -r "${PX4_IGN_GAZEBO_WORLDS}/${PX4_SIM_WORLD}.sdf" &
+		else
+			# starting ign gazebo headless
+			ign gazebo --verbose=1 -r -s "${PX4_IGN_GAZEBO_WORLDS}/${PX4_SIM_WORLD}.sdf" &
+		fi
+	else
+		echo "INFO  [init] ign gazebo already running"
+	fi
+
+	if simulator_ignition_bridge start -m "${PX4_SIM_MODEL#*ign_}" -w "${PX4_SIM_WORLD}"; then
+		sensor_baro_sim start
+		sensor_gps_sim start
+		sensor_mag_sim start
+	else
+		echo "ERROR  [init] ign gazebo failed to start"
+		exit 1
+	fi
+
+elif [ "$PX4_SIM_MODEL" = "jmavsim_iris" ] || [ "$PX4_SIMULATOR" = "jmavsim" ]; then
+
+	echo "INFO  [init] jMAVSim simulator"
+
+	if jps | grep -i jmavsim; then
+		kill $(jps | grep -i jmavsim | awk '{print $1}') || true
+		sleep 1
+	fi
+
+	./jmavsim_run.sh -l -r 250 &
+
+	simulator_mavlink start -h localhost $((4560+px4_instance))

-# Check if PX4_SIM_HOSTNAME environment variable is empty
-# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
-# If both are empty use localhost for simulator
-if [ -z "${PX4_SIM_HOSTNAME}" ]; then
-  if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
-    echo "PX4 SIM HOST: localhost"
-    simulator start -c $simulator_tcp_port
-  else
-    echo "PX4 SIM HOST: $PX4_SIM_HOST_ADDR"
-    simulator start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port
-  fi
 else
-  echo "PX4 SIM HOST: $PX4_SIM_HOSTNAME"
-  simulator start -h $PX4_SIM_HOSTNAME $simulator_tcp_port
+	# otherwise start simulator (mavlink) module
+	simulator_tcp_port=$((4560+px4_instance))
+
+	# Check if PX4_SIM_HOSTNAME environment variable is empty
+	# If empty check if PX4_SIM_HOST_ADDR environment variable is empty
+	# If both are empty use localhost for simulator
+	if [ -z "${PX4_SIM_HOSTNAME}" ]; then
+
+		if [ -z "${PX4_SIM_HOST_ADDR}" ]; then
+			echo "INFO  [init] PX4_SIM_HOSTNAME: localhost"
+			simulator_mavlink start -c $simulator_tcp_port
+		else
+			echo "INFO  [init] PX4_SIM_HOSTNAME: $PX4_SIM_HOST_ADDR"
+			simulator_mavlink start -t $PX4_SIM_HOST_ADDR $simulator_tcp_port
+		fi
+
+	else
+		echo "INFO  [init] PX4_SIM_HOSTNAME: $PX4_SIM_HOSTNAME"
+		simulator_mavlink start -h $PX4_SIM_HOSTNAME $simulator_tcp_port
+	fi
+
 fi
@@ -1,6 +1,6 @@
 #!/bin/sh

-set -e
+#set -e

 # PX4 commands need the 'px4-' prefix in bash.
 # (px4-alias.sh is expected to be in the PATH)
@@ -30,6 +30,7 @@ set MIXER_FILE                  none
 set OUTPUT_MODE                 sim
 set EXTRA_MIXER_MODE            none
 set PWM_OUT                     none
+set PWM_AUX_OUT                 none
 set SDCARD_MIXERS_PATH          etc/mixers
 set USE_IO                      no
 set VEHICLE_TYPE                none
@@ -38,10 +39,24 @@ set LOGGER_BUF                  1000

 set RUN_MINIMAL_SHELL           no

-# Use the variable set by sitl_run.sh to choose the model settings.
-if [ "$PX4_SIM_MODEL" = "shell" ]; then
+set SYS_AUTOSTART=0
+
+if [ "$PX4_SIM_MODEL" = "shell" ]
+then
 	set RUN_MINIMAL_SHELL yes
-else
+
+elif [ -n "$PX4_SYS_AUTOSTART" ]
+then
+	echo "env SYS_AUTOSTART: ${PX4_SYS_AUTOSTART}"
+	SYS_AUTOSTART=${PX4_SYS_AUTOSTART}
+
+elif [ "$PX4_SIM_MODEL" = "none" ] || [ -z $PX4_SIM_MODEL ]
+then
+	# no airframe selected
+	SYS_AUTOSTART=0
+
+elif [ -n "$PX4_SIM_MODEL" ]
+then
 	# Find the matching Autostart ID (file name has the form: [0-9]+_${PX4_SIM_MODEL})
 	# TODO: unify with rc.autostart generation
 	# shellcheck disable=SC2012
@@ -50,12 +65,13 @@ else
 		echo "ERROR  [init] Unknown model $PX4_SIM_MODEL (not found by name on ${R}etc/init.d-posix/airframes)"
 		exit 1
 	else
+		SYS_AUTOSTART=$REQUESTED_AUTOSTART
 		echo "INFO  [init] found model autostart file as SYS_AUTOSTART=$REQUESTED_AUTOSTART"
 	fi
 fi

 # Load parameters
-set PARAM_FILE eeprom/parameters_"$REQUESTED_AUTOSTART"
+set PARAM_FILE parameters.bson
 param select $PARAM_FILE

 if [ -f $PARAM_FILE ]
@@ -66,26 +82,16 @@ then
 	else
 		echo "[param] FAILED loading $PARAM_FILE"
 	fi
-else
-	echo "[param] parameter file not found, creating $PARAM_FILE"
 fi

 # exit early when the minimal shell is requested
 [ $RUN_MINIMAL_SHELL = yes ] && exit 0

+if param compare SYS_AUTOSTART $SYS_AUTOSTART
+then
+	set AUTOCNF no

-# Use environment variable PX4_ESTIMATOR to choose estimator.
-if [ "$PX4_ESTIMATOR" = "q" ]; then
-	param set SYS_MC_EST_GROUP 3
-elif [ "$PX4_ESTIMATOR" = "ekf2" ]; then
-	param set SYS_MC_EST_GROUP 2
-elif [ "$PX4_ESTIMATOR" = "lpe" ]; then
-	param set SYS_MC_EST_GROUP 1
-elif [ "$PX4_ESTIMATOR" = "inav" ]; then
-	param set SYS_MC_EST_GROUP 0
-fi
-
-if param compare SYS_AUTOSTART $REQUESTED_AUTOSTART
+elif [ "$SYS_AUTOSTART" -eq 0 ]
 then
 	set AUTOCNF no
 else
@@ -106,7 +112,7 @@ param set MAV_SYS_ID $((px4_instance+1))

 if [ $AUTOCNF = yes ]
 then
-	param set SYS_AUTOSTART $REQUESTED_AUTOSTART
+	param set SYS_AUTOSTART $SYS_AUTOSTART

 	param set CAL_ACC0_ID  1310988 # 1310988: DRV_IMU_DEVTYPE_SIM, BUS: 1, ADDR: 1, TYPE: SIMULATION
 	param set CAL_GYRO0_ID 1310988 # 1310988: DRV_IMU_DEVTYPE_SIM, BUS: 1, ADDR: 1, TYPE: SIMULATION
@@ -143,6 +149,7 @@ param set-default EKF2_MULTI_MAG 2
 param set-default SENS_MAG_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

 param set-default -s MC_AT_EN 1

@@ -190,28 +197,28 @@ do
 			;;
 	esac
 done
-if [ ! -e "$autostart_file" ]; then
+
+if [ -e "$autostart_file" ]
+then
+	. "$autostart_file"
+
+elif [ ! -e "$autostart_file" ] && [ "$SYS_AUTOSTART" -ne "0" ]
+then
 	echo "Error: no autostart file found ($autostart_file)"
 	exit 1
 fi

-. "$autostart_file"
-
-# Simulator IMU data provided at 250 Hz
-param set IMU_INTEG_RATE 250
-
 #user defined params for instances can be in PATH
 . px4-rc.params

 dataman start
-# start sih in sih_sim mode, otherwise simulator module
-if [ "$SIM_MODE" = "sihsim" ]; then
-	sih start
+
 # only start the simulator if not in replay mode, as both control the lockstep time
-elif ! replay tryapplyparams
+if ! replay tryapplyparams
 then
-  . px4-rc.simulator
+	. px4-rc.simulator
 fi
+
 load_mon start
 battery_simulator start
 tone_alarm start
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# @name Holybro X500 V2
+#
+# @type Quadrotor x
+# @class Copter
+#
+# @maintainer Farhang Naderi <farhang.nba@gmail.com>
+#
+# @board px4_fmu-v2 exclude
+# @board bitcraze_crazyflie exclude
+#
+
+. ${R}etc/init.d/rc.mc_defaults
+
+param set-default IMU_GYRO_CUTOFF 30
+
+param set-default MC_ROLLRATE_P 0.14
+param set-default MC_PITCHRATE_P 0.14
+param set-default MC_ROLLRATE_I 0.3
+param set-default MC_PITCHRATE_I 0.3
+param set-default MC_ROLLRATE_D 0.004
+param set-default MC_PITCHRATE_D 0.004
+
+param set-default CA_ROTOR_COUNT 4
+param set-default CA_ROTOR0_PX 0.25
+param set-default CA_ROTOR0_PY 0.25
+param set-default CA_ROTOR1_PX -0.25
+param set-default CA_ROTOR1_PY -0.25
+param set-default CA_ROTOR2_PX 0.25
+param set-default CA_ROTOR2_PY -0.25
+param set-default CA_ROTOR2_KM -0.05
+param set-default CA_ROTOR3_PX -0.25
+param set-default CA_ROTOR3_PY 0.25
+param set-default CA_ROTOR3_KM -0.05
@@ -73,7 +73,7 @@ param set-default EKF2_PCOEF_YN -0.4
 param set-default EKF2_PCOEF_YP -0.4

 param set-default EKF2_RNG_A_VMAX 1.0
-param set-default EKF2_RNG_AID 0
+param set-default EKF2_RNG_CTRL 0
 param set-default EKF2_RNG_DELAY 55
 param set-default EKF2_RNG_POS_X -0.035
 param set-default EKF2_RNG_POS_Y 0.0
@@ -38,7 +38,7 @@ param set-default SENS_BOARD_ROT 10

 # EKF2
 param set-default EKF2_GND_EFF_DZ 6
-param set-default EKF2_HGT_MODE 1
+param set-default EKF2_HGT_REF 1

 # Position control
 param set-default MPC_Z_P 1
@@ -42,7 +42,7 @@ param set-default SENS_EN_BATT 1
 # EKF2
 param set-default EKF2_AID_MASK 3
 param set-default EKF2_GND_EFF_DZ 6
-param set-default EKF2_HGT_MODE 1
+param set-default EKF2_HGT_REF 1
 param set-default EKF2_MIN_RNG 0.3

 # Flow
@@ -26,7 +26,8 @@ param set-default COM_RC_IN_MODE 1

 param set-default EKF2_ABL_LIM 2
 param set-default EKF2_AID_MASK 3
-param set-default EKF2_HGT_MODE 2
+param set-default EKF2_HGT_REF 2
+param set-default EKF2_RNG_CTRL 2
 param set-default EKF2_MAG_TYPE 1
 param set-default EKF2_OF_DELAY 10

@@ -20,6 +20,7 @@
 param set-default SYS_MC_EST_GROUP 2
 param set-default SYS_HAS_MAG 0
 param set-default EKF2_AID_MASK 2
+param set-default EKF2_GPS_CTRL 0
 param set-default EKF2_MAG_TYPE 5

 param set-default BAT1_N_CELLS 1
@@ -71,7 +71,7 @@ param set-default MIS_TAKEOFF_ALT 1.1
 # EKF
 #####################################
 # Height mode as GPS
-param set-default EKF2_HGT_MODE 1
+param set-default EKF2_HGT_REF 1
 # Enable optical flow and GPS
 param set-default EKF2_MAG_TYPE 1
 param set-default EKF2_OF_QMIN 80
@@ -56,6 +56,7 @@ px4_add_romfs_files(
 	4015_holybro_s500
 	4016_holybro_px4vision
 	4017_nxp_hovergames
+	4019_x500_v2
 	4040_reaper
 	4041_beta75x
 	4050_generic_250
@@ -368,7 +368,7 @@ else
 		# start the simulator in hardware if needed
 		if param compare SYS_HITL 2
 		then
-			sih start
+			simulator_sih start
 		fi

 	else
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/rudder/elevator/throttle/wheel/flaps mixer for PX4FMU
 =======================================================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/v-tail/throttle/wheel/flaps mixer for PX4FMU
 =======================================================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/v-tail/throttle/wheel/flaps mixer for PX4FMU
 =======================================================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/rudder/elevator/throttle mixer for PX4FMU
 ==================================================

@@ -73,4 +74,4 @@ Ch6: Landing gear mixer
 By default pass-through of gear switch

 M: 1
-S: 3 5 10000 10000 0 -10000 10000
+S: 3 5 10000 10000 0 -10000 10000
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Aileron/Elevator/Throttle/Rudder/Gear/Flaps mixer
 ==================================================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Helicopter 120 degree Cyclic-Collective-Pitch Mixing (CCPM) for PX4FMU
 ==================================================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Passthrough mixer for PX4IO
 ============================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Coaxial helicopter mixer
 - Two servomotors act on the swashplate (90 degree angle on the swashplate, decoupled effect on roll and pitch).
 - No collective pitch.
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Generic wing mixer
 ===========================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 Generic differential-drive rover
 ===========================

@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Hexa +

 R: 6+
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Hexa coaxial

 R: 6c
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Hexa X

 R: 6x
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Mount Mixer (e.g. Gimbal, servo-controlled gimbal, etc...)


@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Octo +

 R: 8+
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Octo coaxial

 R: 8c
@@ -1,3 +1,4 @@
+# @board px4_fmu-v2 exclude
 # Octo X

 R: 8x
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Agar	331cefc1d1	init.d-posix: make all simulation airframes simulator specific	2022-09-01 22:00:22 -04:00
Daniel Agar	5dfd2f39ef	boards/cubepilot/cubeorange: initialize all I2C pins immediately	2022-09-01 20:46:09 -04:00
Daniel Agar	e93a3a2a3a	ak09916: enable retries and reset perf count	2022-09-01 20:45:20 -04:00
Daniel Agar	f66b5ce204	simulation: ignition bridge allow IMU or pose callbacks to update system time if newer than clock * requires HRT lockstep changes to eliminate offset (PR #20146)	2022-09-01 20:42:21 -04:00
Daniel Agar	c52f2143d2	posix lockstep remove HRT offset and use full sim time	2022-09-01 20:40:37 -04:00
Daniel Agar	3da0293369	simulator_ignition_bridge: init error handling	2022-09-01 18:54:59 -04:00
Beat Küng	43c5f14aa0	commander: update arming & health protocol, add modes to event hash	2022-09-01 17:07:23 -04:00
Beat Küng	f57321d365	simulator_mavlink: fix esc_status publication	2022-09-01 17:07:23 -04:00
Beat Küng	295caaea60	events/enums.json: remove redundant manual_control_input	2022-09-01 17:07:23 -04:00
Beat Küng	2c96bb3746	px4_parameters.hpp.jinja: explicitly set .name attribute Fixes the compile error on llvm: mixture of designated and non-designated initializers in the same initializer list is a C99 extension [-Wc99-designator]	2022-09-01 17:07:23 -04:00
Beat Küng	1370cc0d74	log.h: add PRINTF_LOG option for direct printf to reduce dependencies	2022-09-01 17:07:23 -04:00
Beat Küng	a9c1415337	Makefile: allow to set CMAKE_ARGS via CLI	2022-09-01 17:07:23 -04:00
Beat Küng	4e940fab83	perf_counter: remove unused include sys/queue.h	2022-09-01 17:07:23 -04:00
Beat Küng	9eff6dd049	commander: cleanup param value description for COM_POSCTL_NAVL	2022-09-01 17:07:23 -04:00
Beat Küng	0e130eac83	refactor commander: move code inside run() into separate methods	2022-09-01 17:07:23 -04:00
Beat Küng	dcb9b712bb	refactor commander: move vehicle control mode to ModeUtil	2022-09-01 17:07:23 -04:00
Beat Küng	f197c8884d	commander: move esc checks to arming check	2022-09-01 17:07:23 -04:00
Beat Küng	c9037f115b	refactor commander: split out home position	2022-09-01 17:07:23 -04:00
Beat Küng	f17f38197d	commander: move estimator checks to arming check	2022-09-01 17:07:23 -04:00
Beat Küng	cfe3d793bf	commander: move battery handling into arming checks	2022-09-01 17:07:23 -04:00
Daniel Agar	5cb44a521c	ekf2: estimator interface handle sample time with signed integers - this prevents unsigned integer overflow if the timestamp is smaller than the configured delay (mostly a simulation edge case)	2022-09-01 09:47:29 -04:00
dagar	75f6f22223	[AUTO COMMIT] update change indication	2022-08-31 08:52:30 -04:00
Daniel Agar	1948c5057a	ekf2: handle all time on delayed horizon (except for newest sample checks) - a growing number of samples come into the backend with the time already delayed (sensor's interrupt setting timestamp sample) - if the incoming timestamp is already delayed then the new data checks (relative to latest IMU) can be slightly wrong - handle almost all timestamps and checks on delayed time horizon, except for explicit checks of new samples - isRecent() and isTimedOut() helpers use delayed time - add new isNewestSampleRecent() used for checking the incoming timestamp of the incoming (adjusted) data	2022-08-31 08:52:30 -04:00
Jukka Laitinen	d6a4e158cf	Add call-gates to px4_crypto for protected build This adds kernel-userspace interfaces to crypto layer Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>	2022-08-31 09:48:49 +02:00
Beat Küng	d681782c7f	fix flashfs: find_entry: do not go to the next sector if the CRC is invalid	2022-08-31 09:42:59 +02:00
Beat Küng	4f52cda504	flashfs: ensure no address past the end of a sector is dereferenced As it might result in a hardfault if it's the last flash sector.	2022-08-31 09:42:59 +02:00
Beat Küng	2776b723ea	holybro/kakuteh7: switch to flash-based params	2022-08-31 09:42:59 +02:00
Hamish Willee	e780a583cd	Fix typo follow height: FLW_TGT_HT	2022-08-29 13:25:35 +02:00
Ben Berry	734d3e4aa0	Reverted changes that broke Level Horizon calibration	2022-08-29 09:54:36 +02:00
Beat Küng	afc99749b8	px4/fmu-v5/uavcanv0perith: disable gps to reduce flash usage	2022-08-25 22:02:15 -04:00
Beat Küng	715afd27f5	ROMFS: exclude mixers on v2 & disable mixer command The dynamic mixing is now the default	2022-08-25 22:02:15 -04:00
Beat Küng	f0295cf596	px4/fmu-v2/defconfig: disable PROCFS Reduces flash usage by ~7.3KB	2022-08-25 22:02:15 -04:00
Beat Küng	ad222760dd	platforms: move CONFIG_FS_PROCFS_MAX_TASKS definition to cpuload.h So it's used for both cases	2022-08-25 22:02:15 -04:00
Beat Küng	70ec3493c5	px4/fmu-v5/stackcheck: disable distance sensors to reduce flash	2022-08-25 22:02:15 -04:00
Beat Küng	666b84027d	GyroFFT: disable 4096 for IMU_GYRO_FFT_LEN saves around 10.5KB flash on px4-fmu-v5	2022-08-25 22:02:15 -04:00
Beat Küng	060738cae1	src: avoid use of double precision pow & exp saves around 5KB flash on px4-fmu-v5	2022-08-25 22:02:15 -04:00
Beat Küng	983a9815eb	libevents: update submodule	2022-08-25 22:02:15 -04:00
Beat Küng	4c41934bb4	commander: inline HealthComponentIndex::HealthComponentIndex Saves around 1KB flash	2022-08-25 22:02:15 -04:00
Beat Küng	1c89b0c9c8	commander: use actuator_function for ESC reporting	2022-08-25 22:02:15 -04:00
Beat Küng	13c93db11a	commander: use circuit breaker params directly in arming checks	2022-08-25 22:02:15 -04:00
Beat Küng	4230eee24f	commander: print 'ready for takeoff' to console for sitl after startup	2022-08-25 22:02:15 -04:00
Beat Küng	2fccb576ad	commander: remove unused includes and variables	2022-08-25 22:02:15 -04:00
Beat Küng	dbb814ff24	HealthAndArmingChecks: CONSOLE_PRINT_ARMING_CHECK_EVENT & reduce flash usage - print list of events whenever they change if CONSOLE_PRINT_ARMING_CHECK_EVENT is set, instead of on each update call - reduce flash usage by moving out templated code into non-template method	2022-08-25 22:02:15 -04:00
Beat Küng	b2cb164c12	commander: replace health flags with health_report from arming checks	2022-08-25 22:02:15 -04:00
Beat Küng	6d1fb92eb7	commander: rework arming checks to use the events interface	2022-08-25 22:02:15 -04:00
Beat Küng	b4a3597c7d	posix rcS: set PWM_AUX_OUT Prevents a shell error in rc.interface	2022-08-25 22:02:15 -04:00
Beat Küng	b3fe0eeae8	mavlink_events: send reset sequence out immediately on startup	2022-08-25 22:02:15 -04:00
Beat Küng	552d08176f	posix rcS: set MAV_PROTO_VER to 2 For SITL it's important that the GCS receives the first events messages that reset the sequence number, in case the user does not press 'Disconnect' when restarting SITL.	2022-08-25 22:02:15 -04:00
Beat Küng	c7b64e3c01	commander: check for ack when calling 'commander takeoff'	2022-08-25 22:02:15 -04:00
Beat Küng	406b0bbc86	commander: handle VEHICLE_CMD_RUN_PREARM_CHECKS	2022-08-25 22:02:15 -04:00
Beat Küng	8f9be0541f	HealthAndArmingChecks: add support for legacy mavlink_log reporting	2022-08-25 22:02:15 -04:00
Beat Küng	f23363f88c	HealthAndArmingChecks: add unit tests for Report	2022-08-25 22:02:15 -04:00
Beat Küng	2507f0a143	px4events: fix known_groups list	2022-08-25 22:02:15 -04:00
Beat Küng	fcadc69e52	mavlink_receiver: set timestamp to gps_inject_data_topic	2022-08-25 22:02:15 -04:00
Beat Küng	c95192d050	orb_print_message_internal: handle 64 bit bitsets	2022-08-25 22:02:15 -04:00
Beat Küng	b7a6de05df	arming checks: add health topic	2022-08-25 22:02:15 -04:00
Beat Küng	07afcf4586	commander preflight checks: new structure using events interface - Reporter class that keeps track of results (list of events + whether arming is possible + health). And only reports when one or more checks change.	2022-08-25 22:02:15 -04:00
Beat Küng	04f7df3848	SubscriptionMultiArray: use Subscription instead of SubscriptionInterval Saves ~3KB RAM on fmu-v5.	2022-08-25 22:02:15 -04:00
Daniel Agar	9b0b0d1168	ekf2: update test change indication csv	2022-08-25 15:55:45 -04:00
Ville Juven	f60f6d2425	Remove px4_work_queue from the kernel side LD command The comment is right, it is not needed -> get rid of it	2022-08-25 13:30:11 -04:00
Daniel Agar	2786239ca6	Jenkinsfile: HIL remove delete airframe from test	2022-08-25 09:48:49 -04:00
Benjamin Perseghetti	02c9ec6085	Add thumbnails for x500.	2022-08-25 09:10:03 -04:00
Benjamin Perseghetti	0e8e38e698	Add x500 ignition (replaces x3)	2022-08-25 09:10:03 -04:00
Daniel Agar	4040e4cdf2	simulation organization and cleanup - new modules/simulation directory to collect all simulators and related modules - new Tools/simulation directory to collect and organize scattered simulation submodules, scripts, etc - simulation module renamed to simulator_mavlink - sih renamed to simulator_sih (not a great name, but I wanted to be clear it was a simulator) - ignition_simulator renamed to simulator_ignition_bridge - large sitl_target.cmake split by simulation option and in some cases pushed to appropriate modules - sitl targets broken down to what's actually available (eg jmavsim only has 1 model and 1 world) - new Gazebo consistently referred to as Ignition for now (probably the least confusing thing until we fully drop Gazebo classic support someday)	2022-08-25 09:10:03 -04:00
David Sidrane	6b2509cbba	px4_fmu-v6c Move I2C 4 to External	2022-08-25 08:46:51 -04:00
FARHANG	8b4df8ceb2	airframes: re-add Holybro X500v2 with dynamic control allocation	2022-08-25 07:52:18 +02:00
Jukka Laitinen	f8f1213841	board_adc: Small fix for printf formatter Print sizeof type with %zu to be compatible with 64 bit targets, where it is unsigned long Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>	2022-08-25 07:50:23 +02:00
bresch	0061ef8b89	[AUTO COMMIT] update change indication	2022-08-24 09:16:11 -04:00
bresch	090d03eea2	ekf2: publish GNSS, rng and EV height biases	2022-08-24 09:16:11 -04:00
bresch	a2a29ba0dd	ekf2: verify parameter configuration for height sources	2022-08-24 09:16:11 -04:00
bresch	8dd5d0d1a3	ekf2: don't reset height when in conditional range aiding	2022-08-24 09:16:11 -04:00
bresch	20cd599bb7	ekf2: fix param migration	2022-08-24 09:16:11 -04:00
bresch	2d39097f60	ekf2: move rng height to file	2022-08-24 09:16:11 -04:00
bresch	28b4cd0579	ekf2: move GNSS hgt control to file	2022-08-24 09:16:11 -04:00
bresch	b6f76b5eaa	ekf2: move ev control to file	2022-08-24 09:16:11 -04:00
bresch	f555281c94	ekf2: move height control-related function to file	2022-08-24 09:16:11 -04:00
bresch	d87feee5b0	ekf2: move baro control logic to file	2022-08-24 09:16:11 -04:00
bresch	12e25eba62	ekf2: add common height fusion timeout parameter	2022-08-24 09:16:11 -04:00
bresch	52f726c5b7	ekf2: in bias estimator, use psd instead of var for prediction PSD is independent from the sampling time while variance isn't	2022-08-24 09:16:11 -04:00
bresch	b04d61c411	ekf2: param migration for rng aid, aid mask (gps) and hgt mode	2022-08-24 09:16:11 -04:00
bresch	3fb218600a	ekf2_test: add multi height source unit tests	2022-08-24 09:16:11 -04:00
bresch	aba2eac0df	ekf2: publish GNSS, rng and EV height biases	2022-08-24 09:16:11 -04:00
bresch	6833c7e311	ekf2: adjust ekf2 aid parameters in configs	2022-08-24 09:16:11 -04:00
bresch	8962cf2d25	ekf2: GPS, baro and range finder control parameters Also remove the legacy "range aid" than can be achieved by setting the height reference to range finder and the range finder control parameter to "conditional". Conditional range aiding cal also be set when the height reference isn't the range finder. This prevents the ratchetting effect due to switching between references.	2022-08-24 09:16:11 -04:00
bresch	578e1339ca	ekf2: re-implement range aid range aid simply forces the range finder to be the height reference when starting	2022-08-24 09:16:11 -04:00
bresch	88ac5ea210	ekf2_test: add test case for accel clipping handling	2022-08-24 09:16:11 -04:00
bresch	375753eba8	ekf2_test: add inertial nav falling detection tests	2022-08-24 09:16:11 -04:00
bresch	66ce1a002b	ekf2_test: rename VisionHeight -> ExternalVisionHeight	2022-08-24 09:16:11 -04:00
bresch	82ec7a495a	ekf2: refactor inertial nav falling check	2022-08-24 09:16:11 -04:00
bresch	f9188b2a14	ekf2: refactor vertical acceleration check for multiple height sources	2022-08-24 09:16:11 -04:00
bresch	8fd79688c0	ekf2: enable multiple height sources fusion Instead of having a single height source fused into the EKF and the other ones "waiting" for a failure or the primary sensor, fuse all sources in EKF2 at the same time. To prevent the sources from fighting against each other, the "primary" source is set as reference and the other ones are running a bias estimator in order to make all the secondary height sources converge to the primary one. If the reference isn't available, another one is automatically selected from a priority list. This secondary reference keeps its current bias estimate but stops updating it in order to be the new reference as close as possible to the primary one.	2022-08-24 09:16:11 -04:00
bresch	f5f31006a0	Ekf2: create HeightBiasEstimator class Contains some logic common to all height bias estimators	2022-08-24 09:16:11 -04:00
JacobCrabill	57125a4c8f	cyphal: Fix FMUv5 config; throw error if no CAN driver exists	2022-08-23 21:24:24 -04:00
huiyulhy	c81efd0174	Fix velocity smoothing functional test	2022-08-23 21:11:35 -04:00
Beat Küng	7b810bb776	boards: update px4 io binary	2022-08-23 21:07:18 -04:00
Beat Küng	b260df711c	Makefile: force serial build for px4io_update	2022-08-23 21:07:18 -04:00
Beat Küng	bae275898b	rc/sbus: restart parser after sucessful decoding & increase time limit Instead of directly passing the next packet to the parser after successful parsing, switch the state to SBUS2_DECODE_STATE_SBUS_START and search for the start byte again. The timeout is increased as the IO main loop also takes a bit of time (max ~0.7ms). Tested on v5x with Futaba R7008SB (60Hz update rate) and FrSky X8R (111Hz update rate). Background: When using the Futaba R7008SB, I noticed there's additional bytes added in between packets. Often it's a null byte, but sometimes more. There's some consistency but I did not find any documentation for it. Sample data: a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 c0 8b 00 0f 04 ec 1f a8 fb 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 04 ec 1f a8 fb 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 ec 1f 30 60 bf 1c bd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 07 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c0 31 00 0f 05 fc 1f a8 fb 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 05 fc 1f a8 fb 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 04 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 04 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c4 00 00 0f 04 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 04 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 04 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c0 31 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 05 fc 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 05 fc 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c0 31 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 f4 1f a8 fb 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c4 00 00 b0 60 7f 1c bd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 ec 1f a8 fb 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c0 31 00 b0 60 bf 1c bd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 04 f4 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 30 70 7f 1c bd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 34 00 0f 05 f4 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 04 00 03 c4 00 00 0f 05 fc 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 05 ec 1f b0 60 bf 1c bd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 14 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 01 08 40 00 02 10 80 00 24 00 0f 05 ec 1f a8 fd 07 16 5b 81 05 d4 a0 06 20 00 This was causing the parser to skip entire packets resulting in an update rate of ~31Hz on the FMU side. With this patch the update rate increases to 42-48Hz. The investigation was triggered by an RC glitch with a packet containing random channel data. It's likely, although not completely verified that the frequent desync randomly happend to pass the CRC check with garbage data.	2022-08-23 21:07:18 -04:00
Daniel Agar	b58f70726f	ekf2: scale delta angle and delta velocity bias to particular IMU sample	2022-08-23 21:06:13 -04:00
Ville Juven	213d5dac2a	platforms/nuttx: Fix hard coded path for karch library Use CONFIG_ARCH instead of arm	2022-08-23 21:05:41 -04:00
Ville Juven	4f6d523c95	mixer_module: Fix linking of mixer_module The module has a hard dependency on mixer library, so link them together	2022-08-23 21:04:58 -04:00
bresch	f89044cfbe	ekf2: fix replay EKF2 start when CONSTRAINED_FLASH	2022-08-23 11:14:15 -04:00
modaltb	40149ecabc	boards: modalai_fc-v2 configure SPI6, disable unused SPI3/4 (#20093 )	2022-08-22 20:58:44 -04:00
alexklimaj	913bae9924	Revert "drivers/uavcan: update libuavcan" This reverts commit `deb938fcea`.	2022-08-22 20:57:06 -04:00
Daniel Agar	cfc579542e	new Ignition Gazebo simulation interface architecture (#20057 ) - much simpler direct interface using Ignition Transport - in tree models and worlds - control allocation output configuration, no more magic actuator mapping to mavlink and back - currently requires no custom Gazebo plugins (keeping things as lightweight and simple as possible) Co-authored-by: Jaeyoung-Lim <jalim@ethz.ch>	2022-08-22 10:58:19 -04:00