Smart clock by Duncan and Kieran

Revision 5:f5fa116b57a1, committed 2017-05-24

Comitter:

scat6490

Date:

Wed May 24 14:57:37 2017 +0000

Parent:

4:2013f3158cc6

Child:

6:d80627e78bfd

Commit message:

Display, clock, alarm, time changing, Wednesday 3:55pm; Commented and small changes

Changed in this revision

--- a/main.cpp	Wed May 24 13:50:26 2017 +0000
+++ b/main.cpp	Wed May 24 14:57:37 2017 +0000
@@ -1,4 +1,3 @@
-
 #include "stdio.h"
 #include "mbed.h"
 #include "SPI_TFT_ILI9341.h"
@@ -8,138 +7,145 @@
 #include "Arial28x28.h"
 #include "font_big.h"
 
-Ticker timer;
-DigitalOut buzzer(PTA12);
-DigitalIn input1(PTA4);
-DigitalIn input60(PTC8);
-DigitalIn input_time_change(PTC9);
-Serial pc(USBTX,USBRX);
+Ticker timer; // Set up a timer
+DigitalOut buzzer(PTA12); // Set up inputs and outputs
+DigitalIn input1(PTA4); // Input for the minute button
+DigitalIn input60(PTC8); // Input for the hour button
+DigitalIn input_time_change(PTC9); // Input for the button which switches from changing the alarm and changing the time
+Serial pc(USBTX,USBRX); // Connection to the desktop, currently only used for debugging
 SPI_TFT_ILI9341 TFT(PTD2, PTD3, PTD1, PTD5, PTD0, PTA13,"TFT"); // mosi, miso, sclk, cs, reset, dc for frdmkl25z
 
-int clock_minutes, clock_hours = 0;
-int clock_seconds = 0;
-int alarm_hours = 7;
+int clock_minutes, clock_hours, clock_seconds = 0; // Initialise clock at 00:00.00
+int alarm_hours = 7; // Initialise alarm at 7am
 int alarm_minutes = 0;
 
