[Commit-gnuradio] r8071 - gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2008-03-22 14:25:26 -0600 (Sat, 22 Mar 2008)
New Revision: 8071

Modified:
   
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
   
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
   
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
Log:
Increased default reset timeout period and cleaned up a few things.

Modified: 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
 2008-03-22 01:17:15 UTC (rev 8070)
+++ 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
 2008-03-22 20:25:26 UTC (rev 8071)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -82,6 +82,7 @@
     if(trigger[index]) {
       outsig[0] = 1; // tell the next block there is a preamble coming
       d_state = STATE_PREAMBLE;
+      printf("Found preamble symbol\n");
     }
     else
       index++;
@@ -103,7 +104,6 @@
     
   case(STATE_FRAME):
     // use this state when we have processed a preamble and are getting the 
rest of the frames
-    //FIXME: add a timeout clause here to enter state STATE_NO_SIG after so 
many times here
     //FIXME: we could also have a power squelch system here to enter 
STATE_NO_SIG if no power is received
 
     // skip over fft length history and cyclic prefix
@@ -113,6 +113,7 @@
     }
 
     if(d_timeout-- == 0) {
+      printf("TIMEOUT\n");
       d_state = STATE_NO_SIG;
     }
 

Modified: 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
  2008-03-22 01:17:15 UTC (rev 8070)
+++ 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
  2008-03-22 20:25:26 UTC (rev 8071)
@@ -30,7 +30,7 @@
 
 gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, 
                                           unsigned int symbol_length,
-                                          unsigned int timeout=100);
+                                          unsigned int timeout=1000);
 
 /*!
  * \brief does the rest of the OFDM stuff

Modified: 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
  2008-03-22 01:17:15 UTC (rev 8070)
+++ 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
  2008-03-22 20:25:26 UTC (rev 8071)
@@ -24,7 +24,7 @@
 
   gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, 
                                             unsigned int symbol_length,
-                                            unsigned int timeout=100);
+                                            unsigned int timeout=1000);
 
 class gr_ofdm_sampler : public gr_sync_block
 {