From b06f7f4f2e47dbaf33b255c9ecdffaa51f35f4a4 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 17 Nov 2014 14:56:11 +0100
Subject: Reduce ROMFS footprint

---
 ROMFS/px4fmu_common/init.d/rc.interface | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'ROMFS/px4fmu_common')

diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface
index e44cd0953..10c6d7511 100644
--- a/ROMFS/px4fmu_common/init.d/rc.interface
+++ b/ROMFS/px4fmu_common/init.d/rc.interface
@@ -8,12 +8,11 @@ then
 	#
 	# Load mixer
 	#
-	set MIXERSD /fs/microsd/etc/mixers/$MIXER.mix
 	
 	#Use the mixer file from the SD-card if it exists
-	if [ -f $MIXERSD ]
+	if [ -f /fs/microsd/etc/mixers/$MIXER.mix ]
 	then
-		set MIXER_FILE $MIXERSD
+		set MIXER_FILE /fs/microsd/etc/mixers/$MIXER.mix
 	else
 		set MIXER_FILE /etc/mixers/$MIXER.mix
 	fi
@@ -35,19 +34,21 @@ then
 		echo "[init] Mixer loaded: $MIXER_FILE"
 	else
 		echo "[init] Error loading mixer: $MIXER_FILE"
-		tone_alarm $TUNE_OUT_ERROR
+		tone_alarm $TUNE_ERR
 	fi
+
+	unset MIXER_FILE
 else
 	if [ $MIXER != skip ]
 	then
 		echo "[init] Mixer not defined"
-		tone_alarm $TUNE_OUT_ERROR
+		tone_alarm $TUNE_ERR
 	fi
 fi
 
 if [ $OUTPUT_MODE == fmu -o $OUTPUT_MODE == io ]
 then
-	if [ $PWM_OUTPUTS != none ]
+	if [ $PWM_OUT != none ]
 	then
 		#
 		# Set PWM output frequency
@@ -55,7 +56,7 @@ then
 		if [ $PWM_RATE != none ]
 		then
 			echo "[init] Set PWM rate: $PWM_RATE"
-			pwm rate -c $PWM_OUTPUTS -r $PWM_RATE
+			pwm rate -c $PWM_OUT -r $PWM_RATE
 		fi
 		
 		#
@@ -64,17 +65,17 @@ then
 		if [ $PWM_DISARMED != none ]
 		then
 			echo "[init] Set PWM disarmed: $PWM_DISARMED"
-			pwm disarmed -c $PWM_OUTPUTS -p $PWM_DISARMED
+			pwm disarmed -c $PWM_OUT -p $PWM_DISARMED
 		fi
 		if [ $PWM_MIN != none ]
 		then
 			echo "[init] Set PWM min: $PWM_MIN"
-			pwm min -c $PWM_OUTPUTS -p $PWM_MIN
+			pwm min -c $PWM_OUT -p $PWM_MIN
 		fi
 		if [ $PWM_MAX != none ]
 		then
 			echo "[init] Set PWM max: $PWM_MAX"
-			pwm max -c $PWM_OUTPUTS -p $PWM_MAX
+			pwm max -c $PWM_OUT -p $PWM_MAX
 		fi
 	fi
 
-- 
cgit v1.2.3