Merged

ROMFS/px4fmu_common/init.d/rcS

@@ -101,8 +101,14 @@ then
 		fi
 	fi
 
-	# Try to get an USB console
-	nshterm /dev/ttyACM0 &
+	if param compare SYS_AUTOSTART 1000
+	then
+		sh /etc/init.d/rc.hil
+		set MODE custom
+	else
+		# Try to get an USB console
+		nshterm /dev/ttyACM0 &
+	fi
 	
 	#
 	# Upgrade PX4IO firmware
@@ -178,6 +184,18 @@ then
 		sh /etc/init.d/31_io_phantom
 		set MODE custom
 	fi
+
+	if param compare SYS_AUTOSTART 100
+	then
+		sh /etc/init.d/100_mpx_easystar
+		set MODE custom
+	fi
+
+	if param compare SYS_AUTOSTART 101
+	then
+		sh /etc/init.d/101_hk_bixler
+		set MODE custom
+	fi
 	
 	# Start any custom extensions that might be missing
 	if [ -f /fs/microsd/etc/rc.local ]