Diff: main.cpp

Revision:

1:026d80a2f7a9

Parent:

0:c2a88630fb72

Child:

2:63ef0a1afcbe

--- a/main.cpp	Wed Apr 29 13:59:21 2015 +0000
+++ b/main.cpp	Wed Apr 29 14:21:02 2015 +0000
@@ -29,17 +29,18 @@
 
 void menu()
 {
-    if (POT<(1.0/2.0)) {
-        lcd.printString("Temperature",15,3);
-        lcd.printString(">",76,3);
-        lcd.printString("Graph",6,6);
-        lcd.printString("Current",42,6);
+    lcd.clear();
+    if (POT>(1.0/2.0)) {
+        lcd.printString("Temperature",2,2);
+        lcd.printString(">",76,2);
+        lcd.printString("Graph",0,5);
+        lcd.printString("Current",42,5);
 
     } else {
-        lcd.printString("Pressure",18,3);
-        lcd.printString("<",2,3);
-        lcd.printString("Graph",6,6);
-        lcd.printString("Current",42,6);
+        lcd.printString("Pressure",18,2);
+        lcd.printString("<",2,2);
+        lcd.printString("Graph",0,5);
+        lcd.printString("Current",42,5);
 
     }
 }
@@ -97,15 +98,21 @@
     timer.attach (&timerExpired , 1.0);
     timeOut.attach (&timeOutStopped , 2.0);
     screen();
+
     while(1) {
         if (timeOutFlag ==1 ){
-        if (timerFlag ==1){
-            timerFlag = 0;
-        lcd.clear();
-        recieveData();
-        displayData();
-        //  menu();
-        }
+            
+            menu();
+            
+            
+            
+//        if (timerFlag ==1){
+//            timerFlag = 0;
+//        lcd.clear();
+//        recieveData();
+//        displayData();
+//        //  menu();
+//        }
     }
     }
 }