Merge remote-tracking branch 'upstream/master' into fwposcontrolmode

This commit is contained in:
Thomas Gubler
2014-12-13 15:59:40 +01:00
2 changed files with 9 additions and 5 deletions

View File

@@ -55,7 +55,6 @@ then
#
if [ $PWM_RATE != none ]
then
echo "[i] PWM rate: $PWM_RATE"
pwm rate -c $PWM_OUT -r $PWM_RATE
fi
@@ -64,17 +63,14 @@ then
#
if [ $PWM_DISARMED != none ]
then
echo "[i] PWM disarmed: $PWM_DISARMED"
pwm disarmed -c $PWM_OUT -p $PWM_DISARMED
fi
if [ $PWM_MIN != none ]
then
echo "[i] PWM min: $PWM_MIN"
pwm min -c $PWM_OUT -p $PWM_MIN
fi
if [ $PWM_MAX != none ]
then
echo "[i] PWM max: $PWM_MAX"
pwm max -c $PWM_OUT -p $PWM_MAX
fi
fi

View File

@@ -1,6 +1,9 @@
#!nsh
#
# PX4FMU startup script.
#
# NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS.
#
#
# Default to auto-start mode.
@@ -480,7 +483,7 @@ then
set MAV_TYPE 1
fi
#param set MAV_TYPE $MAV_TYPE
param set MAV_TYPE $MAV_TYPE
# Load mixer and configure outputs
sh /etc/init.d/rc.interface
@@ -580,6 +583,11 @@ then
echo "Exit from nsh"
exit
fi
unset EXIT_ON_END
# End of autostart
fi
# There is no further processing, so we can free some RAM
# XXX potentially unset all script variables.
unset TUNE_ERR