[Commit-gnuradio] r6354 - gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband

[gnychis]

Author: gnychis
Date: 2007-09-07 14:14:24 -0600 (Fri, 07 Sep 2007)
New Revision: 6354

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
Log:
Work in progress on underrun still


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-09-07 19:58:21 UTC (rev 6353)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-09-07 20:14:24 UTC (rev 6354)
@@ -64,7 +64,7 @@
 static pmt_t s_response_nrx_chan = pmt_intern("response-nrx-chan");
 static pmt_t s_response_current_capacity_allocation  = 
pmt_intern("response-current-capacity-allocation");
 
-static bool verbose = false;
+static bool verbose = true;
 
 class test_usrp_rx : public mb_mblock
 {
@@ -115,7 +115,7 @@
   //bool fake_usrp_p = true;
   bool fake_usrp_p = false;
   
-  d_disk_write = true;
+  //d_disk_write = true;
 
   // Test the TX side
 
@@ -130,7 +130,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("tmac6.rbf"));
+               pmt_intern("nanocell9.rbf"));
 
   // Set TX and RX interpolations
   pmt_dict_set(usrp_dict,
@@ -315,15 +315,17 @@
   if(d_disk_write)
     d_ofile.write(samples, n_bytes);
 
-  if(verbose)
+  if(verbose) {
     std::cout << ".";
+    fflush(stdout);
+  }
 
   if (pmt_is_dict(properties)) {
     // Read the RSSI
     if(pmt_t rssi = pmt_dict_ref(properties, 
                                  pmt_intern("rssi"), 
                                  PMT_NIL)) {
-      if(!pmt_eqv(rssi, PMT_NIL)) 
+      if(!pmt_eqv(rssi, PMT_NIL) && verbose && 0) 
         std::cout << "RSSI: " << rssi << std::endl;
     }
   }

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
      2007-09-07 19:58:21 UTC (rev 6353)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
      2007-09-07 20:14:24 UTC (rev 6354)
@@ -145,7 +145,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("stop2.rbf"));
+               pmt_intern("nanocell.rbf"));
 
   // Set TX and RX interpolations
   pmt_dict_set(usrp_dict,
@@ -637,11 +637,16 @@
   if(pmt_t underrun = pmt_dict_ref(dict, 
                                   pmt_intern("underrun"), 
                                   PMT_NIL)) {
-    if(pmt_eqv(underrun, PMT_T)) 
+    if(pmt_eqv(underrun, PMT_T)) {
       d_n_underruns++;
 
+      if(verbose)
+        std::cout << "[TEST_USRP_INBAND_UNDERRUN] Underrun\n";
+    }
+    else {
     if(verbose)
-      std::cout << "[TEST_USRP_INBAND_UNDERRUN] Underrun\n";
+      std::cout << "[TEST_USRP_INBAND_UNDERRUN] No underrun\n" << underrun 
<<std::endl;
+    }
   } else {
 
     if(verbose)