diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-20 09:36:26 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-20 09:36:26 +0200 |
| commit | 95260d453592903bfcd3dba9379db033738d5b89 (patch) | |
| tree | 36a2a7ac18d0ae36682d0790e99af63f307e6187 | |
| parent | 16559313db86a4dfaeee9d6364deb3bc567bf99c (diff) | |
| download | px4-firmware-95260d453592903bfcd3dba9379db033738d5b89.tar.gz px4-firmware-95260d453592903bfcd3dba9379db033738d5b89.tar.bz2 px4-firmware-95260d453592903bfcd3dba9379db033738d5b89.zip | |
Fixed NSH terminal init
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 9 | ||||
| -rw-r--r-- | src/systemcmds/nshterm/nshterm.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index bb78b6a65..7f0409519 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -61,11 +61,7 @@ then # # Start terminal # -if sercon -then - echo "USB connected" - nshterm /dev/ttyACM0 & -fi +sercon # # Start the ORB (first app to start) @@ -164,5 +160,8 @@ then sh /etc/init.d/31_io_phantom fi +# Try to get an USB console +nshterm /dev/ttyACM0 & + # End of autostart fi diff --git a/src/systemcmds/nshterm/nshterm.c b/src/systemcmds/nshterm/nshterm.c index 41d108ffc..458bb2259 100644 --- a/src/systemcmds/nshterm/nshterm.c +++ b/src/systemcmds/nshterm/nshterm.c @@ -62,7 +62,7 @@ nshterm_main(int argc, char *argv[]) } uint8_t retries = 0; int fd = -1; - while (retries < 5) { + while (retries < 50) { /* the retries are to cope with the behaviour of /dev/ttyACM0 */ /* which may not be ready immediately. */ fd = open(argv[1], O_RDWR); |