From 456b90793b73d4a1113908823e12d8a16211504a Mon Sep 17 00:00:00 2001 From: Jason Abele Date: Thu, 3 Mar 2011 13:58:14 -0800 Subject: Fixes inverted logic in sensors bool interface --- host/include/uhd/types/sensors.hpp | 6 +++--- host/lib/types/sensors.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/host/include/uhd/types/sensors.hpp b/host/include/uhd/types/sensors.hpp index 97d82b4e2..529e1e3e3 100644 --- a/host/include/uhd/types/sensors.hpp +++ b/host/include/uhd/types/sensors.hpp @@ -41,14 +41,14 @@ namespace uhd{ * Create a sensor value from a boolean. * \param name the name of the sensor * \param value the value true or false - * \param ufalse the unit string when value is false * \param utrue the unit string when value is true + * \param ufalse the unit string when value is false */ sensor_value_t( const std::string &name, bool value, - const std::string &ufalse, - const std::string &utrue + const std::string &utrue, + const std::string &ufalse ); /*! diff --git a/host/lib/types/sensors.cpp b/host/lib/types/sensors.cpp index 5f7115d70..dd8a170ea 100644 --- a/host/lib/types/sensors.cpp +++ b/host/lib/types/sensors.cpp @@ -25,8 +25,8 @@ using namespace uhd; sensor_value_t::sensor_value_t( const std::string &name, bool value, - const std::string &ufalse, - const std::string &utrue + const std::string &utrue, + const std::string &ufalse ): name(name), value(value?"true":"false"), unit(value?utrue:ufalse), type(BOOLEAN) -- cgit v1.2.3 From 01ab237b0fcb22e5098bdda139ca76fe7e5d21cb Mon Sep 17 00:00:00 2001 From: Jason Abele Date: Thu, 3 Mar 2011 14:01:05 -0800 Subject: Update USRP1 External Clocking docs for set_master_clock() --- host/docs/usrp1.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/host/docs/usrp1.rst b/host/docs/usrp1.rst index 984f89ae9..f77a26e0a 100644 --- a/host/docs/usrp1.rst +++ b/host/docs/usrp1.rst @@ -136,9 +136,6 @@ The USRP can be modified to accept an external clock reference instead of the 64 The new external clock needs to be a square wave between +7dBm and +15dBm -To configure UHD for the new reference clock, modify host/lib/usrp/usrp1/clock_ctrl.cpp: - -:: - - static const double master_clock_rate = ; +For the correct clock settings, call usrp->set_master_clock_rate(EXT_CLOCK_FREQUENCY) +before any other parameters are set in your application. -- cgit v1.2.3