Changeset 843

Timestamp:

10/01/07 17:04:49 (14 months ago)

Author:

michael

Message:

driver for Pertelian display by Andy Powell

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• config.h.in (modified) (2 diffs)
• configure (modified) (5 diffs)
• drivers.m4 (modified) (5 diffs)
• drv.c (modified) (2 diffs)
• drv_Pertelian.c (copied) (copied from trunk/drv_Sample.c) (16 diffs)
• smoketest.sh (modified) (1 diff)

trunk/Makefile.am

@@ -88 +88 @@
 drv_Noritake.c                \
 drv_NULL.c                    \
+drv_Pertelian                 \
 drv_picoLCD.c                 \
 drv_RouterBoard.c             \

trunk/Makefile.in

@@ -283 +283 @@
 drv_Noritake.c                \
 drv_NULL.c                    \
+drv_Pertelian                 \
 drv_picoLCD.c                 \
 drv_RouterBoard.c             \

trunk/config.h.in

@@ -465 +465 @@
 #undef WITH_PARPORT
 
+/* Pertelian driver */
+#undef WITH_PERTELIAN
+
+/* picoLCD driver */
+#undef WITH_PICOLCD
+
 /* PNG driver */
 #undef WITH_PNG
@@ -503 +509 @@
 /* X11 driver */
 #undef WITH_X11
-
-/* picoLCD driver */
-#undef WITH_picoLCD
 
 /* Define to 1 if the X Window System is missing or not being used. */

trunk/configure

@@ -1345 +1345 @@
                           G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,
                           LUIse, M50530, MatrixOrbital, MilfordInstruments,
-                          Noritake, NULL, PNG, PPM, picoLCD, RouterBoard, Sample,
-                          serdisplib, SimpleLCD, T6963, Trefon, USBLCD,
+                          Noritake, NULL, PNG, PPM, Pertelian, picoLCD, RouterBoard,
+                          Sample, serdisplib, SimpleLCD, T6963, Trefon, USBLCD,
                           USBHUB, WincorNixdorf, X11
   --with-plugins=<list>   choose which plugins to compile.
@@ -7389 +7389 @@
          NORITAKE="yes"
          NULL="yes"
-         picoLCD="yes"
+         PERTELIAN="yes"
+         PICOLCD="yes"
          PNG="yes"
          PPM="yes"
@@ -7463 +7464 @@
          NULL=$val;
          ;;
+      Pertelian)
+         PERTELIAN=$val
+         ;;
       picoLCD)
-         picoLCD=$val
+         PICOLCD=$val
          ;;
       PNG)
@@ -7793 +7797 @@
 fi
 
-if test "$picoLCD" = "yes"; then
+if test "$PERTELIAN" = "yes"; then
+   # select either text or graphics mode
+   TEXT="yes"
+   # select bus: serial (including USB), parallel or i2c
+   SERIAL="yes"
+   DRIVERS="$DRIVERS drv_Pertelian.o"
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_PERTELIAN 1
+_ACEOF
+
+fi
+
+
+
+if test "$PICOLCD" = "yes"; then
    if test "$has_usb" = "true"; then
       TEXT="yes"
@@ -7802 +7821 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define WITH_picoLCD 1
+#define WITH_PICOLCD 1
 _ACEOF
 

trunk/drivers.m4

@@ -36 +36 @@
   [                        G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,]
   [                        LUIse, M50530, MatrixOrbital, MilfordInstruments,]
-  [                        Noritake, NULL, PNG, PPM, picoLCD, RouterBoard, Sample,]
-  [                        serdisplib, SimpleLCD, T6963, Trefon, USBLCD,]
+  [                        Noritake, NULL, PNG, PPM, Pertelian, picoLCD, RouterBoard,]
+  [                        Sample, serdisplib, SimpleLCD, T6963, Trefon, USBLCD,]
   [                        USBHUB, WincorNixdorf, X11],
   drivers=$withval, 
@@ -78 +78 @@
          NORITAKE="yes" 
          NULL="yes" 
-         picoLCD="yes"
+         PERTELIAN="yes"
+         PICOLCD="yes"
          PNG="yes"
          PPM="yes"
@@ -152 +153 @@
          NULL=$val;
          ;;
+      Pertelian)
+         PERTELIAN=$val
+         ;;
       picoLCD)
-         picoLCD=$val
+         PICOLCD=$val
          ;;         
       PNG)
