mirror of
https://gitee.com/xiaohuolufeihua/bizhang_-obav.git
synced 2026-05-22 01:12:31 +00:00
Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul
This commit is contained in:
@@ -83,9 +83,12 @@ then
|
|||||||
param select $PARAM_FILE
|
param select $PARAM_FILE
|
||||||
if param load
|
if param load
|
||||||
then
|
then
|
||||||
echo "[init] Params loaded: $PARAM_FILE"
|
echo "[param] Loaded: $PARAM_FILE"
|
||||||
else
|
else
|
||||||
echo "[init] ERROR: Params loading failed: $PARAM_FILE"
|
echo "[param] FAILED loading $PARAM_FILE"
|
||||||
|
if param reset
|
||||||
|
then
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -280,9 +283,11 @@ then
|
|||||||
nshterm /dev/ttyACM0 &
|
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)
|
# Start the Commander (needs to be this early for in-air-restarts)
|
||||||
|
|||||||
Reference in New Issue
Block a user