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

[gnychis]

Author: gnychis
Date: 2007-09-10 13:55:36 -0600 (Mon, 10 Sep 2007)
New Revision: 6385

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_tx.cc
Log:
Adding the properties dictionary in to the TX program and re-displaying the RSSI
in the RX program


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-10 19:29:39 UTC (rev 6384)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-09-10 19:55:36 UTC (rev 6385)
@@ -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
 {
@@ -325,7 +325,7 @@
     if(pmt_t rssi = pmt_dict_ref(properties, 
                                  pmt_intern("rssi"), 
                                  PMT_NIL)) {
-      if(!pmt_eqv(rssi, PMT_NIL) && verbose && 0) 
+      if(!pmt_eqv(rssi, PMT_NIL) && verbose) 
         std::cout << "RSSI: " << rssi << std::endl;
     }
   }

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_tx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_tx.cc
    2007-09-10 19:29:39 UTC (rev 6384)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_tx.cc
    2007-09-10 19:55:36 UTC (rev 6385)
@@ -121,7 +121,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("boe3.rbf"));
+               pmt_intern("cs1.rbf"));
 
   // Set TX and RX interpolations
   pmt_dict_set(usrp_dict,
@@ -298,13 +298,13 @@
   d_nsamples_xmitted = 0;
   
   // FIXME: carrier sense hack
-//  d_tx->send(s_cmd_to_control_channel,    // C/S packet
-//             pmt_list2(PMT_NIL,           // invoc handle
-//                       pmt_list1(
-//                            pmt_list2(s_op_write_reg, 
-//                                      pmt_list2(
-//                                      pmt_from_long(1), 
-//                                      pmt_from_long(0))))));
+  d_tx->send(s_cmd_to_control_channel,    // C/S packet
+             pmt_list2(PMT_NIL,           // invoc handle
+                       pmt_list1(
+                            pmt_list2(s_op_write_reg, 
+                                      pmt_list2(
+                                      pmt_from_long(1), 
+                                      pmt_from_long(21))))));
 
   build_and_send_next_frame(); // fire off 4 to start pipeline
   build_and_send_next_frame();
@@ -357,12 +357,18 @@
     }
   }
 
+  pmt_t tx_properties = pmt_make_dict();
+  pmt_dict_set(tx_properties,
+               pmt_intern("carrier-sense"),
+               PMT_T);
+
   pmt_t timestamp = pmt_from_long(0xffffffff); // NOW
   d_tx->send(s_cmd_xmit_raw_frame,
-            pmt_list4(pmt_from_long(d_nframes_xmitted),  // invocation-handle
+            pmt_list5(pmt_from_long(d_nframes_xmitted),  // invocation-handle
                       d_tx_chan,                         // channel
                       uvec,                              // the samples
-                      timestamp));
+                      timestamp,
+           tx_properties));
 
   d_nsamples_xmitted += nsamples_this_frame;
   d_nframes_xmitted++;