Move UART mapping comments back to top level rcS script. Deprecate PWM_ACHDIS and replace with PWM_AUX_OUT and set PWM_AUX_DIS value directly in vtol airframe config files. Replace tone_alarm instances with tune_control and default tune enums, and relocate an OUTPUT_MODE == fmu logic block in rcS.

ROMFS/px4fmu_common/init.d/13010_claire

@@ -14,27 +14,28 @@ sh /etc/init.d/rc.vtol_defaults
 
 if [ $AUTOCNF == yes ]
 then
-param set VT_TYPE 1
-param set VT_TILT_MC 0.08
-param set VT_TILT_TRANS 0.5
-param set VT_TILT_FW 0.9
+	param set VT_TYPE 1
+	param set VT_TILT_MC 0.08
+	param set VT_TILT_TRANS 0.5
+	param set VT_TILT_FW 0.9
 
-param set VT_MOT_COUNT 4
-param set VT_FW_MOT_OFFID 13
-param set VT_IDLE_PWM_MC 1080
-param set VT_TYPE 1
+	param set VT_MOT_COUNT 4
+	param set VT_FW_MOT_OFFID 13
+	param set VT_IDLE_PWM_MC 1080
+	param set VT_TYPE 1
 fi
 
+set MAV_TYPE 21
+
 set MIXER claire
+set MIXER_AUX claire
+
 set PWM_OUT 1234
 set PWM_RATE 400
 set PWM_MAX 2000
 
-set MIXER_AUX claire
 set PWM_AUX_RATE 50
 set PWM_AUX_RATE 123
 set PWM_AUX_MIN 1000
 set PWM_AUX_MAX 2000
 set PWM_AUX_DISARMED 1000
-
-set MAV_TYPE 21