Merge branch 'autostart_cleanup' into navigator_new_vector

ROMFS/px4fmu_common/init.d/rc.interface

@@ -33,7 +33,7 @@ then
 		tone_alarm $TUNE_OUT_ERROR
 	fi
 else
-	echo "[init] Mixer not defined
+	echo "[init] Mixer not defined"
 	tone_alarm $TUNE_OUT_ERROR
 fi
 

ROMFS/px4fmu_common/init.d/rcS

@@ -241,7 +241,10 @@ then
 	if [ $HIL == yes ]
 	then
 		set OUTPUT_MODE hil
+		if hw_ver compare PX4FMU_V1
+		then
 			set FMU_MODE serial
+		fi
 	else
 		# Try to get an USB console if not in HIL mode
 		nshterm /dev/ttyACM0 &
@@ -257,6 +260,9 @@ then
 	#
 	set TTYS1_BUSY no
 	
+	# If OUTPUT_MODE == none then something is wrong with setup and we shouldn't try to enable output
+	if [ $OUTPUT_MODE != none ]
+	then
 		if [ $OUTPUT_MODE == io ]
 		then
 			echo "[init] Use PX4IO PWM as primary output"
@@ -366,6 +372,7 @@ then
 				fi
 			fi
 		fi
+	fi
 	
 	#
 	# MAVLink