Diff: clocklogic.h

Revision:

19:4c30c3182e04

Parent:

17:356a299d3224

Child:

29:684e2a3e17b5

--- a/clocklogic.h	Thu May 25 10:17:45 2017 +0000
+++ b/clocklogic.h	Thu May 25 10:58:02 2017 +0000
@@ -1,4 +1,4 @@
-int digital_clock_button_press(){
+int digital_clock_press(){
     int x = readX();
     int y = readY();
     if (touching == 1) {
@@ -26,7 +26,7 @@
             //set desired state to 0
             return 0;
         }
-        else if (x > 140 && x < 230 && y >  100 && y < 200) // alarm button on or off
+        else if (x > 140 && x < 320 && y >  100 && y < 200) // alarm button on or off
         {
             //set desired state to 5
             f_alarm = !(f_alarm);
@@ -39,12 +39,28 @@
     
 
 
-void clock()
+void runclock()
 {
     draw_state(1);
     while (f_state == 1){
-        read_time()
+        read_time();
         TFT.set_font((unsigned char*) Arial24x23); //set alarm hour
+        if (tm_c.sec == 0){
+            TFT.locate(250,40);
+            TFT.printf("  ");
+            if (tm_c.min == 0){
+                TFT.locate(160,40);
+                printf("%d",tm_c.min);
+                if (tm_c.hour == 0)
+                {
+                    TFT.locate(70,40);
+                    printf("%d",tm_c.hour);
+                }
+            }
+        }
+            
+            
+            
         TFT.locate(70,40);
         TFT.printf("%d",tm_c.hour);
         TFT.locate(160,40);
@@ -56,25 +72,26 @@
         TFT.printf("%s",rtc.weekdayToString(tm_c.wday));
         TFT.set_font((unsigned char*) Arial24x23);
         if (f_alarm) {
-        TFT.locate(160,140);
-        TFT.printf("%d",tm_a_hr);
-        TFT.locate(250,40);    
-        TFT.printf("%d",tm_a_min);    
+            TFT.locate(160,140);
+            TFT.printf("%d",tm_a_hr);
+            TFT.locate(250,140);    
+            TFT.printf("%d",tm_a_min);    
         }
         else
         {
             TFT.locate(160,140);
             TFT.printf("   ");
-           TFT.locate(250,40);    
+           TFT.locate(250,140);    
            TFT.printf("   ");   
         }
-        TFT.locate(210,70);
-        TFT.printf("%s",tm_c.date);
-        TFT.locate(250,160);    
+        TFT.locate(70,210);
+        TFT.printf("%d / %d / %d", tm_c.date, tm_c.mon, tm_c.year);
+        wait(0.2);
+       /* TFT.locate(160,210);    
         TFT.printf("%d",tm_c.mon);    
-        TFT.locate(250,250);    
-        TFT.printf("%d",tm_c.year);    
-        }
+        TFT.locate(220,210);    
+        TFT.printf("%d",tm_c.year);     */
+        
         switch (digital_clock_press()){
             case (-1): break;
             case (0): f_state = 0; break;