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

AP_GPS: update for find_serial() change

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

10
libraries/AP_GPS/AP_GPS.cpp
View File

@ -89,14 +89,10 @@ void AP_GPS::init(DataFlash_Class *dataflash, const AP_SerialManager& serial_man
primary_instance = 0;
// search for serial ports with gps protocol
AP_SerialManager::serial_state gps_serial;
if (serial_manager.find_serial(AP_SerialManager::SerialProtocol_GPS, gps_serial)) {
_port[0] = gps_serial.uart;
}
_port[0] = serial_manager.find_serial(AP_SerialManager::SerialProtocol_GPS);
#if GPS_MAX_INSTANCES > 1
if (serial_manager.find_serial(AP_SerialManager::SerialProtocol_GPS2, gps_serial)) {
_port[1] = gps_serial.uart;
}
_port[1] = serial_manager.find_serial(AP_SerialManager::SerialProtocol_GPS2);
#endif
}