aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-01-23 23:10:05 +0100
committerAnton Babushkin <anton.babushkin@me.com>2014-01-23 23:10:05 +0100
commitb3d98e4a19662af44432a0436a1b5de7fb9649c9 (patch)
tree3a0c6de54a6d177bfd165d983f8a98d42b8b8926 /ROMFS
parent55f845888bece8aaa49ebc2b5e25663b6c8f3f3c (diff)
parent4524fe3e4888d569f855d1e7a82c8d5116636a0a (diff)
downloadpx4-firmware-b3d98e4a19662af44432a0436a1b5de7fb9649c9.tar.gz
px4-firmware-b3d98e4a19662af44432a0436a1b5de7fb9649c9.tar.bz2
px4-firmware-b3d98e4a19662af44432a0436a1b5de7fb9649c9.zip
Merge branch 'master' into beta
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/px4fmu_common/init.d/rcS9
1 files changed, 6 insertions, 3 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 45dec5ba6..88077c67f 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -8,7 +8,6 @@
#
set MODE autostart
-set LOG_FILE /fs/microsd/bootlog.txt
set RC_FILE /fs/microsd/etc/rc.txt
set CONFIG_FILE /fs/microsd/etc/config.txt
set EXTRAS_FILE /fs/microsd/etc/extras.txt
@@ -21,10 +20,12 @@ set TUNE_OUT_ERROR ML<<CP4CP4CP4CP4CP4
echo "[init] Looking for microSD..."
if mount -t vfat /dev/mmcsd0 /fs/microsd
then
+ set LOG_FILE /fs/microsd/bootlog.txt
echo "[init] microSD card mounted at /fs/microsd"
# Start playing the startup tune
tone_alarm start
else
+ set LOG_FILE /dev/null
echo "[init] No microSD card found"
# Play SOS
tone_alarm error
@@ -180,8 +181,8 @@ then
set IO_PRESENT yes
else
- echo "[init] PX4IO CRC failure, trying to update"
- echo "PX4IO CRC failure" >> $LOG_FILE
+ echo "[init] Trying to update"
+ echo "PX4IO Trying to update" >> $LOG_FILE
tone_alarm MLL32CP8MB
@@ -198,10 +199,12 @@ then
else
echo "[init] ERROR: PX4IO update failed"
echo "PX4IO update failed" >> $LOG_FILE
+ tone_alarm $TUNE_OUT_ERROR
fi
else
echo "[init] ERROR: PX4IO update failed"
echo "PX4IO update failed" >> $LOG_FILE
+ tone_alarm $TUNE_OUT_ERROR
fi
fi