file option for rx timed samples, misc fixes

4 files changed, 23 insertions, 17 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;
 }
diff --git a/host/lib/usrp/usrp_e/codec_ctrl.cpp b/host/lib/usrp/usrp_e/codec_ctrl.cpp
index ce3458827..ac61bc6b4 100644
--- a/host/lib/usrp/usrp_e/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp_e/codec_ctrl.cpp
@@ -58,9 +58,6 @@ private:
 usrp_e_codec_ctrl_impl::usrp_e_codec_ctrl_impl(usrp_e_iface::sptr iface){
     _iface = iface;
 
-    //FIXME temp poke !!!
-    _iface->poke16(UE_REG_MISC_TEST, 0x0f00);
-
     //soft reset
     _ad9862_regs.soft_reset = 1;
     this->send_reg(0);
@@ -75,8 +72,8 @@ usrp_e_codec_ctrl_impl::usrp_e_codec_ctrl_impl(usrp_e_iface::sptr iface){
     _ad9862_regs.byp_buffer_b = 1;
     _ad9862_regs.buffer_a_pd = 1;
     _ad9862_regs.buffer_b_pd = 1;
-    _ad9862_regs.rx_pga_a = 0x1f;  //TODO bring under api control
-    _ad9862_regs.rx_pga_b = 0x1f;  //TODO bring under api control
+    _ad9862_regs.rx_pga_a = 0;//0x1f;  //TODO bring under api control
+    _ad9862_regs.rx_pga_b = 0;//0x1f;  //TODO bring under api control
     _ad9862_regs.rx_twos_comp = 1;
     _ad9862_regs.rx_hilbert = ad9862_regs_t::RX_HILBERT_DIS;
 
@@ -85,7 +82,7 @@ usrp_e_codec_ctrl_impl::usrp_e_codec_ctrl_impl(usrp_e_iface::sptr iface){
     _ad9862_regs.interleaved = ad9862_regs_t::INTERLEAVED_INTERLEAVED;
     _ad9862_regs.tx_pga_gain = 199; //TODO bring under api control
     _ad9862_regs.tx_hilbert = ad9862_regs_t::TX_HILBERT_DIS;
-    _ad9862_regs.interp = ad9862_regs_t::INTERP_4;
+    _ad9862_regs.interp = ad9862_regs_t::INTERP_2;
     _ad9862_regs.tx_twos_comp = 1;
     _ad9862_regs.fine_mode = ad9862_regs_t::FINE_MODE_BYPASS;
     _ad9862_regs.coarse_mod = ad9862_regs_t::COARSE_MOD_BYPASS;
@@ -108,8 +105,6 @@ usrp_e_codec_ctrl_impl::usrp_e_codec_ctrl_impl(usrp_e_iface::sptr iface){
 }
 
 usrp_e_codec_ctrl_impl::~usrp_e_codec_ctrl_impl(void){
-    return; //FIXME remove this later
-
     //set aux dacs to zero
     this->write_aux_dac(AUX_DAC_A, 0);
     this->write_aux_dac(AUX_DAC_B, 0);
diff --git a/host/lib/usrp/usrp_e/io_impl.cpp b/host/lib/usrp/usrp_e/io_impl.cpp
index a94275b78..e1c1fe80b 100644
--- a/host/lib/usrp/usrp_e/io_impl.cpp
+++ b/host/lib/usrp/usrp_e/io_impl.cpp
@@ -107,7 +107,7 @@ struct usrp_e_impl::io_impl{
 
 void usrp_e_impl::io_init(void){
     //setup rx data path
-    _iface->poke32(UE_REG_CTRL_RX_NSAMPS_PER_PKT, 300); //FIXME magic number
+    _iface->poke32(UE_REG_CTRL_RX_NSAMPS_PER_PKT, get_max_recv_samps_per_packet());
     _iface->poke32(UE_REG_CTRL_RX_NCHANNELS, 1);
     _iface->poke32(UE_REG_CTRL_RX_CLEAR_OVERRUN, 1); //reset
     _iface->poke32(UE_REG_CTRL_RX_VRT_HEADER, 0
@@ -168,7 +168,7 @@ size_t usrp_e_impl::send(
         MASTER_CLOCK_RATE,
         uhd::transport::vrt::pack_le,
         boost::bind(&data_transport::get_send_buff, &_io_impl->transport),
-        (MAX_BUFF_SIZE - sizeof(usrp_transfer_frame))/send_otw_type.get_sample_size(),
+        get_max_send_samps_per_packet(),
         vrt_header_offset_words32
     );
 }
diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.hpp b/host/lib/usrp/usrp_e/usrp_e_impl.hpp
index 657d2d225..487e295cb 100644
--- a/host/lib/usrp/usrp_e/usrp_e_impl.hpp
+++ b/host/lib/usrp/usrp_e/usrp_e_impl.hpp
@@ -80,8 +80,8 @@ public:
     //the io interface
     size_t send(const boost::asio::const_buffer &, const uhd::tx_metadata_t &, const uhd::io_type_t &, send_mode_t);
     size_t recv(const boost::asio::mutable_buffer &, uhd::rx_metadata_t &, const uhd::io_type_t &, recv_mode_t);
-    size_t get_max_send_samps_per_packet(void) const{return _max_num_samples;}
-    size_t get_max_recv_samps_per_packet(void) const{return _max_num_samples;}
+    size_t get_max_send_samps_per_packet(void) const{return 300;}
+    size_t get_max_recv_samps_per_packet(void) const{return 300;}
 
 private:
     //interface to ioctls and file descriptor