[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5630 - gnuradio/branches/features/ofdm/receiver/gnura
From: |
trondeau |
Subject: |
[Commit-gnuradio] r5630 - gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl |
Date: |
Sat, 2 Jun 2007 23:17:17 -0600 (MDT) |
Author: trondeau
Date: 2007-06-02 23:17:16 -0600 (Sat, 02 Jun 2007)
New Revision: 5630
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync.py
Log:
adjustments -- ofdm working in continuous mode with noise, frequency offset,
and multipath; gets first packet
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
2007-06-03 04:32:21 UTC (rev 5629)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py
2007-06-03 05:17:16 UTC (rev 5630)
@@ -58,10 +58,10 @@
win = [] #[1 for i in range(self._fft_length)]
# hard-coded known symbol
- #ks1 = known_symbols_4512_1[0:options.occupied_tones]
+ ks1 = known_symbols_4512_1[0:options.occupied_tones]
+ #ks1 = known_symbols_4512_impulse[0:options.occupied_tones]
ks2 = known_symbols_4512_2[0:options.occupied_tones]
- ks1 = known_symbols_4512_impulse[0:options.occupied_tones]
-
+
symbol_length = options.fft_length + options.cp_length
# accepts messages from the outside world
@@ -158,8 +158,8 @@
"""
self._rcvd_pktq = gr.msg_queue() # holds packets from the PHY
- #ks1 = known_symbols_4512_1[0:options.occupied_tones]
- ks1 = known_symbols_4512_impulse[0:options.occupied_tones]
+ ks1 = known_symbols_4512_1[0:options.occupied_tones]
+ #ks1 = known_symbols_4512_impulse[0:options.occupied_tones]
ks2 = known_symbols_4512_2[0:options.occupied_tones]
symbol_length = options.fft_length + options.cp_length
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
2007-06-03 04:32:21 UTC (rev 5629)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
2007-06-03 05:17:16 UTC (rev 5630)
@@ -50,5 +50,6 @@
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"))
+ self.fg.connect((self.ofdm_corr,1), gr.file_sink(1,
"found_corr_b.dat"))
gr.hier_block.__init__(self, fg, self.chan_filt, self.ofdm_corr)
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync.py
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync.py
2007-06-03 04:32:21 UTC (rev 5629)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_sync.py
2007-06-03 05:17:16 UTC (rev 5630)
@@ -80,7 +80,7 @@
nco_sensitivity = 1.0/fft_length
self.f2c = gr.float_to_complex()
self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
- self.pk_detect = gr.peak_detector_fb(0.2, 0.25, 30, 0.0001)
+ self.pk_detect = gr.peak_detector_fb(0.2, 0.25, 30, 0.0005)
self.sample_and_hold = gr.sample_and_hold_ff()
self.nco = gr.frequency_modulator_fc(nco_sensitivity)
self.inv = gr.multiply_const_ff(-1)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5630 - gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl,
trondeau <=