From 86a3dd8e35847debfdce7c65e52b8ffd8913689a Mon Sep 17 00:00:00 2001 From: reinelt Date: Sun, 24 Aug 2003 04:31:56 +0000 Subject: [lcd4linux @ 2003-08-24 04:31:56 by reinelt] icon.c icon.h added git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@227 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- Makefile.am | 1 + Makefile.in | 13 ++++---- MatrixOrbital.c | 9 +++++- display.c | 9 +++--- icon.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ icon.h | 36 +++++++++++++++++++++ 6 files changed, 154 insertions(+), 11 deletions(-) create mode 100644 icon.c create mode 100644 icon.h diff --git a/Makefile.am b/Makefile.am index 1be1d54..4b6704a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ udelay.c udelay.h \ display.c display.h \ pixmap.c pixmap.h \ bar.c bar.h \ +icon.c icon.h \ fontmap.c fontmap.h \ exec.c exec.h \ mail2.c \ diff --git a/Makefile.in b/Makefile.in index 8fe8f6d..5f72b3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,7 +83,7 @@ lcd4linux_LDFLAGS = $(X_LIBS) lcd4linux_LDADD = @DRIVERS@ @DRVLIBS@ lcd4linux_DEPENDENCIES = @DRIVERS@ -lcd4linux_SOURCES = lcd4linux.c debug.c debug.h cfg.c cfg.h lock.c lock.h pid.c pid.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h mail.c mail.h seti.c seti.h battery.c battery.h dvb.c dvb.h filter.c filter.h udelay.c udelay.h display.c display.h pixmap.c pixmap.h bar.c bar.h fontmap.c fontmap.h exec.c exec.h mail2.c socket.c socket.h +lcd4linux_SOURCES = lcd4linux.c debug.c debug.h cfg.c cfg.h lock.c lock.h pid.c pid.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h mail.c mail.h seti.c seti.h battery.c battery.h dvb.c dvb.h filter.c filter.h udelay.c udelay.h display.c display.h pixmap.c pixmap.h bar.c bar.h icon.c icon.h fontmap.c fontmap.h exec.c exec.h mail2.c socket.c socket.h EXTRA_lcd4linux_SOURCES = parport.c parport.h BeckmannEgle.c Crystalfontz.c Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c @@ -118,7 +118,8 @@ PROGRAMS = $(bin_PROGRAMS) lcd4linux_OBJECTS = lcd4linux.o debug.o cfg.o lock.o pid.o parser.o \ processor.o system.o isdn.o mail.o seti.o battery.o dvb.o filter.o \ -udelay.o display.o pixmap.o bar.o fontmap.o exec.o mail2.o socket.o +udelay.o display.o pixmap.o bar.o icon.o fontmap.o exec.o mail2.o \ +socket.o CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -137,10 +138,10 @@ DEP_FILES = .deps/BeckmannEgle.P .deps/Crystalfontz.P .deps/Cwlinux.P \ .deps/Raster.P .deps/SIN.P .deps/Skeleton.P .deps/T6963.P .deps/Text.P \ .deps/USBLCD.P .deps/XWindow.P .deps/bar.P .deps/battery.P .deps/cfg.P \ .deps/debug.P .deps/display.P .deps/dvb.P .deps/exec.P .deps/filter.P \ -.deps/fontmap.P .deps/isdn.P .deps/lcd4linux.P .deps/lock.P \ -.deps/mail.P .deps/mail2.P .deps/parport.P .deps/parser.P .deps/pid.P \ -.deps/pixmap.P .deps/processor.P .deps/seti.P .deps/socket.P \ -.deps/system.P .deps/udelay.P +.deps/fontmap.P .deps/icon.P .deps/isdn.P .deps/lcd4linux.P \ +.deps/lock.P .deps/mail.P .deps/mail2.P .deps/parport.P .deps/parser.P \ +.deps/pid.P .deps/pixmap.P .deps/processor.P .deps/seti.P \ +.deps/socket.P .deps/system.P .deps/udelay.P SOURCES = $(liblcd4linux_a_SOURCES) $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES) OBJECTS = $(liblcd4linux_a_OBJECTS) $(lcd4linux_OBJECTS) diff --git a/MatrixOrbital.c b/MatrixOrbital.c index 36e6961..6848a7e 100644 --- a/MatrixOrbital.c +++ b/MatrixOrbital.c @@ -1,4 +1,4 @@ -/* $Id: MatrixOrbital.c,v 1.32 2003/08/22 03:45:08 reinelt Exp $ +/* $Id: MatrixOrbital.c,v 1.33 2003/08/24 04:31:56 reinelt Exp $ * * driver for Matrix Orbital serial display modules * @@ -20,6 +20,9 @@ * * * $Log: MatrixOrbital.c,v $ + * Revision 1.33 2003/08/24 04:31:56 reinelt + * icon.c icon.h added + * * Revision 1.32 2003/08/22 03:45:08 reinelt * bug in parallel port code fixed, more icons stuff * @@ -172,6 +175,7 @@ #include "cfg.h" #include "lock.h" #include "display.h" +#include "icon.h" #include "bar.h" #define XRES 5 @@ -264,6 +268,7 @@ static int MO_clear (int protocol) int gpo; memset (FrameBuffer1, ' ', Lcd.rows*Lcd.cols*sizeof(char)); + icon_clear(); bar_clear(); GPO=0; @@ -364,6 +369,8 @@ static int MO_init (LCD *Self, int protocol) Lcd.icons=Icons; } + icon_init(Lcd.rows, Lcd.cols, XRES, YRES, Icons); + bar_init(Lcd.rows, Lcd.cols, XRES, YRES, CHARS-Icons); bar_add_segment( 0, 0,255, 32); // ASCII 32 = blank bar_add_segment(255,255,255,255); // ASCII 255 = block diff --git a/display.c b/display.c index 84c7ae5..6896928 100644 --- a/display.c +++ b/display.c @@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.37 2003/08/17 16:37:39 reinelt Exp $ +/* $Id: display.c,v 1.38 2003/08/24 04:31:56 reinelt Exp $ * * framework for device drivers * @@ -20,6 +20,9 @@ * * * $Log: display.c,v $ + * Revision 1.38 2003/08/24 04:31:56 reinelt + * icon.c icon.h added + * * Revision 1.37 2003/08/17 16:37:39 reinelt * more icon framework * @@ -358,9 +361,7 @@ int lcd_icon (int num, int row, int col, unsigned char *bitmap) if (row<1 || row>Lcd->rows) return -1; if (col<1 || col>Lcd->cols) return -1; if (Lcd->icon==NULL) return 0; - - // Fixme: ToDo! - return 0; + return Lcd->icon(num-1, row-1, col-1, bitmap); } int lcd_gpo (int num, int val) diff --git a/icon.c b/icon.c new file mode 100644 index 0000000..ee9440b --- /dev/null +++ b/icon.c @@ -0,0 +1,97 @@ +/* $Id: icon.c,v 1.1 2003/08/24 04:31:56 reinelt Exp $ + * + * generic icon and heartbeat handling + * + * written 2003 by Michael Reinelt (reinelt@eunet.at) + * + * This program 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. + * + * This program 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. + * + * + * $Log: icon.c,v $ + * Revision 1.1 2003/08/24 04:31:56 reinelt + * icon.c icon.h added + * + * + */ + + +#include + +#include "icon.h" +#include "debug.h" + + +static int ROWS=0; +static int COLS=0; +static int XRES=0; +static int YRES=0; +static int ICONS=0; + +static int *Screen; + + +static int icon_get_bitmap (int num) +{ + int row, col; + char key[15]; + char *val; + + for (row=1; row<=8; row++) { + snprintf (key, sizeof(key), "Icons%d.Bitmap%d", num, row); + val=cfg_get(key); + } +} + + +int icon_init (int rows, int cols, int xres, int yres, int icons) +{ + if (rows<1 || cols<1) + return -1; + + ROWS=rows; + COLS=cols; + XRES=xres; + YRES=yres; + ICONS=icons; + + if (Screen) { + free (Screen); + } + + if ((Screen=malloc(ROWS*COLS*sizeof(*Screen)))==NULL) { + return -1; + } + + icon_clear(); + + return 0; +} + + +void icon_clear(void) +{ + int n; + + for (n=0; n186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 
/* $Id$
 * $URL$
 * 
 * driver for WincorNixdorf serial cashier displays BA63 and BA66
 * 
 * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at>
 * Copyright (C) 2005 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
 *
 * based on the SimpleLCD driver which is
 * Copyright (C) 2005 Julien Aube <ob@obconseil.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_WincorNixdorf
 *
 */

