diff options
| author | Chris Kuethe <chris.kuethe@gmail.com> | 2008-10-19 05:59:58 +0000 |
|---|---|---|
| committer | Chris Kuethe <chris.kuethe@gmail.com> | 2008-10-19 05:59:58 +0000 |
| commit | 5945c5fbad00fc9b4d8d455d1a5c4b28a26a3d93 (patch) | |
| tree | 0676fb78e96c5fe71065cddf87aa06b2b88145ad /nmea_parse.c | |
| parent | c5443f7a51349207527de652f618059692616ca3 (diff) | |
| download | gpsd-5945c5fbad00fc9b4d8d455d1a5c4b28a26a3d93.tar.gz | |
fix the order of merging in time data. from Cvachoucek
Diffstat (limited to 'nmea_parse.c')
| -rw-r--r-- | nmea_parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nmea_parse.c b/nmea_parse.c index 07bfc759..40d0d9b1 100644 --- a/nmea_parse.c +++ b/nmea_parse.c @@ -147,8 +147,8 @@ static gps_mask_t processGPRMC(int count, char *field[], struct gps_device_t *se mask |= ONLINE_SET; } else if (strcmp(field[2], "A")==0) { if (count > 9) { - merge_ddmmyy(field[9], session); merge_hhmmss(field[1], session); + merge_ddmmyy(field[9], session); mask |= TIME_SET; session->gpsdata.fix.time = (double)mkgmtime(&session->driver.nmea.date)+session->driver.nmea.subseconds; if (!GPS_TIME_EQUAL(session->gpsdata.sentence_time, session->gpsdata.fix.time)) { |