[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4589 - gnuradio/branches/developers/n4hy/ofdm/gnuradi
From: |
n4hy |
Subject: |
[Commit-gnuradio] r4589 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm |
Date: |
Thu, 22 Feb 2007 09:38:23 -0700 (MST) |
Author: n4hy
Date: 2007-02-22 09:38:22 -0700 (Thu, 22 Feb 2007)
New Revision: 4589
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
Log:
adding dpll to ofdm_receiver.py
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
2007-02-22 16:29:05 UTC (rev 4588)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
2007-02-22 16:38:22 UTC (rev 4589)
@@ -88,6 +88,7 @@
self.f2c = gr.float_to_complex()
self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
self.pkt_detect = gr.peak_detector_ff(0.2, 0.25, 30, 0.0001)
+ self.dpll = gr.dpll_ff(float(symbol_length),0.02)
self.sample_and_hold = gr.sample_and_hold_ff()
self.nco = gr.frequency_modulator_fc(nco_sensitivity)
self.inv = gr.multiply_const_ff(-1)
@@ -98,7 +99,7 @@
self.fg.connect(self.nco, (self.sigmix,1))
self.fg.connect(self.sigmix, (self.sampler,0))
- sample_trigger = 1
+ sample_trigger = 0
if sample_trigger:
# for testing
peak_null = gr.null_sink(gr.sizeof_float)
@@ -115,19 +116,24 @@
# self.angle = epsilon
self.fg.connect(self.diff, self.pkt_detect)
-
+ use_dpll = 1
if not sample_trigger:
- self.fg.connect(self.pkt_detect, self.f2c, (self.sampler,1))
- self.fg.connect(self.pkt_detect, (self.sample_and_hold,1))
+ if use_dpll:
+ self.fg.connect(self.pkt_detect, self.dpll,self.f2c,
(self.sampler,1))
+ self.fg.connect(self.dpll, (self.sample_and_hold,1))
+ if not use_dpll:
+ self.fg.connect(self.pkt_detect, self.f2c, (self.sampler,1))
+ self.fg.connect(self.pkt_detect, (self.sample_and_hold,1))
self.fg.connect(self.angle, (self.sample_and_hold,0))
self.fg.connect(self.sample_and_hold, self.inv, self.nco)
- if 0:
+ if 1:
self.fg.connect(self.diff, gr.file_sink(gr.sizeof_float,
"theta_f.dat"))
self.fg.connect(self.angle, gr.file_sink(gr.sizeof_float,
"epsilon_f.dat"))
-
+ if use_dpll:
+ self.fg.connect(self.dpll, gr.file_sink(gr.sizeof_float,
"dpll_pulses.dat"))
if sample_trigger:
self.fg.connect(peak_trigger, gr.file_sink(gr.sizeof_float,
"peaks_f.dat"))
else:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4589 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm,
n4hy <=