[Commit-gnuradio] r5956 - gnuradio/branches/features/pager/gr-pager/src

[jcorgan]

Author: jcorgan
Date: 2007-07-13 18:34:33 -0600 (Fri, 13 Jul 2007)
New Revision: 5956

Added:
   gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py
Modified:
   gnuradio/branches/features/pager/gr-pager/src/Makefile.am
   gnuradio/branches/features/pager/gr-pager/src/flex_demod.py
   gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py
Log:
All your pages are belong to us.

Modified: gnuradio/branches/features/pager/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/Makefile.am   2007-07-13 
21:47:00 UTC (rev 5955)
+++ gnuradio/branches/features/pager/gr-pager/src/Makefile.am   2007-07-14 
00:34:33 UTC (rev 5956)
@@ -29,6 +29,7 @@
 
 bin_SCRIPTS = \
     usrp_flex.py \
+    usrp_flex_all.py \
     aypabtu.py 
     
 noinst_PYTHON = \
@@ -70,6 +71,7 @@
     pager_swig.py \
     flex_demod.py \
     usrp_flex.py \
+    usrp_flex_all.py \
     aypabtu.py
     
 ourlib_LTLIBRARIES = _pager_swig.la

Modified: gnuradio/branches/features/pager/gr-pager/src/flex_demod.py
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/flex_demod.py 2007-07-13 
21:47:00 UTC (rev 5955)
+++ gnuradio/branches/features/pager/gr-pager/src/flex_demod.py 2007-07-14 
00:34:33 UTC (rev 5956)
@@ -30,7 +30,7 @@
     This block demodulates a band-limited, complex down-converted baseband 
     channel into FLEX protocol frames.
 
-    Flow graph (so far):
+    Flow graph:
 
     QUAD     - Quadrature demodulator converts FSK to baseband amplitudes  
     RSAMP    - Resample to 16000 sps
@@ -41,28 +41,18 @@
     ---
 
     @param fg: flowgraph
-    @param channel_rate:  incoming sample rate of the baseband channel
     @type sample_rate: integer
     """
 
-
-    def __init__(self, fg, channel_rate, queue):
+    def __init__(self, fg, queue):
         k = 25000/(2*pi*1600)        # 4800 Hz max deviation
         QUAD = gr.quadrature_demod_cf(k)
        self.INPUT = QUAD
-        QUAD_sink = gr.file_sink(gr.sizeof_float, 'quad.dat')
                        
         RSAMP = blks.rational_resampler_fff(fg, 16, 25)
-        RSAMP_sink = gr.file_sink(gr.sizeof_float, 'rsamp.dat')
-
         SLICER = pager_swig.slicer_fb(.001) # Averaging filter constant
-        SLICER_sink = gr.file_sink(gr.sizeof_char, 'slicer.dat')
-
        SYNC = pager_swig.flex_sync(16000)
 
-        fg.connect(QUAD, QUAD_sink)
-        fg.connect(RSAMP, RSAMP_sink)
-        fg.connect(SLICER, SLICER_sink)
         fg.connect(QUAD, RSAMP, SLICER, SYNC)
 
        DEINTA = pager_swig.flex_deinterleave()

Modified: gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py  2007-07-13 
21:47:00 UTC (rev 5955)
+++ gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py  2007-07-14 
00:34:33 UTC (rev 5956)
@@ -118,14 +118,9 @@
                                               0.0,           # Offset frequency
                                               if_rate)       # Sample rate
 
-        AGC = gr.agc_cc(1.0/channel_rate,  # Time constant
-                        1.0,               # Reference power 
-                        1.0,               # Initial gain
-                        1.0)               # Maximum gain
-       
         FLEX = pager.flex_demod(self, 25000, queue)
 
-        self.connect(USRP, CHAN, AGC, FLEX.INPUT)
+        self.connect(USRP, CHAN, FLEX.INPUT)
        
 def main():
     parser = OptionParser(option_class=eng_option)

Added: gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py              
                (rev 0)
+++ gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py      
2007-07-14 00:34:33 UTC (rev 5956)
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+
+from gnuradio import gr, gru, usrp, optfir, eng_notation, blks, pager
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+from string import split, join, printable
+import time
+
+class app_flow_graph(gr.flow_graph):
+    def __init__(self, options, queue):
+        gr.flow_graph.__init__(self)
+
+        if options.from_file is not None:
+            src = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            print "Reading samples from file", options.from_file
+        else:
+            src = usrp.source_c()
+            if options.rx_subdev_spec is None:
+                options.rx_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))
+            src.set_decim_rate(20)
+            result = usrp.tune(src, 0, subdev, 930.5e6+options.calibration)
+            print "Using", subdev.name(), " for receiving."
+            
+        usrp_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
+        self.connect(src, usrp_sink)
+
+        taps = gr.firdes.low_pass(1.0,
+                                  1.0,
+                                  1.0/128.0*0.4,
+                                  1.0/128.0*0.1,
+                                  gr.firdes.WIN_HANN)
+        print "Channel filter has", len(taps), "taps"
+        bank = blks.analysis_filterbank(self, 128, taps)
+        self.connect(src, bank)
+
+        for i in range(128):
+           if ((i < 20) or (i >= 60 and i < 68) or (i >= 108)):
+                self.connect((bank, i), gr.null_sink(gr.sizeof_gr_complex))
+           else:
+               self.connect((bank, i), pager.flex_demod(self, queue).INPUT)
+
+
+def main():
+    parser = OptionParser(option_class=eng_option)
+    parser.add_option("-R", "--rx-subdev-spec", type="subdev",
+                      help="select USRP Rx side A or B (default=first 
daughterboard found)")
+    parser.add_option("-c", "--calibration", type="eng_float", default=0.0,
+                      help="set frequency offset to Hz", metavar="Hz")
+    parser.add_option("-g", "--gain", type="int",
+                      help="set RF gain", metavar="dB")
+    parser.add_option("-F", "--from-file", default=None,
+                      help="Read from file instead of USRP")
+    (options, args) = parser.parse_args()
+
+    print options
+    
+    queue = gr.msg_queue()
+    fg = app_flow_graph(options, queue)
+    try:
+        fg.start()
+       while 1:
+           if not queue.empty_p():
+               msg = queue.delete_head() # Blocking read
+               page = join(split(msg.to_string(), chr(128)), '|')
+               disp = []
+               for n in range(len(page)):
+                   if ord(page[n]) < 32:
+                       disp.append('.')
+                   else:
+                       disp.append(page[n])
+               print join(disp, '')
+                                               
+           else:
+               time.sleep(1)
+
+    except KeyboardInterrupt:
+        fg.stop()
+
+if __name__ == "__main__":
+    main()


Property changes on: 
gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py
___________________________________________________________________
Name: svn:executable
   + *