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

[matt]

Author: matt
Date: 2006-12-17 18:56:05 -0700 (Sun, 17 Dec 2006)
New Revision: 4123

Modified:
   gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py
Log:
updated ofdm test with demod

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py    
    2006-12-18 01:55:22 UTC (rev 4122)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py    
    2006-12-18 01:56:05 UTC (rev 4123)
@@ -62,7 +62,7 @@
 
         cpsize = symbol_length - fftsize
 
-        SNR_db = 30.0
+        SNR_db = 100.0
         SNR = 10.0**(SNR_db/10.0)
         frequency_offset = -0.0
         fdiff = frequency_offset * sample_rate / fftsize
@@ -76,7 +76,7 @@
         print rho
         
         win = [1 for i in range(fftsize)]
-        data = [random.randint(0,1) for i in range(100000)]
+        data = [1,0,0,1]* 5000 #[random.randint(0,1) for i in range(100000)]
        self.src = gr.vector_source_b(data, True)
 
         # Modulator
@@ -165,11 +165,16 @@
         #self.sampler = 
gr.ofdm_sampler(fftsize,symbol_length,(-fftsize-cpsize))
         self.sampler = gr.ofdm_sampler(fftsize,symbol_length,1)
         self.fftdemod = gr.fft_vcc(fftsize,True,win)
+        self.ofdm_demod = gr.ofdm_bpsk_demapper(occupied_tones, fftsize)
+        self.unpack = gr.unpack_k_bits_bb(1)
+
         self.outdem = gr.vector_to_stream(gr.sizeof_gr_complex,fftsize)
-        self.outdat = gr.file_sink(gr.sizeof_gr_complex,"output_data")
+        self.outdat = gr.file_sink(gr.sizeof_char,"output_data")
+#        self.outdat = gr.file_sink(gr.sizeof_gr_complex,"output_data")
+        
+#        self.connect(self.sampler,self.fftdemod,self.outdem,self.outdat)
+        self.connect(self.sampler, self.fftdemod, self.ofdm_demod, 
self.unpack, self.outdat)
 
-        self.connect(self.sampler,self.fftdemod,self.outdem,self.outdat)
-
         self.f2c1 = gr.float_to_complex()
         self.f2c2 = gr.float_to_complex()