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

[jcorgan]

Author: jcorgan
Date: 2007-03-18 20:15:26 -0600 (Sun, 18 Mar 2007)
New Revision: 4776

Modified:
   
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_rx.py
   
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_rx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_rx.py
    2007-03-19 02:13:20 UTC (rev 4775)
+++ 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/sounder_rx.py
    2007-03-19 02:15:26 UTC (rev 4776)
@@ -38,7 +38,7 @@
         gr.hier_block2.__init__(self,
                                 "sounder_rx",                                # 
Block typename
                                 gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
-                                gr.io_signature(0,0,0))                      # 
Output signature
+                                gr.io_signature(0, 1, gr.sizeof_gr_complex)) # 
Output signature
 
         self._max_delay = max_delay
         self._chip_rate = chip_rate
@@ -72,21 +72,26 @@
         self.define_component("s2v-2", 
gr.stream_to_vector(gr.sizeof_gr_complex, self._length))
         self.define_component("mult", gr.multiply_vcc(self._length))
         self.define_component("ifft", gr.fft_vcc(self._length, False, ())) # 
No window needed
-        self.define_component("sink", 
gr.file_sink(gr.sizeof_gr_complex*self._length, "impulse.dat"))
+        self.define_component("v2s", gr.vector_to_stream(gr.sizeof_gr_complex, 
self._length))
+        self.define_component("scale", gr.multiply_const_cc(1.0/self._length))
         
-        # Averaged FFT leg
+        # Averaged FFT of input
         self.connect("self", 0, "s2v-1", 0)
         self.connect("s2v-1", 0, "fft", 0)
         self.connect("fft", 0, "avg", 0)
         self.connect("avg", 0, "decim", 0)
 
+        # Reference signal
+        self.connect("ref", 0, "s2v-2", 0)
+        
         # FFT correlation leg
         self.connect("decim", 0, "mult", 0)
-        self.connect("ref", 0, "s2v-2", 0)
         self.connect("s2v-2", 0, "mult", 1)
         self.connect("mult", 0, "ifft", 0)
-        self.connect("ifft", 0, "sink", 0)
-
+        self.connect("ifft", 0, "v2s", 0)
+        self.connect("v2s", 0, "scale", 0)
+        self.connect("scale", 0, "self", 0)
+        
     def _generate_reference(self):
         # Create a temporary flowgraph to generate conjugate FFT of LFSR output
         hb = gr.hier_block2("temp_block", gr.io_signature(0,0,0), 
gr.io_signature(0,0,0))

Modified: 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
       2007-03-19 02:13:20 UTC (rev 4775)
+++ 
gnuradio/branches/developers/jcorgan/channel/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
       2007-03-19 02:15:26 UTC (rev 4776)
@@ -89,11 +89,13 @@
         self.define_component("usrp", self._u)
        self.define_component("rx",   self._receiver)
         self.define_component("waterfall", self._waterfall)
+        self.define_component("file", gr.file_sink(gr.sizeof_gr_complex, 
"rx.dat"))
        self.connect("usrp", 0, "rx", 0)
-        self.connect("usrp", 0, "waterfall", 0)
+        self.connect("rx", 0, "waterfall", 0)
+        self.connect("rx", 0, "file", 0)
         
     def _setup_display(self):
-        self._waterfall = waterfallsink2.waterfall_sink_c(self._panel,
+        self._waterfall = waterfallsink2.waterfall_sink_c(self._panel, 
fft_rate=15,
                                                           
fft_size=self._receiver._length,
                                                           
sample_rate=self._options.chip_rate)