diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | config.h.in | 9 | ||||
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | drivers.m4 | 27 | ||||
| -rw-r--r-- | drv.c | 4 | ||||
| -rw-r--r-- | drv_Pertelian.c | 328 | ||||
| -rwxr-xr-x | smoketest.sh | 2 |
8 files changed, 387 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index d860904..5b84356 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,6 +87,7 @@ drv_MatrixOrbital.c \ drv_MilfordInstruments.c \ drv_Noritake.c \ drv_NULL.c \ +drv_Pertelian \ drv_picoLCD.c \ drv_RouterBoard.c \ drv_Sample.c \ diff --git a/Makefile.in b/Makefile.in index 5c8b3ef..47b01d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -282,6 +282,7 @@ drv_MatrixOrbital.c \ drv_MilfordInstruments.c \ drv_Noritake.c \ drv_NULL.c \ +drv_Pertelian \ drv_picoLCD.c \ drv_RouterBoard.c \ drv_Sample.c \ diff --git a/config.h.in b/config.h.in index 69bc14c..30902ba 100644 --- a/config.h.in +++ b/config.h.in @@ -464,6 +464,12 @@ /* parport bus driver */ #undef WITH_PARPORT +/* Pertelian driver */ +#undef WITH_PERTELIAN + +/* picoLCD driver */ +#undef WITH_PICOLCD + /* PNG driver */ #undef WITH_PNG @@ -503,9 +509,6 @@ /* X11 driver */ #undef WITH_X11 -/* picoLCD driver */ -#undef WITH_picoLCD - /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING @@ -1344,8 +1344,8 @@ Optional Packages: BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, 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. type --with-plugins=list for a list @@ -7388,7 +7388,8 @@ for driver in $drivers; do MILINST="yes" NORITAKE="yes" NULL="yes" - picoLCD="yes" + PERTELIAN="yes" + PICOLCD="yes" PNG="yes" PPM="yes" ROUTERBOARD="yes" @@ -7462,8 +7463,11 @@ for driver in $drivers; do NULL) NULL=$val; ;; + Pertelian) + PERTELIAN=$val + ;; picoLCD) - picoLCD=$val + PICOLCD=$val ;; PNG) PNG=$val @@ -7792,7 +7796,22 @@ _ACEOF 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" GPIO="yes" @@ -7801,7 +7820,7 @@ if test "$picoLCD" = "yes"; then DRIVERS="$DRIVERS drv_picoLCD.o" cat >>confdefs.h <<\_ACEOF -#define WITH_picoLCD 1 +#define WITH_PICOLCD 1 _ACEOF else @@ -35,8 +35,8 @@ AC_ARG_WITH( [ BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux,] [ 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, drivers=all @@ -77,7 +77,8 @@ for driver in $drivers; do MILINST="yes" NORITAKE="yes" NULL="yes" - picoLCD="yes" + PERTELIAN="yes" + PICOLCD="yes" PNG="yes" PPM="yes" ROUTERBOARD="yes" @@ -151,8 +152,11 @@ for driver in $drivers; do NULL) NULL=$val; ;; + Pertelian) + PERTELIAN=$val + ;; picoLCD) - picoLCD=$val + PICOLCD=$val ;; PNG) PNG=$val @@ -392,14 +396,25 @@ if test "$NULL" = "yes"; then AC_DEFINE(WITH_NULL,1,[NULL driver]) 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" GPIO="yes" SERIAL="yes" 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) fi @@ -67,6 +67,7 @@ extern DRIVER drv_MatrixOrbital; extern DRIVER drv_MilfordInstruments; extern DRIVER drv_Noritake; extern DRIVER drv_NULL; +extern DRIVER drv_Pertelian; extern DRIVER drv_picoLCD; extern DRIVER drv_RouterBoard; extern DRIVER drv_Sample; @@ -146,6 +147,9 @@ DRIVER *Driver[] = { #ifdef WITH_NULL &drv_NULL, #endif +#ifdef WITH_PERTELIAN + &drv_Pertelian, +#endif #ifdef WITH_picoLCD &drv_picoLCD, #endif diff --git a/drv_Pertelian.c b/drv_Pertelian.c new file mode 100644 index 0000000..30df5bd --- /dev/null +++ b/drv_Pertelian.c @@ -0,0 +1,328 @@ +/* $Id$ + * $URL$ + * + * Pertelian lcd4linux driver + * Copyright (C) 2007 Andy Powell <lcd4linux@automted.it> + * + * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at> + * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net> + * + * This file is part of LCD4Linux. + * + * LCD4Linux is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * LCD4Linux is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +/* + * + * exported fuctions: + * + * struct DRIVER drv_Pertelian + * + */ + +#include "config.h" + +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +#include "debug.h" +#include "cfg.h" +#include "qprintf.h" +#include "udelay.h" +#include "plugin.h" +#include "widget.h" +#include "widget_text.h" +#include "widget_icon.h" +#include "widget_bar.h" +#include "drv.h" + +#include "drv_generic_text.h" +#include "drv_generic_serial.h" + +static char Name[] = "Pertelian"; + +static unsigned char rowoffset[4] = { 0x80, 0x80 + 0x40, 0x80 + 0x14, 0x80 + 0x40 + 0x14 }; + +#define PERTELIAN_LCDCOMMAND 0xfe + +/****************************************/ +/*** hardware dependant functions ***/ +/****************************************/ + + +static int drv_Pertelian_open(const char *section) +{ + if (drv_generic_serial_open(section, Name, 0) < 0) + return -1; + return 0; +} + + +static int drv_Pertelian_close(void) +{ + drv_generic_serial_close(); + return 0; +} + +static void drv_Pertelian_send(const char *data, const unsigned int len) +{ + unsigned int i; + + /* 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_generic_serial_write(&data[i], 1); + usleep(1); + } +} + + +/* text mode displays only */ +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_Pertelian_write(const int row, const int col, const char *data, int len) +{ + char cmd[3]; + + 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_Pertelian_defchar(const int ascii, const unsigned char *matrix) +{ + char cmd[11] = ""; + int i; + + cmd[0] = PERTELIAN_LCDCOMMAND; + cmd[1] = (0x40 + (8 * ascii)); + for (i = 0; i < 8; i++) { + cmd[i + 2] = matrix[i] & 0x1f; + } + drv_Pertelian_send(cmd, 10); +} + +static int drv_Pertelian_backlight(int backlight) +{ + char cmd[2]; + + 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_Pertelian_start(const char *section) +{ + int backlight; + int rows = -1, cols = -1; + char *s; + char cmd[12] = ""; + + 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; + } + if (sscanf(s, "%dx%d", &cols, &rows) != 2 || rows < 1 || cols < 1) { + error("%s: bad %s.Size '%s' from %s", Name, section, s, cfg_source()); + free(s); + return -1; + } + + DROWS = rows; + DCOLS = cols; + + /* open communication with the display */ + if (drv_Pertelian_open(section) < 0) { + return -1; + } + + /* reset & initialize display */ + 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; +} + + +/****************************************/ +/*** plugins ***/ +/****************************************/ + + +/****************************************/ +/*** widget callbacks ***/ +/****************************************/ + + +/* using drv_generic_text_draw(W) */ +/* using drv_generic_text_icon_draw(W) */ +/* using drv_generic_text_bar_draw(W) */ +/* using drv_generic_gpio_draw(W) */ + + +/****************************************/ +/*** exported functions ***/ +/****************************************/ + + +/* list models */ +int drv_Pertelian_list(void) +{ + printf("generic"); + return 0; +} + + +/* initialize driver & display */ +/* use this function for a text display */ +int drv_Pertelian_init(const char *section, const int quiet) +{ + WIDGET_CLASS wc; + int ret; + + info("%s: %s", Name, "$Rev$"); + + /* display preferences */ + XRES = 5; /* pixel width of one char */ + YRES = 8; /* pixel height of one char */ + CHARS = 8; /* number of user-defineable characters */ + CHAR0 = 0; /* ASCII of first user-defineable char */ + GOTO_COST = 2; /* number of bytes a goto command requires */ + + /* real worker functions */ + drv_generic_text_real_write = drv_Pertelian_write; + drv_generic_text_real_defchar = drv_Pertelian_defchar; + + + /* start display */ + if ((ret = drv_Pertelian_start(section)) != 0) + return ret; + + if (!quiet) { + char buffer[40]; + qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS); + if (drv_generic_text_greet(buffer, "LinITX.com")) { + sleep(3); + drv_Pertelian_clear(); + } + } + + /* initialize generic text driver */ + if ((ret = drv_generic_text_init(section, Name)) != 0) + return ret; + + /* initialize generic icon driver */ + if ((ret = drv_generic_text_icon_init()) != 0) + return ret; + + /* initialize generic bar driver */ + if ((ret = drv_generic_text_bar_init(0)) != 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; + widget_register(&wc); + + + return 0; +} + + + +/* close driver & display */ +int drv_Pertelian_quit(const int quiet) +{ + + info("%s: shutting down.", Name); + + drv_generic_text_quit(); + + /* clear display */ + drv_Pertelian_clear(); + + /* say goodbye... */ + if (!quiet) { + drv_generic_text_greet("goodbye!", NULL); + } + + debug("closing connection"); + drv_Pertelian_close(); + + return (0); +} + +DRIVER drv_Pertelian = { + .name = Name, + .list = drv_Pertelian_list, + .init = drv_Pertelian_init, + .quit = drv_Pertelian_quit, +}; diff --git a/smoketest.sh b/smoketest.sh index 45027be..256edcc 100755 --- a/smoketest.sh +++ b/smoketest.sh @@ -9,7 +9,7 @@ rm -f smoketest.log lcd4linux make distclean ./bootstrap -for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux EA232graphic G15 HD44780 LCD2USB LCDLinux LCDTerm LEDMatrix LPH7508 LUIse M50530 MatrixOrbital MilfordInstruments Noritake NULL picoLCD PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon USBHUB USBLCD WincorNixdorf X11; do +for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux EA232graphic G15 HD44780 LCD2USB LCDLinux LCDTerm LEDMatrix LPH7508 LUIse M50530 MatrixOrbital MilfordInstruments Noritake NULL Pertelian picoLCD PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon USBHUB USBLCD WincorNixdorf X11; do make distclean ./configure --with-drivers=$driver |