diff options
author | Helen Oleynikova <helenoleynikova@gmail.com> | 2014-03-05 10:56:58 +0100 |
---|---|---|
committer | Helen Oleynikova <helenoleynikova@gmail.com> | 2014-03-05 10:56:58 +0100 |
commit | 9ffa5a665a2ac8b887cbd9383eab1947137f0def (patch) | |
tree | 8768be481c5ffdf0c363d33f3be0c41c280f6011 /ROMFS/px4fmu_common | |
parent | 1d9d24f605aeb13b87efe2f6cf82232768b148ac (diff) | |
download | px4-firmware-9ffa5a665a2ac8b887cbd9383eab1947137f0def.tar.gz px4-firmware-9ffa5a665a2ac8b887cbd9383eab1947137f0def.tar.bz2 px4-firmware-9ffa5a665a2ac8b887cbd9383eab1947137f0def.zip |
Set the mavlink port settings back to ttyS1 by default.
Diffstat (limited to 'ROMFS/px4fmu_common')
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index af78162ed..1baac0eb3 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -387,7 +387,7 @@ then mavlink start -b 230400 -d /dev/ttyACM0 usleep 5000 else - if [ $TTYS1_BUSY == yes ] + if [ $TTYS1_BUSY == yes -o $ARDRONE == yes] then # Start MAVLink on ttyS0, because FMU ttyS1 pins configured as something else mavlink start -d /dev/ttyS0 @@ -397,10 +397,8 @@ then set EXIT_ON_END yes else # Start MAVLink on default port: ttyS1 - mavlink start -d /dev/ttyS0 + mavlink start usleep 5000 - - set EXIT_ON_END yes fi fi |