aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_SerialManager: fixed matching bug in protocol_match()

Browse Source 
thanks to Mike Clement for noticing this
This commit is contained in:
Andrew Tridgell 2015-04-06 15:28:03 -07:00
parent c5c40adb76
commit 5284211c96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_SerialManager/AP_SerialManager.cpp
View File

@ -313,13 +313,13 @@ bool AP_SerialManager::protocol_match(enum SerialProtocol protocol1, enum Serial
// mavlink match // mavlink match
if (((protocol1 == SerialProtocol_MAVLink) || (protocol1 == SerialProtocol_MAVLink2)) && if (((protocol1 == SerialProtocol_MAVLink) || (protocol1 == SerialProtocol_MAVLink2)) &&
((protocol2 == SerialProtocol_MAVLink) || (protocol1 == SerialProtocol_MAVLink2))) { ((protocol2 == SerialProtocol_MAVLink) || (protocol2 == SerialProtocol_MAVLink2))) {
return true; return true;
} }
// gps match // gps match
if (((protocol1 == SerialProtocol_GPS) || (protocol1 == SerialProtocol_GPS2)) && if (((protocol1 == SerialProtocol_GPS) || (protocol1 == SerialProtocol_GPS2)) &&
((protocol2 == SerialProtocol_GPS) || (protocol1 == SerialProtocol_GPS2))) { ((protocol2 == SerialProtocol_GPS) || (protocol2 == SerialProtocol_GPS2))) {
return true; return true;
} }