Mike Moore / Mbed 2 deprecated RTOS_HW_07

homework 7

Dependencies:   mbed-rtos mbed C12832_lcd LM75B

Files at this revision

API Documentation at this revision

Revision 107:7de171a8464e, committed 2013-09-12

Comitter:
gatedClock
Date:
Thu Sep 12 21:14:18 2013 +0000
Parent:
106:5137c38345d3
Child:
108:da479434bd7d
Commit message:
cleanup.

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Thu Sep 12 21:11:59 2013 +0000
+++ b/main.cpp	Thu Sep 12 21:14:18 2013 +0000
@@ -103,7 +103,7 @@
     Queue<int, 1> queueClearTotalTime;          // total time control.
 //--global_variables----------------------------//------------------------------ 
 
-    float    gfCelsius;                         // from thermometer.
+  //  float    gfCelsius;                         // from thermometer.
         
     tButtons gtButtons;                         // ISR button updates.
     
@@ -669,6 +669,7 @@
       int       dCurrentTimerMs;
       int       dPreviousTimerMs;
       float     fLastMeasuredTemperature;
+      float     fCelsius;
       osEvent   queueEvent;                     // from button state manager.
       
       dCurrentTimerMs = 0;
@@ -688,8 +689,8 @@
       
         if (dTempControl == TEMP_READ)
         {
-          gfCelsius = temperature.read();         // physical measurement.
-          fLastMeasuredTemperature = gfCelsius;
+          fCelsius = temperature.read();         // physical measurement.
+          fLastMeasuredTemperature = fCelsius;
 //          temperatureTimer.reset();             // reset timer while we're not using it.
         }
         
@@ -698,7 +699,7 @@
         
         
         
-         gfCelsius = ((float) (giRemainingTime.dTotalTime - giRemainingTime.dRemainingTime) / (float) 6.0) + fLastMeasuredTemperature;
+         fCelsius = ((float) (giRemainingTime.dTotalTime - giRemainingTime.dRemainingTime) / (float) 6.0) + fLastMeasuredTemperature;
             
             
             
@@ -708,7 +709,7 @@
       
       
       
-        giLCD.fCelsius = gfCelsius;
+        giLCD.fCelsius = fCelsius;
         
       
         Thread::wait(THREAD_1_WAITmS);          // multitasking.