aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-09-12 10:15:30 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-09-12 10:15:30 +0200
commit45cf5080b0824488ffb36ec61c7ce4c1c7038e4b (patch)
treecf41a73e2fa26ce0e28926748a93321bde28592d
parent5d09f48110a1a2ebca6c3240b063963bb8e91bca (diff)
parent5c0ec659b6a6ff75dce799da8504ecabdf442f28 (diff)
downloadpx4-firmware-45cf5080b0824488ffb36ec61c7ce4c1c7038e4b.tar.gz
px4-firmware-45cf5080b0824488ffb36ec61c7ce4c1c7038e4b.tar.bz2
px4-firmware-45cf5080b0824488ffb36ec61c7ce4c1c7038e4b.zip
Merge branch 'master' into fat-dma
-rwxr-xr-xROMFS/px4fmu_common/init.d/rcS4
1 files changed, 3 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 1f466e49f..4c4b0129e 100755
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -207,7 +207,9 @@ then
if [ $MODE == autostart ]
then
# Telemetry port is on both FMU boards ttyS1
- mavlink start -b 57600 -d /dev/ttyS1
+ # but the AR.Drone motors can be get 'flashed'
+ # if starting MAVLink on them - so do not
+ # start it as default (default link: USB)
# Start commander
commander start