diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-18 10:23:25 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-18 10:23:25 +0200 |
| commit | 13761544829b14eff4b4d4d51a2bf72b91c4a783 (patch) | |
| tree | c529201a0d4c6f7b57efbce6ab60de2a75035327 /ROMFS | |
| parent | 349c9624694ff0d17d10523470ff62b34356207e (diff) | |
| parent | 0cd8f2d35b30b5081083ae830409a9090a02c6bc (diff) | |
| download | px4-firmware-13761544829b14eff4b4d4d51a2bf72b91c4a783.tar.gz px4-firmware-13761544829b14eff4b4d4d51a2bf72b91c4a783.tar.bz2 px4-firmware-13761544829b14eff4b4d4d51a2bf72b91c4a783.zip | |
Merged
Diffstat (limited to 'ROMFS')
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 498c93f28..bbd86a474 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -7,7 +7,6 @@ # can change this to prevent automatic startup of the flight script. # set MODE autostart -set USB autoconnect # # Try to mount the microSD card. @@ -46,28 +45,40 @@ fi # from an EXTERNAL_SCRIPTS build option if [ -f /etc/init.d/rc.APM ] then - - # - # Check for USB host - # - if [ $USB != autoconnect ] + if sercon then - echo "[init] not connecting USB" - else - if sercon - then - echo "[init] USB interface connected" - else - if [ -f /dev/ttyACM0 ] - echo "[init] NSH via USB" - then - else - echo "[init] No USB connected" - fi - fi + echo "[init] USB interface connected" fi - echo Running rc.APM + echo "Running rc.APM" # if APM startup is successful then nsh will exit sh /etc/init.d/rc.APM fi + +if [ $MODE == autostart ] +then + +# +# Start the ORB (first app to start) +# +uorb start + +# +# Load microSD params +# +if ramtron start +then + param select /ramtron/params + if [ -f /ramtron/params ] + then + param load /ramtron/params + fi +else + param select /fs/microsd/params + if [ -f /fs/microsd/params ] + then + param load /fs/microsd/params + fi +fi + +fi |