diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-26 11:53:52 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-26 11:53:52 +0200 |
| commit | dfde02c82507d183fdc16aa2d45cb8d9cdf6ff0e (patch) | |
| tree | a3259c6d98d44f809b6742d11477debb8aa6c188 | |
| parent | c5731bbc3f29361f3d50ecc54d44a521d2441a48 (diff) | |
| download | px4-firmware-dfde02c82507d183fdc16aa2d45cb8d9cdf6ff0e.tar.gz px4-firmware-dfde02c82507d183fdc16aa2d45cb8d9cdf6ff0e.tar.bz2 px4-firmware-dfde02c82507d183fdc16aa2d45cb8d9cdf6ff0e.zip | |
Startup scripts fixup, fixed unmatched dependencies
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/30_io_camflyer | 9 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/31_io_phantom | 7 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.multirotor | 5 | ||||
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 11 |
4 files changed, 21 insertions, 11 deletions
diff --git a/ROMFS/px4fmu_common/init.d/30_io_camflyer b/ROMFS/px4fmu_common/init.d/30_io_camflyer index c9d5d6632..6a0bd4da8 100644 --- a/ROMFS/px4fmu_common/init.d/30_io_camflyer +++ b/ROMFS/px4fmu_common/init.d/30_io_camflyer @@ -1,6 +1,6 @@ #!nsh -cho "[init] 30_io_camflyer: PX4FMU+PX4IO on Camflyer" +echo "[init] 30_io_camflyer: PX4FMU+PX4IO on Camflyer" # # Load default params for this platform @@ -49,6 +49,11 @@ px4io limit 100 # Start the sensors (depends on orb, px4io) # sh /etc/init.d/rc.sensors + +# +# Start logging (depends on sensors) +# +sh /etc/init.d/rc.logging # # Start GPS interface (depends on orb) @@ -64,4 +69,4 @@ kalman_demo start # Load mixer and start controllers (depends on px4io) # mixer load /dev/pwm_output /etc/mixers/FMU_Q.mix -control_demo start +fw_att_control start diff --git a/ROMFS/px4fmu_common/init.d/31_io_phantom b/ROMFS/px4fmu_common/init.d/31_io_phantom index 0deffe3f1..718313862 100644 --- a/ROMFS/px4fmu_common/init.d/31_io_phantom +++ b/ROMFS/px4fmu_common/init.d/31_io_phantom @@ -44,6 +44,11 @@ commander start # Start the sensors # sh /etc/init.d/rc.sensors + +# +# Start logging (depends on sensors) +# +sh /etc/init.d/rc.logging # # Start GPS interface @@ -59,4 +64,4 @@ kalman_demo start # Load mixer and start controllers (depends on px4io) # mixer load /dev/pwm_output /etc/mixers/FMU_Q.mix -control_demo start +fw_att_control start diff --git a/ROMFS/px4fmu_common/init.d/rc.multirotor b/ROMFS/px4fmu_common/init.d/rc.multirotor index 73f1b3742..e3638e3d1 100644 --- a/ROMFS/px4fmu_common/init.d/rc.multirotor +++ b/ROMFS/px4fmu_common/init.d/rc.multirotor @@ -9,6 +9,11 @@ sh /etc/init.d/rc.sensors # +# Start logging (depends on sensors) +# +sh /etc/init.d/rc.logging + +# # Start the commander. # commander start diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 6a82acdcc..c4abd07d2 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -103,11 +103,9 @@ then blinkm systemstate fi fi - - # - # Start logging - # - sh /etc/init.d/rc.logging + + # Try to get an USB console + nshterm /dev/ttyACM0 & # # Check if PX4IO Firmware should be upgraded (from Andrew Tridgell) @@ -183,9 +181,6 @@ then set MODE custom fi - # Try to get an USB console - nshterm /dev/ttyACM0 & - # Start any custom extensions that might be missing if [ -f /fs/microsd/etc/rc.local ] then |