[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5743 - gnuradio/branches/features/ofdm/sync/gnuradio-
From: |
trondeau |
Subject: |
[Commit-gnuradio] r5743 - gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl |
Date: |
Fri, 8 Jun 2007 13:44:33 -0600 (MDT) |
Author: trondeau
Date: 2007-06-08 13:44:32 -0600 (Fri, 08 Jun 2007)
New Revision: 5743
Modified:
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
Log:
cleaning up to make handling choice of sync block easier
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-08 19:43:12 UTC (rev 5742)
+++
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
2007-06-08 19:44:32 UTC (rev 5743)
@@ -41,22 +41,19 @@
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, logging)
- #self.ofdm_sync_pnac = ofdm_sync_pnac(fg, fft_length, cp_length, ks[0])
+ SYNC = "pn"
+ if SYNC == "ml":
+ self.ofdm_sync = ofdm_sync_ml(fg, fft_length, cp_length, snr,
logging)
+ elif SYNC == "pn":
+ self.ofdm_sync = ofdm_sync_pn(fg, fft_length, cp_length, logging)
+ elif SYNC == "pnac":
+ self.ofdm_sync = ofdm_sync_pnac(fg, fft_length, cp_length, ks[0])
self.fft_demod = gr.fft_vcc(fft_length, True, win, True)
self.ofdm_corr = gr.ofdm_correlator(occupied_tones, fft_length,
cp_length, ks[1], ks[2])
- if 0:
- self.fg.connect(self.chan_filt, self.ofdm_sync_ml, self.fft_demod,
self.ofdm_corr)
- self.fg.connect(self.chan_filt, self.ofdm_sync_pn)
- self.fg.connect(self.chan_filt, self.ofdm_sync_pnac)
- if 1:
- #self.fg.connect(self.chan_filt, self.ofdm_sync_ml)
- 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)
+ self.fg.connect(self.chan_filt, self.ofdm_sync, self.fft_demod,
self.ofdm_corr)
if logging:
self.fg.connect(self.chan_filt, gr.file_sink(gr.sizeof_gr_complex,
"chan_filt_c.dat"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5743 - gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl,
trondeau <=