dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Do not work on USB UARTs

This commit is contained in:
Lorenz Meier 2014-03-16 19:43:09 +01:00
parent 2fe9f65c45
commit 2db7d30400
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/mavlink/mavlink_main.cpp
View File

@ -201,6 +201,7 @@ Mavlink::Mavlink() :
_mavlink_fd(-1), _mavlink_fd(-1),
_task_running(false), _task_running(false),
_hil_enabled(false), _hil_enabled(false),
_is_usb_uart(false),
_main_loop_delay(1000), _main_loop_delay(1000),
_subscriptions(nullptr), _subscriptions(nullptr),
_streams(nullptr), _streams(nullptr),
@ -577,17 +578,19 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
return -1; return -1;
} }
/* if (!_is_usb_uart) {
* Setup hardware flow control. If the port has no RTS pin this call will fail, /*
* which is not an issue, but requires a separate call so we can fail silently. * Setup hardware flow control. If the port has no RTS pin this call will fail,
*/ * which is not an issue, but requires a separate call so we can fail silently.
(void)tcgetattr(_uart_fd, &uart_config); */
uart_config.c_cflag |= CRTS_IFLOW; (void)tcgetattr(_uart_fd, &uart_config);
(void)tcsetattr(_uart_fd, TCSANOW, &uart_config); uart_config.c_cflag |= CRTS_IFLOW;
(void)tcsetattr(_uart_fd, TCSANOW, &uart_config);
/* setup output flow control */ /* setup output flow control */
if (enable_flow_control(true)) { if (enable_flow_control(true)) {
warnx("ERR FLOW CTRL EN"); warnx("ERR FLOW CTRL EN");
}
} }
return _uart_fd; return _uart_fd;
@ -596,6 +599,11 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
int int
Mavlink::enable_flow_control(bool enabled) Mavlink::enable_flow_control(bool enabled)
{ {
// We can't do this on USB - skip
if (_is_usb_uart) {
return OK;
}
struct termios uart_config; struct termios uart_config;
int ret = tcgetattr(_uart_fd, &uart_config); int ret = tcgetattr(_uart_fd, &uart_config);
if (enabled) { if (enabled) {
@ -1701,10 +1709,9 @@ Mavlink::task_main(int argc, char *argv[])
fflush(stdout); fflush(stdout);
struct termios uart_config_original; struct termios uart_config_original;
bool usb_uart;
/* default values for arguments */ /* default values for arguments */
_uart_fd = mavlink_open_uart(_baudrate, _device_name, &uart_config_original, &usb_uart); _uart_fd = mavlink_open_uart(_baudrate, _device_name, &uart_config_original, &_is_usb_uart);
if (_uart_fd < 0) { if (_uart_fd < 0) {
warn("could not open %s", _device_name); warn("could not open %s", _device_name);

1
src/modules/mavlink/mavlink_main.h
View File

@ -208,6 +208,7 @@ private:
/* states */ /* states */
bool _hil_enabled; /**< Hardware In the Loop mode */ bool _hil_enabled; /**< Hardware In the Loop mode */
bool _is_usb_uart; /**< Port is USB */
unsigned _main_loop_delay; /**< mainloop delay, depends on data rate */ unsigned _main_loop_delay; /**< mainloop delay, depends on data rate */