@@ -393 +397 @@
 fi
 
-if test "$picoLCD" = "yes"; then
+if test "$PERTELIAN" = "yes"; then
+   # select either text or graphics mode
+   TEXT="yes"
+   # select bus: serial (including USB), parallel or i2c
+   SERIAL="yes"
+   DRIVERS="$DRIVERS drv_Pertelian.o"
+   AC_DEFINE(WITH_PERTELIAN,1,[Pertelian driver])
+fi
+
+
+
+if test "$PICOLCD" = "yes"; then
    if test "$has_usb" = "true"; then
       TEXT="yes"
@@ -400 +415 @@
       LIBUSB="yes"
       DRIVERS="$DRIVERS drv_picoLCD.o"
-      AC_DEFINE(WITH_picoLCD,1,[picoLCD driver])
+      AC_DEFINE(WITH_PICOLCD,1,[picoLCD driver])
    else
       AC_MSG_WARN(usb.h not found: picoLCD driver disabled)

trunk/drv.c

@@ -68 +68 @@
 extern DRIVER drv_Noritake;
 extern DRIVER drv_NULL;
+extern DRIVER drv_Pertelian;
 extern DRIVER drv_picoLCD;
 extern DRIVER drv_RouterBoard;
@@ -146 +147 @@
 #ifdef WITH_NULL
     &drv_NULL,
+#endif
+#ifdef WITH_PERTELIAN
+    &drv_Pertelian,
 #endif
 #ifdef WITH_picoLCD

trunk/drv_Pertelian.c

@@ -2 +2 @@
  * $URL$
  *
- * sample lcd4linux driver
+ * Pertelian lcd4linux driver
+ * Copyright (C) 2007 Andy Powell <lcd4linux@automted.it> 
  *
  * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at>
@@ -29 +30 @@
  * exported fuctions:
  *
- * struct DRIVER drv_Sample
+ * struct DRIVER drv_Pertelian
  *
  */
@@ -52 +53 @@
 #include "drv.h"
 
-/* text mode display? */
 #include "drv_generic_text.h"
-
-/* graphic display? */
-#include "drv_generic_graphic.h"
-
-/* GPO's? */
-#include "drv_generic_gpio.h"
-
-/* serial port? */
 #include "drv_generic_serial.h"
 
-/* parallel port? */
-#include "drv_generic_parport.h"
-
-/* i2c bus? */
-#ifdef WITH_I2C
-#include "drv_generic_i2c.h"
-#endif
-
-
-static char Name[] = "Sample";
-
-
-/* for parallel port displays only */
-/* use whatever lines you need */
-static unsigned char SIGNAL_RS;
-static unsigned char SIGNAL_EX;
-
-
+static char Name[] = "Pertelian";
+
+static unsigned char rowoffset[4] = { 0x80, 0x80 + 0x40, 0x80 + 0x14, 0x80 + 0x40 + 0x14 };
+
+#define PERTELIAN_LCDCOMMAND 0xfe
 
 /****************************************/
@@ -87 +66 @@
 /****************************************/
 
