[Commit-gnuradio] r4115 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general

[matt]

Author: matt
Date: 2006-12-17 16:14:35 -0700 (Sun, 17 Dec 2006)
New Revision: 4115

Removed:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.lo
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.lo
Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
Log:
OFDM receiver working with frequency offsets

Deleted: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.lo

Deleted: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.lo

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
     2006-12-17 20:30:39 UTC (rev 4114)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
     2006-12-17 23:14:35 UTC (rev 4115)
@@ -45,38 +45,11 @@
     d_fft_length(fft_length), d_symbol_length(symbol_length), d_delay(delay), 
     d_phase(0), d_freq(0), d_avg(0)
 {
-  glb_i = 0;
-  i_now = 0;
 }
 
-/*
 void
 gr_ofdm_sampler::forecast (int noutput_items, gr_vector_int 
&ninput_items_required)
 {
-  int nreqd = 0;
-
-  if(d_delay >= 0) {
-    nreqd = d_symbol_length * noutput_items + d_delay;
-    //fprintf(stderr, "forecast delay>=0\n");
-  }
-  else if((unsigned)abs(d_delay) > d_symbol_length) {
-    nreqd = d_symbol_length * noutput_items + (abs(d_delay) - noutput_items);
-    //fprintf(stderr, "forecast |delay|>symbol_length\n");
-  }
-  else {
-    nreqd = d_symbol_length * noutput_items;
-    //    fprintf(stderr, "forecast else\n");
-  }
-
-  unsigned ninputs = ninput_items_required.size ();
-  for (unsigned i = 0; i < ninputs; i++)
-    ninput_items_required[i] = nreqd+1;
-}
-*/
-
-void
-gr_ofdm_sampler::forecast (int noutput_items, gr_vector_int 
&ninput_items_required)
-{
   // FIXME need more if we want to produce more than 1
   int nreqd  = d_fft_length + d_symbol_length + 1;
   unsigned ninputs = ninput_items_required.size ();
@@ -106,102 +79,20 @@
   while(i<d_symbol_length+d_fft_length && (found==0)) {
     if( (theta[i].real() > d_avg*0.10) &&
        (theta[i].real() > theta[i+1].real()) ) {
-      fprintf(stderr,"Peak at %d, %f\n",i,theta[i].real());
+      //      fprintf(stderr,"%d: %f 
%f\n",i,theta[i].real(),epsilon[i].real());
       found = 1;
+      d_freq = epsilon[i].real() / d_fft_length;
       for(unsigned int j=0;j<d_fft_length;j++) {
-       *optr++ = iptr[i-d_fft_length+j+1];
+       d_phase += d_freq;
+       gr_complex nco = gr_expj(-d_phase);
+       *optr++ = nco * iptr[i-d_fft_length+j+1];
       }
     }
     else {
+      d_phase += d_freq;
       i++;
     }
   }
   consume_each(d_symbol_length);
   return found;
 }
-
-  /*
-  for(unsigned int i=0;i<d_symbol_length;i++)
-    fprintf(stderr,"%d  %f\n",i,theta[i].real());
-  for(unsigned int i=0;i<d_fft_length;i++) {
-    *optr++ = iptr[i+d_delay];
-    */
-
-/*
-int
-gr_ofdm_sampler::general_work (int noutput_items,
-                              gr_vector_int &ninput_items,
-                              gr_vector_const_void_star &input_items,
-                              gr_vector_void_star &output_items)
-{
-  gr_complex *theta   = (gr_complex *) input_items[1];
-  gr_complex *epsilon = (gr_complex *) input_items[2];
-  gr_complex *iptr = (gr_complex *) input_items[0];
-  gr_complex *optr = (gr_complex *) output_items[0];
-
-  bool found = false;
-  unsigned int peak_index=0;
-  unsigned int nproduced=0;
-  unsigned int i = 0;
-
-  fprintf(stderr, "enter\n");
-
-// while(i < -(std::min(0, d_delay))) {
-//   increment_loop((theta[i]).real());
-//  i++;
-//  glb_i++;
-  }
-
-
-unsigned int lastindex = ninput_items[0] - std::max(0, d_delay) - 
d_symbol_length;
-
-  while(i < lastindex) {
-    found = false;
-    
-    if(theta[i].real() > d_avg*0.10) {
-      while((i < lastindex) && (!found)) {
-       if(theta[i+1].real() < theta[i].real()) {
-         peak_index = i-1;
-         d_freq = 0; //epsilon[peak_index].real();
-         found = true;
-         fprintf(stderr, "peak hit: %d \t theta: %f avg: %f freq: %f\n", 
-                 glb_i-i_now, theta[peak_index].real(), d_avg, d_freq);
-         i_now = glb_i;
-         //memcpy(&optr[nproduced*d_fft_size], &iptr[peak_index], 
d_fft_size*sizeof(gr_complex));
-         nproduced++;
-         while(i < peak_index + d_symbol_length-1) {
-           gr_complex nco_out = gr_expj(-d_phase);
-           *optr++ = nco_out * iptr[i];
-           increment_loop((theta[i]).real());
-           i++;
-           glb_i++;
-         }
-       }
-       else {
-         increment_loop((theta[i]).real());
-         i++;
-         glb_i++;
-       }
-      }
-    }
-    else {
-      increment_loop((theta[i]).real());
-      i++;
-      glb_i++;
-    }
-  }
-  
-  fprintf(stderr, "exit\n");
-
-  consume_each(i);
-  return nproduced;
-}
-*/
-
-void gr_ofdm_sampler::increment_loop(float theta)
-{
-  float alpha = 0.01;
-  d_phase += d_freq * (1.0/(2.0*M_PI));
-  d_avg = (alpha)*theta + (1-alpha)*d_avg;
-  //  fprintf(stderr, "avg: %f\t theta: %f\n", d_avg, theta);
-}

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
      2006-12-17 20:30:39 UTC (rev 4114)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
      2006-12-17 23:14:35 UTC (rev 4115)
@@ -54,11 +54,6 @@
   float d_freq;
   float d_avg;
 
-  unsigned int glb_i;
-  unsigned int i_now;
-
-  void increment_loop(float theta);
-
  public:
   void forecast (int noutput_items, gr_vector_int &ninput_items_required);