[Commit-gnuradio] r4594 - in gnuradio/branches/developers/n4hy/ofdm: gnuradio-core/src/lib/general gnuradio-examples/python/ofdm

[n4hy]

Author: n4hy
Date: 2007-02-22 10:29:40 -0700 (Thu, 22 Feb 2007)
New Revision: 4594

Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_dpll_ff.cc
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
Log:
bug fix in gr_dpll, mod to ofdm_receiver

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_dpll_ff.cc
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_dpll_ff.cc
  2007-02-22 17:22:01 UTC (rev 4593)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_dpll_ff.cc
  2007-02-22 17:29:40 UTC (rev 4594)
@@ -44,6 +44,13 @@
   d_pulse_frequency = 1.0/period;
   d_gain = gain;
   d_decision_threshold = 1.0 - 0.5*d_pulse_frequency;
+#if 1
+  fprintf(stderr,"frequency = %f period = %f gain = %f threshold = %f\n",
+         d_pulse_frequency,
+         period,
+         d_gain,
+         d_decision_threshold);
+#endif
   set_history(1); // so we can look behind us
 }
 
@@ -62,7 +69,7 @@
        d_pulse_phase = 1;
        d_restart += 3;
       } else {
-       if (d_restart == 1) d_restart+=1;
+       if (d_restart >0) d_restart+=1;
        if (d_pulse_phase > 0.5) d_pulse_phase += d_gain*(1.0-d_pulse_phase);
        else d_pulse_phase -= d_gain*d_pulse_phase;
       }

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 17:22:01 UTC (rev 4593)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
       2007-02-22 17:29:40 UTC (rev 4594)
@@ -84,11 +84,11 @@
         self.fg.connect(self.moving_sum_filter,(self.diff,1))
 
         #ML measurements input to sampler block and detect
-        nco_sensitivity = 0 #1.0/fft_length
+        nco_sensitivity = 1.0/fft_length
         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.dpll = gr.dpll_ff(float(symbol_length),0.01)
         self.sample_and_hold = gr.sample_and_hold_ff()
         self.nco = gr.frequency_modulator_fc(nco_sensitivity)
         self.inv = gr.multiply_const_ff(-1)
@@ -129,7 +129,7 @@
         self.fg.connect(self.sample_and_hold, self.inv, self.nco)
         
 
-        if 1:
+        if 0:
             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: