hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

examples: Fix tx_bursts bandwidth/freq/gain reporting

Browse Source 
This example would not specify a channel when querying the actual
frequency/bandwidth/gain after setting it. When using the --channels
options like this:

    tx_bursts --channels 1 --freq 1e9 [...]

...it would request the frequency of 1 GHz on channel 1, then query the
frequency on channel 0 when reporting the "actual" frequency.

Also removes some boost::format().
This commit is contained in:
Martin Braun 2021-12-09 11:34:04 +01:00 committed by Aaron Rossetto
parent 610488690a
commit 8972efb734
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
host/examples/tx_bursts.cpp
View File

@ -111,9 +111,8 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
return ~0;
}
std::cout << boost::format("Setting TX Freq: %f MHz...") % (freq / 1e6) << std::endl;
std::cout << boost::format("Setting TX LO Offset: %f MHz...") % (lo_offset / 1e6)
<< std::endl;
std::cout << "Requesting TX Freq: " << freq / 1e6 << " MHz..." << std::endl;
std::cout << "Requesting TX LO Offset: " << lo_offset / 1e6 << " MHz..." << std::endl;
for (size_t i = 0; i < channel_nums.size(); i++) {
uhd::tune_request_t tune_request;
@ -123,24 +122,23 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
tune_request.args = uhd::device_addr_t("mode_n=integer");
usrp->set_tx_freq(tune_request, channel_nums[i]);
}
std::cout << boost::format("Actual TX Freq: %f MHz...") % (usrp->get_tx_freq() / 1e6)
<< std::endl
std::cout << "Actual TX Freq: " << (usrp->get_tx_freq(channel_nums.front()) / 1e6)
<< " MHz..." << std::endl
<< std::endl;
std::cout << boost::format("Setting TX Gain: %f...") % (gain) << std::endl;
std::cout << "Requesting TX Gain: " << gain << " dB ..." << std::endl;
for (size_t i = 0; i < channel_nums.size(); i++)
usrp->set_tx_gain(gain, channel_nums[i]);
std::cout << boost::format("Actual TX Gain: %f...") % (usrp->get_tx_gain())
std::cout << "Actual TX Gain: " << (usrp->get_tx_gain(channel_nums.front())) << "..."
<< std::endl
<< std::endl;
// set the analog frontend filter bandwidth
if (vm.count("bw")) {
std::cout << boost::format("Setting TX Bandwidth: %f MHz...") % (bw / 1e6)
<< std::endl;
std::cout << "Requesting TX Bandwidth: " << (bw / 1e6) << " MHz..." << std::endl;
usrp->set_tx_bandwidth(bw);
std::cout << boost::format("Actual TX Bandwidth: %f MHz...")
% (usrp->get_tx_bandwidth() / 1e6)
std::cout << "Actual TX Bandwidth: "
<< usrp->get_tx_bandwidth(channel_nums.front()) / 1e6 << " MHz..."
<< std::endl
<< std::endl;
}