diff options
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/codec_impl.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp index 82174960c..890969b5a 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.cpp +++ b/host/lib/usrp/usrp2/codec_ctrl.cpp @@ -74,6 +74,7 @@ public: //_ads62p44_regs.decimation = DECIMATION_DECIMATE_1; _ads62p44_regs.power_down = ads62p44_regs_t::POWER_DOWN_NORMAL; this->send_ads62p44_reg(0x14); + this->set_rx_analog_gain(1); break; case usrp2_iface::USRP_NXXX: break; @@ -147,11 +148,11 @@ public: } } - void set_rx_analog_gain(bool gain) { //turns on/off analog 3.5dB preamp + void set_rx_analog_gain(bool /*gain*/) { //turns on/off analog 3.5dB preamp switch(_iface->get_rev()){ case usrp2_iface::USRP_N200: case usrp2_iface::USRP_N210: - _ads62p44_regs.coarse_gain = gain ? ads62p44_regs_t::COARSE_GAIN_3_5DB : ads62p44_regs_t::COARSE_GAIN_0DB; + _ads62p44_regs.coarse_gain = ads62p44_regs_t::COARSE_GAIN_3_5DB;//gain ? ads62p44_regs_t::COARSE_GAIN_3_5DB : ads62p44_regs_t::COARSE_GAIN_0DB; this->send_ads62p44_reg(0x14); break; diff --git a/host/lib/usrp/usrp2/codec_impl.cpp b/host/lib/usrp/usrp2/codec_impl.cpp index df4975bb1..d7078d985 100644 --- a/host/lib/usrp/usrp2/codec_impl.cpp +++ b/host/lib/usrp/usrp2/codec_impl.cpp @@ -30,7 +30,6 @@ using namespace boost::assign; //this only applies to N2XX static const uhd::dict<std::string, gain_range_t> codec_rx_gain_ranges = map_list_of - ("analog", gain_range_t(0, 3.5, 3.5)) ("digital", gain_range_t(0, 6.0, 0.5)) ("digital-fine", gain_range_t(0, 0.5, 0.05)); @@ -127,11 +126,12 @@ void usrp2_mboard_impl::rx_codec_set_gain(double gain, const std::string &name){ assert_has(codec_rx_gain_ranges.keys(), name, "codec rx gain name"); _codec_rx_gains[name] = gain; - +/* if(name == "analog") { _codec_ctrl->set_rx_analog_gain(gain > 0); //just turn it on or off return; } +*/ if(name == "digital") { _codec_ctrl->set_rx_digital_gain(gain); return; |