[Commit-gnuradio] r4136 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2006-12-17 23:54:58 -0700 (Sun, 17 Dec 2006)
New Revision: 4136

Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test.py
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test_nogui.py
Log:
improvements to both ofdm test code

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
       2006-12-18 06:34:40 UTC (rev 4135)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
       2006-12-18 06:54:58 UTC (rev 4136)
@@ -70,7 +70,6 @@
         # Correlator data handler
         self.c2mag = gr.complex_to_mag()
         self.angle = gr.complex_to_arg()
-        self.scale = gr.multiply_const_ff(-1000.0/(2*math.pi))
         self.fg.connect(self.input,(self.mixer,1))
         self.fg.connect(self.delay,self.conjg,(self.mixer,0))
         self.fg.connect(self.mixer,self.movingsum2,self.c2mag)

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test.py
   2006-12-18 06:34:40 UTC (rev 4135)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test.py
   2006-12-18 06:54:58 UTC (rev 4136)
@@ -92,14 +92,14 @@
         self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage,1)
         self.offset = 
gr.sig_source_c((sample_rate*1.0),gr.GR_SIN_WAVE,fdiff,1.0,0.0)
         self.mixer_offset = gr.multiply_cc()
-        self.throttle = gr.throttle(gr.sizeof_gr_complex, 5e3)
+        self.throttle = gr.throttle(gr.sizeof_gr_complex, 1e4)
 
         self.connect(self.offset,(self.mixer_offset,0))
         self.connect(self.noise,(self.noise_adder,0))
         self.connect(self.mixer_offset, self.throttle, (self.noise_adder,1))
 
         # Put modulated signal through channel
-        #self.scope = fftsink.fft_sink_c (self, panel, fft_size=1024, 
sample_rate=sample_rate, fft_rate=30)
+        self.scope = fftsink.fft_sink_c (self, panel, fft_size=1024, 
sample_rate=sample_rate, fft_rate=30)
         self.connect(self.cp_adder, (self.mixer_offset,1))
 
 
@@ -116,17 +116,16 @@
         # save output
         self.outdat = gr.file_sink(gr.sizeof_char,"output_data")
         self.connect(self.unpack, self.outdat)
-        
-        if 0:
-            self.connect(self.noise_adder,self.throttle, self.scope)
-            self.oscope = scopesink.scope_sink_f(self, panel, 
sample_rate=sample_rate)
-            self.connect(self.moving_sum_filter,(self.oscope,0))
-            self.connect(self.c2mag,(self.oscope,1))
-            self.connect(self.diff,(self.oscope,0))
-            self.connect(self.movingsum2,self.angle,self.scale,(self.oscope,1))
 
-            self._build_gui(vbox)
+        self.scale = gr.multiply_const_ff(-1000.0/(2*math.pi))
 
+        self.connect(self.noise_adder, self.scope)
+        self.oscope = scopesink.scope_sink_f(self, panel, 
sample_rate=sample_rate)
+        self.connect(self.ofdm_rx.diff,(self.oscope,0))
+        self.connect(self.ofdm_rx.angle,self.scale,(self.oscope,1))
+        
+        self._build_gui(vbox)
+
     def _set_status_msg(self, msg):
         self.frame.GetStatusBar().SetStatusText(msg, 0)
 

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test_nogui.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test_nogui.py
     2006-12-18 06:34:40 UTC (rev 4135)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_test_nogui.py
     2006-12-18 06:54:58 UTC (rev 4136)
@@ -87,7 +87,7 @@
         self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage,1)
         self.offset = 
gr.sig_source_c((sample_rate*1.0),gr.GR_SIN_WAVE,fdiff,1.0,0.0)
         self.mixer_offset = gr.multiply_cc()
-        self.throttle = gr.throttle(gr.sizeof_gr_complex, 5e3)
+        self.throttle = gr.throttle(gr.sizeof_gr_complex, 1e4)
 
         self.connect(self.offset,(self.mixer_offset,0))
         self.connect(self.noise,(self.noise_adder,0))
@@ -107,7 +107,6 @@
         self.unpack = gr.unpack_k_bits_bb(1)
 
         self.connect(self.noise_adder, self.ofdm_rx, self.fftdemod, 
self.ofdm_demod, self.unpack)
-        self.connect(self.ofdm_demod, gr.file_sink(gr.sizeof_char, "src"))
              
         # save output
         self.outdat = gr.file_sink(gr.sizeof_char,"output_data")