file option for rx timed samples, misc fixes

1 files changed, 16 insertions, 5 deletions

diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 64da260d5..eb7ef7251 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -20,13 +20,14 @@
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
 #include <iostream>
+#include <fstream>
 #include <complex>
 
 namespace po = boost::program_options;
 
 int UHD_SAFE_MAIN(int argc, char *argv[]){
     //variables to be set by po
-    std::string args;
+    std::string args, file_path;
     int seconds_in_future;
     size_t total_num_samps;
     double rx_rate, freq;
@@ -40,6 +41,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         ("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to receive")
         ("rxrate", po::value<double>(&rx_rate)->default_value(100e6/16), "rate of incoming samples")
         ("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
+        ("file", po::value<std::string>(&file_path)->default_value(""), "write samps to output file")
     ;
     po::variables_map vm;
     po::store(po::parse_command_line(argc, argv, desc), vm);
@@ -76,14 +78,20 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     stream_cmd.time_spec = uhd::time_spec_t(seconds_in_future);
     sdev->issue_stream_cmd(stream_cmd);
 
+    std::ofstream outfile;
+    if(file_path != "") outfile.open (file_path.c_str(), std::ios::out | std::ios::binary);
+
+    //setup recv buffer, io type, and metadata for recv
+    uhd::rx_metadata_t md;
+    uhd::io_type_t io_type(uhd::io_type_t::COMPLEX_INT16);
+    std::vector<std::complex<float> > recv_mem(dev->get_max_recv_samps_per_packet());
+    boost::asio::mutable_buffer buff(boost::asio::buffer(recv_mem));
+
     //loop until total number of samples reached
     size_t num_acc_samps = 0; //number of accumulated samples
     while(num_acc_samps < total_num_samps){
-        uhd::rx_metadata_t md;
-        std::vector<std::complex<float> > buff(dev->get_max_recv_samps_per_packet());
         size_t num_rx_samps = dev->recv(
-            boost::asio::buffer(buff),
-            md, uhd::io_type_t::COMPLEX_FLOAT32,
+            buff, md, io_type,
             uhd::device::RECV_MODE_ONE_PACKET
         );
         if (num_rx_samps == 0 and num_acc_samps > 0){
@@ -95,11 +103,14 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         std::cout << boost::format("Got packet: %u samples, %u secs, %u nsecs")
             % num_rx_samps % md.time_spec.secs % md.time_spec.nsecs << std::endl;
 
+        if(file_path != "") outfile.write(boost::asio::buffer_cast<const char *>(buff), num_rx_samps*io_type.size);
+
         num_acc_samps += num_rx_samps;
     }
 
     //finished
     std::cout << std::endl << "Done!" << std::endl << std::endl;
+    if(file_path != "") outfile.close();
 
     return 0;
 }