-/* low-level parallel port stuff */
-/* example for sending one byte over the wire */
-static void drv_Sample_bang(const unsigned int data)
-{
-    /* put data on DB1..DB8 */
-    drv_generic_parport_data(data & 0xff);
-
-    /* set/clear some signals */
-    drv_generic_parport_control(SIGNAL_RS, SIGNAL_RS);
-
-    /* data setup time (e.g. 200 ns) */
-    ndelay(200);
-
-    /* send byte */
-    /* signal pulse width 500ns */
-    drv_generic_parport_toggle(SIGNAL_EX, 1, 500);
-
-    /* wait for command completion (e.g. 100 us) */
-    udelay(100);
-}
-
-
-static int drv_Sample_open(const char *section)
-{
-    /* open serial port */
-    /* don't mind about device, speed and stuff, this function will take care of */
-
+
+static int drv_Pertelian_open(const char *section)
+{
     if (drv_generic_serial_open(section, Name, 0) < 0)
   return -1;
-
-
-    /* opening the parallel port is a bit more tricky: */
-    /* you have to do all the bit-banging yourself... */
-
-    if (drv_generic_parport_open(section, Name) != 0) {
-  error("%s: could not initialize parallel port!", Name);
-  return -1;
-    }
-
-    /* read the wiring from config */
-    if ((SIGNAL_EX = drv_generic_parport_wire_ctrl("EX", "STROBE")) == 0xff)
-  return -1;
-    if ((SIGNAL_RS = drv_generic_parport_wire_ctrl("RS", "INIT")) == 0xff)
-  return -1;
-
-    /* clear all signals */
-    drv_generic_parport_control(SIGNAL_EX | SIGNAL_RS, 0);
-
-    /* set direction: write */
-    drv_generic_parport_direction(0);
-
-    return 0;
-}
-
-
-static int drv_Sample_close(void)
-{
-    /* close whatever port you've opened */
-    drv_generic_parport_close();
+    return 0;
+}
+
+
+static int drv_Pertelian_close(void)
+{
     drv_generic_serial_close();
-
-    return 0;
-}
-
-
-/* dummy function that sends something to the display */
-static void drv_Sample_send(const char *data, const unsigned int len)
+    return 0;
+}
+
+static void drv_Pertelian_send(const char *data, const unsigned int len)
 {
     unsigned int i;
 
-    /* send data to the serial port is easy... */
-    drv_generic_serial_write(data, len);
-
-    /* sending data to the parallel port is a bit more tricky... */
+    /* Pertelian interface seems to offer no buffering at all
+       so we have to slow things down a tad yes 1usec is enough  */
+
     for (i = 0; i < len; i++) {
-  drv_Sample_bang(*data++);
+  drv_generic_serial_write(&data[i], 1);
+  usleep(1);
     }
 }
@@ -168 +96 @@
 
 /* text mode displays only */
-static void drv_Sample_clear(void)
-{
-    char cmd[1];
-
-    /* do whatever is necessary to clear the display */
-    /* assume 0x01 to be a 'clear display' command */
-    cmd[0] = 0x01;
-    drv_Sample_send(cmd, 1);
+static void drv_Pertelian_clear(void)
+{
+    char cmd[2];
+
+    cmd[0] = PERTELIAN_LCDCOMMAND;
+    cmd[1] = 0x01;
+    drv_Pertelian_send(cmd, 2);
 }
 
 
 /* text mode displays only */
-static void drv_Sample_write(const int row, const int col, const char *data, int len)
+static void drv_Pertelian_write(const int row, const int col, const char *data, int len)
 {
     char cmd[3];
 
-    /* do the cursor positioning here */
-    /* assume 0x02 to be a 'Goto' command */
-    cmd[0] = 0x02;
-    cmd[1] = row;
-    cmd[2] = col;
-    drv_Sample_send(cmd, 3);
-
-    /* send string to the display */
-    drv_Sample_send(data, len);
-
+    cmd[0] = PERTELIAN_LCDCOMMAND;
+    cmd[1] = ((rowoffset[row]) + (col));
+    drv_Pertelian_send(cmd, 2);
+    drv_Pertelian_send(data, len);
 }
 
 /* text mode displays only */
-static void drv_Sample_defchar(const int ascii, const unsigned char *matrix)
-{
-    char cmd[10];
+static void drv_Pertelian_defchar(const int ascii, const unsigned char *matrix)
+{
+    char cmd[11] = "";
     int i;
 
-    /* call the 'define character' function */
-    /* assume 0x03 to be the 'defchar' command */
-    cmd[0] = 0x03;
-    cmd[1] = ascii;
-
-    /* send bitmap to the display */
+    cmd[0] = PERTELIAN_LCDCOMMAND;
+    cmd[1] = (0x40 + (8 * ascii));
     for (i = 0; i < 8; i++) {
-  cmd[i + 2] = *matrix++;
-    }
-    drv_Sample_send(cmd, 10);
-}
-
-
-/* for graphic displays only */
-static void drv_Sample_blit(const int row, const int col, const int height, const int width)
-{
-    int r, c;
-
-    for (r = row; r < row + height; r++) {
-  for (c = col; c < col + width; c++) {
-      /* drv_generic_graphic_black() returns 1 if pixel is black */
-      /* drv_generic_graphic_gray() returns a gray value 0..255 */
-      /* drv_generic_graphic_rgb() returns a RGB color */
-      if (drv_generic_graphic_black(r, c)) {
-    /* set bit */
-      } else {
-    /* clear bit */
-      }
-  }
-    }
-}
-
-
-/* remove unless you have GPO's */
-static int drv_Sample_GPO(const int num, const int val)
-{
-    char cmd[4];
-
-    /* assume 0x42 to be the 'GPO' command */
-    cmd[0] = 0x42;
-    cmd[1] = num;
-    cmd[2] = (val > 0) ? 1 : 0;
-
-    drv_Sample_send(cmd, 3);
-
-    return 0;
-}
-
-
-/* example function used in a plugin */
-static int drv_Sample_contrast(int contrast)
+  cmd[i + 2] = matrix[i] & 0x1f;
+    }
+    drv_Pertelian_send(cmd, 10);
+}
+
+static int drv_Pertelian_backlight(int backlight)
 {
     char cmd[2];
 
-    /* adjust limits according to the display */
-    if (contrast < 0)
-  contrast = 0;
-    if (contrast > 255)
-  contrast = 255;
-
-    /* call a 'contrast' function */
-    /* assume 0x04 to be the 'set contrast' command */
-    cmd[0] = 0x04;
-    cmd[1] = contrast;
-    drv_Sample_send(cmd, 2);
-
-    return contrast;
+    if (backlight <= 0)
+  backlight = 2;
+    else if (backlight >= 1)
+  backlight = 3;
+
+    cmd[0] = PERTELIAN_LCDCOMMAND;
+    cmd[1] = backlight;
+
+    drv_Pertelian_send(cmd, 2);
+
+    return backlight;
 }
 
 
 /* start text mode display */
