Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 09:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

GPS: fixed a race condition in the ublox driver

Browse Source 
the status update comes as a separate message from the lat/lon
This commit is contained in:
Andrew Tridgell 2012-06-04 14:47:58 +10:00
parent 012fc35314
commit 0f0cbce22f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_GPS/AP_GPS_UBLOX.cpp
View File

@ -173,12 +173,19 @@ AP_GPS_UBLOX::_parse_gps(void)
longitude = _buffer.posllh.longitude; longitude = _buffer.posllh.longitude;
latitude = _buffer.posllh.latitude; latitude = _buffer.posllh.latitude;
altitude = _buffer.posllh.altitude_msl / 10; altitude = _buffer.posllh.altitude_msl / 10;
fix = next_fix;
break; break;
case MSG_STATUS: case MSG_STATUS:
fix = (_buffer.status.fix_status & NAV_STATUS_FIX_VALID) && (_buffer.status.fix_type == FIX_3D); next_fix = (_buffer.status.fix_status & NAV_STATUS_FIX_VALID) && (_buffer.status.fix_type == FIX_3D);
if (!next_fix) {
fix = false;
}
break; break;
case MSG_SOL: case MSG_SOL:
fix = (_buffer.solution.fix_status & NAV_STATUS_FIX_VALID) && (_buffer.solution.fix_type == FIX_3D); next_fix = (_buffer.solution.fix_status & NAV_STATUS_FIX_VALID) && (_buffer.solution.fix_type == FIX_3D);
if (!next_fix) {
fix = false;
}
num_sats = _buffer.solution.satellites; num_sats = _buffer.solution.satellites;
hdop = _buffer.solution.position_DOP; hdop = _buffer.solution.position_DOP;
break; break;

3
libraries/AP_GPS/AP_GPS_UBLOX.h
View File

@ -119,6 +119,9 @@ private:
// Buffer parse & GPS state update // Buffer parse & GPS state update
bool _parse_gps(); bool _parse_gps();
// used to update fix between status and position packets
bool next_fix;
}; };
#endif #endif