Merged failsafe from master

This commit is contained in:
Lorenz Meier
2014-08-12 08:22:50 +02:00
4 changed files with 15 additions and 9 deletions
+1 -4
View File
@@ -9,7 +9,4 @@ sh /etc/init.d/rc.fw_defaults
set MIXER Viper set MIXER Viper
pwm failsafe -c 5 -p 1000 set FAILSAFE "-c567 -p 1000"
pwm failsafe -c 6 -p 1000
pwm failsafe -c 7 -p 1000
pwm failsafe -c 8 -p 1000
+5
View File
@@ -77,4 +77,9 @@ then
pwm max -c $PWM_OUTPUTS -p $PWM_MAX pwm max -c $PWM_OUTPUTS -p $PWM_MAX
fi fi
fi fi
if [ $FAILSAFE != none ]
then
pwm failsafe -d $OUTPUT_DEV $FAILSAFE
fi
fi fi
+5
View File
@@ -68,6 +68,11 @@ else
fi fi
fi fi
# Check for flow sensor
if px4flow start
then
fi
# #
# Start the sensor collection task. # Start the sensor collection task.
# IMPORTANT: this also loads param offsets # IMPORTANT: this also loads param offsets
+4 -5
View File
@@ -66,6 +66,9 @@ then
# #
sercon sercon
# Try to get an USB console
nshterm /dev/ttyACM0 &
# #
# Start the ORB (first app to start) # Start the ORB (first app to start)
# #
@@ -96,11 +99,9 @@ then
# #
if rgbled start if rgbled start
then then
echo "[init] RGB Led"
else else
if blinkm start if blinkm start
then then
echo "[init] BlinkM"
blinkm systemstate blinkm systemstate
fi fi
fi fi
@@ -129,6 +130,7 @@ then
set LOAD_DEFAULT_APPS yes set LOAD_DEFAULT_APPS yes
set GPS yes set GPS yes
set GPS_FAKE no set GPS_FAKE no
set FAILSAFE none
# #
# Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts # Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts
@@ -279,9 +281,6 @@ then
fi fi
fi fi
# Try to get an USB console
nshterm /dev/ttyACM0 &
# #
# Start the datamanager (and do not abort boot if it fails) # Start the datamanager (and do not abort boot if it fails)
# #