adf435x: enhance logging messages

This commit is contained in:
Mark Meserve 2019-04-15 15:49:08 -05:00 committed by michael-west
parent d82696b412
commit 170172d101

View File

@ -324,16 +324,19 @@ public:
adf435x_regs_t::LDF_INT_N :
adf435x_regs_t::LDF_FRAC_N;
std::string tuning_str = (int_n_mode) ? "Integer-N" : "Fractional";
UHD_LOGGER_TRACE("ADF435X")
<< boost::format("ADF 435X Frequencies (MHz): REQUESTED=%0.9f, ACTUAL=%0.9f")
% (target_freq/1e6) % (actual_freq/1e6)
<< boost::format("ADF 435X Intermediates (MHz): Feedback=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f, REF=%0.2f")
% (feedback_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) % (_reference_freq/1e6)
<< boost::format("ADF 435X Tuning: %s") % tuning_str.c_str()
<< boost::format("ADF 435X Settings: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d")
% R % BS % N % FRAC % MOD % T % D % RFdiv
;
// clang-format off
UHD_LOG_TRACE("ADF435X", boost::format(
"ADF 435X Frequencies (MHz): REQUESTED=%0.9f, ACTUAL=%0.9f")
% (target_freq / 1e6) % (actual_freq / 1e6));
UHD_LOG_TRACE("ADF435X", boost::format(
"ADF 435X Intermediates (MHz): Feedback=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f, REF=%0.2f")
% (feedback_freq / 1e6) % (vco_freq / 1e6) % (pfd_freq / 1e6) % (pfd_freq / BS / 1e6) % (_reference_freq / 1e6));
UHD_LOG_TRACE("ADF435X",
"ADF 435X Tuning: " << ((int_n_mode) ? "Integer-N" : "Fractional"));
UHD_LOG_TRACE("ADF435X", boost::format(
"ADF 435X Settings: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d")
% R % BS % N % FRAC % MOD % T % D % RFdiv);
// clang-format on
UHD_ASSERT_THROW((_regs.frac_12_bit & ((uint16_t)~0xFFF)) == 0);
UHD_ASSERT_THROW((_regs.mod_12_bit & ((uint16_t)~0xFFF)) == 0);