Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_SerialManager: call set_options() before first UART use 

this ensures options are set before the first begin() call
This commit is contained in:
Andrew Tridgell 2021-07-08 08:25:07 +10:00
parent c2b310ad86
commit 18d90f76b5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_SerialManager/AP_SerialManager.cpp
View File

@ -569,7 +569,13 @@ AP_HAL::UARTDriver *AP_SerialManager::find_serial(enum SerialProtocol protocol,
return nullptr; return nullptr;
} }
const uint8_t serial_idx = _state - &state[0]; const uint8_t serial_idx = _state - &state[0];
return hal.serial(serial_idx);
// set options before any user does begin()
AP_HAL::UARTDriver *port = hal.serial(serial_idx);
if (port) {
port->set_options(_state->options);
}
return port;
} }
// find_baudrate - searches available serial ports for the first instance that allows the given protocol // find_baudrate - searches available serial ports for the first instance that allows the given protocol