aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-06-12 16:07:42 -0700
committerBen Hilburn <ben.hilburn@ettus.com>2014-07-17 18:16:04 -0700
commit863953d972f19f38fb82eb17d1fe923a0337b0ed (patch)
tree6751ce3433d65430bf1cc7926bd6c29ad3f411e1 /host/lib/usrp
parent208d85167838b0bb90d0938c791c1eae4b788e4d (diff)
downloaduhd-863953d972f19f38fb82eb17d1fe923a0337b0ed.tar.gz
uhd-863953d972f19f38fb82eb17d1fe923a0337b0ed.tar.bz2
uhd-863953d972f19f38fb82eb17d1fe923a0337b0ed.zip
- Changed variables from uint8_t to uint32_t so parsing of hex strings would work properly.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/gps_ctrl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index 3d7684849..6b3f73cf6 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -69,8 +69,8 @@ private:
return false;
std::stringstream ss;
- boost::uint8_t string_crc;
- boost::uint8_t calculated_crc = 0;
+ boost::uint32_t string_crc;
+ boost::uint32_t calculated_crc = 0;
// get crc from string
ss << std::hex << nmea.substr(nmea.length()-2, 2);
@@ -114,7 +114,7 @@ private:
{
msgs["SERVO"] = msg;
}
- else if (boost::regex_match(msg, gp_msg_regex) && is_nmea_checksum_ok(msg))
+ else if (boost::regex_match(msg, gp_msg_regex) and is_nmea_checksum_ok(msg))
{
msgs[msg.substr(1,5)] = msg;
}