fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 07:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

MAVLink: No need to restore previous port config on exit

Browse Source
This commit is contained in:
Lorenz Meier
2016-08-26 23:38:46 +02:00
parent ebce93f338
commit e67a6bdfc2
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+6 -14
View File
@@ -618,7 +618,7 @@ int Mavlink::get_component_id()
return mavlink_system.compid; return mavlink_system.compid;
} }
int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *uart_config_original) int Mavlink::mavlink_open_uart(int baud, const char *uart_name)
{ {
#ifndef B460800 #ifndef B460800
#define B460800 460800 #define B460800 460800
@@ -731,16 +731,13 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
int termios_state; int termios_state;
_is_usb_uart = false; _is_usb_uart = false;
/* Back up the original uart configuration to restore it after exit */ /* Initialize the uart config */
if ((termios_state = tcgetattr(_uart_fd, uart_config_original)) < 0) { if ((termios_state = tcgetattr(_uart_fd, &uart_config)) < 0) {
warnx("ERR GET CONF %s: %d\n", uart_name, termios_state); warnx("ERR GET CONF %s: %d\n", uart_name, termios_state);
::close(_uart_fd); ::close(_uart_fd);
return -1; return -1;
} }
/* Fill the struct for the new configuration */
tcgetattr(_uart_fd, &uart_config);
/* Clear ONLCR flag (which appends a CR for every LF) */ /* Clear ONLCR flag (which appends a CR for every LF) */
uart_config.c_oflag &= ~ONLCR; uart_config.c_oflag &= ~ONLCR;
@@ -767,7 +764,7 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
#endif #endif
if ((termios_state = tcsetattr(_uart_fd, TCSANOW, &uart_config)) < 0) { if ((termios_state = tcsetattr(_uart_fd, TCSANOW, &uart_config)) < 0) {
warnx("ERR SET CONF %s\n", uart_name); PX4_WARN("ERR SET CONF %s\n", uart_name);
::close(_uart_fd); ::close(_uart_fd);
return -1; return -1;
} }
@@ -787,7 +784,7 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
/* setup output flow control */ /* setup output flow control */
if (enable_flow_control(true)) { if (enable_flow_control(true)) {
warnx("hardware flow control not supported"); PX4_WARN("hardware flow control not supported");
} }
} else { } else {
@@ -1782,8 +1779,6 @@ Mavlink::task_main(int argc, char *argv[])
_datarate = MAX_DATA_RATE; _datarate = MAX_DATA_RATE;
} }
struct termios uart_config_original = {};
if (get_protocol() == SERIAL) { if (get_protocol() == SERIAL) {
if (Mavlink::instance_exists(_device_name, this)) { if (Mavlink::instance_exists(_device_name, this)) {
warnx("%s already running", _device_name); warnx("%s already running", _device_name);
@@ -1797,7 +1792,7 @@ Mavlink::task_main(int argc, char *argv[])
fflush(stdout); fflush(stdout);
/* default values for arguments */ /* default values for arguments */
_uart_fd = mavlink_open_uart(_baudrate, _device_name, &uart_config_original); _uart_fd = mavlink_open_uart(_baudrate, _device_name);
if (_uart_fd < 0 && _mode != MAVLINK_MODE_CONFIG) { if (_uart_fd < 0 && _mode != MAVLINK_MODE_CONFIG) {
warn("could not open %s", _device_name); warn("could not open %s", _device_name);
@@ -2256,9 +2251,6 @@ Mavlink::task_main(int argc, char *argv[])
_subscriptions = nullptr; _subscriptions = nullptr;
if (_uart_fd >= 0 && !_is_usb_uart) { if (_uart_fd >= 0 && !_is_usb_uart) {
/* reset the UART flags to original state */
tcsetattr(_uart_fd, TCSANOW, &uart_config_original);
/* close UART */ /* close UART */
::close(_uart_fd); ::close(_uart_fd);
} }
src/modules/mavlink/mavlink_main.h
+1 -1
View File
@@ -561,7 +561,7 @@ private:
void mavlink_update_system(); void mavlink_update_system();
#ifndef __PX4_QURT #ifndef __PX4_QURT
int mavlink_open_uart(int baudrate, const char *uart_name, struct termios *uart_config_original); int mavlink_open_uart(int baudrate, const char *uart_name);
#endif #endif
static unsigned int interval_from_rate(float rate); static unsigned int interval_from_rate(float rate);