Boat Module

ROMFS/px4fmu_common/init.d/CMakeLists.txt

@@ -72,8 +72,6 @@ if(CONFIG_MODULES_ROVER_POS_CONTROL)
 	px4_add_romfs_files(
 		rc.rover_apps
 		rc.rover_defaults
-
-		rc.boat_defaults # hack
 	)
 endif()
 
@@ -84,6 +82,13 @@ if(CONFIG_MODULES_DIFFERENTIAL_DRIVE)
 	)
 endif()
 
+if(CONFIG_MODULES_BOAT)
+	px4_add_romfs_files(
+		rc.boat_apps
+		rc.boat_defaults
+	)
+endif()
+
 if(CONFIG_MODULES_UUV_ATT_CONTROL)
 	px4_add_romfs_files(
 		rc.uuv_apps

ROMFS/px4fmu_common/init.d/airframes/70001_boat

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# @name RC Boat
+#
+# @type Boat
+# @class Boat
+#
+# @output Servo1 Steering
+# @output Motor1 Throttle
+
+. ${R}etc/init.d/rc.boat_defaults
+
+# Failsafe
+param set-default NAV_RCL_ACT 6 # Disarm on stick input loss
+param set-default NAV_DLL_ACT 6 # Disarm on ground station loss
+param set-default COM_DL_LOSS_T 5 # timeout for ground station connection
+param set-default COM_RC_LOSS_T 10 # timeout for stick input
+param set-default COM_RCL_EXCEPT 1 # Continue mission without stick input
+
+param set-default COM_ARM_WO_GPS 1 # Disable GPS prearm check
+param set-default COM_DISARM_LAND -1 # Don't disarm automatically
+param set-default COM_DISARM_PRFLT -1
+
+# Battery setup
+# param set-default BAT1_N_CELLS 1
+# param set-default BAT1_V_EMPTY 10
+# param set-default BAT1_V_CHARGED 18
+
+# Estimation
+param set-default EKF2_MULTI_IMU 0 # Disable multi-IMU
+param set-default SENS_IMU_MODE 1
+param set-default CAL_MAG0_PRIO 0 # Disable internal Magnetometer
+param set-default MBE_ENABLE 0 # Disable online mag calibration when disarmed
+param set-default EKF2_GPS_CTRL 15 # Enable GPS heading fusion
+param set-default SENS_GPS_MASK 0 # Disable multi-GPS blending
+
+# Estimation workarounds, should be double-checked if necessary
+param set-default EKF2_GBIAS_INIT 0.01
+param set-default EKF2_SYNT_MAG_Z 1 # Why? Who said magnetometer Z is not usable?
+
+param set-default EKF2_GPS_V_NOISE 0.751 # Lower certainty for GPS
+param set-default EKF2_GPS_POS_X 2.5 # GPS position, accurate?
+param set-default EKF2_REQ_EPV 10 # Accept GPS easier
+param set-default EKF2_REQ_HDRIFT 1
+param set-default EKF2_REQ_SACC 2
+param set-default EKF2_REQ_VDRIFT 20
+
+param set-default EKF2_MAG_CHK_STR 0.5 # Accept mag easier
+param set-default COM_ARM_MAG_STR 0 # Disable magnetic field strength prearm check
+param set-default COM_ARM_MAG_ANG 360 # Disable internal/external magnetometer consistency check
+param set-default EKF2_ABL_LIM 1 # Higher accelerometer bias limit, was sometimes above the threshold, GPS reporting 0 altitude issue?

ROMFS/px4fmu_common/init.d/rc.boat_apps

@@ -0,0 +1,11 @@
+#!/bin/sh
+# Standard apps for a differential drive rover.
+
+# Start the attitude and position estimator.
+ekf2 start &
+
+# Start rover differential drive controller.
+boat start
+
+# Start Land Detector.
+land_detector start rover

ROMFS/px4fmu_common/init.d/rc.boat_defaults

@@ -5,7 +5,7 @@
 # NOTE: Script variables are declared/initialized/unset in the rcS script.
 #
 
-set VEHICLE_TYPE rover
+set VEHICLE_TYPE boat
 
 # MAV_TYPE_SURFACE_BOAT 11
 param set-default MAV_TYPE 11

ROMFS/px4fmu_common/init.d/rc.vehicle_setup

@@ -32,6 +32,15 @@ then
 	. ${R}etc/init.d/rc.rover_apps
 fi
 
+#
+# Boat setup.
+#
+if [ $VEHICLE_TYPE = boat ]
+then
+	# Start standard Boat apps.
+	. ${R}etc/init.d/rc.boat_apps
+fi
+
 #
 # Differential Rover setup.
 #