diff options
Diffstat (limited to 'host/lib/usrp/dboard/magnesium')
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_bands.cpp | 30 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp index ef72aee95..b54bf9a62 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp @@ -98,23 +98,23 @@ magnesium_radio_control_impl::rx_band magnesium_radio_control_impl::_map_freq_to { magnesium_radio_control_impl::rx_band band; - if (fp_compare_epsilon<double>(freq) < MAGNESIUM_MIN_FREQ) { + if (freq_compare_epsilon(freq) < MAGNESIUM_MIN_FREQ) { band = rx_band::INVALID_BAND; - } else if (fp_compare_epsilon<double>(freq) < MAGNESIUM_LOWBAND_FREQ) { + } else if (freq_compare_epsilon(freq) < MAGNESIUM_LOWBAND_FREQ) { band = rx_band::LOWBAND; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(1)) { + } else if (freq_compare_epsilon(freq) < band_map.at(1)) { band = rx_band::BAND0; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(2)) { + } else if (freq_compare_epsilon(freq) < band_map.at(2)) { band = rx_band::BAND1; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(3)) { + } else if (freq_compare_epsilon(freq) < band_map.at(3)) { band = rx_band::BAND2; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(4)) { + } else if (freq_compare_epsilon(freq) < band_map.at(4)) { band = rx_band::BAND3; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(5)) { + } else if (freq_compare_epsilon(freq) < band_map.at(5)) { band = rx_band::BAND4; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(6)) { + } else if (freq_compare_epsilon(freq) < band_map.at(6)) { band = rx_band::BAND5; - } else if (fp_compare_epsilon<double>(freq) <= MAGNESIUM_MAX_FREQ) { + } else if (freq_compare_epsilon(freq) <= MAGNESIUM_MAX_FREQ) { band = rx_band::BAND6; } else { band = rx_band::INVALID_BAND; @@ -128,17 +128,17 @@ magnesium_radio_control_impl::tx_band magnesium_radio_control_impl::_map_freq_to { magnesium_radio_control_impl::tx_band band; - if (fp_compare_epsilon<double>(freq) < MAGNESIUM_MIN_FREQ) { + if (freq_compare_epsilon(freq) < MAGNESIUM_MIN_FREQ) { band = tx_band::INVALID_BAND; - } else if (fp_compare_epsilon<double>(freq) < MAGNESIUM_LOWBAND_FREQ) { + } else if (freq_compare_epsilon(freq) < MAGNESIUM_LOWBAND_FREQ) { band = tx_band::LOWBAND; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(1)) { + } else if (freq_compare_epsilon(freq) < band_map.at(1)) { band = tx_band::BAND0; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(2)) { + } else if (freq_compare_epsilon(freq) < band_map.at(2)) { band = tx_band::BAND1; - } else if (fp_compare_epsilon<double>(freq) < band_map.at(3)) { + } else if (freq_compare_epsilon(freq) < band_map.at(3)) { band = tx_band::BAND2; - } else if (fp_compare_epsilon<double>(freq) <= MAGNESIUM_MAX_FREQ) { + } else if (freq_compare_epsilon(freq) <= MAGNESIUM_MAX_FREQ) { band = tx_band::BAND3; } else { band = tx_band::INVALID_BAND; diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp index 441e7b427..637d85d49 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp @@ -299,8 +299,8 @@ void magnesium_radio_control_impl::_update_freq( : ad9371_freq; RFNOC_LOG_TRACE("RF freq = " << rf_freq); - UHD_ASSERT_THROW(fp_compare_epsilon<double>(rf_freq) >= 0); - UHD_ASSERT_THROW(fp_compare_epsilon<double>(std::abs(rf_freq - _desired_rf_freq[dir])) + UHD_ASSERT_THROW(freq_compare_epsilon(rf_freq) >= 0); + UHD_ASSERT_THROW(freq_compare_epsilon(std::abs(rf_freq - _desired_rf_freq[dir])) <= _master_clock_rate / 2); if (dir == RX_DIRECTION) { radio_control_impl::set_rx_frequency(rf_freq, chan); |