diff options
| author | Mark Meserve <mark.meserve@ni.com> | 2018-12-21 15:52:13 -0600 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-10 09:50:16 -0800 |
| commit | ec0b4dd1274c2d1d3fd392561f90e0186732cd52 (patch) | |
| tree | 79e77dae3a7529e642197f82bbedfbd4862adc28 /host/lib | |
| parent | a476cba5f5cc753c90749d1573ae286286a89c98 (diff) | |
| download | uhd-ec0b4dd1274c2d1d3fd392561f90e0186732cd52.tar.gz uhd-ec0b4dd1274c2d1d3fd392561f90e0186732cd52.tar.bz2 uhd-ec0b4dd1274c2d1d3fd392561f90e0186732cd52.zip | |
rh: general code cleanup
- Add default bandwidth range
- Add default mash order constant
- Delete MPM todos
- Cleanup whitespace in MPM python code
- Add docstring for is_lo_dist_present
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp index a4b2cd17a..9cf7c57e6 100644 --- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp +++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp @@ -39,6 +39,7 @@ namespace { constexpr char RHODIUM_DEFAULT_RX_ANTENNA[] = "RX2"; constexpr char RHODIUM_DEFAULT_TX_ANTENNA[] = "TX/RX"; constexpr double RHODIUM_DEFAULT_BANDWIDTH = 250e6; // Hz + constexpr auto RHODIUM_DEFAULT_MASH_ORDER = lmx2592_iface::mash_order_t::THIRD; //! Rhodium gain profile options const std::vector<std::string> RHODIUM_GP_OPTIONS = { @@ -193,7 +194,7 @@ void rhodium_radio_ctrl_impl::_init_peripherals() UHD_LOG_TRACE(unique_id(), "Writing initial TX LO state..."); _tx_lo->set_reference_frequency(RHODIUM_LO1_REF_FREQ); - _tx_lo->set_mash_order(lmx2592_iface::mash_order_t::THIRD); + _tx_lo->set_mash_order(RHODIUM_DEFAULT_MASH_ORDER); UHD_LOG_TRACE(unique_id(), "Initializing RX LO..."); _rx_lo = lmx2592_iface::make( @@ -202,7 +203,7 @@ void rhodium_radio_ctrl_impl::_init_peripherals() UHD_LOG_TRACE(unique_id(), "Writing initial RX LO state..."); _rx_lo->set_reference_frequency(RHODIUM_LO1_REF_FREQ); - _rx_lo->set_mash_order(lmx2592_iface::mash_order_t::THIRD); + _rx_lo->set_mash_order(RHODIUM_DEFAULT_MASH_ORDER); UHD_LOG_TRACE(unique_id(), "Initializing GPIOs..."); _gpio = @@ -357,7 +358,7 @@ void rhodium_radio_ctrl_impl::_init_frontend_subtree( }) ; subtree->create<meta_range_t>(tx_fe_path / "bandwidth" / "range") - .set(meta_range_t(0.0, 0.0, 0.0)) // FIXME + .set(meta_range_t(RHODIUM_DEFAULT_BANDWIDTH, RHODIUM_DEFAULT_BANDWIDTH)) .add_coerced_subscriber([](const meta_range_t &){ throw uhd::runtime_error( "Attempting to update bandwidth range!"); @@ -373,7 +374,7 @@ void rhodium_radio_ctrl_impl::_init_frontend_subtree( }) ; subtree->create<meta_range_t>(rx_fe_path / "bandwidth" / "range") - .set(meta_range_t(0.0, 0.0, 0.0)) // FIXME + .set(meta_range_t(RHODIUM_DEFAULT_BANDWIDTH, RHODIUM_DEFAULT_BANDWIDTH)) .add_coerced_subscriber([](const meta_range_t &){ throw uhd::runtime_error( "Attempting to update bandwidth range!"); |