diff options
author | Ashish Chaudhari <ashish@ettus.com> | 2016-09-28 11:20:22 -0700 |
---|---|---|
committer | mbr0wn <martin.braun@ettus.com> | 2016-09-30 11:49:00 -0700 |
commit | 70cd8780a512ce7892b598edeff07523f1293055 (patch) | |
tree | 10d9bb30102a31d62658a7ca9ae53793d1987dd5 /host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | |
parent | 60920644aa33d1a6f7a4dac30bdb890b9bc4301f (diff) | |
download | uhd-70cd8780a512ce7892b598edeff07523f1293055.tar.gz uhd-70cd8780a512ce7892b598edeff07523f1293055.tar.bz2 uhd-70cd8780a512ce7892b598edeff07523f1293055.zip |
bugfix: TwinRX: Use correct LEDs when mapping chan -> ant
- 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 <martin.braun@ettus.com>
Reviewed-By: Marcus Müller <marcus.mueller@ettus.com>
Diffstat (limited to 'host/lib/usrp/x300/x300_radio_ctrl_impl.hpp')
-rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
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<size_t, 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; std::map<size_t, usrp::dboard_eeprom_t> _db_eeproms; usrp::dboard_manager::sptr _db_manager; |