diff options
| author | Michael West <michael.west@ettus.com> | 2014-02-18 16:18:04 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2014-02-18 16:18:04 -0800 |
| commit | 4d9c03d44b02d0ee91355280dbc58d1f19deddea (patch) | |
| tree | 8e40fa4fb361933252cffae4af98a5e9df9218c1 /host/lib/usrp/x300/x300_impl.hpp | |
| parent | 7fef199d194c9a63b3312845979fa353f90f4d23 (diff) | |
| download | uhd-4d9c03d44b02d0ee91355280dbc58d1f19deddea.tar.gz uhd-4d9c03d44b02d0ee91355280dbc58d1f19deddea.tar.bz2 uhd-4d9c03d44b02d0ee91355280dbc58d1f19deddea.zip | |
- Fix for BUG #264: ./test_pps_input --source external passes even with no 1 PPS on external input on X3xx
- Fixed behavior of PPS and clock references to be consistent and intuitive.
-- Added detection of clock reference and PPS.
-- Changed order of precedence to external, gpsdo, internal for default of clock and PPS.
-- Throws runtime error if the user requests a reference clock or PPS that is not present.
- Bumped FPGA compatibility to 4.
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 1fb3676a0..b64f9ad01 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -302,6 +302,7 @@ private: void update_time_source(mboard_members_t&, const std::string &); uhd::sensor_value_t get_ref_locked(uhd::wb_iface::sptr); + bool is_pps_present(uhd::wb_iface::sptr); void set_db_eeprom(uhd::i2c_iface::sptr i2c, const size_t, const uhd::usrp::dboard_eeprom_t &); void set_mb_eeprom(uhd::i2c_iface::sptr i2c, const uhd::usrp::mboard_eeprom_t &); |