IoT Ox / Mbed 2 deprecated MainSketch Featured

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   RTC-DS1307 SPI_TFT_ILI9341 TFT_fonts mbed tsi_sensor

Fork of TFT_Mikroelectronika_IL9341_sketchpad by Oxford CWM Team

Diff: analoglogic.h

Revision:
44:1c516642c34e
Parent:
42:5d9ccb16c8ef
Parent:
40:05798eeadd02
Child:
48:76ac309a2bd9
--- a/analoglogic.h	Fri May 26 08:36:54 2017 +0000
+++ b/analoglogic.h	Fri May 26 08:38:04 2017 +0000
@@ -23,7 +23,9 @@
         else if (x > 0 && x < 50 && y > 150 && y < 200) // side button 4 
         {
             //set desired state to 4
-            return 4;
+           // f_cycle = !f_cycle;
+           return 4;
+            
         }else if (x > 0 && x < 50 && y > 200 && y < 240) // button home
         {
             //set desired state to 0
@@ -106,13 +108,18 @@
         TFT.printf("%d",tm_c.mon);    
         TFT.locate(220,210);    
         TFT.printf("%d",tm_c.year);     */
-        
-        switch (digital_clock_press()){
+        if (f_cycle){
+            f_state = 1;
+            wait(1);
+        }
+        switch (ana_clock_press()){
             case (-1): break;
             case (0): f_state = 1; break;
             case (1): f_state = 1; break;
             case (2): f_state = 3; break;
             case (3): f_state = 4; break;
+            case (4): f_state = 5; break;
         }
+        
     }
 }
\ No newline at end of file