[Commit-gnuradio] r4684 - gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder

[jcorgan]

Author: jcorgan
Date: 2007-03-01 20:57:08 -0700 (Thu, 01 Mar 2007)
New Revision: 4684

Modified:
   
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/sounder_tx.py
   
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
Log:
Refactored USRP specific code out of sounder_tx

Modified: 
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/sounder_tx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/sounder_tx.py
    2007-03-02 02:51:21 UTC (rev 4683)
+++ 
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/sounder_tx.py
    2007-03-02 03:57:08 UTC (rev 4684)
@@ -21,50 +21,34 @@
 # 
 
 from gnuradio import gr, usrp, eng_notation
-from usrp_sink import usrp_sink_c
 import math
 
 n2s = eng_notation.num_to_str
 
 class sounder_tx(gr.hier_block2):
     """
-    Creates a top-level channel sounder block with the given parameters.
+    Creates a channel sounder generator with the given parameters.
     """
 
-    def __init__(self, subdev_spec, freq, cal, verbose, max_delay, chip_rate, 
amplitude):
-
-        # Call hierarchical block constructor
-        # Top-level blocks have no inputs or outputs
+    def __init__(self, max_delay, chip_rate, verbose):
         gr.hier_block2.__init__(self,
-                                "sounder_tx",           # Block typename
-                                gr.io_signature(0,0,0), # Input signature
-                                gr.io_signature(0,0,0)) # Output signature
-        self._freq = freq
-        self._cal = cal
-        self._verbose = verbose
+                                "sounder_tx",                          # Block 
typename
+                                gr.io_signature(0,0,0),                # Input 
signature
+                                gr.io_signature(1, 1, gr.sizeof_char)) # 
Output signature
+
         self._max_delay = max_delay
+        self._chip_rate = chip_rate
+        self._verbose = verbose
 
-        self._u = usrp_sink_c(0, subdev_spec, chip_rate, self._freq, 
self._cal, verbose)
-        self._chip_rate = self._u._if_rate
-        self._resolution = 1.0/self._chip_rate
-
         min_chips = int(math.ceil(2.0*self._max_delay * self._chip_rate))
         degree = int(math.ceil(math.log(min_chips)/math.log(2)))
         self._length = 2**degree-1
 
-        self._glfsr = gr.glfsr_source_b(degree)
-        self._mapper = gr.chunks_to_symbols_bc((-amplitude+0j, amplitude+0j), 
1)
         
         if self._verbose:
-            print "Actual chip rate is", n2s(self._chip_rate), "chips/sec"
-            print "Resolution is", n2s(self._resolution), "sec"
-            print "Using specified maximum delay spread of", self._max_delay, 
"sec"
             print "Mininum sequence length needed is", n2s(min_chips), "chips"
             print "Using PN sequence of degree", degree, "length", self._length
-            print "Output amplitude is", amplitude
             
-        self.define_component("glfsr", self._glfsr)
-        self.define_component("mapper", self._mapper)
-        self.define_component("usrp", self._u)
-        self.connect("glfsr", 0, "mapper", 0)
-        self.connect("mapper", 0, "usrp", 0)
+        # Connect PN source to block output
+        self.define_component("glfsr", gr.glfsr_source_b(degree))
+        self.connect("glfsr", 0, "self", 0)

Modified: 
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
       2007-03-02 02:51:21 UTC (rev 4683)
+++ 
gnuradio/branches/developers/jcorgan/sounder/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
       2007-03-02 03:57:08 UTC (rev 4684)
@@ -23,8 +23,44 @@
 from gnuradio import gr, eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+from usrp_sink import usrp_sink_c
 from sounder_tx import sounder_tx
 
+n2s = eng_notation.num_to_str
+
+class usrp_sounder_tx(gr.hier_block2):
+    def __init__(self, subdev_spec, freq, cal, verbose, max_delay, chip_rate, 
amplitude):
+
+        # Call hierarchical block constructor
+        # Top-level blocks have no inputs or outputs
+        gr.hier_block2.__init__(self,
+                                "usrp_sounder_tx",      # Block typename
+                                gr.io_signature(0,0,0), # Input signature
+                                gr.io_signature(0,0,0)) # Output signature
+
+        self._freq = freq
+        self._cal = cal
+        self._verbose = verbose
+        self._max_delay = max_delay
+       self._amplitude = amplitude
+       
+        self._u = usrp_sink_c(0, subdev_spec, chip_rate, self._freq, 
self._cal, self._verbose)
+       self.define_component("usrp", self._u)
+        self._chip_rate = self._u._if_rate
+       self.define_component("pn", sounder_tx(self._max_delay, 
self._chip_rate, self._verbose))
+       self.define_component("mapper", gr.chunks_to_symbols_bc((-amplitude+0j, 
amplitude+0j), 1))
+
+        if self._verbose:
+            print "Chip rate is", n2s(self._chip_rate), "chips/sec"
+            print "Resolution is", n2s(1.0/self._chip_rate), "sec"
+            print "Using specified maximum delay spread of", self._max_delay, 
"sec"
+            print "Output amplitude is", amplitude
+
+       # Ultimately this will be
+       # self.connect("pn mapper usrp")
+       self.connect("pn", 0, "mapper", 0)
+       self.connect("mapper", 0, "usrp", 0)
+
 def main():
        parser = OptionParser(option_class=eng_option)
 
@@ -41,7 +77,7 @@
                          help="set maximum delay spread (default=%default)")
        parser.add_option("-r", "--chip-rate", type="eng_float", default=8e6,
                          help="set sounder chip rate (default=%default)")
-       parser.add_option("-g", "--amplitude", type="eng_float", 
default=32000.0,
+       parser.add_option("-g", "--amplitude", type="eng_float", default=8000.0,
                          help="set output amplitude (default=%default)")
         (options, args) = parser.parse_args()
 
@@ -50,9 +86,9 @@
             sys.exit(1)
 
        # Create an instance of a hierarchical block
-       top_block = sounder_tx(options.tx_subdev_spec, options.freq, 
options.cal,
-                              options.verbose, options.max_delay, 
options.chip_rate,
-                              options.amplitude)
+       top_block = usrp_sounder_tx(options.tx_subdev_spec, options.freq, 
options.cal,
+                                   options.verbose, options.max_delay, 
options.chip_rate,
+                                   options.amplitude)
                              
        # Create an instance of a runtime, passing it the top block
        # to process