diff options
| author | Josh Blum <josh@joshknows.com> | 2012-05-16 10:56:43 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-05-16 10:56:43 -0700 |
| commit | 78bf395b2d9ab0ae3ec2b9c7cd583f30a4780d95 (patch) | |
| tree | 7c1a68106d54b580c2d7f7cd50bd57434adddc5b /host/docs | |
| parent | c94963a43665809d0a75cebac6283cb7c88a6f5c (diff) | |
| parent | e5c9dee58715e927dd919aa3bf361983d17a172f (diff) | |
| download | uhd-78bf395b2d9ab0ae3ec2b9c7cd583f30a4780d95.tar.gz uhd-78bf395b2d9ab0ae3ec2b9c7cd583f30a4780d95.tar.bz2 uhd-78bf395b2d9ab0ae3ec2b9c7cd583f30a4780d95.zip | |
Merge branch 'maint'
Conflicts:
host/docs/gpsdo.rst
Diffstat (limited to 'host/docs')
| -rw-r--r-- | host/docs/gpsdo.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/docs/gpsdo.rst b/host/docs/gpsdo.rst index f5e6f5e57..fcd9b30f5 100644 --- a/host/docs/gpsdo.rst +++ b/host/docs/gpsdo.rst @@ -75,6 +75,6 @@ format using the **time.h** library in C, **boost::posix_time** in C++, etc. Other information can be fetched as well. You can query the lock status with the **gps_locked** sensor, as well as obtain raw NMEA sentences using -the **gps_gpgsa**, **gps_gprmc**, and **gps_gpgga** sensors. Location +the **gps_gprmc**, and **gps_gpgga** sensors. Location information can be parsed out of the **gps_gpgga** sensor by using **gpsd** or another NMEA parser. |