[Commit-gnuradio] r5725 - gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2007-06-06 20:06:48 -0600 (Wed, 06 Jun 2007)
New Revision: 5725

Modified:
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pn.py
Log:
passing logging option to pieces of the receiver to turn logging on/off from 
command line

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
 2007-06-07 01:43:02 UTC (rev 5724)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
 2007-06-07 02:06:48 UTC (rev 5725)
@@ -94,7 +94,9 @@
 
             fg.connect(self._pkt_input, self.ifft, self.cp_adder, self.scale)
         else:
-            self._pkt_input = gr.ofdm_bpsk_mapper(msgq_limit, 
options.occupied_tones, options.fft_length)
+            #self._pkt_input = gr.ofdm_bpsk_mapper(msgq_limit, 
options.occupied_tones, options.fft_length)
+            #self._pkt_input = gr.ofdm_qpsk_mapper(msgq_limit, 
options.occupied_tones, options.fft_length)
+            self._pkt_input = gr.ofdm_qam_mapper(msgq_limit, 
options.occupied_tones, options.fft_length, 16)
             self.preambles = gr.ofdm_insert_preamble(options.fft_length, 
padded_preambles)
             self.ifft = gr.fft_vcc(options.fft_length, False, win, True)
             self.cp_adder = gr.ofdm_cyclic_prefixer(options.fft_length, 
symbol_length)
@@ -209,7 +211,8 @@
         
         symbol_length = options.fft_length + options.cp_length
         self.ofdm_recv = ofdm_receiver(fg, options.fft_length, 
options.cp_length,
-                                       options.occupied_tones, options.snr, 
preambles)
+                                       options.occupied_tones, options.snr, 
preambles,
+                                       options.log)
         self.ofdm_demod = gr.ofdm_frame_sink(self._rcvd_pktq,
                                              options.occupied_tones)
         

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
    2007-06-07 01:43:02 UTC (rev 5724)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
    2007-06-07 02:06:48 UTC (rev 5725)
@@ -27,7 +27,7 @@
 from gnuradio.blksimpl.ofdm_sync_pnac import ofdm_sync_pnac
 
 class ofdm_receiver(gr.hier_block):
-    def __init__(self, fg, fft_length, cp_length, occupied_tones, snr, ks):
+    def __init__(self, fg, fft_length, cp_length, occupied_tones, snr, ks, 
logging=False):
         self.fg = fg
 
         bw = (float(occupied_tones) / float(fft_length)) / 2.0
@@ -42,7 +42,7 @@
         win = [1 for i in range(fft_length)]
 
         #self.ofdm_sync_ml = ofdm_sync_ml(fg, fft_length, cp_length, snr)
-        self.ofdm_sync_pn = ofdm_sync_pn(fg, fft_length, cp_length)
+        self.ofdm_sync_pn = ofdm_sync_pn(fg, fft_length, cp_length, logging)
         #self.ofdm_sync_pnac = ofdm_sync_pnac(fg, fft_length, cp_length, ks[0])
 
         self.fft_demod = gr.fft_vcc(fft_length, True, win, True)
@@ -58,7 +58,7 @@
             self.fg.connect(self.chan_filt, self.ofdm_sync_pn, self.fft_demod, 
self.ofdm_corr)
             #self.fg.connect(self.chan_filt, self.ofdm_sync_pnac)
         
-        if 1:
+        if logging:
             self.fg.connect(self.chan_filt, gr.file_sink(gr.sizeof_gr_complex, 
"chan_filt_c.dat"))
             self.fg.connect(self.fft_demod, 
gr.file_sink(gr.sizeof_gr_complex*fft_length, "fft_out_c.dat"))
             self.fg.connect(self.ofdm_corr, 
gr.file_sink(gr.sizeof_gr_complex*occupied_tones, "ofdm_corr_out_c.dat"))

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pn.py
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pn.py
     2007-06-07 01:43:02 UTC (rev 5724)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync_pn.py
     2007-06-07 02:06:48 UTC (rev 5725)
@@ -25,7 +25,7 @@
 from gnuradio import gr
 
 class ofdm_sync_pn(gr.hier_block):
-    def __init__(self, fg, fft_length, cp_length):
+    def __init__(self, fg, fft_length, cp_length, logging=False):
         self.fg = fg
 
         # FIXME: when converting to hier_block2's, the output signature
@@ -114,7 +114,7 @@
         self.fg.connect(self.pk_detect, (self.sample_and_hold,1))
 
 
-        if 1:
+        if logging:
             self.fg.connect(self.matched_filter, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-mf_f.dat"))
             self.fg.connect(self.normalize, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-theta_f.dat"))
             self.fg.connect(self.angle, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-epsilon_f.dat"))