Revision 106:5137c38345d3, committed 2013-09-12

Comitter:

gatedClock

Date:

Thu Sep 12 21:11:59 2013 +0000

Parent:

105:d08988bfb31b

Child:

107:7de171a8464e

Commit message:

cleanup.

Changed in this revision

--- a/main.cpp	Thu Sep 12 21:10:06 2013 +0000
+++ b/main.cpp	Thu Sep 12 21:11:59 2013 +0000
@@ -102,7 +102,7 @@
     Queue<int, 1> queueSuppressTimeAdjust;      // total time control.
     Queue<int, 1> queueClearTotalTime;          // total time control.
 //--global_variables----------------------------//------------------------------ 
-    char     gcInitializePipeline;              // 1 to initialize pipeline state.
+
     float    gfCelsius;                         // from thermometer.
         
     tButtons gtButtons;                         // ISR button updates.
@@ -131,15 +131,12 @@
     Timer        debounceTimer;                 // button debounce timer.
     Timer        beepTimer;                     // beep-duration timer.
     Timer        temperatureTimer;              // how often to raise temperature.
-    Timer        doneTimer;                     // how long in FSM done state.
+
 
     Ticker       tickerButtonStateManager;      // manage the button states.
     Ticker       tickerSlowClock;               // generate a ~1Hz clock.
     Ticker       tickerCookCountdown;           // remaining cook time.      
     Ticker       tickerBeep;                    // beeper ticker. 
-    
- //   Timer        timerFSMdone;                  // duration of FSM 'done' state.
-
 //-------prototypes-----------------------------//------------------------------
 
     void slowClock();                           // 1Hz or thereabouts.
@@ -192,7 +189,7 @@
       debounceTimer.start();                    // kick-off debounce timer.
       
       
-      gcInitializePipeline = 1;                 // tell pipeline to initialize.
+
       
       initialization();                         // initialize variables.
 
@@ -374,11 +371,11 @@
             
       osEvent   queueEvent;                     // from button state manager.
       beepTimer.start();                        // run the beep timer.
-      doneTimer.start();
+
 
       dBeepSeconds = BEEPTIME;
       
-  //    queueModTotalTime.put((int *) dMessage,1);// pre
+
       
       
       queueTemperatureControl.put((int *) TEMP_READ,1);