diff options
| author | Mark Meserve <mark.meserve@ni.com> | 2019-02-04 12:50:58 -0600 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-06-12 16:22:04 -0700 |
| commit | 153713a56e3343a9e01407e7e6716a8887058a9c (patch) | |
| tree | 9e05a68883130cb540a984115cd25ec2358801c6 /host/lib | |
| parent | 57d6ed2a0a3c45fcd6854dcdac6377be3f336830 (diff) | |
| download | uhd-153713a56e3343a9e01407e7e6716a8887058a9c.tar.gz uhd-153713a56e3343a9e01407e7e6716a8887058a9c.tar.bz2 uhd-153713a56e3343a9e01407e7e6716a8887058a9c.zip | |
max287x: improve logging
- Split tuning log into 3 lines
- Remove duplicated MAX287X
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/include/uhdlib/usrp/common/max287x.hpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/host/lib/include/uhdlib/usrp/common/max287x.hpp b/host/lib/include/uhdlib/usrp/common/max287x.hpp index cb3a36068..92bc31630 100644 --- a/host/lib/include/uhdlib/usrp/common/max287x.hpp +++ b/host/lib/include/uhdlib/usrp/common/max287x.hpp @@ -632,13 +632,18 @@ double max287x<max287x_regs_t>::set_frequency( double actual_freq = double((N + (double(FRAC)/double(MOD)))*ref_freq*(1+int(D))/(R*(1+int(T)))) * fb_divisor / RFdiv; UHD_LOGGER_TRACE("MAX287X") - << boost::format("MAX287x: Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f") - % ref_freq % double(RFdiv*2) % double(N + double(FRAC)/double(MOD)) - << boost::format("MAX287x: tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s") - % R % BS % N % FRAC % MOD % T % D % RFdiv % ((is_int_n) ? "Integer-N" : "Fractional") - << boost::format("MAX287x: Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f") - % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) - ; + << boost::format("Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f") % ref_freq + % double(RFdiv * 2) % double(N + double(FRAC) / double(MOD)); + UHD_LOGGER_TRACE("MAX287X") + << boost::format( + "Tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, type=%s") + % R % BS % N % FRAC % MOD % T % D % RFdiv + % ((is_int_n) ? "Integer-N" : "Fractional"); + UHD_LOGGER_TRACE("MAX287X") + << boost::format("Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, " + "BAND=%0.2f") + % (target_freq / 1e6) % (actual_freq / 1e6) % (vco_freq / 1e6) + % (pfd_freq / 1e6) % (pfd_freq / BS / 1e6); //load the register values _regs.rf_output_enable = max287x_regs_t::RF_OUTPUT_ENABLE_ENABLED; |