Menu
▾
▴
[G15daemon-commits] SF.net SVN: g15daemon: [195] trunk/g15daemon-wip
|
From: <ane...@us...> - 2006-11-24 11:31:28
|
Revision: 195
http://svn.sourceforge.net/g15daemon/?rev=195&view=rev
Author: aneurysm9
Date: 2006-11-24 03:31:26 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Add analog clock thanks to Rasta Freak
Modified Paths:
--------------
trunk/g15daemon-wip/ChangeLog
trunk/g15daemon-wip/plugins/g15_plugin_clock.c
Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog 2006-11-23 07:01:10 UTC (rev 194)
+++ trunk/g15daemon-wip/ChangeLog 2006-11-24 11:31:26 UTC (rev 195)
@@ -93,3 +93,4 @@
- Clock is now a plugin
- dependency on libdaemon is now removed
- g15daemon is now dependant on libg15render.
+- Clock now includes analog clock thanks to Rasta Freak <igo...@zg...>
Modified: trunk/g15daemon-wip/plugins/g15_plugin_clock.c
===================================================================
--- trunk/g15daemon-wip/plugins/g15_plugin_clock.c 2006-11-23 07:01:10 UTC (rev 194)
+++ trunk/g15daemon-wip/plugins/g15_plugin_clock.c 2006-11-24 11:31:26 UTC (rev 195)
@@ -33,17 +33,108 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <math.h>
+#include <time.h>
#include <libg15.h>
#include <config.h>
#include <g15daemon.h>
#include <libg15render.h>
+extern double round(double);
+// clock specs:
+#define CLOCK_CENTERX 25
+#define CLOCK_CENTERY 21
+#define CLOCK_RADIUS 20
+
+// useful shortcuts (g15r_drawCircle() is a bit egg-shaped, or my math is :)
+#define CLOCK_STARTX (CLOCK_CENTERX-CLOCK_RADIUS-1)
+#define CLOCK_STARTY (CLOCK_CENTERY-CLOCK_RADIUS)
+#define CLOCK_ENDX (CLOCK_CENTERX+CLOCK_RADIUS+1)
+#define CLOCK_ENDY (CLOCK_CENTERY+CLOCK_RADIUS)
+
static int mode=1;
static int showdate=0;
+static int digital=1;
+g15canvas *static_canvas = NULL;
-static int *lcdclock(lcd_t *lcd)
+//----------------------------------------------------------------------------
+// calc x,y for given minute/hour/sec (pos), cut_off is for radius variations
+// ( ie. shorter/longer clock-hands, line parts....)
+void get_clock_pos(int pos, int *x, int *y, int cut_off)
{
+ // pos = [0-60]
+
+ // make sure it's in range:
+ pos %= 60;
+
+ // angles go contra-clockwise, but clock goes clockwise :), so invert clock orientation
+ pos = 60 - pos;
+
+ // this math is patent-copy-trademark-protected by <Rasta Freak> :)
+ double ang = 270.0 - 6.0*(double)pos;
+ ang = (ang * 2.0 * M_PI) / 360.0;
+
+ // simple pre-school math for naturaly dumb:
+ double _x = (double)CLOCK_CENTERX + (cos(ang)*(double)(CLOCK_RADIUS+1-cut_off));
+ double _y = (double)CLOCK_CENTERY + (sin(ang)*(double)(CLOCK_RADIUS-cut_off));
+
+ *x = (int)(round(_x));
+ *y = (int)(round(_y));
+}
+
+//----------------------------------------------------------------------------
+// draw clock frame (only once, as it is stored in static_canvas)
+// NOTE - coords here are hardcoded !
+void draw_static_canvas(void)
+{
+ g15canvas *c = static_canvas;
+ int i;
+
+ g15r_clearScreen (c, G15_COLOR_WHITE);
+ g15r_drawCircle(c, CLOCK_CENTERX, CLOCK_CENTERY, CLOCK_RADIUS, 0, G15_COLOR_BLACK);
+ g15r_drawCircle(c, CLOCK_CENTERX, CLOCK_CENTERY, 2, 1, G15_COLOR_BLACK);
+
+ for (i=0; i<60; i+=5)
+ {
+ if ((i%15)==0)
+ {
+ // draw number (12/3/6/9):
+ switch (i)
+ {
+ case 0:
+ g15r_renderString(c, (unsigned char*)"12", 0, G15_TEXT_SMALL, 22, 3);
+ break;
+
+ case 15:
+ g15r_renderString(c, (unsigned char*)"3", 3, G15_TEXT_SMALL, 42, 1);
+ break;
+
+ case 30:
+ g15r_renderString(c, (unsigned char*)"6", 6, G15_TEXT_SMALL, 24, -1);
+ break;
+
+ case 45:
+ g15r_renderString(c, (unsigned char*)"9", 3, G15_TEXT_SMALL, 6, 1);
+ break;
+ }
+ }
+ else
+ {
+ // draw 4-pixel square dot for other hours:
+ int x1,y1,dir;
+ if (i>15 && i<45) dir=-1; else dir=1;
+ get_clock_pos(i, &x1, &y1, 3);
+ g15r_setPixel(c, x1, y1, G15_COLOR_BLACK);
+ g15r_setPixel(c, x1+dir, y1, G15_COLOR_BLACK);
+ g15r_setPixel(c, x1, y1+dir, G15_COLOR_BLACK);
+ g15r_setPixel(c, x1+dir, y1+dir, G15_COLOR_BLACK);
+ }
+ }
+}
+
+static int draw_digital(g15canvas *canvas)
+{
unsigned int col = 0;
unsigned int len=0;
int narrows=0;
@@ -51,25 +142,15 @@
char buf[10];
char ampm[3];
int height = G15_LCD_HEIGHT - 1;
- g15canvas *canvas = (g15canvas *) malloc (sizeof (g15canvas));
-
- if (canvas != NULL)
- {
- memset(canvas->buffer, 0, G15_BUFFER_LEN);
- canvas->mode_cache = 0;
- canvas->mode_reverse = 0;
- canvas->mode_xor = 0;
- }
-
+
time_t currtime = time(NULL);
- memset(lcd->buf,0,G15_BUFFER_LEN);
memset(buf,0,10);
memset(ampm,0,3);
if(showdate) {
char buf2[40];
strftime(buf2,40,"%A %e %B %Y",localtime(&currtime));
- g15r_renderString (canvas,buf2 , 0, G15_TEXT_MED, 80-((strlen(buf2)*5)/2), height-6);
+ g15r_renderString (canvas,(unsigned char *)buf2 , 0, G15_TEXT_MED, 80-((strlen(buf2)*5)/2), height-6);
height-=10;
}
@@ -106,10 +187,97 @@
}
if(ampm[0]!=0)
- g15r_renderString (canvas,ampm,0,G15_TEXT_LARGE,totalwidth+15,height-6);
+ g15r_renderString (canvas,(unsigned char *)ampm,0,G15_TEXT_LARGE,totalwidth+15,height-6);
+ return G15_PLUGIN_OK;
+}
+
+static int draw_analog(g15canvas *c)
+{
+ int xh, yh;
+ int xm, ym;
+ int xs, ys;
+
+ time_t now = time(NULL);
+ struct tm *t = localtime(&now);
+
+ int h;
+ h = t->tm_hour;
+ h %= 12;
+ h *= 5;
+ h += t->tm_min * 5 / 60;
+
+ get_clock_pos(h, &xh, &yh, 9);
+ get_clock_pos(t->tm_min, &xm, &ym, 6);
+ get_clock_pos(t->tm_sec, &xs, &ys, 3);
+
+ // put background:
+ memcpy(c, static_canvas, sizeof(g15canvas));
+
+ // hour
+ g15r_drawLine(c, CLOCK_CENTERX-2, CLOCK_CENTERY, xh, yh, G15_COLOR_BLACK);
+ g15r_drawLine(c, CLOCK_CENTERX-1, CLOCK_CENTERY, xh, yh, G15_COLOR_BLACK);
+ g15r_drawLine(c, CLOCK_CENTERX, CLOCK_CENTERY, xh, yh+1, G15_COLOR_BLACK);
+ g15r_drawLine(c, CLOCK_CENTERX+1, CLOCK_CENTERY, xh, yh, G15_COLOR_BLACK);
+ g15r_drawLine(c, CLOCK_CENTERX+2, CLOCK_CENTERY, xh, yh, G15_COLOR_BLACK);
+
+ // minute
+ g15r_drawLine(c, CLOCK_CENTERX-1, CLOCK_CENTERY, xm, ym, G15_COLOR_BLACK);
+ g15r_drawLine(c, CLOCK_CENTERX, CLOCK_CENTERY, xm, ym+1, G15_COLOR_BLACK);
+ g15r_drawLine(c, CLOCK_CENTERX+1, CLOCK_CENTERY, xm, ym, G15_COLOR_BLACK);
+
+ // second:
+ g15r_drawLine(c, CLOCK_CENTERX, CLOCK_CENTERY, xs, ys, G15_COLOR_BLACK);
+
+ //
+ // draw texts:
+ //
+ char day[32]; // Tuesday
+ char mon[32]; // March
+ char year[32]; // 1234 AD
+ char time[32]; // 22:33:44
+ char date[32]; // 21.April
+
+ strftime(day, sizeof(day), "%A", t);
+ strftime(mon, sizeof(mon), "%B", t);
+ sprintf(date, "%d.%s", t->tm_mday, mon);
+ sprintf(year, "%4d AD", t->tm_year+1900);
+ if(mode)
+ strftime(time,sizeof(time),"%H:%M:%S",t);
+ else
+ strftime(time,sizeof(time),"%r",t);
+
+ g15r_renderString(c, (unsigned char*)time, 0, G15_TEXT_LARGE, 60, 0);
+ g15r_renderString(c, (unsigned char*)day, 1, G15_TEXT_LARGE, 60, 0);
+ g15r_renderString(c, (unsigned char*)date, 2, G15_TEXT_LARGE, 60, 0);
+ g15r_renderString(c, (unsigned char*)year, 3, G15_TEXT_LARGE, 60, 0);
+
+ return G15_PLUGIN_OK;
+}
+
+
+static int *lcdclock(lcd_t *lcd)
+{
+ int ret = 0;
+ g15canvas *canvas = (g15canvas *) malloc (sizeof (g15canvas));
+
+ if (canvas != NULL)
+ {
+ memset(canvas->buffer, 0, G15_BUFFER_LEN);
+ canvas->mode_cache = 0;
+ canvas->mode_reverse = 0;
+ canvas->mode_xor = 0;
+ }
+
+ memset(lcd->buf,0,G15_BUFFER_LEN);
+
+ if(digital)
+ ret = draw_digital(canvas);
+ else
+ ret = draw_analog(canvas);
+
memcpy (lcd->buf, canvas->buffer, G15_BUFFER_LEN);
- lcd->ident = currtime+100;
+ lcd->ident = random();
free(canvas);
return G15_PLUGIN_OK;
}
@@ -130,6 +298,10 @@
showdate = 1^showdate;
g15daemon_cfg_write_bool(clockcfg, "ShowDate", showdate);
}
+ if(myevent->value & G15_KEY_L4) {
+ digital = 1^digital;
+ g15daemon_cfg_write_bool(clockcfg, "Digital", digital);
+ }
// printf("Clock plugin received keypress event : %i\n",myevent->value);
break;
case G15_EVENT_VISIBILITY_CHANGED:
@@ -151,6 +323,18 @@
config_section_t *clockcfg = g15daemon_cfg_load_section(lcd->masterlist,"Clock");
mode=g15daemon_cfg_read_bool(clockcfg, "24hrFormat",1);
showdate=g15daemon_cfg_read_bool(clockcfg, "ShowDate",0);
+ digital=g15daemon_cfg_read_bool(clockcfg, "Digital",1);
+
+ static_canvas = (g15canvas*)malloc(sizeof(g15canvas));
+ if (static_canvas != NULL)
+ {
+ memset(static_canvas->buffer, 0, G15_BUFFER_LEN);
+ static_canvas->mode_cache = 0;
+ static_canvas->mode_reverse = 0;
+ static_canvas->mode_xor = 0;
+ draw_static_canvas();
+ }
+
return NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
