diff options
| author | Mark Meserve <mark.meserve@ni.com> | 2019-05-03 16:46:57 -0500 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2019-05-21 21:37:19 -0700 |
| commit | a01e54f9974184627b10d32b9c5f59381531be5d (patch) | |
| tree | 2f3bb510866a515c97624021d223aab8efbe92f8 | |
| parent | 9609aeb4be7249d52a4def856d86de336bfc0fbe (diff) | |
| download | uhd-a01e54f9974184627b10d32b9c5f59381531be5d.tar.gz uhd-a01e54f9974184627b10d32b9c5f59381531be5d.tar.bz2 uhd-a01e54f9974184627b10d32b9c5f59381531be5d.zip | |
twinrx: set lo2 to use new low spur tuning mode
| -rw-r--r-- | host/lib/usrp/dboard/db_twinrx.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp index 27b2c22da..bc655ef27 100644 --- a/host/lib/usrp/dboard/db_twinrx.cpp +++ b/host/lib/usrp/dboard/db_twinrx.cpp @@ -127,7 +127,7 @@ public: "los/LO2/charge_pump/value", prepend_ch("los/LO2/charge_pump/desired", _ch_name), prepend_ch("los/LO2/charge_pump/coerced", _ch_name), - 0.3125e-6, + 1.25e-6, AUTO_RESOLVE_ON_READ_WRITE); //Gain Specific diff --git a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp index 29342ce51..91cfa22ca 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp @@ -134,6 +134,8 @@ public: _lo2_iface[i]->set_output_power(adf435x_iface::OUTPUT_POWER_5DBM); _lo2_iface[i]->set_reference_freq(TWINRX_DESIRED_REFERENCE_FREQ); _lo2_iface[i]->set_muxout_mode(adf435x_iface::MUXOUT_DLD); + _lo2_iface[i]->set_tuning_mode(adf435x_iface::TUNING_MODE_LOW_SPUR); + _lo2_iface[i]->set_prescaler(adf435x_iface::PRESCALER_8_9); } commit(); } @@ -449,18 +451,13 @@ public: double set_lo2_synth_freq(channel_t ch, double freq, bool commit = true) { boost::lock_guard<boost::mutex> lock(_mutex); - static const double PRESCALER_THRESH = 3.6e9; double coerced_freq = 0.0; if (ch == CH1 or ch == BOTH) { - _lo2_iface[size_t(CH1)]->set_prescaler(freq > PRESCALER_THRESH ? - adf435x_iface::PRESCALER_8_9 : adf435x_iface::PRESCALER_4_5); coerced_freq = _lo2_iface[size_t(CH1)]->set_frequency(freq, false, false); _lo2_freq[size_t(CH1)] = tune_freq_t(freq); } if (ch == CH2 or ch == BOTH) { - _lo2_iface[size_t(CH2)]->set_prescaler(freq > PRESCALER_THRESH ? - adf435x_iface::PRESCALER_8_9 : adf435x_iface::PRESCALER_4_5); coerced_freq = _lo2_iface[size_t(CH2)]->set_frequency(freq, false, false); _lo2_freq[size_t(CH2)] = tune_freq_t(freq); } |