Smart clock by Duncan and Kieran

Diff: main.cpp

Revision:

4:2013f3158cc6

Parent:

3:6a328c7e9b1c

Child:

5:f5fa116b57a1

--- a/main.cpp	Tue May 23 15:50:45 2017 +0000
+++ b/main.cpp	Wed May 24 13:50:26 2017 +0000
@@ -9,23 +9,53 @@
 #include "font_big.h"
 
 Ticker timer;
-DigitalOut output_high1(PTA4);
-DigitalOut output_high60(PTC8);
 DigitalOut buzzer(PTA12);
-DigitalOut output_time_change(PTA2);
-DigitalIn input1(PTA5);
-DigitalIn input60(PTC9);
-DigitalIn input_time_change(PTC2);
+DigitalIn input1(PTA4);
+DigitalIn input60(PTC8);
+DigitalIn input_time_change(PTC9);
 Serial pc(USBTX,USBRX);
 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 alarm_minutes = 0;
 
 void timeup(){
-    clock_minutes = (clock_minutes + 1) % 60;
-    if (clock_minutes==0) (clock_hours++) % 24;
+    clock_seconds++;
+    clock_seconds %= 60;
+    
+    if (clock_seconds==0) 
+    {
+        clock_minutes++;
+        clock_minutes %= 60;
+    }
+    if (clock_minutes==0 && clock_seconds==0) 
+    {
+        clock_hours++;
+        clock_hours %= 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 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
+    
+    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
+    
+    TFT.fillcircle(circleX, circleY, circleRadius, Red); // 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
 }
 
 int main()
@@ -34,12 +64,13 @@
     wait(0.2);
      
     TFT.set_orientation(1);   // Make it horizontal
-    TFT.background(Red);    // Set background to black
+    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.fillrect(0, 0, 320, 30, Red);
+    TFT.locate(5, 5);
     TFT.printf("Clock by Duncan and Kieran");
     
     wait(0.1);
@@ -47,13 +78,10 @@
     TFT.background(Black);    // Set background to black
     TFT.set_font((unsigned char*) Arial28x28); // Set the font
     
-    output_time_change = 1;
-    output_high1 = 1;
-    output_high60 = 1;
     timer.attach(&timeup, 1);
     
     while(1) {
-        if (input_time_change == 1)
+        if (input_time_change)
         {
             switch(input1){
                 case 1:
@@ -103,13 +131,15 @@
         alarm_hours %= 24;
         
         TFT.locate(50, 50);
-        TFT.printf("Time: %d:%d ", clock_hours, clock_minutes);
+        TFT.printf("Time: %02d:%02d.%02d", clock_hours, clock_minutes, clock_seconds);
         
         TFT.locate(50, 100);
-        TFT.printf("Alarm: %d:%d ", alarm_hours, alarm_minutes);
+        TFT.printf("Alarm: %02d:%02d", alarm_hours, alarm_minutes);
         
         TFT.locate(50, 150);
         TFT.printf("%d ", (int) input_time_change);
+        
+        drawclock();
     }
 
 }