[Commit-gnuradio] r7743 - in gnuradio/branches/developers/gnychis/inband/usrp: fpga/rbf/rev2 fpga/rbf/rev4 host/apps-inband host/lib/inband

[gnychis]

Author: gnychis
Date: 2008-02-19 11:36:10 -0700 (Tue, 19 Feb 2008)
New Revision: 7743

Added:
   
gnuradio/branches/developers/gnychis/inband/usrp/fpga/rbf/rev2/std_inband_dual.rbf
   
gnuradio/branches/developers/gnychis/inband/usrp/fpga/rbf/rev4/std_inband_dual.rbf
Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2rx.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2tx.cc
   gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
New RBF for 2RX/2TX (dual) support within inband project.

Confirmed that RBF supports dual TX properly.
Confirmed RBF generates USB packets from both channels.

Need to confirm mux setting and verify incoming samples of both channels.


Added: 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/rbf/rev2/std_inband_dual.rbf
===================================================================
(Binary files differ)


Property changes on: 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/rbf/rev2/std_inband_dual.rbf
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/rbf/rev4/std_inband_dual.rbf
===================================================================
(Binary files differ)


Property changes on: 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/rbf/rev4/std_inband_dual.rbf
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2rx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2rx.cc
   2008-02-19 04:14:40 UTC (rev 7742)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2rx.cc
   2008-02-19 18:36:10 UTC (rev 7743)
@@ -109,7 +109,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("dual2.rbf"));
+               pmt_intern("std_inband_dual.rbf"));
 
   pmt_dict_set(usrp_dict,
                pmt_intern("decim-rx"),

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2tx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2tx.cc
   2008-02-19 04:14:40 UTC (rev 7742)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_2tx.cc
   2008-02-19 18:36:10 UTC (rev 7743)
@@ -120,7 +120,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("std_inband.rbf"));
+               pmt_intern("std_inband_dual.rbf"));
 
   // Set TX and RX interpolations
   pmt_dict_set(usrp_dict,

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2008-02-19 04:14:40 UTC (rev 7742)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2008-02-19 18:36:10 UTC (rev 7743)
@@ -44,7 +44,7 @@
 
 usrp_rx::usrp_rx(mb_runtime *rt, const std::string &instance_name, pmt_t 
user_arg)
   : mb_mblock(rt, instance_name, user_arg),
-    d_disk_write(true),
+    d_disk_write(false),
     d_disk_write_pkt(true)   // if true, writes full packet, else just the 
payload
 {
   d_cs = define_port("cs", "usrp-rx-cs", true, mb_port::EXTERNAL);

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2008-02-19 04:14:40 UTC (rev 7742)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2008-02-19 18:36:10 UTC (rev 7743)
@@ -342,7 +342,7 @@
     return;
   }
 
-  if(!d_urx->set_rx_freq (0, -d_rf_freq) || d_urx->set_rx_freq(1, -d_rf_freq)) 
{
+  if(!d_urx->set_rx_freq (0, -d_rf_freq) || !d_urx->set_rx_freq(1, 
-d_rf_freq)) {
     if (verbose)
       std::cout << "[usrp_server] Failed to set center frequency on RX\n";
     reply_data = pmt_list2(invocation_handle, PMT_F);