aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2009-11-01 05:01:17 +0000
committermichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2009-11-01 05:01:17 +0000
commit5ed074b437defc099cd2046dd171e8f4fe1cca7b (patch)
tree509fe9deda698c89db33a756c1a47b28fbf43e5f
parent34fd00e7b751932b1739b165006be944fb0ecaed (diff)
downloadlcd4linux-5ed074b437defc099cd2046dd171e8f4fe1cca7b.tar.gz
Logic Way GmbH ABP08 ABP09 enhancements by Arndt Kritzner
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1047 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--drv_LW_ABP.c261
1 files changed, 236 insertions, 25 deletions
diff --git a/drv_LW_ABP.c b/drv_LW_ABP.c
index e876f0c..45ae9fc 100644
--- a/drv_LW_ABP.c
+++ b/drv_LW_ABP.c
@@ -46,15 +46,17 @@
#include "cfg.h"
#include "qprintf.h"
#include "udelay.h"
+#include "timer.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
-#include "widget_icon.h"
#include "widget_bar.h"
+#include "widget_keypad.h"
#include "drv.h"
/* text mode display? */
#include "drv_generic_text.h"
+#include "drv_generic_keypad.h"
/* serial port? */
#include "drv_generic_serial.h"
@@ -64,9 +66,24 @@
#include "drv_generic_i2c.h"
#endif
+#define KEY_UP 1
+#define KEY_DOWN 2
+#define KEY_LEFT 3
+#define KEY_RIGHT 4
static char Name[] = "LW_ABP";
+/* ring buffer for bytes received from the display */
+static unsigned char RingBuffer[256];
+static unsigned int RingRPos = 0;
+static unsigned int RingWPos = 0;
+
+static int button = -1;
+static char *colors[] = { "r 0", "r 1", "g 0", "g 1", "b 0", "b 1", "c 0", "c 1", "m 0", "m 1", "y 0", "y 1", NULL };
+
+#define TIMESYNC_FIRST 600
+#define TIMESYNC_INTERVAL 24*3600
+static time_t next_timesync;
/****************************************/
/*** hardware dependant functions ***/
@@ -101,14 +118,39 @@ static void drv_LW_ABP_send(const char *data, const unsigned int len)
/* text mode displays only */
-static void drv_LW_ABP_clear(void)
+static void drv_LW_ABP_reset(void)
{
char cmd[] = "lcd init\r\n";
+ /* do whatever is necessary to initialize the display */
+ drv_LW_ABP_send(cmd, strlen(cmd));
+}
+
+static void drv_LW_ABP_clear(void)
+{
+ char cmd[] = "lcd clear\r\n";
+
/* do whatever is necessary to clear the display */
drv_LW_ABP_send(cmd, strlen(cmd));
}
+static int drv_LW_ABP_time(unsigned char force)
+{
+ char cmd[] = "date set ";
+ char command[50];
+ time_t t = time(NULL);
+
+ if (force || (t > next_timesync)) {
+ /* do whatever is necessary to set clock on the display */
+ sprintf(command, "%s%u\r\n", cmd, t);
+ drv_LW_ABP_send(command, strlen(command));
+ next_timesync = t + TIMESYNC_INTERVAL;
+ info("%s: synced time to %u, next is %u\n", Name, t, next_timesync);
+ return 1;
+ }
+
+ return 0;
+}
/* text mode displays only */
static void drv_LW_ABP_write(const int row, const int col, const char *data, int len)
@@ -139,23 +181,162 @@ static void drv_LW_ABP_defchar(const int ascii, const unsigned char *matrix)
{
}
-/* example function used in a plugin */
-static int drv_LW_ABP_contrast(int contrast)
+static unsigned char byte(int pos)
+{
+ if (pos >= 0) {
+ pos += RingRPos;
+ if (pos >= sizeof(RingBuffer))
+ pos -= sizeof(RingBuffer);
+ } else {
+ pos += RingWPos;
+ if (pos < 0)
+ pos += sizeof(RingBuffer);
+ }
+ return RingBuffer[pos];
+}
+
+static void drv_LW_ABP_process_button(void)
+{
+ /* Key Activity */
+ debug("%s: Key Activity: %d", Name, button);
+ drv_generic_keypad_press(button);
+}
+
+static int drv_LW_ABP_poll(void)
{
- char cmd[2];
+ /* read into RingBuffer */
+ while (1) {
+ char buffer[32];
+ int num, n;
+ num = drv_generic_serial_poll(buffer, sizeof(buffer));
+ if (num <= 0)
+ break;
+ /* put result into RingBuffer */
+ for (n = 0; n < num; n++) {
+ RingBuffer[RingWPos++] = (unsigned char) buffer[n];
+ if (RingWPos >= sizeof(RingBuffer))
+ RingWPos = 0;
+ }
+ }
- /* adjust limits according to the display */
- if (contrast < 0)
- contrast = 0;
- if (contrast > 255)
- contrast = 255;
+ /* process RingBuffer */
+ while (1) {
+ char command[32];
+ int n, num;
+ /* packet size */
+ num = RingWPos - RingRPos;
+ if (num < 0)
+ num += sizeof(RingBuffer);
+ /* minimum packet size=3 */
+ if (num < 1)
+ return 0;
+ if (byte(0) != '[') {
+ goto GARBAGE;
+ }
+ for (n = 0; (n < num) && (n < (sizeof(command) - 1)); n++) {
+ command[n] = byte(n);
+ if (command[n] == ']') {
+ n++;
+ break;
+ }
+ }
+ command[n] = '\0';
+ if (command[n - 1] != ']') {
+ if (strlen(command) < 4)
+ return 0;
+ goto GARBAGE;
+ }
+ info("%s: command read from keypad: %s\n", Name, command);
+ if (sscanf(command, "[T%d]", &button) == 1) {
+ info("%s: button %d pressed\n", Name, button);
+ } else {
+ goto GARBAGE;
+ }
+ /* increment read pointer */
+ RingRPos += strlen(command);
+ if (RingRPos >= sizeof(RingBuffer))
+ RingRPos -= sizeof(RingBuffer);
+ /* a packet arrived */
+ return 1;
+ GARBAGE:
+ debug("%s: dropping garbage byte %02x", Name, byte(0));
+ RingRPos++;
+ if (RingRPos >= sizeof(RingBuffer))
+ RingRPos = 0;
+ continue;
+ }
- /* call a 'contrast' function */
- /* assume 0x04 to be the 'set contrast' command */
- cmd[0] = 0x04;
- cmd[1] = contrast;
- drv_LW_ABP_send(cmd, 2);
+ /* not reached */
+ return 0;
+}
+static void drv_LW_ABP_timer(void __attribute__ ((unused)) * notused)
+{
+ while (drv_LW_ABP_poll()) {
+ drv_LW_ABP_process_button();
+ }
+
+ drv_LW_ABP_time(0);
+}
+
+static int drv_LW_ABP_keypad(const int num)
+{
+ int val = 0;
+
+ switch (num) {
+ case KEY_UP:
+ debug("%s: Key Up", Name);
+ val += WIDGET_KEY_PRESSED;
+ val += WIDGET_KEY_UP;
+ break;
+ case KEY_DOWN:
+ debug("%s: Key Down", Name);
+ val += WIDGET_KEY_PRESSED;
+ val += WIDGET_KEY_DOWN;
+ break;
+ case KEY_LEFT:
+ debug("%s: Key Left / Cancel", Name);
+ val += WIDGET_KEY_PRESSED;
+ val += WIDGET_KEY_LEFT;
+// val += WIDGET_KEY_CANCEL;
+ break;
+ case KEY_RIGHT:
+ debug("%s: Key Right / Confirm", Name);
+ val += WIDGET_KEY_PRESSED;
+ val += WIDGET_KEY_RIGHT;
+// val += WIDGET_KEY_CONFIRM;
+ break;
+ default:
+ debug("%s: Unbound Key '%d'", Name, num);
+ break;
+ }
+
+ return val;
+}
+
+static char *drv_LW_ABP_background(char *color)
+{
+ static char *Background = NULL;
+ char cmd[] = "lcd set color ";
+ int idx;
+ if (color != NULL) {
+ for (idx = 0; colors[idx] != NULL; idx++) {
+ if (strcmp(color, colors[idx]) == 0)
+ break;
+ }
+ if (colors[idx] != NULL) {
+ Background = colors[idx];
+ debug("%s: set background color %s", Name, Background);
+ drv_LW_ABP_send(cmd, strlen(cmd));
+ drv_LW_ABP_send(color, strlen(color));
+ drv_LW_ABP_send("\r\n", 2);
+ }
+ }
+ return Background;
+}
+
+static int drv_LW_ABP_contrast(int contrast)
+{
return contrast;
}
@@ -166,6 +347,7 @@ static int drv_LW_ABP_start(const char *section)
int contrast;
int rows = -1, cols = -1;
char *s;
+ char *background;
char cmd[1];
s = cfg_get(section, "Size", NULL);
@@ -182,15 +364,21 @@ static int drv_LW_ABP_start(const char *section)
DROWS = rows;
DCOLS = cols;
+ next_timesync = time(NULL) + TIMESYNC_FIRST;
+
/* open communication with the display */
if (drv_LW_ABP_open(section) < 0) {
return -1;
}
- /* reset & initialize display */
- /* assume 0x00 to be a 'reset' command */
- cmd[0] = 0x00;
- drv_LW_ABP_send(cmd, 0);
+ drv_LW_ABP_reset(); /* initialize display */
+
+ background = cfg_get(section, "Background", NULL);
+ if ((background != NULL) && (*background != '\0')) {
+ if (drv_LW_ABP_background(background) == NULL) {
+ debug("%s: wrong background color specified: %s", Name, background);
+ }
+ }
if (cfg_number(section, "Contrast", 0, 0, 255, &contrast) > 0) {
drv_LW_ABP_contrast(contrast);
@@ -213,6 +401,25 @@ static void plugin_contrast(RESULT * result, RESULT * arg1)
SetResult(&result, R_NUMBER, &contrast);
}
+static void plugin_background(RESULT * result, const int argc, RESULT * argv[])
+{
+ char *color;
+
+ switch (argc) {
+ case 0:
+ color = drv_LW_ABP_background(NULL);
+ SetResult(&result, R_STRING, &color);
+ break;
+ case 1:
+ color = drv_LW_ABP_background(R2S(argv[0]));
+ SetResult(&result, R_STRING, &color);
+ break;
+ default:
+ error("%s.backlight(): wrong number of parameters (%d)", Name, argc);
+ SetResult(&result, R_STRING, "");
+ }
+}
+
/****************************************/
/*** widget callbacks ***/
@@ -257,6 +464,10 @@ int drv_LW_ABP_init(const char *section, const int quiet)
/* real worker functions */
drv_generic_text_real_write = drv_LW_ABP_write;
drv_generic_text_real_defchar = drv_LW_ABP_defchar;
+ drv_generic_keypad_real_press = drv_LW_ABP_keypad;
+
+ /* regularly process display answers */
+ timer_add(drv_LW_ABP_timer, NULL, 100, 0);
/* start display */
if ((ret = drv_LW_ABP_start(section)) != 0)
@@ -283,20 +494,18 @@ int drv_LW_ABP_init(const char *section, const int quiet)
if ((ret = drv_generic_text_bar_init(0)) != 0)
return ret;
+ /* initialize generic key pad driver */
+ if ((ret = drv_generic_keypad_init(section, Name)) != 0)
+ return ret;
+
/* add fixed chars to the bar driver */
drv_generic_text_bar_add_segment(0, 0, 255, 32); /* ASCII 32 = blank */
-
/* register text widget */
wc = Widget_Text;
wc.draw = drv_generic_text_draw;
widget_register(&wc);
- /* register icon widget */
- wc = Widget_Icon;
- wc.draw = drv_generic_text_icon_draw;
- widget_register(&wc);
-
/* register bar widget */
wc = Widget_Bar;
wc.draw = drv_generic_text_bar_draw;
@@ -304,6 +513,7 @@ int drv_LW_ABP_init(const char *section, const int quiet)
/* register plugins */
AddFunction("LCD::contrast", 1, plugin_contrast);
+ AddFunction("LCD::background", -1, plugin_background);
return 0;
}
@@ -318,6 +528,7 @@ int drv_LW_ABP_quit(const int quiet)
info("%s: shutting down.", Name);
drv_generic_text_quit();
+ drv_generic_keypad_quit();
/* clear display */
drv_LW_ABP_clear();