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

AP_GPS: Don't autodetect NMEA instances

Browse Source
This commit is contained in:
Michael du Breuil 2017-05-29 23:33:39 -07:00 committed by Francisco Ferreira
parent 3bdd4c0cd6
commit 84598544fb
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_GPS/AP_GPS.cpp
View File

@ -467,8 +467,8 @@ void AP_GPS::detect_instance(uint8_t instance)
break;
}
// record the time when we started detection. This is used to try
// to avoid initialising a uBlox as a NMEA GPS
// record the time when we started detection. This is used as a flag to
// indicate that the detected GPS baud rate should be broadcast
if (dstate->detect_started_ms == 0) {
dstate->detect_started_ms = now;
}
@ -539,13 +539,9 @@ void AP_GPS::detect_instance(uint8_t instance)
else if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_ERB) &&
AP_GPS_ERB::_detect(dstate->erb_detect_state, data)) {
new_gps = new AP_GPS_ERB(*this, state[instance], _port[instance]);
} else if (now - dstate->detect_started_ms > (ARRAY_SIZE(_baudrates) * GPS_BAUD_TIME_MS)) {
// prevent false detection of NMEA mode in
// a MTK or UBLOX which has booted in NMEA mode
if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_NMEA) &&
AP_GPS_NMEA::_detect(dstate->nmea_detect_state, data)) {
new_gps = new AP_GPS_NMEA(*this, state[instance], _port[instance]);
}
} else if (_type[instance] == GPS_TYPE_NMEA &&
AP_GPS_NMEA::_detect(dstate->nmea_detect_state, data)) {
new_gps = new AP_GPS_NMEA(*this, state[instance], _port[instance]);
}
}