diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 16:52:07 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 16:52:07 +0100 |
| commit | 295f87f22cc471fccb44e3f3dee3e8fcab263de2 (patch) | |
| tree | a2c5935e3be65964bc16de0862d119335eb6db8b /ROMFS | |
| parent | 46e588e26fa20264350e4046a9fb002c95074c14 (diff) | |
| parent | c4ce5b9286a582b0f938d87861999ee30dd285e4 (diff) | |
| download | px4-firmware-295f87f22cc471fccb44e3f3dee3e8fcab263de2.tar.gz px4-firmware-295f87f22cc471fccb44e3f3dee3e8fcab263de2.tar.bz2 px4-firmware-295f87f22cc471fccb44e3f3dee3e8fcab263de2.zip | |
Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into beta_mavlink2
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.usb | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.usb b/ROMFS/px4fmu_common/init.d/rc.usb index 0de2d4295..558be4275 100644 --- a/ROMFS/px4fmu_common/init.d/rc.usb +++ b/ROMFS/px4fmu_common/init.d/rc.usb @@ -5,7 +5,7 @@ echo "Starting MAVLink on this USB console" -mavlink start -r 5000 -d /dev/ttyACM0 +mavlink start -r 10000 -d /dev/ttyACM0 # Exit shell to make it available to MAVLink exit diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index ee0bb307b..7797feb74 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -393,7 +393,7 @@ then if [ $HIL == yes ] then sleep 1 - set MAVLINK_FLAGS "-r 10000 -d /dev/ttyACM0 -m hil" + set MAVLINK_FLAGS "-r 10000 -d /dev/ttyACM0" usleep 5000 else # Normal mode, use baudrate 57600 (default) and data rate 1000 bytes/s |