diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-02 21:10:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-02 21:10:40 +0200 |
| commit | 7bb583d6e21a0fa7e51f147d23997aaeb7e218c9 (patch) | |
| tree | 72ff4a7b2ab58368e02d18b8f5ff063214164b0f /ROMFS/px4fmu_common/init.d | |
| parent | 37740cc9aff6b23b472a364d21a3aec225216cb3 (diff) | |
| parent | 971e8103014412d8453b010063318cf46e996288 (diff) | |
| download | px4-firmware-7bb583d6e21a0fa7e51f147d23997aaeb7e218c9.tar.gz px4-firmware-7bb583d6e21a0fa7e51f147d23997aaeb7e218c9.tar.bz2 px4-firmware-7bb583d6e21a0fa7e51f147d23997aaeb7e218c9.zip | |
Merge branch 'integration' into mavlink_variable_length
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.FMU_quad_x | 6 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.IO_QUAD | 6 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.PX4IO | 6 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.PX4IOAR | 8 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.hil | 6 | ||||
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 7 |
6 files changed, 22 insertions, 17 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.FMU_quad_x b/ROMFS/px4fmu_common/init.d/rc.FMU_quad_x index 8787443ea..980197d68 100644 --- a/ROMFS/px4fmu_common/init.d/rc.FMU_quad_x +++ b/ROMFS/px4fmu_common/init.d/rc.FMU_quad_x @@ -20,10 +20,10 @@ uorb start # Load microSD params # echo "[init] loading microSD params" -param select /fs/microsd/parameters -if [ -f /fs/microsd/parameters ] +param select /fs/microsd/params +if [ -f /fs/microsd/params ] then - param load /fs/microsd/parameters + param load /fs/microsd/params fi # diff --git a/ROMFS/px4fmu_common/init.d/rc.IO_QUAD b/ROMFS/px4fmu_common/init.d/rc.IO_QUAD index 287cb0483..5f2de0d7e 100644 --- a/ROMFS/px4fmu_common/init.d/rc.IO_QUAD +++ b/ROMFS/px4fmu_common/init.d/rc.IO_QUAD @@ -13,10 +13,10 @@ uorb start # Load microSD params # echo "[init] loading microSD params" -param select /fs/microsd/parameters -if [ -f /fs/microsd/parameters ] +param select /fs/microsd/params +if [ -f /fs/microsd/params ] then - param load /fs/microsd/parameters + param load /fs/microsd/params fi # diff --git a/ROMFS/px4fmu_common/init.d/rc.PX4IO b/ROMFS/px4fmu_common/init.d/rc.PX4IO index 7ae4a5586..925a5703e 100644 --- a/ROMFS/px4fmu_common/init.d/rc.PX4IO +++ b/ROMFS/px4fmu_common/init.d/rc.PX4IO @@ -13,10 +13,10 @@ uorb start # Load microSD params # echo "[init] loading microSD params" -param select /fs/microsd/parameters -if [ -f /fs/microsd/parameters ] +param select /fs/microsd/params +if [ -f /fs/microsd/params ] then - param load /fs/microsd/parameters + param load /fs/microsd/params fi # diff --git a/ROMFS/px4fmu_common/init.d/rc.PX4IOAR b/ROMFS/px4fmu_common/init.d/rc.PX4IOAR index ab29e21c7..f55ac2ae3 100644 --- a/ROMFS/px4fmu_common/init.d/rc.PX4IOAR +++ b/ROMFS/px4fmu_common/init.d/rc.PX4IOAR @@ -17,13 +17,13 @@ echo "[init] doing PX4IOAR startup..." uorb start # -# Init the parameter storage +# Load microSD params # echo "[init] loading microSD params" -param select /fs/microsd/parameters -if [ -f /fs/microsd/parameters ] +param select /fs/microsd/params +if [ -f /fs/microsd/params ] then - param load /fs/microsd/parameters + param load /fs/microsd/params fi # diff --git a/ROMFS/px4fmu_common/init.d/rc.hil b/ROMFS/px4fmu_common/init.d/rc.hil index 980b78edd..7614ac0fe 100644 --- a/ROMFS/px4fmu_common/init.d/rc.hil +++ b/ROMFS/px4fmu_common/init.d/rc.hil @@ -17,10 +17,10 @@ hil mode_pwm # Load microSD params # echo "[init] loading microSD params" -param select /fs/microsd/parameters -if [ -f /fs/microsd/parameters ] +param select /fs/microsd/params +if [ -f /fs/microsd/params ] then - param load /fs/microsd/parameters + param load /fs/microsd/params fi # diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index c0a70f7dd..0efcc5db9 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -69,7 +69,12 @@ else then echo "[init] USB interface connected" else - echo "[init] No USB connected" + if [ -f /dev/ttyACM0 ] + echo "[init] NSH via USB" + then + else + echo "[init] No USB connected" + fi fi fi |