Changeset 856

Timestamp:

03/03/08 17:54:18 (9 months ago)

Author:

michux

Message:

add keypad support for module lcm162

Location:

trunk

Files:

• drv_HD44780.c (modified) (5 diffs)
• drv_generic_keypad.h (modified) (1 diff)

trunk/drv_HD44780.c

@@ -70 +70 @@
 #ifdef WITH_PARPORT
 #include "drv_generic_parport.h"
+#include "drv_generic_keypad.h"
+#include "widget_keypad.h"
 #endif
 
@@ -980 +982 @@
 #ifdef WITH_PARPORT
 
+
+static int drv_HD_LCM162_keypad_handler(const int num)
+{
+  return num;
+}
+
 static void drv_HD_LCM162_timer(void __attribute__ ((unused)) * notused)
 {
@@ -1001 +1009 @@
   data = temp;
 
+  int KEYPAD_VAL=0;
   keynum = (data & mask3 ? 1 : 0) + (data & mask5 ? 2 : 0);
+  switch(keynum)
+    {
+    default:
+    case 0: KEYPAD_VAL=WIDGET_KEY_CANCEL; break;
+    case 1: KEYPAD_VAL=WIDGET_KEY_UP; break;
+    case 2: KEYPAD_VAL=WIDGET_KEY_CONFIRM; break;
+    case 3: KEYPAD_VAL=WIDGET_KEY_DOWN; break;
+    }
+
   updown = (data & mask6 ? 1 : 0);
+  KEYPAD_VAL += updown ? WIDGET_KEY_PRESSED : WIDGET_KEY_RELEASED;
+
+  drv_generic_keypad_press(KEYPAD_VAL);
 
   debug("key %d press %d", keynum, updown);
@@ -1213 +1234 @@
     if (Capabilities & CAP_LCM162) {
   timer_add(drv_HD_LCM162_timer, NULL, 10, 0);
+  drv_generic_keypad_real_press = drv_HD_LCM162_keypad_handler;
     }
 #endif
@@ -1333 +1355 @@
   return ret;
 
+    if ((ret = drv_generic_keypad_init(section, Name)) != 0)
+  return ret;
+
     /* register text widget */
     wc = Widget_Text;

trunk/drv_generic_keypad.h

@@ -28 +28 @@
 #include "widget.h"
 
-/* these functinos must be implemented by the real driver */
+/* these functions must be implemented by the real driver */
 extern int (*drv_generic_keypad_real_press) (const int num);