diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-03 17:02:15 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-03 17:02:15 -0800 |
| commit | 942c69b710510e6143a6f3c22bbe3ff0687f4bc6 (patch) | |
| tree | fc5a786effc07735e22658249f6bee29b69e94f9 | |
| parent | d2556f45c943e54d1b74afe94bff98cd81661bb2 (diff) | |
| parent | 01ab237b0fcb22e5098bdda139ca76fe7e5d21cb (diff) | |
| download | uhd-942c69b710510e6143a6f3c22bbe3ff0687f4bc6.tar.gz uhd-942c69b710510e6143a6f3c22bbe3ff0687f4bc6.tar.bz2 uhd-942c69b710510e6143a6f3c22bbe3ff0687f4bc6.zip | |
Merge branch 'master' into next
| -rw-r--r-- | host/docs/usrp1.rst | 7 | ||||
| -rw-r--r-- | host/include/uhd/types/sensors.hpp | 6 | ||||
| -rw-r--r-- | host/lib/types/sensors.cpp | 4 |
3 files changed, 7 insertions, 10 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 = <YOUR_NEW_REFERENCE_FREQUENCY>; +For the correct clock settings, call usrp->set_master_clock_rate(EXT_CLOCK_FREQUENCY) +before any other parameters are set in your application. 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 401c229a3..52a63d14c 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) |