Merged beta into master

ROMFS/px4fmu_common/init.d/rc.interface

@@ -97,6 +97,12 @@ then
 	fi
 fi
 
+# This is a FMUv2+ thing
+if ver hwcmp PX4FMU_V1
+then
+	set MIXER_AUX none
+fi
+
 if [ $MIXER_AUX != none ]
 then
 	#

ROMFS/px4fmu_common/init.d/rc.sensors

@@ -110,11 +110,6 @@ else
 	fi
 fi
 
-# Check for flow sensor
-if px4flow start &
-then
-fi
-
 #
 # Start sensors
 #

ROMFS/px4fmu_common/init.d/rcS

@@ -726,16 +726,22 @@ then
 # End of autostart
 fi
 
+# There is no further script processing, so we can free some RAM
+# XXX potentially unset all script variables.
+unset TUNE_ERR
+
 # Boot is complete, inform MAVLink app(s) that the system is now fully up and running
 mavlink boot_complete
 
+if ver hwcmp PX4FMU_V2
+then
+	# Check for flow sensor - as it is a background task, launch it last
+	px4flow start &
+fi
+
 if [ $EXIT_ON_END == yes ]
 then
 	echo "Exit from nsh"
 	exit
 fi
 unset EXIT_ON_END
-
-# There is no further processing, so we can free some RAM
-# XXX potentially unset all script variables.
-unset TUNE_ERR