Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_SerialManager: remove PX4 code bracketed by defines which will never be set

Browse Source 
Also update a comment
This commit is contained in:
Peter Barker 2019-01-19 17:33:55 +11:00 committed by Andrew Tridgell
parent d3671d9ca3
commit cd2182453a
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_SerialManager/AP_SerialManager.cpp
View File

@ -28,9 +28,6 @@ extern const AP_HAL::HAL& hal;
#ifdef HAL_SERIAL5_PROTOCOL #ifdef HAL_SERIAL5_PROTOCOL
#define SERIAL5_PROTOCOL HAL_SERIAL5_PROTOCOL #define SERIAL5_PROTOCOL HAL_SERIAL5_PROTOCOL
#define SERIAL5_BAUD HAL_SERIAL5_BAUD #define SERIAL5_BAUD HAL_SERIAL5_BAUD
#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V4)
#define SERIAL5_PROTOCOL SerialProtocol_MAVLink
#define SERIAL5_BAUD 921600
#else #else
#define SERIAL5_PROTOCOL SerialProtocol_None #define SERIAL5_PROTOCOL SerialProtocol_None
#define SERIAL5_BAUD AP_SERIALMANAGER_MAVLINK_BAUD/1000 #define SERIAL5_BAUD AP_SERIALMANAGER_MAVLINK_BAUD/1000
@ -272,13 +269,6 @@ void AP_SerialManager::init()
// initialise serial ports // initialise serial ports
for (uint8_t i=1; i<SERIALMANAGER_NUM_PORTS; i++) { for (uint8_t i=1; i<SERIALMANAGER_NUM_PORTS; i++) {
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2
if (i == 5 && state[i].protocol != SerialProtocol_None) {
// tell nsh to exit to free up this uart
g_nsh_should_exit = true;
}
#endif
if (state[i].uart != nullptr) { if (state[i].uart != nullptr) {
// see if special options have been requested // see if special options have been requested
@ -459,8 +449,9 @@ void AP_SerialManager::set_blocking_writes_all(bool blocking)
} }
/* /*
* map from a 16 bit EEPROM baud rate to a real baud rate. * map from a 16 bit EEPROM baud rate to a real baud rate. For
* For PX4 we can do 1.5MBit, although 921600 is more reliable. * stm32-based boards we can do 1.5MBit, although 921600 is more
* reliable.
*/ */
uint32_t AP_SerialManager::map_baudrate(int32_t rate) const uint32_t AP_SerialManager::map_baudrate(int32_t rate) const
{ {