aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/gps_ctrl.cpp
diff options
context:
space:
mode:
authorAndrej Rode <andrej.rode@ettus.com>2017-02-07 16:37:25 -0800
committerMartin Braun <martin.braun@ettus.com>2017-02-20 17:13:15 -0800
commit21aad77c9ca07f4271136b9241f5adb00a6bb908 (patch)
tree636ffe3ab2296e9afa661d3a12eb359224cd3254 /host/lib/usrp/gps_ctrl.cpp
parent2b33f2bb4c01d4306fd46f78edf6e355a03e2ed7 (diff)
downloaduhd-21aad77c9ca07f4271136b9241f5adb00a6bb908.tar.gz
uhd-21aad77c9ca07f4271136b9241f5adb00a6bb908.tar.bz2
uhd-21aad77c9ca07f4271136b9241f5adb00a6bb908.zip
utils: introduce new logging API and remove msg API
Diffstat (limited to 'host/lib/usrp/gps_ctrl.cpp')
-rw-r--r--host/lib/usrp/gps_ctrl.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index b4b4ffa0f..cc3e1b8e3 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -16,7 +16,7 @@
//
#include <uhd/usrp/gps_ctrl.hpp>
-#include <uhd/utils/msg.hpp>
+
#include <uhd/utils/log.hpp>
#include <uhd/exception.hpp>
#include <uhd/types/sensors.hpp>
@@ -91,7 +91,7 @@ private:
sentences[which].get<2>() = true;
}
} catch(std::exception &e) {
- UHD_LOGV(often) << "get_sentence: " << e.what();
+ UHD_LOGGER_DEBUG("GPS") << "get_sentence: " << e.what();
}
if (not sentence.empty() or now > exit_time)
@@ -158,7 +158,7 @@ private:
if (msg.length() < 6)
{
- UHD_LOGV(regularly) << __FUNCTION__ << ": Short GPSDO string: " << msg << std::endl;
+ UHD_LOGGER_WARNING("GPS") << __FUNCTION__ << ": Short GPSDO string: " << msg ;
continue;
}
@@ -173,7 +173,7 @@ private:
}
else
{
- UHD_LOGV(regularly) << __FUNCTION__ << ": Malformed GPSDO string: " << msg << std::endl;
+ UHD_LOGGER_WARNING("GPS") << __FUNCTION__ << ": Malformed GPSDO string: " << msg ;
}
}
@@ -233,7 +233,7 @@ public:
if(i_heard_some_nmea) {
_gps_type = GPS_TYPE_GENERIC_NMEA;
} else if(i_heard_something_weird) {
- UHD_MSG(error) << "GPS invalid reply \"" << reply << "\", assuming none available" << std::endl;
+ UHD_LOGGER_ERROR("GPS") << "GPS invalid reply \"" << reply << "\", assuming none available";
}
}
@@ -241,17 +241,17 @@ public:
case GPS_TYPE_INTERNAL_GPSDO:
erase_all(reply, "\r");
erase_all(reply, "\n");
- UHD_MSG(status) << "Found an internal GPSDO: " << reply << std::endl;
+ UHD_LOGGER_INFO("GPS") << "Found an internal GPSDO: " << reply;
init_gpsdo();
break;
case GPS_TYPE_GENERIC_NMEA:
- UHD_MSG(status) << "Found a generic NMEA GPS device" << std::endl;
+ UHD_LOGGER_INFO("GPS") << "Found a generic NMEA GPS device";
break;
case GPS_TYPE_NONE:
default:
- UHD_MSG(status) << "No GPSDO found" << std::endl;
+ UHD_LOGGER_INFO("GPS") << "No GPSDO found";
break;
}
@@ -361,7 +361,7 @@ private:
return gps_time;
} catch(std::exception &e) {
- UHD_LOGV(often) << "get_time: " << e.what();
+ UHD_LOGGER_DEBUG("GPS") << "get_time: " << e.what();
error_cnt++;
}
}
@@ -388,7 +388,7 @@ private:
else
return (get_token(reply, 6) != "0");
} catch(std::exception &e) {
- UHD_LOGV(often) << "locked: " << e.what();
+ UHD_LOGGER_DEBUG("GPS") << "locked: " << e.what();
error_cnt++;
}
}