IoT Ox / Mbed 2 deprecated MainSketch Featured

Dependencies:   RTC-DS1307 SPI_TFT_ILI9341 TFT_fonts mbed tsi_sensor

Fork of TFT_Mikroelectronika_IL9341_sketchpad by Oxford CWM Team

Revision:
38:3fe3bafbf0c7
Parent:
37:54285105ed80
Child:
39:4b70d28cb273
Child:
40:05798eeadd02
diff -r 54285105ed80 -r 3fe3bafbf0c7 drawhands.h
--- a/drawhands.h	Thu May 25 16:01:06 2017 +0000
+++ b/drawhands.h	Thu May 25 19:54:51 2017 +0000
@@ -1,17 +1,16 @@
-#include "libs.h"
 
-void draw_hands ( int x0 , int y0 , int r , float minutes , float hours , int color) 
+void draw_hands ( int x0 , int y0 , int r , float minutes , int hours , int color) 
    {
-          
-          int rs = 0.8 * r ; // shorter moving hand
+          int x1,y1,x2,y2;
+          int rs = 0.6 * r ; // shorter moving hand
           int m = minutes ;        
           int k = hours % 12; 
-          int angle2 = k * M_PI / 6 ;
-          int angle = m * M_PI / 30 ;
-          x1 = rs * cos(angle) + x0;
-          y1 = rs * sin(angle) + y0;
-          x2 = r * cos(angle2) + x0;
-          y2 = r * sin(angle2) + y0;
+          double angle2 = k * M_PI / 6 ;
+          double angle = m * M_PI / 30 ;
+          x1 = rs * sin(angle) + x0;
+          y1 = rs * cos(angle) + y0;
+          x2 = r * sin(angle2) + x0;
+          y2 = r * cos(angle2) + y0;
           TFT.line(x0, y0, x2, y2, color);
           TFT.line(x0, y0, x1, y1, color); 
   }