summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authortrondeau2008-01-29 19:58:49 +0000
committertrondeau2008-01-29 19:58:49 +0000
commitd25106c30ba0b169148ddaf98bb30dfd38012e03 (patch)
tree1934fe5d02103f4ad91d076bb07594883a6ae261 /gnuradio-core
parent1881514841bf270dfeaf7884233e2c88acbe0bd4 (diff)
downloadgnuradio-d25106c30ba0b169148ddaf98bb30dfd38012e03.tar.gz
gnuradio-d25106c30ba0b169148ddaf98bb30dfd38012e03.tar.bz2
gnuradio-d25106c30ba0b169148ddaf98bb30dfd38012e03.zip
Switched OFDM sync block to use peak detector from Kyle Jamieson. This solves one problem of locking up with low SNR but does not solve the big over-the-air problems.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7523 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py b/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
index e3e0ad9d2..0ec22cced 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
@@ -86,9 +86,9 @@ class ofdm_sync_pn(gr.hier_block2):
self.sigmix = gr.multiply_cc()
#ML measurements input to sampler block and detect
- self.sub1 = gr.add_const_ff(-1)
- self.pk_detect = gr.peak_detector_fb(0.20, 0.20, 30, 0.001)
- #self.pk_detect = gr.peak_detector2_fb()
+ #self.sub1 = gr.add_const_ff(-1)
+ #self.pk_detect = gr.peak_detector_fb(0.20, 0.20, 30, 0.001)
+ self.pk_detect = gr.peak_detector2_fb(9)
#self.pk_detect = gr.threshold_detector_fb(0.5)
self.regen = gr.regenerate_bb(symbol_length)
@@ -123,7 +123,8 @@ class ofdm_sync_pn(gr.hier_block2):
self.matched_filter = gr.fir_filter_fff(1,matched_filter_taps)
self.connect(self.normalize, self.matched_filter)
- self.connect(self.matched_filter, self.sub1, self.pk_detect)
+ #self.connect(self.matched_filter, self.sub1, self.pk_detect)
+ self.connect(self.matched_filter, self.pk_detect)
self.connect(self.pk_detect, self.regen)
self.connect(self.regen, (self.sampler,1))
self.connect(self.pk_detect, (self.sample_and_hold,1))