diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-20 14:35:15 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-20 14:35:15 -0700 |
| commit | 79c9b12b2aa3107634153db03a1fd9058f6aa6b9 (patch) | |
| tree | e2f23fd2ec3bca01e5e58daf6a86626b821e5e31 /host | |
| parent | 81f25fca0c82a45586cb07e7d08b8e2c98e2e629 (diff) | |
| parent | 054a752bb25f9e17c1269b28ad2a95865c0d63a2 (diff) | |
| download | uhd-79c9b12b2aa3107634153db03a1fd9058f6aa6b9.tar.gz uhd-79c9b12b2aa3107634153db03a1fd9058f6aa6b9.tar.bz2 uhd-79c9b12b2aa3107634153db03a1fd9058f6aa6b9.zip | |
Merge branch 'maint'
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/dboard/db_dbsrx2.cpp | 14 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_regs.hpp | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp index 8a8f61a69..1debe3c8f 100644 --- a/host/lib/usrp/dboard/db_dbsrx2.cpp +++ b/host/lib/usrp/dboard/db_dbsrx2.cpp @@ -40,7 +40,7 @@ using namespace boost::assign; /*********************************************************************** * The DBSRX2 constants **********************************************************************/ -static const freq_range_t dbsrx2_freq_range(0.8e9, 2.4e9); +static const freq_range_t dbsrx2_freq_range(0.8e9, 2.3e9); //Multiplied by 2.0 for conversion to complex bandpass from lowpass static const freq_range_t dbsrx2_bandwidth_range(2.0*4.0e6, 2.0*40.0e6); @@ -245,7 +245,7 @@ double dbsrx2::set_lo_freq(double target_freq){ //target_freq = dbsrx2_freq_range.clip(target_freq); //variables used in the calculation below - int scaler = target_freq > 1125e6 ? 2 : 4; + int scaler = target_freq >= 1125e6 ? 2 : 4; double ref_freq = this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX); int R, intdiv, fracdiv, ext_div; double N; @@ -279,8 +279,10 @@ double dbsrx2::set_lo_freq(double target_freq){ << boost::format(" Actual Freq=%fMHz\n") % (_lo_freq/1e6) << std::endl; - //send the registers - send_reg(0x0, 0x7); + //send the registers 0x0 through 0x7 + //writing register 0x4 (F divider LSB) starts the VCO auto seletion so it must be written last + send_reg(0x5, 0x7); + send_reg(0x0, 0x4); //FIXME: probably unnecessary to call get_locked here //get_locked(); @@ -304,7 +306,7 @@ static int gain_to_bbg_vga_reg(double &gain){ UHD_LOGV(often) << boost::format("DBSRX2 BBG Gain:\n") - << boost::format(" %f dB, bbg: %d") % gain % reg + << boost::format(" %f dB, bbg: %d") % gain % reg << std::endl; return reg; @@ -329,7 +331,7 @@ static double gain_to_gc1_rfvga_dac(double &gain){ UHD_LOGV(often) << boost::format("DBSRX2 GC1 Gain:\n") - << boost::format(" %f dB, dac_volts: %f V") % gain % dac_volts + << boost::format(" %f dB, dac_volts: %f V") % gain % dac_volts << std::endl; //the actual gain setting diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index e931b7983..698d98f55 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1321,8 +1321,8 @@ void x300_impl::update_atr_leds(gpio_core_200_32wo::sptr leds, const std::string { const bool is_txrx = (rx_ant == "TX/RX"); const int rx_led = (1 << 2); - const int txrx_led = (1 << 1); - const int tx_led = (1 << 0); + const int tx_led = (1 << 1); + const int txrx_led = (1 << 0); leds->set_atr_reg(dboard_iface::ATR_REG_IDLE, 0); leds->set_atr_reg(dboard_iface::ATR_REG_RX_ONLY, is_txrx? txrx_led : rx_led); leds->set_atr_reg(dboard_iface::ATR_REG_TX_ONLY, tx_led); diff --git a/host/lib/usrp/x300/x300_regs.hpp b/host/lib/usrp/x300/x300_regs.hpp index cf1e33695..d4610499a 100644 --- a/host/lib/usrp/x300/x300_regs.hpp +++ b/host/lib/usrp/x300/x300_regs.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_X300_REGS_HPP #define INCLUDED_X300_REGS_HPP +#include <stdint.h> #include <boost/cstdint.hpp> #define TOREG(x) ((x)*4) |