-static int drv_Sample_start(const char *section)
-{
-    int contrast;
+static int drv_Pertelian_start(const char *section)
+{
+    int backlight;
     int rows = -1, cols = -1;
     char *s;
-    char cmd[1];
+    char cmd[12] = "";
 
     s = cfg_get(section, "Size", NULL);
@@ -294 +171 @@
     DCOLS = cols;
 
-    /* number of GPO's; remove if you don't have them */
-    GPOS = 8;
-
     /* open communication with the display */
-    if (drv_Sample_open(section) < 0) {
+    if (drv_Pertelian_open(section) < 0) {
   return -1;
     }
 
     /* reset & initialize display */
-    /* assume 0x00 to be a 'reset' command */
-    cmd[0] = 0x00;
-    drv_Sample_send(cmd, 0);
-
-    if (cfg_number(section, "Contrast", 0, 0, 255, &contrast) > 0) {
-  drv_Sample_contrast(contrast);
-    }
-
-    drv_Sample_clear();   /* clear display */
-
-    return 0;
-}
-
-
-/* start graphic display */
-static int drv_Sample_start2(const char *section)
-{
-    char *s;
-    char cmd[1];
-    int contrast;
-
-    /* read display size from config */
-    s = cfg_get(section, "Size", NULL);
-    if (s == NULL || *s == '\0') {
-  error("%s: no '%s.Size' entry from %s", Name, section, cfg_source());
-  return -1;
-    }
-
-    DROWS = -1;
-    DCOLS = -1;
-    if (sscanf(s, "%dx%d", &DCOLS, &DROWS) != 2 || DCOLS < 1 || DROWS < 1) {
-  error("%s: bad Size '%s' from %s", Name, s, cfg_source());
-  return -1;
-    }
-
-    s = cfg_get(section, "Font", "6x8");
-    if (s == NULL || *s == '\0') {
-  error("%s: no '%s.Font' entry from %s", Name, section, cfg_source());
-  return -1;
-    }
-
-    XRES = -1;
-    YRES = -1;
-    if (sscanf(s, "%dx%d", &XRES, &YRES) != 2 || XRES < 1 || YRES < 1) {
-  error("%s: bad Font '%s' from %s", Name, s, cfg_source());
-  return -1;
-    }
-
-    /* Fixme: provider other fonts someday... */
-    if (XRES != 6 && YRES != 8) {
-  error("%s: bad Font '%s' from %s (only 6x8 at the moment)", Name, s, cfg_source());
-  return -1;
-    }
-
-    /* you surely want to allocate a framebuffer or something... */
-
-    /* open communication with the display */
-    if (drv_Sample_open(section) < 0) {
-  return -1;
-    }
-
-    /* reset & initialize display */
-    /* assume 0x00 to be a 'reset' command */
-    cmd[0] = 0x00;
-    drv_Sample_send(cmd, 1);
-
-    if (cfg_number(section, "Contrast", 0, 0, 255, &contrast) > 0) {
-  drv_Sample_contrast(contrast);
-    }
+    cmd[0] = PERTELIAN_LCDCOMMAND;
+    cmd[1] = 0x38;
+    cmd[2] = PERTELIAN_LCDCOMMAND;
+    cmd[3] = 0x06;
+    cmd[4] = PERTELIAN_LCDCOMMAND;
+    cmd[5] = 0x10;    /* move cursor on data write */
+    cmd[6] = PERTELIAN_LCDCOMMAND;
+    cmd[7] = 0x0c;
+    cmd[8] = 0x0c;
+
+    drv_Pertelian_send(cmd, 8);
+
+    if (cfg_number(section, "Backlight", 0, 0, 1, &backlight) > 0) {
+  drv_Pertelian_backlight(backlight);
+    }
+
+    drv_Pertelian_clear();  /* clear display */
 
     return 0;
@@ -380 +202 @@
 /***            plugins               ***/
 /****************************************/
-
-static void plugin_contrast(RESULT * result, RESULT * arg1)
-{
-    double contrast;
-
-    contrast = drv_Sample_contrast(R2N(arg1));
-    SetResult(&result, R_NUMBER, &contrast);
-}
 
 
@@ -407 +221 @@
 
 /* list models */
-int drv_Sample_list(void)
+int drv_Pertelian_list(void)
 {
     printf("generic");
@@ -416 +230 @@
 /* initialize driver & display */
 /* use this function for a text display */
-int drv_Sample_init(const char *section, const int quiet)
+int drv_Pertelian_init(const char *section, const int quiet)
 {
     WIDGET_CLASS wc;
@@ -431 +245 @@
 
     /* real worker functions */
-    drv_generic_text_real_write = drv_Sample_write;
-    drv_generic_text_real_defchar = drv_Sample_defchar;
-
-    /* remove unless you have GPO's */
-    drv_generic_gpio_real_set = drv_Sample_GPO;
+    drv_generic_text_real_write = drv_Pertelian_write;
+    drv_generic_text_real_defchar = drv_Pertelian_defchar;
 
 
     /* start display */
-    if ((ret = drv_Sample_start(section)) != 0)
+    if ((ret = drv_Pertelian_start(section)) != 0)
   return ret;
 
@@ -445 +256 @@
   char buffer[40];
   qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
-  if (drv_generic_text_greet(buffer, "www.bwct.de")) {
+  if (drv_generic_text_greet(buffer, "LinITX.com")) {
       sleep(3);
-      drv_Sample_clear();
+      drv_Pertelian_clear();
   }
     }
@@ -466 +277 @@
     drv_generic_text_bar_add_segment(0, 0, 255, 32);  /* ASCII  32 = blank */
 
-
-    /* initialize generic GPIO driver */
-    /* remove unless you have GPO's */
-    if ((ret = drv_generic_gpio_init(section, Name)) != 0)
-  return ret;
 
     /* register text widget */
@@ -487 +293 @@
     widget_register(&wc);
 
-    /* register plugins */
-    AddFunction("LCD::contrast", 1, plugin_contrast);
-
-    return 0;
-}
-
-
-/* initialize driver & display */
-/* use this function for a graphic display */
-int drv_Sample_init2(const char *section, const int quiet)
-{
-    int ret;
-
-    /* real worker functions */
-    drv_generic_graphic_real_blit = drv_Sample_blit;
-
-    /* remove unless you have GPO's */
-    drv_generic_gpio_real_set = drv_Sample_GPO;
-
-    /* start display */
-    if ((ret = drv_Sample_start2(section)) != 0)
-  return ret;
-
-    /* initialize generic graphic driver */
-    if ((ret = drv_generic_graphic_init(section, Name)) != 0)
-  return ret;
-
-    if (!quiet) {
-  char buffer[40];
-  qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
-  if (drv_generic_graphic_greet(buffer, NULL)) {
-      sleep(3);
-      drv_generic_graphic_clear();
-  }
-    }
-
-    /* register plugins */
-    AddFunction("LCD::contrast", 1, plugin_contrast);
 
     return 0;
@@ -532 +300 @@
 
 /* close driver & display */
-/* use this function for a text display */
-int drv_Sample_quit(const int quiet)
+int drv_Pertelian_quit(const int quiet)
 {
 
@@ -540 +307 @@
     drv_generic_text_quit();