diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-08-14 08:08:35 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-08-14 12:30:53 -0700 |
| commit | 9b51e4cfbe0aefa4e7ff3a64b15b22ec30a0a5e3 (patch) | |
| tree | 713d40619a273103db2ae90fcde3c965acea7621 | |
| parent | 7e476226e6af0626d36e110513fe60970a9f1a9c (diff) | |
| download | uhd-9b51e4cfbe0aefa4e7ff3a64b15b22ec30a0a5e3.tar.gz uhd-9b51e4cfbe0aefa4e7ff3a64b15b22ec30a0a5e3.tar.bz2 uhd-9b51e4cfbe0aefa4e7ff3a64b15b22ec30a0a5e3.zip | |
gps_ctrl: code cleanup
| -rw-r--r-- | host/lib/usrp/gps_ctrl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp index b9d5128bb..207ef10ab 100644 --- a/host/lib/usrp/gps_ctrl.cpp +++ b/host/lib/usrp/gps_ctrl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011,2014 Ettus Research LLC +// Copyright 2010-2011,2014-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -157,7 +157,7 @@ public: _send("HAAAY GUYYYYS\n"); //to elicit a response from the GPSDO //wait for _send(...) to return - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); //then we loop until we either timeout, or until we get a response that indicates we're a JL device const boost::system_time comm_timeout = boost::get_system_time() + milliseconds(GPS_COMM_TIMEOUT_MS); @@ -237,19 +237,19 @@ private: //issue some setup stuff so it spits out the appropriate data //none of these should issue replies so we don't bother looking for them //we have to sleep between commands because the JL device, despite not acking, takes considerable time to process each command. - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); _send("SYST:COMM:SER:ECHO OFF\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); _send("SYST:COMM:SER:PRO OFF\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); _send("GPS:GPGGA 1\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); _send("GPS:GGAST 0\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); _send("GPS:GPRMC 1\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); _send("SERV:TRAC 0\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); } //retrieve a raw NMEA sentence @@ -352,7 +352,7 @@ private: //enable servo reporting _send("SERV:TRAC 1\n"); - sleep(milliseconds(GPSDO_STUPID_DELAY_MS)); + sleep(milliseconds(GPSDO_COMMAND_DELAY_MS)); std::string reply; @@ -399,7 +399,7 @@ private: static const int GPS_SERVO_FRESHNESS = 2500; static const int GPS_LOCK_FRESHNESS = 2500; static const int GPS_TIMEOUT_DELAY_MS = 200; - static const int GPSDO_STUPID_DELAY_MS = 200; + static const int GPSDO_COMMAND_DELAY_MS = 200; }; /*********************************************************************** |