diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-11 19:39:30 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-11 19:39:30 +0200 |
| commit | 467e67e7e7b89d6ddd408f56b625ab2362e17d4d (patch) | |
| tree | cac9146463899a105700efa0a7546b425158dd4b /ROMFS/px4fmu_common | |
| parent | f0458af28b3414cd43276c08c029be7900d0d9cf (diff) | |
| parent | 2ca89032409d0519e242006fa34ab26548fdd7e0 (diff) | |
| download | px4-firmware-467e67e7e7b89d6ddd408f56b625ab2362e17d4d.tar.gz px4-firmware-467e67e7e7b89d6ddd408f56b625ab2362e17d4d.tar.bz2 px4-firmware-467e67e7e7b89d6ddd408f56b625ab2362e17d4d.zip | |
Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul
Diffstat (limited to 'ROMFS/px4fmu_common')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 24b2a299a..c9e6a27ca 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -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) |