#include "config.h"

#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <termios.h>

#include "debug.h"
#include "cfg.h"
#include "qprintf.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
#include "widget_bar.h"
#include "drv.h"
#include "drv_generic_text.h"
#include "drv_generic_serial.h"


#define ESC "\033"


static char Name[] = "WincorNixdorf";

typedef struct {
    int type;
    char *name;
    int rows;
    int cols;
} MODEL;

static MODEL Models[] = {
    {63, "BA63", 2, 20},
    {66, "BA66", 4, 20},
    {-1, "unknown", -1, -1},
};

static int Model;


/****************************************/
/***  hardware dependant functions    ***/
/****************************************/

static void drv_WN_clear(void)
{
    drv_generic_serial_write(ESC "[2J", 4);
}


static void drv_WN_write(const int row, const int col, const char *data, int len)
{
    char cmd[8] = ESC "[r;ccH";

    cmd[2] = '1' + row;
    cmd[4] = '0' + (col / 10);
    cmd[5] = '1' + (col % 10);

    drv_generic_serial_write(cmd, 7);
    drv_generic_serial_write(data, len);
}


static int drv_WN_start(const char *section, const int quiet)
{
    int i, len;
    int selftest;
    char *model = NULL;
    char buffer[32];

    model = cfg_get(section, "Model", NULL);
    if (model == NULL && *model == '\0') {
	error("%s: no '%s.Model' entry from %s", Name, section, cfg_source());
	return -1;
    }

    for (i = 0; Models[i].type != -1; i++) {
	if (strcasecmp(Models[i].name, model) == 0)
	    break;
    }
    if (Models[i].type == -1) {
	error("%s: %s.Model '%s' is unknown from %s", Name, section, model, cfg_source());
	return -1;
    }
    Model = i;
    info("%s: using model '%s'", Name, Models[Model].name);

    /* initialize global variables */
    DROWS = Models[Model].rows;
    DCOLS = Models[Model].cols;

    if (drv_generic_serial_open(section, Name, CS8 | PARENB | PARODD) < 0)
	return -1;

    /* real worker functions */
    drv_generic_text_real_write = drv_WN_write;

    cfg_number(section, "SelfTest", 0, 0, 1, &selftest);
    if (selftest) {
	info("%s: initiating display selftest sequence", Name);

	/* read display identification */
	drv_generic_serial_write(ESC "[0c", 4);
	usleep(100 * 1000);

	if ((len = drv_generic_serial_read(buffer, -1 * (int) sizeof(buffer))) > 0) {
	    info("%s: waiting 15 seconds for selftest", Name);
	    drv_generic_serial_write(buffer, len);
	    sleep(15);
	    info("%s: selftest finished", Name);
	} else {
	    info("%s: selftest initiation failed", Name);
	}
    }

    /* clear display */
    drv_WN_clear();

    if (!quiet) {
	char buffer[40];
	qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
	if (drv_generic_text_greet(buffer, NULL)) {
	    sleep(3);
	    drv_WN_clear();
	}
    }

    return 0;
}


