From 70cd8780a512ce7892b598edeff07523f1293055 Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Wed, 28 Sep 2016 11:20:22 -0700 Subject: bugfix: TwinRX: Use correct LEDs when mapping chan -> ant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added LED controller objects for each block port in radio - Added desired subscribers for each frontend's antenna property that updates LED ATR values Reviewed-By: Martin Braun Reviewed-By: Marcus Müller --- host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'host/lib/usrp/x300/x300_radio_ctrl_impl.hpp') diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp index 46540a0c7..65d4443eb 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp @@ -150,7 +150,7 @@ private: static const uint32_t RX_FE_BASE = 232; }; - void _update_atr_leds(const std::string &rx_ant); + void _update_atr_leds(const std::string &rx_ant, const size_t chan); void _self_cal_adc_capture_delay(bool print_status); @@ -170,12 +170,12 @@ private: // members // Not necessarily this block's sampling rate (tick rate). double _radio_clk_rate; - radio_regmap_t::sptr _regs; - usrp::gpio_atr::gpio_atr_3000::sptr _leds; - spi_core_3000::sptr _spi; - x300_adc_ctrl::sptr _adc; - x300_dac_ctrl::sptr _dac; - usrp::gpio_atr::gpio_atr_3000::sptr _fp_gpio; + radio_regmap_t::sptr _regs; + std::map _leds; + spi_core_3000::sptr _spi; + x300_adc_ctrl::sptr _adc; + x300_dac_ctrl::sptr _dac; + usrp::gpio_atr::gpio_atr_3000::sptr _fp_gpio; std::map _db_eeproms; usrp::dboard_manager::sptr _db_manager; -- cgit v1.2.3