diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-03 08:17:22 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-03 08:17:22 +0200 |
| commit | 2457013bbba3e15e3fbfcc45f07428f006d56dcd (patch) | |
| tree | 796625ab98a6c83c86083681457885ed09dcd74d | |
| parent | 791e22f44245676a743af5d73dd159f92fb1c159 (diff) | |
| download | px4-firmware-2457013bbba3e15e3fbfcc45f07428f006d56dcd.tar.gz px4-firmware-2457013bbba3e15e3fbfcc45f07428f006d56dcd.tar.bz2 px4-firmware-2457013bbba3e15e3fbfcc45f07428f006d56dcd.zip | |
Hotfix for USB: Starting MAVLink only on USB if connected. Needs rewrite of MAVLink and delay / retries for correct approach
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 8 | ||||
| -rw-r--r-- | src/modules/mavlink/mavlink.c | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 9bb8e4a49..8c79a035a 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -63,9 +63,8 @@ then if sercon then echo "USB connected" - else - # second attempt - sercon & + sleep 3 + mavlink start -d /dev/ttyACM0 -b 230400 fi # @@ -105,7 +104,7 @@ then fi # Try to get an USB console - nshterm /dev/ttyACM0 & + #nshterm /dev/ttyACM0 & # # Upgrade PX4IO firmware @@ -219,5 +218,6 @@ then gps start fi + # End of autostart fi diff --git a/src/modules/mavlink/mavlink.c b/src/modules/mavlink/mavlink.c index 052ce7948..a8ca19d7a 100644 --- a/src/modules/mavlink/mavlink.c +++ b/src/modules/mavlink/mavlink.c @@ -516,7 +516,6 @@ void mavlink_update_system(void) int mavlink_thread_main(int argc, char *argv[]) { /* initialize mavlink text message buffering */ - usleep(1000); mavlink_logbuffer_init(&lb, 10); int ch; |