diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-10-15 16:19:27 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-10-15 16:19:27 -0700 |
| commit | c41a7fa386a467ba76d5f09f390cb62a1bfa7282 (patch) | |
| tree | 3f458325c74af227b5745ce5390624f8fc94f638 /host/lib/usrp/multi_usrp.cpp | |
| parent | 09a69b22ae41ca6b9935508d523ae88df58301f3 (diff) | |
| parent | eb2f57a6241ce04a3d89c5f41557658387440c3f (diff) | |
| download | uhd-c41a7fa386a467ba76d5f09f390cb62a1bfa7282.tar.gz uhd-c41a7fa386a467ba76d5f09f390cb62a1bfa7282.tar.bz2 uhd-c41a7fa386a467ba76d5f09f390cb62a1bfa7282.zip | |
Merge branch 'master' into x300/dram
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 396237e24..57c593efb 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -438,8 +438,10 @@ public: ******************************************************************/ void set_master_clock_rate(double rate, size_t mboard){ if (mboard != ALL_MBOARDS){ - if (_tree->exists(mb_root(mboard) / "auto_tick_rate")) { + if (_tree->exists(mb_root(mboard) / "auto_tick_rate") + and _tree->access<bool>(mb_root(mboard) / "auto_tick_rate").get()) { _tree->access<bool>(mb_root(mboard) / "auto_tick_rate").set(false); + UHD_MSG(status) << "Setting master clock rate selection to 'manual'." << std::endl; } _tree->access<double>(mb_root(mboard) / "tick_rate").set(rate); return; |