diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-15 15:54:02 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-15 15:54:02 -0700 |
| commit | 6bd9fed25f702bf6b2a244c6c045e3945ad165a5 (patch) | |
| tree | 3e8a80843403a195deaf7da54e2f00fec5402bf7 | |
| parent | dedf16ea795443f41edefbeb1eb77e2b91cb4691 (diff) | |
| parent | acfe51f641f16b3e6a02c764e58b986899e262a9 (diff) | |
| download | uhd-6bd9fed25f702bf6b2a244c6c045e3945ad165a5.tar.gz uhd-6bd9fed25f702bf6b2a244c6c045e3945ad165a5.tar.bz2 uhd-6bd9fed25f702bf6b2a244c6c045e3945ad165a5.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index f5e53678c..6a9de1f30 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1387,7 +1387,8 @@ void x300_impl::update_time_source(mboard_members_t &mb, const std::string &sour //check for valid pps if (!is_pps_present(mb.zpu_ctrl)) { - throw uhd::runtime_error((boost::format("The %d PPS was not detected. Please check the PPS source and try again.") % source).str()); + // TODO - Implement intelligent PPS detection + /* throw uhd::runtime_error((boost::format("The %d PPS was not detected. Please check the PPS source and try again.") % source).str()); */ } } |