-void timeup(){
-    clock_seconds++;
-    clock_seconds %= 60;
+void timeup(){ // Function to increment the clock every second
+    clock_seconds++; // Increment the time
+    clock_seconds %= 60; // Reset seconds to 0 if it gets to 60
     
     if (clock_seconds==0) 
     {
-        clock_minutes++;
-        clock_minutes %= 60;
+        clock_minutes++; // Add a minute if the seconds got reset
+        clock_minutes %= 60; // Reset the minutes to 0 if it gets to 60
     }
     if (clock_minutes==0 && clock_seconds==0) 
     {
-        clock_hours++;
-        clock_hours %= 24;
+        clock_hours++; // Add an hour if the minutes got reset
+        clock_hours %= 24; // Reset the hour to 0 if it gets to 24
     }
 }
 
-// TODO: Add %02d to time ouputs, try font_big.h, comment every line, make sure the drawclock function works, fix the input_time_change and add seconds/precise timing
 void drawclock() // Draws an analogue clock using the clock_minutes and clock_hours variables
 {
-    int hourX, hourY, minuteX, minuteY; // Initialise variables to be used
-    int circleX = 200; // Circle centre X
+    int hourX, hourY, minuteX, minuteY, secondX, secondY; // Initialise variables to be used
+    int circleX = 250; // Circle centre X
     int circleY = 200; // Circle centre Y
     int circleRadius = 30; // Circle radius
     
     double factorH = (2 * 3.141) / 12; // Convert hour to radians
     double factorM = (2 * 3.141) / 60; // Convert minute to radians
+    double factorS = (2 * 3.141) / 60; // Convert second to radians
     
-    hourX = floor(0.9 * circleRadius * sin((double) (clock_hours * factorH))); // Calculate difference in X values of the two ends of the hour hand.
-    hourY = floor(0.9 * circleRadius * cos((double) (clock_hours * factorH))); // Same for Y of hour hand. The 0.9 means the hands are smaller than the circle
-    minuteX = floor(0.9 * circleRadius * sin((double) (clock_minutes * factorM))); // Same for X of minute hand
-    minuteY = floor(0.9 * circleRadius * cos((double) (clock_minutes * factorM))); // Same for Y of minute hand
+    hourX = floor(0.6 * circleRadius * sin((double) (clock_hours * factorH))); // Calculate difference in X values of the two ends of the hour hand.
+    hourY = floor(0.6 * circleRadius * cos((double) (clock_hours * factorH))); // Same for Y of hour hand. The 0.9 means the hands are smaller than the circle
+    minuteX = floor(0.95 * circleRadius * sin((double) (clock_minutes * factorM))); // Same for X of minute hand
+    minuteY = floor(0.95 * circleRadius * cos((double) (clock_minutes * factorM))); // Same for Y of minute hand
+    secondX = floor(0.85 * circleRadius * sin((double) (clock_seconds * factorS))); // Same for X of second hand
+    secondY = floor(0.85 * circleRadius * cos((double) (clock_seconds * factorS))); // Same for Y of second hand
     
     TFT.fillcircle(circleX, circleY, circleRadius, Red); // Draws a red circle
+    TFT.circle(circleX, circleY, circleRadius, White); // Draws a red circle
     TFT.line(circleX, circleY, circleX + hourX, circleY - hourY, White); // Draws the hour hand
     TFT.line(circleX, circleY, circleX + minuteX, circleY - minuteY, White); // Draws the minute hand
+    TFT.line(circleX, circleY, circleX + secondX, circleY - secondY, Black); // Draws the minute hand
+    
+    for (int i = 0; i < 12; i++)
+    {
+        int timeX = floor(circleRadius * sin((double) (i * factorH))); // Calculate the X for the hour indicators around the edge
+        int timeY = floor(circleRadius * cos((double) (i * factorH))); // Same for Y of the hour indicators
+        
+        TFT.line(circleX + 0.8 * timeX, circleY - 0.8 * timeY, circleX + timeX, circleY - timeY, White); // Draws the hour indicators
+    }
 }
 
 int main()
 {
-    //pc.baud(115200);
-    wait(0.2);
+    wait(0.2); // Just wait for set up
      
-    TFT.set_orientation(1);   // Make it horizontal
-    TFT.background(Black);      // Set background to black
-    TFT.foreground(White);    // Set text to white
-    TFT.cls();                // Clear screen
-    TFT.set_font((unsigned char*) Arial12x12); // Set the font
+    TFT.set_orientation(1); // Make the display horizontal
+    TFT.background(Black); // Set background to black
+    TFT.foreground(White); // Set text to white
+    TFT.cls(); // Clear screen
     
-    TFT.fillrect(0, 0, 320, 30, Red);
-    TFT.locate(5, 5);
-    TFT.printf("Clock by Duncan and Kieran");
+    TFT.set_font((unsigned char*) Arial12x12); // Set the font to Arial 12x12
+    TFT.fillrect(0, 0, 320, 32, Red); // Draw a red rectangle at the top
+    TFT.locate(10, 10); // Move the text location
+    TFT.printf("Clock by Duncan and Kieran"); // Write some text in the box at the top
     
-    wait(0.1);
+    TFT.background(Black); // Set background to black
+    TFT.set_font((unsigned char*) Arial28x28); // Set the font to Arial 28x28
     
-    TFT.background(Black);    // Set background to black
-    TFT.set_font((unsigned char*) Arial28x28); // Set the font
-    
-    timer.attach(&timeup, 1);
+    timer.attach(&timeup, 1); // Set up the timer so it increments every second
     
     while(1) {
-        if (input_time_change)
+        if (input_time_change) // Check if the toggle switch is pressed to change which time the other buttons adjust (pressed changes the time, unpressed changes the alarm)
         {
-            switch(input1){
+            switch(input1){ // Check if the minute button is pressed
                 case 1:
-                    clock_minutes = (clock_minutes++) % 60;
-                    wait(0.2);
-                 break;
+                    clock_minutes++; // Increment the time minutes
+                    clock_minutes %= 60; // Set the minutes back to 0 if it's 60
+                    wait(0.2); // Wait so the time doesn't increase too fast
+                    break;
                 case 0:
-                 break;
+                    break;
             }
-            switch(input60){
+            switch(input60){ // Check if the hour button is pressed
                 case 1:
-                    clock_hours = clock_hours++;
-                    wait(0.2);
+                    clock_hours++; // Increment the time hours
+                    clock_hours %= 24; // Set the hours back to 0 if it's 24
+                    wait(0.2); // Wait so the time doesn't increase too fast
                     break;
                 case 0:
                     break;
             }
         } else
         {
-            switch(input1){
+            switch(input1){ // Check if the minute button is pressed
                 case 1:
-                    alarm_minutes = (alarm_minutes++) % 60;
-                    wait(0.2);
+                    alarm_minutes++; // Increment the alarm minutes
+                    alarm_minutes %= 60; // Set the minutes back to 0 if it's 60
+                    wait(0.2); // Wait so the alarm time doesn't increase too fast
                     break;
                 case 0:
                     break;
             }
-            switch(input60){
+            switch(input60){ // Check if the hour button is pressed
                 case 1:
-                    alarm_hours = alarm_hours++;
-                    wait(0.2);
+                    alarm_hours++; // Increment the alarm hours
+                    alarm_hours %= 24; // Set the hours back to 0 if it's 24
+                    wait(0.2); // Wait so the alarm time doesn't increase too fast
                     break;
                 case 0:
                     break;
             }
         }
         
-        if (clock_hours == alarm_hours && clock_minutes == alarm_minutes)
+        if (clock_hours == alarm_hours && clock_minutes == alarm_minutes && (clock_seconds % 2) == 0) // Check if the time is equal to the alarm time, and the seconds is even
         {
-            buzzer = 1;
+            buzzer = 1; // Buzz
+            
         } else
         {
-            buzzer = 0;    
+            buzzer = 0; // Don't buzz  
         }
         
-        clock_hours %= 24;
-        alarm_hours %= 24;
-        
-        TFT.locate(50, 50);
-        TFT.printf("Time: %02d:%02d.%02d", clock_hours, clock_minutes, clock_seconds);
+        TFT.locate(30, 70); // Move the text location
+        TFT.printf("Time: %02d:%02d.%02d", clock_hours, clock_minutes, clock_seconds); // Write the time to the TFT
         
-        TFT.locate(50, 100);
-        TFT.printf("Alarm: %02d:%02d", alarm_hours, alarm_minutes);
+        TFT.locate(30, 120); // Move the text location
+        TFT.printf("Alarm: %02d:%02d", alarm_hours, alarm_minutes); // Write the alarm time to the TFT
         
-        TFT.locate(50, 150);
-        TFT.printf("%d ", (int) input_time_change);
-        
-        drawclock();
+        drawclock(); // Call a function to draw the analogue clock
     }
 
 }