[Commit-gnuradio] r5981 - gnuradio/trunk/gr-pager/src

[jcorgan]

Author: jcorgan
Date: 2007-07-15 23:42:22 -0600 (Sun, 15 Jul 2007)
New Revision: 5981

Modified:
   gnuradio/trunk/gr-pager/src/flex_demod.py
   gnuradio/trunk/gr-pager/src/usrp_flex.py
Log:
Fix reference message and tweak DC removal constant.

Modified: gnuradio/trunk/gr-pager/src/flex_demod.py
===================================================================
--- gnuradio/trunk/gr-pager/src/flex_demod.py   2007-07-16 05:29:55 UTC (rev 
5980)
+++ gnuradio/trunk/gr-pager/src/flex_demod.py   2007-07-16 05:42:22 UTC (rev 
5981)
@@ -42,7 +42,7 @@
        self.connect(self, quad)
        
         rsamp = blks2.rational_resampler_fff(16, 25)
-        slicer = pager_swig.slicer_fb(1e-5) # DC removal averaging filter 
constant
+        slicer = pager_swig.slicer_fb(5e-5) # DC removal averaging filter 
constant
        sync = pager_swig.flex_sync(16000)
 
         self.connect(quad, rsamp, slicer, sync)

Modified: gnuradio/trunk/gr-pager/src/usrp_flex.py
===================================================================
--- gnuradio/trunk/gr-pager/src/usrp_flex.py    2007-07-16 05:29:55 UTC (rev 
5980)
+++ gnuradio/trunk/gr-pager/src/usrp_flex.py    2007-07-16 05:42:22 UTC (rev 
5981)
@@ -55,42 +55,42 @@
 
        if options.from_file is None:
             # Set up USRP source with specified RX daughterboard
-            src = usrp.source_c()
+            self.src = usrp.source_c()
             if options.rx_subdev_spec == None:
-                options.subdev_spec = usrp.pick_rx_subdevice(src)
-            subdev = usrp.selected_subdev(src, options.rx_subdev_spec)
-            src.set_mux(usrp.determine_rx_mux_value(src, 
options.rx_subdev_spec))
+                options.rx_subdev_spec = usrp.pick_rx_subdevice(self.src)
+            self.subdev = usrp.selected_subdev(self.src, 
options.rx_subdev_spec)
+            self.src.set_mux(usrp.determine_rx_mux_value(self.src, 
options.rx_subdev_spec))
 
             # Grab 250 KHz of spectrum (sample rate becomes 250 ksps complex)
-            src.set_decim_rate(256)
+            self.src.set_decim_rate(256)
                    
             # If no gain specified, set to midrange
             if options.gain is None:
-                g = subdev.gain_range()
+                g = self.subdev.gain_range()
                 options.gain = (g[0]+g[1])/2.0
-            subdev.set_gain(options.gain)
+            self.subdev.set_gain(options.gain)
 
             # Tune daughterboard
             actual_frequency = options.frequency+options.calibration
-            tune_result = usrp.tune(src, 0, subdev, actual_frequency)
+            tune_result = usrp.tune(self.src, 0, self.subdev, actual_frequency)
             if not tune_result:
-                sys.stderr.write("Failed to set center frequency 
to"+`actual_frequency`+"\n")
+                sys.stderr.write("Failed to set center frequency to 
"+`actual_frequency`+"\n")
                 sys.exit(1)
 
             if options.verbose:
-                print "Using RX daughterboard", subdev.side_and_name()
+                print "Using RX daughterboard", self.subdev.side_and_name()
                 print "USRP gain is", options.gain
                 print "USRP tuned to", actual_frequency
             
         else:
             # Use supplied file as source of samples
-            src = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.src = gr.file_source(gr.sizeof_gr_complex, options.from_file)
             if options.verbose:
                 print "Reading samples from", options.from_file
            
         if options.log and not options.from_file:
             usrp_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
-            self.connect(src, usrp_sink)
+            self.connect(self.src, usrp_sink)
 
         # Set up 22KHz-wide bandpass about center frequency. Decimate by 10
         # to get channel rate of 25Ksps
@@ -116,7 +116,7 @@
         # FLEX protocol demodulator
         flex = pager.flex_demod(queue, options.frequency, options.verbose, 
options.log)
 
-        self.connect(src, chan, flex)
+        self.connect(self.src, chan, flex)
        
 def main():
     parser = OptionParser(option_class=eng_option)