diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-22 11:10:48 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-22 11:10:48 +0200 |
| commit | fd56c15a20c1728fde7fb3e975819dfe748caf1c (patch) | |
| tree | c6e7f6b667501ff1d867b43b398260379c70699d /src/modules/mavlink/mavlink_main.cpp | |
| parent | d41a01483a9a1e61c12492501bf975021595b3a6 (diff) | |
| parent | aefea1a95d221e541be219d9fec7eece3c72fd50 (diff) | |
| download | px4-firmware-fd56c15a20c1728fde7fb3e975819dfe748caf1c.tar.gz px4-firmware-fd56c15a20c1728fde7fb3e975819dfe748caf1c.tar.bz2 px4-firmware-fd56c15a20c1728fde7fb3e975819dfe748caf1c.zip | |
Merge remote-tracking branch 'px4/master' into navigator_cleanup
Conflicts:
ROMFS/px4fmu_common/init.d/rcS
src/modules/mavlink/mavlink_main.cpp
src/modules/mavlink/mavlink_messages.cpp
src/modules/mavlink/module.mk
src/modules/sdlog2/sdlog2_messages.h
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index c60c85495..30d400f31 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -574,6 +574,11 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios * /* open uart */ _uart_fd = open(uart_name, O_RDWR | O_NOCTTY); + if (_uart_fd < 0) { + return _uart_fd; + } + + /* Try to set baud rate */ struct termios uart_config; int termios_state; @@ -1964,6 +1969,7 @@ Mavlink::task_main(int argc, char *argv[]) configure_stream("NAMED_VALUE_FLOAT", 1.0f * rate_mult); configure_stream("GLOBAL_POSITION_SETPOINT_INT", 3.0f * rate_mult); configure_stream("ROLL_PITCH_YAW_THRUST_SETPOINT", 3.0f * rate_mult); + configure_stream("DISTANCE_SENSOR", 0.5f); break; case MAVLINK_MODE_CAMERA: |