Merged failsafe from master

ROMFS/px4fmu_common/init.d/3035_viper

@@ -9,7 +9,4 @@ sh /etc/init.d/rc.fw_defaults
 
 set MIXER Viper
 
-pwm failsafe -c 5 -p 1000
-pwm failsafe -c 6 -p 1000
-pwm failsafe -c 7 -p 1000
-pwm failsafe -c 8 -p 1000
+set FAILSAFE "-c567 -p 1000"

ROMFS/px4fmu_common/init.d/rc.interface

@@ -77,4 +77,9 @@ then
 			pwm max -c $PWM_OUTPUTS -p $PWM_MAX
 		fi
 	fi
+
+	if [ $FAILSAFE != none ]
+	then
+		pwm failsafe -d $OUTPUT_DEV $FAILSAFE
+	fi
 fi

ROMFS/px4fmu_common/init.d/rc.sensors

@@ -68,6 +68,11 @@ else
 	fi
 fi
 
+# Check for flow sensor
+if px4flow start
+then
+fi
+
 #
 # Start the sensor collection task.
 # IMPORTANT: this also loads param offsets

ROMFS/px4fmu_common/init.d/rcS

@@ -66,6 +66,9 @@ then
 	#
 	sercon
 
+	# Try to get an USB console
+	nshterm /dev/ttyACM0 &
+
 	#
 	# Start the ORB (first app to start)
 	#
@@ -96,11 +99,9 @@ then
 	#
 	if rgbled start
 	then
-		echo "[init] RGB Led"
 	else
 		if blinkm start
 		then
-			echo "[init] BlinkM"
 			blinkm systemstate
 		fi
 	fi
@@ -129,6 +130,7 @@ then
 	set LOAD_DEFAULT_APPS yes
 	set GPS yes
 	set GPS_FAKE no
+	set FAILSAFE none
 
 	#
 	# Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts
@@ -279,9 +281,6 @@ then
 		fi
 	fi
 
-	# Try to get an USB console
-	nshterm /dev/ttyACM0 &
-
 	#
 	# Start the datamanager (and do not abort boot if it fails)
 	#