diff options
| -rw-r--r-- | host/lib/rc/cal/x4xx_pwr_zbx_rx_0_rx1.cal | bin | 4504 -> 6112 bytes | |||
| -rw-r--r-- | host/lib/rc/cal/x4xx_pwr_zbx_rx_0_tx+rx0.cal | bin | 4504 -> 6112 bytes | |||
| -rw-r--r-- | host/lib/rc/cal/x4xx_pwr_zbx_rx_1_rx1.cal | bin | 4504 -> 6112 bytes | |||
| -rw-r--r-- | host/lib/rc/cal/x4xx_pwr_zbx_rx_1_tx+rx0.cal | bin | 4504 -> 6112 bytes | |||
| -rw-r--r-- | host/lib/rc/cal/x4xx_pwr_zbx_tx_0_tx+rx0.cal | bin | 3832 -> 5344 bytes | |||
| -rw-r--r-- | host/lib/rc/cal/x4xx_pwr_zbx_tx_1_tx+rx0.cal | bin | 3832 -> 5344 bytes | |||
| -rw-r--r-- | host/lib/usrp/common/pwr_cal_mgr.cpp | 6 |
7 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_rx1.cal b/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_rx1.cal Binary files differindex cc25f6ded..b71088c48 100644 --- a/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_rx1.cal +++ b/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_rx1.cal diff --git a/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_tx+rx0.cal b/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_tx+rx0.cal Binary files differindex 6da01d48b..d4a3d5f14 100644 --- a/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_tx+rx0.cal +++ b/host/lib/rc/cal/x4xx_pwr_zbx_rx_0_tx+rx0.cal diff --git a/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_rx1.cal b/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_rx1.cal Binary files differindex d56c740c2..569bcdbd8 100644 --- a/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_rx1.cal +++ b/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_rx1.cal diff --git a/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_tx+rx0.cal b/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_tx+rx0.cal Binary files differindex 99f4eec4d..3740896a0 100644 --- a/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_tx+rx0.cal +++ b/host/lib/rc/cal/x4xx_pwr_zbx_rx_1_tx+rx0.cal diff --git a/host/lib/rc/cal/x4xx_pwr_zbx_tx_0_tx+rx0.cal b/host/lib/rc/cal/x4xx_pwr_zbx_tx_0_tx+rx0.cal Binary files differindex 349557bae..abc864c76 100644 --- a/host/lib/rc/cal/x4xx_pwr_zbx_tx_0_tx+rx0.cal +++ b/host/lib/rc/cal/x4xx_pwr_zbx_tx_0_tx+rx0.cal diff --git a/host/lib/rc/cal/x4xx_pwr_zbx_tx_1_tx+rx0.cal b/host/lib/rc/cal/x4xx_pwr_zbx_tx_1_tx+rx0.cal Binary files differindex 4ecf1ba00..5cc7ca25a 100644 --- a/host/lib/rc/cal/x4xx_pwr_zbx_tx_1_tx+rx0.cal +++ b/host/lib/rc/cal/x4xx_pwr_zbx_tx_1_tx+rx0.cal diff --git a/host/lib/usrp/common/pwr_cal_mgr.cpp b/host/lib/usrp/common/pwr_cal_mgr.cpp index d2838cbe9..7fb569e83 100644 --- a/host/lib/usrp/common/pwr_cal_mgr.cpp +++ b/host/lib/usrp/common/pwr_cal_mgr.cpp @@ -99,7 +99,7 @@ public: _load_cal_data(key); UHD_ASSERT_THROW(_cal_data.count(key)); _desired_power = power_dbm; - const uint64_t freq = static_cast<uint64_t>(_get_freq()); + const uint64_t freq = static_cast<uint64_t>(std::round(_get_freq())); auto& cal_data = _cal_data.at(key); if (!cal_data) { const std::string err_msg = std::string("Attempting to set power for key ") @@ -141,7 +141,7 @@ public: throw uhd::runtime_error(err_msg); } - const uint64_t freq = static_cast<uint64_t>(_get_freq()); + const uint64_t freq = static_cast<uint64_t>(std::round(_get_freq())); const double hw_gain = _gain_group->get_value(_hw_gain_name); const double hw_power = cal_data->get_power(hw_gain, freq); // We directly scale the power with the residual gain @@ -167,7 +167,7 @@ public: UHD_LOG_ERROR(_log_id, err_msg); throw uhd::runtime_error(err_msg); } - const uint64_t freq = static_cast<uint64_t>(_get_freq()); + const uint64_t freq = static_cast<uint64_t>(std::round(_get_freq())); return cal_data->get_power_limits(freq); } |