diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-27 09:46:21 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-27 09:46:21 +0200 |
| commit | 863b6d2d94691619fa2361cf3c0599759fd5f325 (patch) | |
| tree | 9843601f6d346da9f0b3f780040d81f228ecb772 /ROMFS/px4fmu_common/init.d/rcS | |
| parent | e14366fef3192626b501e9d63d41c58bc22d8c2a (diff) | |
| parent | b928897ab525a79eb2fad202fc28ef0235adeb50 (diff) | |
| download | px4-firmware-863b6d2d94691619fa2361cf3c0599759fd5f325.tar.gz px4-firmware-863b6d2d94691619fa2361cf3c0599759fd5f325.tar.bz2 px4-firmware-863b6d2d94691619fa2361cf3c0599759fd5f325.zip | |
Merge branch 'master' of github.com:PX4/Firmware into indoor
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 349b82f40..6aa542a29 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -66,6 +66,9 @@ then # sercon + # Try to get an USB console + nshterm /dev/ttyACM0 & + # # Start the ORB (first app to start) # @@ -96,11 +99,9 @@ then # if rgbled start then - echo "[init] RGB Led" else if blinkm start then - echo "[init] BlinkM" blinkm systemstate fi fi @@ -129,6 +130,7 @@ then set LOAD_DEFAULT_APPS yes set GPS yes set GPS_FAKE no + set FAILSAFE none # # Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts @@ -279,9 +281,6 @@ then fi fi - # Try to get an USB console - nshterm /dev/ttyACM0 & - # # Start the datamanager (and do not abort boot if it fails) # |