IoT Ox / Mbed 2 deprecated MainSketch Featured

Contains the main execution of the clock uses headers to import functions

Dependencies:   RTC-DS1307 SPI_TFT_ILI9341 TFT_fonts mbed tsi_sensor

Fork of TFT_Mikroelectronika_IL9341_sketchpad by Oxford CWM Team

Files at this revision

API Documentation at this revision

Revision 13:e74e09de81e4, committed 2017-05-25

Comitter:
Owenmatthewmcgowan
Date:
Thu May 25 09:22:22 2017 +0000
Parent:
12:50289d0ac834
Child:
14:e0fb408647cf
Child:
15:796e17680825
Commit message:
edited settings display 10:20 thurs

Changed in this revision

poll.h Show annotated file Show diff for this revision Revisions of this file
settings.h Show annotated file Show diff for this revision Revisions of this file 
--- a/poll.h	Wed May 24 16:15:04 2017 +0000
+++ b/poll.h	Thu May 25 09:22:22 2017 +0000
@@ -31,7 +31,7 @@
 
 
 
-int readX()
+int readY()
 {
     int delta = 0, xv1 = 0, xv2 = 0, k = 0;
     int temp1 = 0, temp2 = 0;
@@ -67,7 +67,7 @@
     //return(xv2/10); //maybe better to return the average of both....
 }
 // subroutine to read y values - has different pin functions ..
-int readY()
+int readX()
 {
     DigitalOut yp(PTB3);
     DigitalOut ym(PTB2);

--- a/settings.h	Wed May 24 16:15:04 2017 +0000
+++ b/settings.h	Thu May 25 09:22:22 2017 +0000
@@ -13,13 +13,17 @@
     
     //set New button (used to set new alarm/time/date)
     TFT.set_font((unsigned char*) Arial12x12); 
-    TFT.locate(0,40);
-    TFT.printf("Set New");
+    TFT.locate(71,25);
+    TFT.set_orientation(0);
+    
+    TFT.printf("Cancel");
+    TFT.set_orientation(1);
 
     //Full reset button
-    TFT.locate(0,140);
-    TFT.printf("Full reset");
-
+    TFT.locate(170,25);
+    TFT.set_orientation(0);
+    TFT.printf("Set New");
+    TFT.set_orientation(1);
      //home button
     TFT.locate(0,210);
     TFT.printf("Home");
@@ -31,18 +35,17 @@
     TFT.rect(50,0,320,100,Blue);  //set alarm box
     TFT.rect(50,100,320,200,White); //set time box
     TFT.rect(50,200,320,240,White); //set date box
-    
+
     TFT.set_font((unsigned char*) Arial12x12); //set alarm title
     TFT.locate(105,0);
     TFT.printf("Set Alarm");
-
     TFT.set_font((unsigned char*) Arial28x28); //set alarm hour
     TFT.locate(50,30);
-    TFT.printf("Alarm_Hour");
+    TFT.printf("AH");//Alarm_Hour
 
      //set alarm mins
     TFT.locate(230,30);
-    TFT.printf("Alarm_Min");
+    TFT.printf("Am");//Alarm_Min
     
     TFT.set_font((unsigned char*) Arial12x12); //set time title
     TFT.locate(105,100);
@@ -50,11 +53,11 @@
 
     TFT.set_font((unsigned char*) Arial28x28); //set time hour
     TFT.locate(50,130);
-    TFT.printf("Time_Hour");
+    TFT.printf("TH"); // Time_hour
     
     //set time mins
     TFT.locate(230,130);
-    TFT.printf("Alarm_Min");
+    TFT.printf("TM");//Time Min
 
     TFT.set_font((unsigned char*) Arial12x12);//set date day
     TFT.locate(50,200);