[Commit-gnuradio] gnuradio-examples/python/gmsk2 receive_path.py ...

[Matt Ettus]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-examples
Changes by:     Matt Ettus <mettus>     06/06/17 19:22:52

Modified files:
        python/gmsk2   : receive_path.py tunnel_ip_null_mac.py 

Log message:
        changes to make cs_mac work, hopefully

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-examples/python/gmsk2/receive_path.py?cvsroot=gnuradio&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnuradio-examples/python/gmsk2/tunnel_ip_null_mac.py?cvsroot=gnuradio&r1=1.7&r2=1.8

Patches:
Index: receive_path.py
===================================================================
RCS file: /sources/gnuradio/gnuradio-examples/python/gmsk2/receive_path.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- receive_path.py     23 May 2006 16:37:30 -0000      1.5
+++ receive_path.py     17 Jun 2006 19:22:52 -0000      1.6
@@ -36,7 +36,9 @@
         gain_mu = 0.03     # default
         threshold = -1     # use system default
         
-        self.u = usrp.source_c ()
+        fusb_block_size = 4096
+        fusb_nblocks = 8
+        self.u = usrp.source_c 
(fusb_block_size=fusb_block_size,fusb_nblocks=fusb_nblocks)
         adc_rate = self.u.adc_rate()
 
         (self._bitrate, self._spb, self._decim) = pick_rx_bitrate(bitrate, 1, 
spb,
@@ -82,6 +84,12 @@
         if log_p:
             self._add_logging(fg)
 
+        # Carrier Sensing Blocks
+        alpha = 0.001
+        thresh = 10   # in dB, will have to adjust
+        self.probe = gr.probe_avg_mag_sqrd_c(thresh,alpha)
+        fg.connect(self.chan_filt,self.probe)
+
     def set_freq(self, target_freq):
         """
         Set the center frequency we're interested in.
@@ -125,7 +133,10 @@
         """
         Return True if we think carrier is present
         """
-        return self.packet_receiver.carrier_sensed()
+        #return self.packet_receiver.carrier_sensed()
+        #return self.probe.level() > X
+        return self.probe.unmuted()
+    
     
     def _add_logging(self, fg):
         fg.connect(self.packet_receiver.gmsk_demod.freq_offset,

Index: tunnel_ip_null_mac.py
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-examples/python/gmsk2/tunnel_ip_null_mac.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tunnel_ip_null_mac.py       31 Jan 2006 08:09:07 -0000      1.7
+++ tunnel_ip_null_mac.py       17 Jun 2006 19:22:52 -0000      1.8
@@ -223,8 +223,8 @@
     (tun_fd, tun_ifname) = open_tun_interface(options.tun_device_filename)
 
     # instantiate the MAC
-    mac = null_mac(tun_fd, MTU, verbose=True)
-    #mac = cs_mac(tun_fd, MTU, verbose=True)
+    #mac = null_mac(tun_fd, MTU, verbose=True)
+    mac = cs_mac(tun_fd, MTU, verbose=True)
 
     # build the graph (PHY)
     fg = my_graph(options.tx_subdev_spec, options.rx_subdev_spec,