|
Lines 753-764
Link Here
|
| 753 |
{ |
753 |
{ |
| 754 |
gpsdata->satellites_used = libgps_gpsdata.satellites_used; |
754 |
gpsdata->satellites_used = libgps_gpsdata.satellites_used; |
| 755 |
gpsdata->hdop = libgps_gpsdata.dop.hdop; |
755 |
gpsdata->hdop = libgps_gpsdata.dop.hdop; |
|
|
756 |
#if GPSD_API_MAJOR_VERSION >= 9 /* API change. gpsd version 3.20 and subsequent. */ |
| 757 |
gpsdata->fix.time = libgps_gpsdata.fix.time.tv_sec + (libgps_gpsdata.fix.time.tv_nsec*1e-9); |
| 758 |
#else |
| 756 |
gpsdata->fix.time = libgps_gpsdata.fix.time; |
759 |
gpsdata->fix.time = libgps_gpsdata.fix.time; |
|
|
760 |
#endif |
| 757 |
if (isnan(gpsdata->fix.time)) |
761 |
if (isnan(gpsdata->fix.time)) |
| 758 |
{ |
762 |
{ |
| 759 |
gpsdata->fix.time = (time_t) 0; |
763 |
gpsdata->fix.time = (time_t) 0; |
| 760 |
} |
764 |
} |
|
|
765 |
#if GPSD_API_MAJOR_VERSION >= 9 |
| 766 |
gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); |
| 767 |
#else |
| 761 |
gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); |
768 |
gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); |
|
|
769 |
#endif |
| 762 |
if (gpsdata->valid) |
770 |
if (gpsdata->valid) |
| 763 |
{ |
771 |
{ |
| 764 |
gpsdata->seen_valid = TRUE; |
772 |
gpsdata->seen_valid = TRUE; |
|
Lines 767-773
Link Here
|
| 767 |
gpsdata->fix.longitude = libgps_gpsdata.fix.longitude; |
775 |
gpsdata->fix.longitude = libgps_gpsdata.fix.longitude; |
| 768 |
gpsdata->fix.speed = libgps_gpsdata.fix.speed; |
776 |
gpsdata->fix.speed = libgps_gpsdata.fix.speed; |
| 769 |
gpsdata->fix.heading = libgps_gpsdata.fix.track; |
777 |
gpsdata->fix.heading = libgps_gpsdata.fix.track; |
|
|
778 |
#if GPSD_API_MAJOR_VERSION >= 9 |
| 779 |
gpsdata->fix.altitude = libgps_gpsdata.fix.altMSL; |
| 780 |
#else |
| 770 |
gpsdata->fix.altitude = libgps_gpsdata.fix.altitude; |
781 |
gpsdata->fix.altitude = libgps_gpsdata.fix.altitude; |
|
|
782 |
#endif |
| 771 |
} |
783 |
} |
| 772 |
|
784 |
|
| 773 |
g_source_remove(watchdog); |
785 |
g_source_remove(watchdog); |
