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: rfnoc: Add Tune Requests to examples

Browse Source 
Changed rfnoc_replay_samples_from_file and rfnoc_rx_to_file examples to
demonstrate the use of tune requests in RFNoC blocks.

Co-authored-by: Riya Alias <riya.alias@ni.com>
This commit is contained in:
Martin Anderseck 2024-10-02 10:55:22 +02:00 committed by joergho
parent fc7123e5e9
commit 787e1422b8
2 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
host/examples/rfnoc_replay_samples_from_file.cpp
View File

@ -55,7 +55,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
* Set up the program options
***********************************************************************/
std::string args, tx_args, file, ant, ref;
double rate, freq, gain, bw;
double rate, freq, gain, bw, lo_offset;
size_t radio_id, radio_chan, replay_id, replay_chan, nsamps;
po::options_description desc("Allowed Options");
@ -71,11 +71,13 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
("nsamps", po::value<size_t>(&nsamps)->default_value(0), "number of samples to play (0 for infinite)")
("file", po::value<std::string>(&file)->default_value("usrp_samples.dat"), "name of the file to read binary samples from")
("freq", po::value<double>(&freq), "RF center frequency in Hz")
("lo-offset", po::value<double>(&lo_offset), "Offset for frontend LO in Hz (optional)")
("rate", po::value<double>(&rate), "rate of radio block")
("gain", po::value<double>(&gain), "gain for the RF chain")
("ant", po::value<std::string>(&ant), "antenna selection")
("bw", po::value<double>(&bw), "analog front-end filter bandwidth in Hz")
("ref", po::value<std::string>(&ref), "clock reference (internal, external, mimo, gpsdo)")
("dot", "instead of a textual representation, generate a dot graph of the RFNoC connections")
;
// clang-format on
po::variables_map vm;
@ -138,7 +140,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
<< duc_chan << std::endl;
}
/************************************************************************
* Set up streamer to Replay block and commit graph
***********************************************************************/
@ -151,6 +152,14 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
tx_stream = graph->create_tx_streamer(1, stream_args);
graph->connect(tx_stream, 0, replay_ctrl->get_block_id(), replay_chan);
graph->commit();
std::cout << "Active connections:" << std::endl;
if (vm.count("dot")) {
std::cout << graph->to_dot() << std::endl;
} else {
for (auto& edge : graph->enumerate_active_connections()) {
std::cout << "* " << edge.to_string() << std::endl;
}
}
/************************************************************************
* Set up radio
@ -175,10 +184,25 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
}
std::cout << std::fixed;
std::cout << "Requesting TX Freq: " << (freq / 1e6) << " MHz..." << std::endl;
radio_ctrl->set_tx_frequency(freq, radio_chan);
std::cout << "Actual TX Freq: " << (radio_ctrl->get_tx_frequency(radio_chan) / 1e6)
uhd::tune_request_t tune_request(freq);
if (vm.count("lo-offset")) {
std::cout << boost::format("Setting TX LO Offset: %f MHz...") % (lo_offset / 1e6)
<< std::endl;
tune_request = uhd::tune_request_t(freq, lo_offset);
}
if (vm.count("int-n")) {
tune_request.args = uhd::device_addr_t("mode_n=integer");
}
auto tune_req_action = uhd::rfnoc::tune_request_action_info::make(tune_request);
tune_req_action->tune_request = tune_request;
replay_ctrl->post_output_action(tune_req_action, 0);
std::cout << "TX Freq at Radio: " << (radio_ctrl->get_tx_frequency(radio_chan) / 1e6)
<< " MHz..." << std::endl
<< std::endl;
std::cout << std::resetiosflags(std::ios::fixed);
// Set the sample rate

44
host/examples/rfnoc_rx_to_file.cpp
View File

@ -226,7 +226,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
std::string args, file, format, ant, subdev, ref, wirefmt, streamargs, block_id,
block_props;
size_t total_num_samps, spb, spp, radio_id, radio_chan, block_port;
double rate, freq, gain, bw, total_time, setup_time;
double rate, freq, gain, bw, total_time, setup_time, lo_offset;
// setup the program options
po::options_description desc("Allowed options");
@ -253,6 +253,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
("radio-chan", po::value<size_t>(&radio_chan)->default_value(0), "Radio channel")
("rate", po::value<double>(&rate)->default_value(1e6), "RX rate of the radio block")
("freq", po::value<double>(&freq)->default_value(0.0), "RF center frequency in Hz")
("lo-offset", po::value<double>(&lo_offset), "Offset for frontend LO in Hz (optional)")
("gain", po::value<double>(&gain), "gain for the RF chain")
("ant", po::value<std::string>(&ant), "antenna selection")
("bw", po::value<double>(&bw), "analog frontend filter bandwidth in Hz")
@ -376,21 +377,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
graph->get_mb_controller(0)->set_clock_source(ref);
}
// set the center frequency
if (vm.count("freq")) {
std::cout << "Requesting RX Freq: " << (freq / 1e6) << " MHz..." << std::endl;
uhd::tune_request_t tune_request(freq);
if (vm.count("int-n")) {
radio_ctrl->set_rx_tune_args(
uhd::device_addr_t("mode_n=integer"), radio_chan);
}
radio_ctrl->set_rx_frequency(freq, radio_chan);
std::cout << "Actual RX Freq: "
<< (radio_ctrl->get_rx_frequency(radio_chan) / 1e6) << " MHz..."
<< std::endl
<< std::endl;
}
// set the rf gain
if (vm.count("gain")) {
std::cout << "Requesting RX Gain: " << gain << " dB..." << std::endl;
@ -468,6 +454,32 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
* Set up sampling rate and (optional) user block properties. We do this
* after commit() so we can use the property propagation.
***********************************************************************/
// set the center frequency
if (vm.count("freq")) {
std::cout << "Requesting RX Freq: " << (freq / 1e6) << " MHz..." << std::endl;
uhd::tune_request_t tune_request(freq);
if (vm.count("lo-offset")) {
std::cout << boost::format("Setting RX LO Offset: %f MHz...")
% (lo_offset / 1e6)
<< std::endl;
tune_request = uhd::tune_request_t(freq, lo_offset);
}
if (vm.count("int-n")) {
tune_request.args = uhd::device_addr_t("mode_n=integer");
}
auto tune_req_action = uhd::rfnoc::tune_request_action_info::make(tune_request);
tune_req_action->tune_request = tune_request;
rx_stream->post_input_action(tune_req_action, 0);
std::cout << "Actual RX Freq: "
<< (radio_ctrl->get_rx_frequency(radio_chan) / 1e6) << " MHz..."
<< std::endl
<< std::endl;
}
// set the sample rate
if (rate <= 0.0) {
std::cerr << "Please specify a valid sample rate" << std::endl;