/****************************************/
/***            plugins               ***/
/****************************************/

/* none */


/****************************************/
/***        widget callbacks          ***/
/****************************************/


/* using drv_generic_text_draw(W) */


/****************************************/
/***        exported functions        ***/
/****************************************/


/* list models */
int drv_WN_list(void)
{
    printf("BA63 BA66");
    return 0;
}


/* initialize driver & display */
int drv_WN_init(const char *section, const int quiet)
{
    WIDGET_CLASS wc;
    int ascii;
    int ret;

    info("%s: %s", Name, "$Rev$");

    /* display preferences */
    XRES = 5;			/* pixel width of one char  */
    YRES = 7;			/* pixel height of one char  */
    CHARS = 0;			/* number of user-defineable characters */
    CHAR0 = 0;			/* ASCII of first user-defineable char */
    ICONS = 0;			/* number of user-defineable characters reserved for icons */
    GOTO_COST = 6;		/* number of bytes a goto command requires */

    /* start display */
    if ((ret = drv_WN_start(section, quiet)) != 0)
	return ret;

    /* initialize generic text driver */
    if ((ret = drv_generic_text_init(section, Name)) != 0)
	return ret;

    /* initialize generic bar driver */
    if ((ret = drv_generic_text_bar_init(1)) != 0)
	return ret;

    cfg_number(section, "BarChar", '*', 1, 255, &ascii);

    /* add fixed chars to the bar driver */
    drv_generic_text_bar_add_segment(0, 0, 255, 32);	/* ASCII  32 = blank */
    drv_generic_text_bar_add_segment(255, 255, 255, ascii);

    /* register text widget */
    wc = Widget_Text;
    wc.draw = drv_generic_text_draw;
    widget_register(&wc);

    /* register bar widget */
    wc = Widget_Bar;
    wc.draw = drv_generic_text_bar_draw;
    widget_register(&wc);

    /* register plugins */
    /* none */

    return 0;
}


/* close driver & display */
int drv_WN_quit(const int quiet)
{

    info("%s: shutting down.", Name);

    drv_generic_text_quit();

    /* clear display */
    drv_WN_clear();

    /* say goodbye... */
    if (!quiet) {
	drv_generic_text_greet("goodbye!", NULL);
    }

    drv_generic_serial_close();

    return (0);
}


DRIVER drv_WincorNixdorf = {
    .name = Name,
    .list = drv_WN_list,
    .init = drv_WN_init,
    .quit = drv_WN_quit,
};