Merge branch 'main' into dev-boat

ROMFS/px4fmu_common/init.d-posix/airframes/40000_gz_boat

@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# @name Boat
+#
+
+. ${R}etc/init.d/rc.uuv_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=ocean}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=boat}
+
+param set-default SIM_GZ_EN 1
+
+param set-default CA_AIRFRAME 9
+
+param set-default CA_ROTOR_COUNT 2
+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_PX -2
+param set-default CA_ROTOR0_PY -1
+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_PX -2
+param set-default CA_ROTOR1_PY 1
+param set-default CA_R_REV 3
+
+param set-default CA_SV_CS_COUNT 1
+param set-default CA_SV_CS0_TYPE 4
+param set-default CA_SV_CS0_TRQ_Y 1
+
+param set-default SIM_GZ_EC_FUNC1 101
+param set-default SIM_GZ_EC_FUNC2 102
+param set-default SIM_GZ_SV_FUNC1 201

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

@@ -111,6 +111,8 @@ px4_add_romfs_files(
 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2
 
+	40000_gz_boat
+
 	50000_gz_rover_differential
 	51000_gz_rover_ackermann
 	52000_gz_rover_mecanum