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

[jcorgan]

Author: jcorgan
Date: 2007-04-01 21:30:33 -0600 (Sun, 01 Apr 2007)
New Revision: 4841

Modified:
   
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_tx.py
   
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
Log:
Updated sounder transmitter to use gr_lfsr_source_f, cut CPU utilization in 
half.

Modified: 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_tx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_tx.py
    2007-04-02 03:07:57 UTC (rev 4840)
+++ 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_tx.py
    2007-04-02 03:30:33 UTC (rev 4841)
@@ -32,9 +32,9 @@
 
     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(1, 1, gr.sizeof_char)) # 
Output signature
+                                "sounder_tx",                           # 
Block typename
+                                gr.io_signature(0,0,0),                 # 
Input signature
+                                gr.io_signature(1, 1, gr.sizeof_float)) # 
Output signature
 
         self._max_delay = max_delay
         self._chip_rate = chip_rate
@@ -50,5 +50,5 @@
             print "Using PN sequence of degree", degree, "length", self._length
             
         # Connect PN source to block output
-        self.define_component("glfsr", gr.glfsr_source_b(degree))
+        self.define_component("glfsr", gr.glfsr_source_f(degree))
         self.connect("glfsr", 0, "self", 0)

Modified: 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
       2007-04-02 03:07:57 UTC (rev 4840)
+++ 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
       2007-04-02 03:30:33 UTC (rev 4841)
@@ -48,19 +48,22 @@
        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))
-
+        self.define_component("gain", gr.multiply_const_ff(amplitude));
+        self.define_component("f2c", gr.float_to_complex())
+        
         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)
-
+       # self.connect("pn gain f2c usrp")
+       self.connect("pn", 0, "gain", 0)
+        self.connect("gain", 0, "f2c", 0)
+        self.connect("f2c", 0, "usrp", 0)
+                              
 def main():
        parser = OptionParser(option_class=eng_option)