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

AP_Frsky_telem: update for find_serial() change

This commit is contained in:
Andrew Tridgell 2015-01-29 15:37:18 +11:00
parent 9ba2fefde3
commit 085a926e61
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_Frsky_Telem/AP_Frsky_Telem.cpp
View File

@ -67,19 +67,12 @@ AP_Frsky_Telem::AP_Frsky_Telem(AP_AHRS &ahrs, AP_BattMonitor &battery) :
// init - perform require initialisation including detecting which protocol to use
void AP_Frsky_Telem::init(const AP_SerialManager& serial_manager)
{
// initialise port to null
_port = NULL;
// check for FRSky_DPort
AP_SerialManager::serial_state frsky_serial;
if (serial_manager.find_serial(AP_SerialManager::SerialProtocol_FRSky_DPort, frsky_serial)) {
_port = frsky_serial.uart;
if ((_port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FRSky_DPort))) {
_protocol = FrSkyDPORT;
_initialised_uart = true; // SerialManager initialises uart for us
}
// check for FRSky_SPort
if (serial_manager.find_serial(AP_SerialManager::SerialProtocol_FRSky_SPort, frsky_serial)) {
_port = frsky_serial.uart;
} else if ((_port = serial_manager.find_serial(AP_SerialManager::SerialProtocol_FRSky_SPort))) {
// check for FRSky_SPort
_protocol = FrSkySPORT;
_gps_call = 0;
_fas_call = 0;