From b5e80dfb2a67e525283fd05e05c9b4821c15843b Mon Sep 17 00:00:00 2001 From: natetemple Date: Wed, 9 Jan 2019 11:26:06 -0800 Subject: Examples: update lo-offset naming in tx from file Update tx_samples_from_file lo-offset naming convention --- host/examples/tx_samples_from_file.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/host/examples/tx_samples_from_file.cpp b/host/examples/tx_samples_from_file.cpp index 108ab4230..23c55cf25 100644 --- a/host/examples/tx_samples_from_file.cpp +++ b/host/examples/tx_samples_from_file.cpp @@ -56,7 +56,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //variables to be set by po std::string args, file, type, ant, subdev, ref, wirefmt, channel; size_t spb; - double rate, freq, gain, bw, delay, lo_off; + double rate, freq, gain, bw, delay, lo_offset; //setup the program options po::options_description desc("Allowed options"); @@ -68,7 +68,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("spb", po::value(&spb)->default_value(10000), "samples per buffer") ("rate", po::value(&rate), "rate of outgoing samples") ("freq", po::value(&freq), "RF center frequency in Hz") - ("lo_off", po::value(&lo_off), "Offset for frontend LO in Hz (optional)") + ("lo-offset", po::value(&lo_offset)->default_value(0.0), + "Offset for frontend LO in Hz (optional)") + ("lo_off", po::value(&lo_offset), + "(DEPRECATED) will go away soon! Use --lo-offset instead") ("gain", po::value(&gain), "gain for the RF chain") ("ant", po::value(&ant), "antenna selection") ("subdev", po::value(&subdev), "subdevice specification") @@ -120,9 +123,9 @@ 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; uhd::tune_request_t tune_request; - if(vm.count("lo_off")) tune_request = uhd::tune_request_t(freq, lo_off); - else tune_request = uhd::tune_request_t(freq); + tune_request = uhd::tune_request_t(freq, lo_offset); if(vm.count("int-n")) tune_request.args = uhd::device_addr_t("mode_n=integer"); usrp->set_tx_freq(tune_request); std::cout << boost::format("Actual TX Freq: %f MHz...") % (usrp->get_tx_freq()/1e6) << std::endl << std::endl; -- cgit v1.2.3