aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--host/examples/CMakeLists.txt2
-rw-r--r--host/examples/latency_test.cpp6
-rw-r--r--host/examples/rx_multi_samples.cpp158
-rw-r--r--host/examples/rx_samples_to_file.cpp147
-rw-r--r--host/examples/rx_timed_samples.cpp57
-rw-r--r--host/examples/tx_samples_from_file.cpp149
-rw-r--r--host/examples/tx_timed_samples.cpp66
-rw-r--r--host/examples/tx_waveforms.cpp69
8 files changed, 515 insertions, 139 deletions
diff --git a/host/examples/CMakeLists.txt b/host/examples/CMakeLists.txt
index 434caa328..44ed55380 100644
--- a/host/examples/CMakeLists.txt
+++ b/host/examples/CMakeLists.txt
@@ -20,11 +20,13 @@
########################################################################
SET(example_sources
benchmark_rx_rate.cpp
+ rx_multi_samples.cpp
rx_samples_to_file.cpp
rx_samples_to_udp.cpp
rx_timed_samples.cpp
test_async_messages.cpp
test_pps_input.cpp
+ tx_samples_from_file.cpp
tx_timed_samples.cpp
tx_waveforms.cpp
latency_test.cpp
diff --git a/host/examples/latency_test.cpp b/host/examples/latency_test.cpp
index be44aad70..85ac73567 100644
--- a/host/examples/latency_test.cpp
+++ b/host/examples/latency_test.cpp
@@ -150,9 +150,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
break;
default:
- std::cout << boost::format
- ("failed:\n Got unexpected event code 0x%x.\n")
- % async_md.event_code << std::endl;
+ std::cerr << boost::format(
+ "failed:\n Got unexpected event code 0x%x.\n"
+ ) % async_md.event_code << std::endl;
other++;
break;
}
diff --git a/host/examples/rx_multi_samples.cpp b/host/examples/rx_multi_samples.cpp
new file mode 100644
index 000000000..e820343ca
--- /dev/null
+++ b/host/examples/rx_multi_samples.cpp
@@ -0,0 +1,158 @@
+//
+// Copyright 2011 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/thread_priority.hpp>
+#include <uhd/utils/safe_main.hpp>
+#include <uhd/usrp/multi_usrp.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <boost/thread.hpp>
+#include <iostream>
+#include <complex>
+
+namespace po = boost::program_options;
+
+int UHD_SAFE_MAIN(int argc, char *argv[]){
+ uhd::set_thread_priority_safe();
+
+ //variables to be set by po
+ std::string args, sync, subdev;
+ double seconds_in_future;
+ size_t total_num_samps;
+ double rate;
+
+ //setup the program options
+ po::options_description desc("Allowed options");
+ desc.add_options()
+ ("help", "help message")
+ ("args", po::value<std::string>(&args)->default_value(""), "single uhd device address args")
+ ("secs", po::value<double>(&seconds_in_future)->default_value(1.5), "number of seconds in the future to receive")
+ ("nsamps", po::value<size_t>(&total_num_samps)->default_value(10000), "total number of samples to receive")
+ ("rate", po::value<double>(&rate)->default_value(100e6/16), "rate of incoming samples")
+ ("sync", po::value<std::string>(&sync)->default_value("now"), "synchronization method: now, pps")
+ ("subdev", po::value<std::string>(&subdev)->default_value(""), "subdev spec (homogeneous across motherboards)")
+ ("dilv", "specify to disable inner-loop verbose")
+ ;
+ po::variables_map vm;
+ po::store(po::parse_command_line(argc, argv, desc), vm);
+ po::notify(vm);
+
+ //print the help message
+ if (vm.count("help")){
+ std::cout << boost::format("UHD RX Multi Samples %s") % desc << std::endl;
+ std::cout <<
+ " This is a demonstration of how to receive aligned data from multiple channels.\n"
+ " This example can receive from multiple DSPs, multiple motherboards, or both.\n"
+ " The MIMO cable or PPS can be used to synchronize the configuration. See --sync\n"
+ "\n"
+ " Specify --subdev to select multiple channels per motherboard.\n"
+ " Ex: --subdev=\"0:A 0:B\" to get 2 channels on a Basic RX.\n"
+ "\n"
+ " Specify --args to select multiple motherboards in a configuration.\n"
+ " Ex: --args=\"addr0=192.168.10.2, addr1=192.168.10.3\"\n"
+ << std::endl;
+ return ~0;
+ }
+
+ bool verbose = vm.count("dilv") == 0;
+
+ //create a usrp device
+ std::cout << std::endl;
+ std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl;
+ uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args);
+
+ //always select the subdevice first, the channel mapping affects the other settings
+ if (vm.count("subdev")) usrp->set_rx_subdev_spec(subdev); //sets across all mboards
+
+ std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl;
+
+ //set the rx sample rate (sets across all channels)
+ std::cout << boost::format("Setting RX Rate: %f Msps...") % (rate/1e6) << std::endl;
+ usrp->set_rx_rate(rate);
+ std::cout << boost::format("Actual RX Rate: %f Msps...") % (usrp->get_rx_rate()/1e6) << std::endl << std::endl;
+
+ std::cout << boost::format("Setting device timestamp to 0...") << std::endl;
+ if (sync == "now"){
+ usrp->set_time_now(uhd::time_spec_t(0.0));
+ boost::this_thread::sleep(boost::posix_time::milliseconds(50)); //wait for mimo cable time sync
+ }
+ else if (sync == "pps"){
+ usrp->set_time_unknown_pps(uhd::time_spec_t(0.0));
+ boost::this_thread::sleep(boost::posix_time::seconds(1)); //wait for pps sync pulse
+ }
+
+ //setup streaming
+ std::cout << std::endl;
+ std::cout << boost::format(
+ "Begin streaming %u samples, %f seconds in the future..."
+ ) % total_num_samps % seconds_in_future << std::endl;
+ uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE);
+ stream_cmd.num_samps = total_num_samps;
+ stream_cmd.stream_now = false;
+ stream_cmd.time_spec = uhd::time_spec_t(seconds_in_future);
+ usrp->issue_stream_cmd(stream_cmd); //tells all channels to stream
+
+ //meta-data will be filled in by recv()
+ uhd::rx_metadata_t md;
+
+ //allocate buffers to receive with samples (one buffer per channel)
+ size_t samps_per_buff = usrp->get_device()->get_max_recv_samps_per_packet();
+ std::vector<std::vector<std::complex<float> > > buffs(
+ usrp->get_rx_num_channels(), std::vector<std::complex<float> >(samps_per_buff)
+ );
+
+ //create a vector of pointers to point to each of the channel buffers
+ std::vector<std::complex<float> *> buff_ptrs;
+ for (size_t i = 0; i < buffs.size(); i++) buff_ptrs.push_back(&buffs[i].front());
+
+ //the first call to recv() will block this many seconds before receiving
+ double timeout = seconds_in_future + 0.1; //timeout (delay before receive + padding)
+
+ size_t num_acc_samps = 0; //number of accumulated samples
+ while(num_acc_samps < total_num_samps){
+ //receive a single packet
+ size_t num_rx_samps = usrp->get_device()->recv(
+ buff_ptrs, samps_per_buff, md,
+ uhd::io_type_t::COMPLEX_FLOAT32,
+ uhd::device::RECV_MODE_ONE_PACKET, timeout
+ );
+
+ //use a small timeout for subsequent packets
+ timeout = 0.1;
+
+ //handle the error code
+ if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT) break;
+ if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
+ throw std::runtime_error(str(boost::format(
+ "Unexpected error code 0x%x"
+ ) % md.error_code));
+ }
+
+ if(verbose) std::cout << boost::format(
+ "Received packet: %u samples, %u full secs, %f frac secs"
+ ) % num_rx_samps % md.time_spec.get_full_secs() % md.time_spec.get_frac_secs() << std::endl;
+
+ num_acc_samps += num_rx_samps;
+ }
+
+ if (num_acc_samps < total_num_samps) std::cerr << "Receive timeout before all samples received..." << std::endl;
+
+ //finished
+ std::cout << std::endl << "Done!" << std::endl << std::endl;
+
+ return 0;
+}
diff --git a/host/examples/rx_samples_to_file.cpp b/host/examples/rx_samples_to_file.cpp
index e202fcb1c..d44315701 100644
--- a/host/examples/rx_samples_to_file.cpp
+++ b/host/examples/rx_samples_to_file.cpp
@@ -23,28 +23,66 @@
#include <boost/thread.hpp>
#include <iostream>
#include <fstream>
+#include <csignal>
#include <complex>
namespace po = boost::program_options;
+static bool stop_signal_called = false;
+void sig_int_handler(int){stop_signal_called = true;}
+
+template<typename samp_type> void recv_to_file(
+ uhd::usrp::multi_usrp::sptr usrp,
+ const uhd::io_type_t &io_type,
+ const std::string &file,
+ size_t samps_per_buff
+){
+ uhd::rx_metadata_t md;
+ std::vector<samp_type> buff(samps_per_buff);
+ std::ofstream outfile(file.c_str(), std::ofstream::binary);
+
+ while(not stop_signal_called){
+ size_t num_rx_samps = usrp->get_device()->recv(
+ &buff.front(), buff.size(), md, io_type,
+ uhd::device::RECV_MODE_FULL_BUFF
+ );
+
+ if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT) break;
+ if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
+ throw std::runtime_error(str(boost::format(
+ "Unexpected error code 0x%x"
+ ) % md.error_code));
+ }
+
+ outfile.write((const char*)&buff.front(), num_rx_samps*sizeof(samp_type));
+ }
+
+ outfile.close();
+}
+
int UHD_SAFE_MAIN(int argc, char *argv[]){
uhd::set_thread_priority_safe();
//variables to be set by po
- std::string args, file;
- size_t total_num_samps;
- double rate, freq, gain;
+ std::string args, file, type, ant, subdev;
+ size_t total_num_samps, spb;
+ double rate, freq, gain, bw;
//setup the program options
po::options_description desc("Allowed options");
desc.add_options()
("help", "help message")
("args", po::value<std::string>(&args)->default_value(""), "multi uhd device address args")
- ("file", po::value<std::string>(&file)->default_value("out.16sc.dat"), "name of the file to write binary samples to")
- ("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to receive")
- ("rate", po::value<double>(&rate)->default_value(100e6/16), "rate of incoming samples")
- ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
- ("gain", po::value<double>(&gain)->default_value(0), "gain for the RF chain")
+ ("file", po::value<std::string>(&file)->default_value("usrp_samples.dat"), "name of the file to write binary samples to")
+ ("type", po::value<std::string>(&type)->default_value("float"), "sample type: double, float, or short")
+ ("nsamps", po::value<size_t>(&total_num_samps)->default_value(0), "total number of samples to receive")
+ ("spb", po::value<size_t>(&spb)->default_value(10000), "samples per buffer")
+ ("rate", po::value<double>(&rate), "rate of incoming samples")
+ ("freq", po::value<double>(&freq), "RF center frequency in Hz")
+ ("gain", po::value<double>(&gain), "gain for the RF chain")
+ ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
+ ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
;
po::variables_map vm;
po::store(po::parse_command_line(argc, argv, desc), vm);
@@ -60,70 +98,67 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << std::endl;
std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl;
uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args);
+
+ //always select the subdevice first, the channel mapping affects the other settings
+ if (vm.count("subdev")) usrp->set_rx_subdev_spec(subdev);
+
std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl;
- //set the rx sample rate
+ //set the sample rate
+ if (not vm.count("rate")){
+ std::cerr << "Please specify the sample rate with --rate" << std::endl;
+ return ~0;
+ }
std::cout << boost::format("Setting RX Rate: %f Msps...") % (rate/1e6) << std::endl;
usrp->set_rx_rate(rate);
std::cout << boost::format("Actual RX Rate: %f Msps...") % (usrp->get_rx_rate()/1e6) << std::endl << std::endl;
- //set the rx center frequency
- std::cout << boost::format("Setting RX Freq: %f Mhz...") % (freq/1e6) << std::endl;
+ //set the center frequency
+ if (not vm.count("freq")){
+ std::cerr << "Please specify the center frequency with --freq" << std::endl;
+ return ~0;
+ }
+ std::cout << boost::format("Setting RX Freq: %f MHz...") % (freq/1e6) << std::endl;
usrp->set_rx_freq(freq);
- std::cout << boost::format("Actual RX Freq: %f Mhz...") % (usrp->get_rx_freq()/1e6) << std::endl << std::endl;
+ std::cout << boost::format("Actual RX Freq: %f MHz...") % (usrp->get_rx_freq()/1e6) << std::endl << std::endl;
- //set the rx rf gain
- std::cout << boost::format("Setting RX Gain: %f dB...") % gain << std::endl;
- usrp->set_rx_gain(gain);
- std::cout << boost::format("Actual RX Gain: %f dB...") % usrp->get_rx_gain() << std::endl << std::endl;
+ //set the rf gain
+ if (vm.count("gain")){
+ std::cout << boost::format("Setting RX Gain: %f dB...") % gain << std::endl;
+ usrp->set_rx_gain(gain);
+ std::cout << boost::format("Actual RX Gain: %f dB...") % usrp->get_rx_gain() << std::endl << std::endl;
+ }
+
+ //set the IF filter bandwidth
+ if (vm.count("bw")){
+ std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl;
+ usrp->set_rx_bandwidth(bw);
+ std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % usrp->get_rx_bandwidth() << std::endl << std::endl;
+ }
+
+ //set the antenna
+ if (vm.count("ant")) usrp->set_rx_antenna(ant);
boost::this_thread::sleep(boost::posix_time::seconds(1)); //allow for some setup time
//setup streaming
- uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE);
+ uhd::stream_cmd_t stream_cmd((total_num_samps == 0)?
+ uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS:
+ uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE
+ );
stream_cmd.num_samps = total_num_samps;
stream_cmd.stream_now = true;
usrp->issue_stream_cmd(stream_cmd);
+ if (total_num_samps == 0){
+ std::signal(SIGINT, &sig_int_handler);
+ std::cout << "Press Ctrl + C to stop streaming..." << std::endl;
+ }
- //loop until total number of samples reached
- size_t num_acc_samps = 0; //number of accumulated samples
- uhd::rx_metadata_t md;
- std::vector<std::complex<short> > buff(usrp->get_device()->get_max_recv_samps_per_packet());
- std::ofstream outfile(file.c_str(), std::ofstream::binary);
-
- while(num_acc_samps < total_num_samps){
- size_t num_rx_samps = usrp->get_device()->recv(
- &buff.front(), buff.size(), md,
- uhd::io_type_t::COMPLEX_INT16,
- uhd::device::RECV_MODE_ONE_PACKET
- );
-
- //handle the error codes
- switch(md.error_code){
- case uhd::rx_metadata_t::ERROR_CODE_NONE:
- break;
-
- case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
- if (num_acc_samps == 0) continue;
- std::cout << boost::format(
- "Got timeout before all samples received, possible packet loss, exiting loop..."
- ) << std::endl;
- goto done_loop;
-
- default:
- std::cout << boost::format(
- "Got error code 0x%x, exiting loop..."
- ) % md.error_code << std::endl;
- goto done_loop;
- }
-
- //write complex short integer samples to the binary file
- outfile.write((const char*)&buff[0], num_rx_samps * sizeof(std::complex<short>));
-
- num_acc_samps += num_rx_samps;
- } done_loop:
-
- outfile.close();
+ //recv to file
+ if (type == "double") recv_to_file<std::complex<double> >(usrp, uhd::io_type_t::COMPLEX_FLOAT64, file, spb);
+ else if (type == "float") recv_to_file<std::complex<float> >(usrp, uhd::io_type_t::COMPLEX_FLOAT32, file, spb);
+ else if (type == "short") recv_to_file<std::complex<short> >(usrp, uhd::io_type_t::COMPLEX_INT16, file, spb);
+ else throw std::runtime_error("Unknown type " + type);
//finished
std::cout << std::endl << "Done!" << std::endl << std::endl;
diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 630b4a7a9..28d7ee466 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -32,18 +32,17 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::string args;
double seconds_in_future;
size_t total_num_samps;
- double rate, freq, clock;
+ double rate, clock;
//setup the program options
po::options_description desc("Allowed options");
desc.add_options()
("help", "help message")
("args", po::value<std::string>(&args)->default_value(""), "single uhd device address args")
- ("secs", po::value<double>(&seconds_in_future)->default_value(3), "number of seconds in the future to receive")
- ("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to receive")
+ ("secs", po::value<double>(&seconds_in_future)->default_value(1.5), "number of seconds in the future to receive")
+ ("nsamps", po::value<size_t>(&total_num_samps)->default_value(10000), "total number of samples to receive")
("clock", po::value<double>(&clock), "master clock frequency in Hz")
("rate", po::value<double>(&rate)->default_value(100e6/16), "rate of incoming samples")
- ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
("dilv", "specify to disable inner-loop verbose")
;
po::variables_map vm;
@@ -75,11 +74,6 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
usrp->set_rx_rate(rate);
std::cout << boost::format("Actual RX Rate: %f Msps...") % (usrp->get_rx_rate()/1e6) << std::endl << std::endl;
- //set the rx center frequency
- std::cout << boost::format("Setting RX Freq: %f Mhz...") % (freq/1e6) << std::endl;
- usrp->set_rx_freq(freq);
- std::cout << boost::format("Actual RX Freq: %f Mhz...") % (usrp->get_rx_freq()/1e6) << std::endl << std::endl;
-
std::cout << boost::format("Setting device timestamp to 0...") << std::endl;
usrp->set_time_now(uhd::time_spec_t(0.0));
@@ -94,44 +88,43 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
stream_cmd.time_spec = uhd::time_spec_t(seconds_in_future);
usrp->issue_stream_cmd(stream_cmd);
- //allocate buffer to receive
+ //meta-data will be filled in by recv()
+ uhd::rx_metadata_t md;
+
+ //allocate buffer to receive with samples
std::vector<std::complex<float> > buff(usrp->get_device()->get_max_recv_samps_per_packet());
- //loop until total number of samples reached
+ //the first call to recv() will block this many seconds before receiving
+ double timeout = seconds_in_future + 0.1; //timeout (delay before receive + padding)
+
size_t num_acc_samps = 0; //number of accumulated samples
while(num_acc_samps < total_num_samps){
- uhd::rx_metadata_t md;
+ //receive a single packet
size_t num_rx_samps = usrp->get_device()->recv(
&buff.front(), buff.size(), md,
uhd::io_type_t::COMPLEX_FLOAT32,
- uhd::device::RECV_MODE_ONE_PACKET
+ uhd::device::RECV_MODE_ONE_PACKET, timeout
);
- //handle the error codes
- switch(md.error_code){
- case uhd::rx_metadata_t::ERROR_CODE_NONE:
- break;
-
- case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
- if (num_acc_samps == 0) continue;
- std::cout << boost::format(
- "Got timeout before all samples received, possible packet loss, exiting loop..."
- ) << std::endl;
- goto done_loop;
-
- default:
- std::cout << boost::format(
- "Got error code 0x%x, exiting loop..."
- ) % md.error_code << std::endl;
- goto done_loop;
+ //use a small timeout for subsequent packets
+ timeout = 0.1;
+
+ //handle the error code
+ if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT) break;
+ if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){
+ throw std::runtime_error(str(boost::format(
+ "Unexpected error code 0x%x"
+ ) % md.error_code));
}
if(verbose) std::cout << boost::format(
- "Got packet: %u samples, %u full secs, %f frac secs"
+ "Received packet: %u samples, %u full secs, %f frac secs"
) % num_rx_samps % md.time_spec.get_full_secs() % md.time_spec.get_frac_secs() << std::endl;
num_acc_samps += num_rx_samps;
- } done_loop:
+ }
+
+ if (num_acc_samps < total_num_samps) std::cerr << "Receive timeout before all samples received..." << std::endl;
//finished
std::cout << std::endl << "Done!" << std::endl << std::endl;
diff --git a/host/examples/tx_samples_from_file.cpp b/host/examples/tx_samples_from_file.cpp
new file mode 100644
index 000000000..acf899fa9
--- /dev/null
+++ b/host/examples/tx_samples_from_file.cpp
@@ -0,0 +1,149 @@
+//
+// Copyright 2011 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/thread_priority.hpp>
+#include <uhd/utils/safe_main.hpp>
+#include <uhd/usrp/multi_usrp.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <boost/thread.hpp>
+#include <iostream>
+#include <fstream>
+#include <complex>
+
+namespace po = boost::program_options;
+
+template<typename samp_type> void send_from_file(
+ uhd::usrp::multi_usrp::sptr usrp,
+ const uhd::io_type_t &io_type,
+ const std::string &file,
+ size_t samps_per_buff
+){
+ uhd::tx_metadata_t md;
+ md.start_of_burst = false;
+ md.end_of_burst = false;
+ std::vector<samp_type> buff(samps_per_buff);
+ std::ifstream infile(file.c_str(), std::ifstream::binary);
+
+ //loop until the entire file has been read
+ while(not md.end_of_burst){
+
+ infile.read((char*)&buff.front(), buff.size()*sizeof(samp_type));
+ size_t num_tx_samps = infile.gcount()/sizeof(samp_type);
+
+ md.end_of_burst = infile.eof();
+
+ usrp->get_device()->send(
+ &buff.front(), num_tx_samps, md, io_type,
+ uhd::device::SEND_MODE_FULL_BUFF
+ );
+ }
+
+ infile.close();
+}
+
+int UHD_SAFE_MAIN(int argc, char *argv[]){
+ uhd::set_thread_priority_safe();
+
+ //variables to be set by po
+ std::string args, file, type, ant, subdev;
+ size_t spb;
+ double rate, freq, gain, bw;
+
+ //setup the program options
+ po::options_description desc("Allowed options");
+ desc.add_options()
+ ("help", "help message")
+ ("args", po::value<std::string>(&args)->default_value(""), "multi uhd device address args")
+ ("file", po::value<std::string>(&file)->default_value("usrp_samples.dat"), "name of the file to read binary samples from")
+ ("type", po::value<std::string>(&type)->default_value("float"), "sample type: double, float, or short")
+ ("spb", po::value<size_t>(&spb)->default_value(10000), "samples per buffer")
+ ("rate", po::value<double>(&rate), "rate of outgoing samples")
+ ("freq", po::value<double>(&freq), "RF center frequency in Hz")
+ ("gain", po::value<double>(&gain), "gain for the RF chain")
+ ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
+ ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
+ ;
+ po::variables_map vm;
+ po::store(po::parse_command_line(argc, argv, desc), vm);
+ po::notify(vm);
+
+ //print the help message
+ if (vm.count("help")){
+ std::cout << boost::format("UHD TX samples from file %s") % desc << std::endl;
+ return ~0;
+ }
+
+ //create a usrp device
+ std::cout << std::endl;
+ std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl;
+ uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args);
+
+ //always select the subdevice first, the channel mapping affects the other settings
+ if (vm.count("subdev")) usrp->set_tx_subdev_spec(subdev);
+
+ std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl;
+
+ //set the sample rate
+ if (not vm.count("rate")){
+ std::cerr << "Please specify the sample rate with --rate" << std::endl;
+ return ~0;
+ }
+ std::cout << boost::format("Setting TX Rate: %f Msps...") % (rate/1e6) << std::endl;
+ usrp->set_tx_rate(rate);
+ std::cout << boost::format("Actual TX Rate: %f Msps...") % (usrp->get_tx_rate()/1e6) << std::endl << std::endl;
+
+ //set the center frequency
+ if (not vm.count("freq")){
+ std::cerr << "Please specify the center frequency with --freq" << std::endl;
+ return ~0;
+ }
+ std::cout << boost::format("Setting TX Freq: %f MHz...") % (freq/1e6) << std::endl;
+ usrp->set_tx_freq(freq);
+ std::cout << boost::format("Actual TX Freq: %f MHz...") % (usrp->get_tx_freq()/1e6) << std::endl << std::endl;
+
+ //set the rf gain
+ if (vm.count("gain")){
+ std::cout << boost::format("Setting TX Gain: %f dB...") % gain << std::endl;
+ usrp->set_tx_gain(gain);
+ std::cout << boost::format("Actual TX Gain: %f dB...") % usrp->get_tx_gain() << std::endl << std::endl;
+ }
+
+ //set the IF filter bandwidth
+ if (vm.count("bw")){
+ std::cout << boost::format("Setting TX Bandwidth: %f MHz...") % bw << std::endl;
+ usrp->set_tx_bandwidth(bw);
+ std::cout << boost::format("Actual TX Bandwidth: %f MHz...") % usrp->get_tx_bandwidth() << std::endl << std::endl;
+ }
+
+ //set the antenna
+ if (vm.count("ant")) usrp->set_tx_antenna(ant);
+
+ boost::this_thread::sleep(boost::posix_time::seconds(1)); //allow for some setup time
+
+ //send from file
+ if (type == "double") send_from_file<std::complex<double> >(usrp, uhd::io_type_t::COMPLEX_FLOAT64, file, spb);
+ else if (type == "float") send_from_file<std::complex<float> >(usrp, uhd::io_type_t::COMPLEX_FLOAT32, file, spb);
+ else if (type == "short") send_from_file<std::complex<short> >(usrp, uhd::io_type_t::COMPLEX_INT16, file, spb);
+ else throw std::runtime_error("Unknown type " + type);
+
+ //finished
+ std::cout << std::endl << "Done!" << std::endl << std::endl;
+
+ return 0;
+}
diff --git a/host/examples/tx_timed_samples.cpp b/host/examples/tx_timed_samples.cpp
index f10d7e4ea..03f87122d 100644
--- a/host/examples/tx_timed_samples.cpp
+++ b/host/examples/tx_timed_samples.cpp
@@ -33,8 +33,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::string args;
double seconds_in_future;
size_t total_num_samps;
- size_t samps_per_packet;
- double rate, freq;
+ double rate;
float ampl;
//setup the program options
@@ -42,11 +41,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
desc.add_options()
("help", "help message")
("args", po::value<std::string>(&args)->default_value(""), "single uhd device address args")
- ("secs", po::value<double>(&seconds_in_future)->default_value(3), "number of seconds in the future to transmit")
- ("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to transmit")
- ("spp", po::value<size_t>(&samps_per_packet)->default_value(1000), "number of samples per packet")
+ ("secs", po::value<double>(&seconds_in_future)->default_value(1.5), "number of seconds in the future to transmit")
+ ("nsamps", po::value<size_t>(&total_num_samps)->default_value(10000), "total number of samples to transmit")
("rate", po::value<double>(&rate)->default_value(100e6/16), "rate of outgoing samples")
- ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
("ampl", po::value<float>(&ampl)->default_value(float(0.3)), "amplitude of each sample")
("dilv", "specify to disable inner-loop verbose")
;
@@ -73,45 +70,56 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
usrp->set_tx_rate(rate);
std::cout << boost::format("Actual TX Rate: %f Msps...") % (usrp->get_tx_rate()/1e6) << std::endl << std::endl;
- //set the tx center frequency
- std::cout << boost::format("Setting TX Freq: %f Mhz...") % (freq/1e6) << std::endl;
- usrp->set_tx_freq(freq);
- std::cout << boost::format("Actual TX Freq: %f Mhz...") % (usrp->get_tx_freq()/1e6) << std::endl << std::endl;
-
std::cout << boost::format("Setting device timestamp to 0...") << std::endl;
usrp->set_time_now(uhd::time_spec_t(0.0));
- //allocate data to send
- std::vector<std::complex<float> > buff(samps_per_packet, std::complex<float>(ampl, ampl));
+ //allocate buffer with data to send
+ std::vector<std::complex<float> > buff(usrp->get_device()->get_max_send_samps_per_packet(), std::complex<float>(ampl, ampl));
+ //setup metadata for the first packet
uhd::tx_metadata_t md;
+ md.start_of_burst = false;
+ md.end_of_burst = false;
+ md.has_time_spec = true;
md.time_spec = uhd::time_spec_t(seconds_in_future);
- //send the data in multiple packets
- size_t num_packets = (total_num_samps+samps_per_packet-1)/samps_per_packet;
- for (size_t i = 0; i < num_packets; i++){
+ //the first call to send() will block this many seconds before sending:
+ double timeout = seconds_in_future + 0.1; //timeout (delay before transmit + padding)
- //setup the metadata flags per fragment
- md.start_of_burst = (i == 0); //only first packet has SOB
- md.end_of_burst = (i == num_packets-1); //only last packet has EOB
- md.has_time_spec = (i == 0); //only first packet has time
+ size_t num_acc_samps = 0; //number of accumulated samples
+ while(num_acc_samps < total_num_samps){
+ size_t samps_to_send = std::min(total_num_samps - num_acc_samps, buff.size());
- size_t samps_to_send = std::min(total_num_samps - samps_per_packet*i, samps_per_packet);
+ //ensure the the last packet has EOB set
+ md.end_of_burst = samps_to_send <= buff.size();
- //send the entire packet (driver fragments internally)
+ //send a single packet
size_t num_tx_samps = usrp->get_device()->send(
&buff.front(), samps_to_send, md,
uhd::io_type_t::COMPLEX_FLOAT32,
- uhd::device::SEND_MODE_FULL_BUFF,
- //send will backup into the host this many seconds before sending:
- seconds_in_future + 0.1 //timeout (delay before transmit + padding)
+ uhd::device::SEND_MODE_ONE_PACKET, timeout
);
- if (num_tx_samps < samps_to_send) std::cout << "Send timeout..." << std::endl;
- if(verbose) std::cout << std::endl << boost::format("Sent %d samples") % num_tx_samps << std::endl;
+
+ //use a small timeout for subsequent packets
+ timeout = 0.1;
+
+ //do not use time spec for subsequent packets
+ md.has_time_spec = false;
+
+ if (num_tx_samps < samps_to_send) std::cerr << "Send timeout..." << std::endl;
+ if(verbose) std::cout << boost::format("Sent packet: %u samples") % num_tx_samps << std::endl;
+
+ num_acc_samps += num_tx_samps;
}
- //ensure that the buffers have flushed out to the device before deconstruction
- boost::this_thread::sleep(boost::posix_time::seconds(1));
+ std::cout << std::endl << "Waiting for async burst ACK... " << std::flush;
+ uhd::async_metadata_t async_md;
+ bool got_async_burst_ack = false;
+ //loop through all messages for the ACK packet (may have underflow messages in queue)
+ while (not got_async_burst_ack and usrp->get_device()->recv_async_msg(async_md, seconds_in_future)){
+ got_async_burst_ack = (async_md.event_code == uhd::async_metadata_t::EVENT_CODE_BURST_ACK);
+ }
+ std::cout << (got_async_burst_ack? "success" : "fail") << std::endl;
//finished
std::cout << std::endl << "Done!" << std::endl << std::endl;
diff --git a/host/examples/tx_waveforms.cpp b/host/examples/tx_waveforms.cpp
index 05d49a8b3..5b3a1b70c 100644
--- a/host/examples/tx_waveforms.cpp
+++ b/host/examples/tx_waveforms.cpp
@@ -20,16 +20,19 @@
#include <uhd/utils/static.hpp>
#include <uhd/usrp/multi_usrp.hpp>
#include <boost/program_options.hpp>
-#include <boost/thread/thread_time.hpp> //system time
#include <boost/math/special_functions/round.hpp>
#include <boost/format.hpp>
#include <boost/function.hpp>
#include <iostream>
#include <complex>
+#include <csignal>
#include <cmath>
namespace po = boost::program_options;
+static bool stop_signal_called = false;
+void sig_int_handler(int){stop_signal_called = true;}
+
/***********************************************************************
* Waveform generators
**********************************************************************/
@@ -61,9 +64,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
uhd::set_thread_priority_safe();
//variables to be set by po
- std::string args, wave_type;
- size_t total_duration, spb;
- double rate, freq, gain, wave_freq;
+ std::string args, wave_type, ant, subdev;
+ size_t spb;
+ double rate, freq, gain, wave_freq, bw;
float ampl;
//setup the program options
@@ -71,12 +74,14 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
desc.add_options()
("help", "help message")
("args", po::value<std::string>(&args)->default_value(""), "single uhd device address args")
- ("duration", po::value<size_t>(&total_duration)->default_value(3), "number of seconds to transmit")
("spb", po::value<size_t>(&spb)->default_value(10000), "samples per buffer")
- ("rate", po::value<double>(&rate)->default_value(1.5e6), "rate of outgoing samples")
- ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
+ ("rate", po::value<double>(&rate), "rate of outgoing samples")
+ ("freq", po::value<double>(&freq), "RF center frequency in Hz")
("ampl", po::value<float>(&ampl)->default_value(float(0.3)), "amplitude of the waveform")
- ("gain", po::value<double>(&gain)->default_value(0), "gain for the RF chain")
+ ("gain", po::value<double>(&gain), "gain for the RF chain")
+ ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
+ ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
("wave-type", po::value<std::string>(&wave_type)->default_value("CONST"), "waveform type (CONST, SQUARE, RAMP, SINE)")
("wave-freq", po::value<double>(&wave_freq)->default_value(0), "waveform frequency in Hz")
;
@@ -94,22 +99,46 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << std::endl;
std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl;
uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args);
+
+ //always select the subdevice first, the channel mapping affects the other settings
+ if (vm.count("subdev")) usrp->set_tx_subdev_spec(subdev);
+
std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl;
- //set the tx sample rate
+ //set the sample rate
+ if (not vm.count("rate")){
+ std::cerr << "Please specify the sample rate with --rate" << std::endl;
+ return ~0;
+ }
std::cout << boost::format("Setting TX Rate: %f Msps...") % (rate/1e6) << std::endl;
usrp->set_tx_rate(rate);
std::cout << boost::format("Actual TX Rate: %f Msps...") % (usrp->get_tx_rate()/1e6) << std::endl << std::endl;
- //set the tx center frequency
- std::cout << boost::format("Setting TX Freq: %f Mhz...") % (freq/1e6) << std::endl;
+ //set the center frequency
+ if (not vm.count("freq")){
+ std::cerr << "Please specify the center frequency with --freq" << std::endl;
+ return ~0;
+ }
+ std::cout << boost::format("Setting TX Freq: %f MHz...") % (freq/1e6) << std::endl;
usrp->set_tx_freq(freq);
- std::cout << boost::format("Actual TX Freq: %f Mhz...") % (usrp->get_tx_freq()/1e6) << std::endl << std::endl;
+ std::cout << boost::format("Actual TX Freq: %f MHz...") % (usrp->get_tx_freq()/1e6) << std::endl << std::endl;
+
+ //set the rf gain
+ if (vm.count("gain")){
+ std::cout << boost::format("Setting TX Gain: %f dB...") % gain << std::endl;
+ usrp->set_tx_gain(gain);
+ std::cout << boost::format("Actual TX Gain: %f dB...") % usrp->get_tx_gain() << std::endl << std::endl;
+ }
- //set the tx rf gain
- std::cout << boost::format("Setting TX Gain: %f dB...") % gain << std::endl;
- usrp->set_tx_gain(gain);
- std::cout << boost::format("Actual TX Gain: %f dB...") % usrp->get_tx_gain() << std::endl << std::endl;
+ //set the IF filter bandwidth
+ if (vm.count("bw")){
+ std::cout << boost::format("Setting TX Bandwidth: %f MHz...") % bw << std::endl;
+ usrp->set_tx_bandwidth(bw);
+ std::cout << boost::format("Actual TX Bandwidth: %f MHz...") % usrp->get_tx_bandwidth() << std::endl << std::endl;
+ }
+
+ //set the antenna
+ if (vm.count("ant")) usrp->set_tx_antenna(ant);
//for the const wave, set the wave freq for small samples per period
if (wave_freq == 0 and wave_type == "CONST"){
@@ -144,9 +173,11 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
md.start_of_burst = false; //never SOB when continuous
md.end_of_burst = false;
- //send the data in multiple packets
- boost::system_time end_time(boost::get_system_time() + boost::posix_time::seconds(total_duration));
- while(end_time > boost::get_system_time()){
+ std::signal(SIGINT, &sig_int_handler);
+ std::cout << "Press Ctrl + C to stop streaming..." << std::endl;
+
+ //send data until the signal handler gets called
+ while(not stop_signal_called){
//fill the buffer with the waveform
for (size_t n = 0; n < buff.size(); n++){
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 04:26:40 +0000