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: allow override of SERIAL2_PROTOCOL

Browse Source
This commit is contained in:
Andrew Tridgell 2018-11-18 20:50:09 +11:00
parent da402f4fb7
commit cfb401995f
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

@ -36,6 +36,12 @@ extern const AP_HAL::HAL& hal;
#define SERIAL5_BAUD AP_SERIALMANAGER_MAVLINK_BAUD/1000 #define SERIAL5_BAUD AP_SERIALMANAGER_MAVLINK_BAUD/1000
#endif #endif
#ifdef HAL_SERIAL2_PROTOCOL
#define SERIAL2_PROTOCOL_DEFAULT HAL_SERIAL2_PROTOCOL
#else
#define SERIAL2_PROTOCOL_DEFAULT SerialProtocol_MAVLink
#endif
#ifndef HAL_SERIAL6_PROTOCOL #ifndef HAL_SERIAL6_PROTOCOL
#define SERIAL6_PROTOCOL SerialProtocol_None #define SERIAL6_PROTOCOL SerialProtocol_None
#define SERIAL6_BAUD AP_SERIALMANAGER_MAVLINK_BAUD/1000 #define SERIAL6_BAUD AP_SERIALMANAGER_MAVLINK_BAUD/1000
@ -78,7 +84,7 @@ const AP_Param::GroupInfo AP_SerialManager::var_info[] = {
// @Values: -1:None, 1:MAVLink1, 2:MAVLink2, 3:Frsky D, 4:Frsky SPort, 5:GPS, 7:Alexmos Gimbal Serial, 8:SToRM32 Gimbal Serial, 9:Rangefinder, 10:FrSky SPort Passthrough (OpenTX), 11:Lidar360, 13:Beacon, 14:Volz servo out, 15:SBus servo out, 16:ESC Telemetry, 17:Devo Telemetry // @Values: -1:None, 1:MAVLink1, 2:MAVLink2, 3:Frsky D, 4:Frsky SPort, 5:GPS, 7:Alexmos Gimbal Serial, 8:SToRM32 Gimbal Serial, 9:Rangefinder, 10:FrSky SPort Passthrough (OpenTX), 11:Lidar360, 13:Beacon, 14:Volz servo out, 15:SBus servo out, 16:ESC Telemetry, 17:Devo Telemetry
// @User: Standard // @User: Standard
// @RebootRequired: True // @RebootRequired: True
AP_GROUPINFO("2_PROTOCOL", 3, AP_SerialManager, state[2].protocol, SerialProtocol_MAVLink), AP_GROUPINFO("2_PROTOCOL", 3, AP_SerialManager, state[2].protocol, SERIAL2_PROTOCOL_DEFAULT),
// @Param: 2_BAUD // @Param: 2_BAUD
// @DisplayName: Telemetry 2 Baud Rate // @DisplayName: Telemetry 2 Baud Rate