diff options
author | Martin Braun <martin.braun@ettus.com> | 2020-05-19 13:07:52 -0700 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-05-20 15:18:51 -0500 |
commit | 8aeb34d7699d95190674adceb5769dc9dc56b555 (patch) | |
tree | 94c03c2b94a6b65e366c984ac92df8a1950fdae5 /host/lib | |
parent | e4f7b70e82c8acdc1bb61e79aff5cb69add16a75 (diff) | |
download | uhd-8aeb34d7699d95190674adceb5769dc9dc56b555.tar.gz uhd-8aeb34d7699d95190674adceb5769dc9dc56b555.tar.bz2 uhd-8aeb34d7699d95190674adceb5769dc9dc56b555.zip |
fixup! lib: Add power cal manager
- The tracking mode was not set to power when calling set_power()
- The data consistency check had an inverted logic, thus always printing
a warning
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/usrp/common/pwr_cal_mgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/lib/usrp/common/pwr_cal_mgr.cpp b/host/lib/usrp/common/pwr_cal_mgr.cpp index 1fdd15645..0c30be7ad 100644 --- a/host/lib/usrp/common/pwr_cal_mgr.cpp +++ b/host/lib/usrp/common/pwr_cal_mgr.cpp @@ -123,6 +123,7 @@ public: << " dB, Actual total power: " << coerced_total_power << " dBm -> actual total gain: " << coerced_total_gain << " dB"); + _mode = tracking_mode::TRACK_POWER; // We directly scale the power with the residual gain return coerced_total_power; } @@ -221,7 +222,7 @@ public: if (std::any_of(_cal_data.cbegin(), _cal_data.cend(), [](const cal_data_map_type::value_type& data) { - return bool(data.second); + return !bool(data.second); })) { UHD_LOG_WARNING(_log_id, "Some ports for " << _serial |