Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 02:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: have_flow_control uses mavlink_comm

Browse Source
This commit is contained in:
Randy Mackay 2015-01-26 10:36:54 +09:00 committed by Andrew Tridgell
parent 1157c13eb6
commit 1275ff7d40
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -46,8 +46,8 @@ GCS_MAVLINK::init(AP_HAL::UARTDriver *port, mavlink_channel_t mav_chan)
mavlink_comm_1_port = _port; mavlink_comm_1_port = _port;
initialised = true; initialised = true;
break; break;
#if MAVLINK_COMM_NUM_BUFFERS > 2
case MAVLINK_COMM_2: case MAVLINK_COMM_2:
#if MAVLINK_COMM_NUM_BUFFERS > 2
mavlink_comm_2_port = _port; mavlink_comm_2_port = _port;
initialised = true; initialised = true;
break; break;
@ -403,14 +403,31 @@ bool GCS_MAVLINK::have_flow_control(void)
{ {
switch (chan) { switch (chan) {
case MAVLINK_COMM_0: case MAVLINK_COMM_0:
if (mavlink_comm_0_port == NULL) {
return false;
} else {
// assume USB has flow control // assume USB has flow control
return hal.gpio->usb_connected() || hal.uartA->get_flow_control() != AP_HAL::UARTDriver::FLOW_CONTROL_DISABLE; return hal.gpio->usb_connected() || mavlink_comm_0_port->get_flow_control() != AP_HAL::UARTDriver::FLOW_CONTROL_DISABLE;
}
break;
case MAVLINK_COMM_1: case MAVLINK_COMM_1:
return hal.uartC->get_flow_control() != AP_HAL::UARTDriver::FLOW_CONTROL_DISABLE; if (mavlink_comm_1_port == NULL) {
return false;
} else {
return mavlink_comm_1_port->get_flow_control() != AP_HAL::UARTDriver::FLOW_CONTROL_DISABLE;
}
break;
case MAVLINK_COMM_2: case MAVLINK_COMM_2:
return hal.uartD != NULL && hal.uartD->get_flow_control() != AP_HAL::UARTDriver::FLOW_CONTROL_DISABLE; #if MAVLINK_COMM_NUM_BUFFERS > 2
if (mavlink_comm_2_port == NULL) {
return false;
} else {
return mavlink_comm_2_port != NULL && mavlink_comm_2_port->get_flow_control() != AP_HAL::UARTDriver::FLOW_CONTROL_DISABLE;
}
break;
#endif
default: default:
break; break;