diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-14 15:52:46 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-14 15:52:46 +0100 |
| commit | 7b60761bf53cab2b63c33aa8d054e3fb1a90ddf8 (patch) | |
| tree | 65f486de04656e502bdc813d3251969d9bba0dbd /ROMFS | |
| parent | 1008d0c38320544579eb449d54c053e14568585e (diff) | |
| parent | b529e112b8ffaa92274f9dc5d94a1fce581a358e (diff) | |
| download | px4-firmware-7b60761bf53cab2b63c33aa8d054e3fb1a90ddf8.tar.gz px4-firmware-7b60761bf53cab2b63c33aa8d054e3fb1a90ddf8.tar.bz2 px4-firmware-7b60761bf53cab2b63c33aa8d054e3fb1a90ddf8.zip | |
Merge branch 'master' into autostart_cleanup
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index a809f2870..441d99ecf 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -59,20 +59,6 @@ fi if [ $MODE == autostart ] then echo "[init] AUTOSTART mode" - - # - # Load parameters - # - param select /fs/microsd/params - if [ -f /fs/microsd/params ] - then - if param load /fs/microsd/params - then - echo "[init] Parameters loaded" - else - echo "[init] Parameter file corrupt - ignoring" - fi - fi # # Start CDC/ACM serial driver @@ -85,6 +71,30 @@ then uorb start # + # Load parameters + # + if mtd start + then + param select /fs/mtd_params + if param load /fs/mtd_params + then + else + echo "FAILED LOADING PARAMS" + fi + else + param select /fs/microsd/params + if [ -f /fs/microsd/params ] + then + if param load /fs/microsd/params + then + echo "Parameters loaded" + else + echo "Parameter file corrupt - ignoring" + fi + fi + fi + + # # Start system state indicator # if rgbled start |