diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-03 22:45:33 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-03 22:45:33 +0200 |
commit | 175020cb5b9b5bb4162a765f8d924830105fad58 (patch) | |
tree | d860b5d85044ebd7e1520bdc0a67cbf78723aa6f | |
parent | b5ec359c79f10172f45b979d7fb3b4572cd06eb1 (diff) | |
download | px4-firmware-175020cb5b9b5bb4162a765f8d924830105fad58.tar.gz px4-firmware-175020cb5b9b5bb4162a765f8d924830105fad58.tar.bz2 px4-firmware-175020cb5b9b5bb4162a765f8d924830105fad58.zip |
Hotfix: Identified mavlink issue source, workaround, working on a fix
-rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 4 | ||||
-rw-r--r-- | src/modules/mavlink/mavlink.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 8c79a035a..32fb67a45 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -63,8 +63,6 @@ then if sercon then echo "USB connected" - sleep 3 - mavlink start -d /dev/ttyACM0 -b 230400 fi # @@ -104,7 +102,7 @@ then fi # Try to get an USB console - #nshterm /dev/ttyACM0 & + nshterm /dev/ttyACM0 & # # Upgrade PX4IO firmware diff --git a/src/modules/mavlink/mavlink.c b/src/modules/mavlink/mavlink.c index a8ca19d7a..5eb7cba9b 100644 --- a/src/modules/mavlink/mavlink.c +++ b/src/modules/mavlink/mavlink.c @@ -739,7 +739,7 @@ int mavlink_thread_main(int argc, char *argv[]) tcsetattr(uart, TCSANOW, &uart_config_original); /* destroy log buffer */ - mavlink_logbuffer_destroy(&lb); + //mavlink_logbuffer_destroy(&lb); thread_running = false; |