[Commit-gnuradio] r5845 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband

[gnychis]

Author: gnychis
Date: 2007-06-26 13:30:56 -0600 (Tue, 26 Jun 2007)
New Revision: 5845

Modified:
   gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_cs.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
Testing CS work in progress


Modified: gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am      
2007-06-26 18:57:45 UTC (rev 5844)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am      
2007-06-26 19:30:56 UTC (rev 5845)
@@ -64,7 +64,7 @@
 usrp_cal_dc_offset_LDADD       = $(USRP_LA)
 
 test_usrp_inband_cs_SOURCES    = test_usrp_inband_cs.cc time_stuff.c 
ui_sincos.c
-test_usrp_inband_cs_LDADD      = $(USRP_LA) $(MBLOCK_LA)
+test_usrp_inband_cs_LDADD      = $(USRP_LA)
 
 test_usrp_inband_tx_SOURCES    = test_usrp_inband_tx.cc time_stuff.c 
ui_sincos.c
 test_usrp_inband_tx_LDADD      = $(USRP_LA)

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_cs.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_cs.cc
   2007-06-26 18:57:45 UTC (rev 5844)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_cs.cc
   2007-06-26 19:30:56 UTC (rev 5845)
@@ -45,7 +45,7 @@
 #include <symbols_usrp_tx.h>
 #include <symbols_usrp_rx.h>
 
-static bool verbose = true;
+static bool verbose = false;
 
 class test_usrp_cs : public mb_mblock
 {
@@ -88,6 +88,7 @@
   void send_packets();
   void enter_receiving();
   void enter_transmitting();
+  void build_and_send_ping();
   void build_and_send_next_frame();
   void handle_xmit_response(pmt_t invocation_handle);
   void enter_closing_channel();
@@ -113,8 +114,8 @@
   d_rx = define_port("rx0", "usrp-rx", false, mb_port::INTERNAL);
   d_cs = define_port("cs", "usrp-server-cs", false, mb_port::INTERNAL);
   
-  bool fake_usrp_p = true;
-  //bool fake_usrp_p = false;
+  //bool fake_usrp_p = true;
+  bool fake_usrp_p = false;
 
   // Test the TX side
 
@@ -319,7 +320,9 @@
 void
 test_usrp_cs::enter_receiving()
 {
-
+  d_rx->send(s_cmd_start_recv_raw_samples,
+             pmt_list2(PMT_F,
+                       d_rx_chan));
 }
 
 void
@@ -331,6 +334,8 @@
   if(verbose)
     std::cout << "[TEST_USRP_INBAND_CS] Beginning transmission\n";
 
+  build_and_send_ping();
+
   build_and_send_next_frame(); // fire off 4 to start pipeline
   build_and_send_next_frame();
   build_and_send_next_frame();
@@ -338,6 +343,13 @@
 }
 
 void
+test_usrp_cs::build_and_send_ping()
+{
+  d_tx->send(s_cmd_to_control_channel,
+             pmt_list2(PMT_NIL, pmt_list1(pmt_list3(s_op_ping_fixed, PMT_NIL, 
PMT_NIL))));
+}
+
+void
 test_usrp_cs::build_and_send_next_frame()
 {
   // allocate the uniform vector for the samples

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc 
    2007-06-26 18:57:45 UTC (rev 5844)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc 
    2007-06-26 19:30:56 UTC (rev 5845)
@@ -669,8 +669,6 @@
 
   for(int i=0; i < n_subpackets; i++) {
 
-    std::cout << "Parsing subpacket " << i << std::endl;
-    
     pmt_t subp = pmt_nth(i, subpackets);
     pmt_t subp_cmd = pmt_nth(0, subp);
 
@@ -682,8 +680,6 @@
     //--------- PING FIXED --------------//
     if(pmt_eq(subp_cmd, s_op_ping_fixed)) {
 
-      std::cout << "!!! PING !!!\n";
-
       long rid = 0;
       long pingval = 0;
 

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
      2007-06-26 18:57:45 UTC (rev 5844)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2007-06-26 19:30:56 UTC (rev 5845)
@@ -222,7 +222,7 @@
 
   // Open up a standard RX and TX for communication with the USRP
    
-  std::string rbf = "stop.rbf";
+  std::string rbf = "last.rbf";
   //std::string rbf = "";
 
   d_utx = usrp_standard_tx::make(which_usrp,