dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul

This commit is contained in:
Lorenz Meier 2014-08-11 19:39:30 +02:00
parent f0458af28b 2ca8903240
commit 467e67e7e7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ROMFS/px4fmu_common/init.d/rcS
View File

@ -83,9 +83,12 @@ then
param select $PARAM_FILE
if param load
then
echo "[init] Params loaded: $PARAM_FILE"
echo "[param] Loaded: $PARAM_FILE"
else
echo "[init] ERROR: Params loading failed: $PARAM_FILE"
echo "[param] FAILED loading $PARAM_FILE"
if param reset
then
fi
fi
#
@ -280,9 +283,11 @@ then
nshterm /dev/ttyACM0 &
#
# Start the datamanager
# Start the datamanager (and do not abort boot if it fails)
#
dataman start
if dataman start
then
fi
#
# Start the Commander (needs to be this early for in-air-restarts)