Merge remote-tracking branch 'upstream/master' into geo

This commit is contained in:
Thomas Gubler
2014-04-24 16:17:16 +02:00
3 changed files with 27 additions and 29 deletions
+5
View File
@@ -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;