diff --git a/CREDITS b/CREDITS index 64e1f14..930a006 100644 --- a/CREDITS +++ b/CREDITS @@ -207,6 +207,7 @@ John Sanders: Eric Pooch: - Mac OS X / Darwin support + - serialPOS driver Benjamin Wiedmann - Added functionality for HITACHI SP14Q002 gLCD (320x240) diff --git a/ChangeLog b/ChangeLog index 9d30f8b..0767247 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ v.0.5dev (ongoing development) + new ConnectionType vdr-wakeup in hd44780 driver (originally Frank Jepsen) * fixes for the hd44780-serial drivers (Matteo Pillon) + new options for the hd44780 driver (Frank Jepsen) + + new driver for text based serial Point of Sale displays (Eric Pooch) v.0.5.1 + config file support in lcdproc client (Andrew Foss) diff --git a/LCDd.conf b/LCDd.conf index df8158f..04506ad 100644 --- a/LCDd.conf +++ b/LCDd.conf @@ -39,8 +39,8 @@ # bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, EyeboxOne, # g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior, irman, # joy, lb216,lcdm001, lcterm, lirc,MD8800, ms6931, mtc_s16209x, -# MtxOrb, NoritakeVFD, pyramid, sed1330, sed1520, serialVFD, -# sli, stv5730, svga, t6963, text, tyan, ula200, xosd +# MtxOrb, NoritakeVFD, pyramid, sed1330, sed1520, serialPOS, +# serialVFD, sli, stv5730, svga, t6963, text, tyan, ula200, xosd Driver=curses # Tells the driver to bind to the given interface @@ -727,6 +727,24 @@ Port=0x378 +## serial POS display driver ## +[serialPOS] + +# Device to use in serial modea [default: /dev/lcd] +Device=/dev/lcd + +# Specifies the size of the display in characters. [default: 16x2] +Size=16x2 + +# Set the communication protocol to use with the POS display. +# [default: AEDEX; legal: IEE, Epson, Emax, IBM, LogicControls, Ultimate] +Type=AEDEX + +# communication baud rate with the display [default: 9600; legal: 1200, 2400, 19200, 115200] +Speed=9600 + + + ## Serial VFD driver ## ## Drives various (see below) serial 5x7dot VFD's. ## [serialVFD] diff --git a/acinclude.m4 b/acinclude.m4 index 1d088a5..a468c08 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -8,14 +8,14 @@ AC_ARG_ENABLE(drivers, [ bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,EyeboxOne,] [ g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,] [ joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,] - [ MtxOrb,NoritakeVFD,pyramid,sed1330,sed1520,serialVFD,] - [ sli,stv5730,svga,t6963,text,tyan,ula200,xosd] + [ MtxOrb,NoritakeVFD,pyramid,sed1330,sed1520,serialPOS,] + [ serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd] [ 'all' compiles all drivers;] [ 'all,!xxx,!yyy' de-selects previously selected drivers], drivers="$enableval", drivers=[bayrad,CFontz,CFontz633,curses,CwLnx,glk,lb216,lcdm001,MtxOrb,pyramid,text]) -allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,pyramid,sed1330,sed1520,serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd] +allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,pyramid,sed1330,sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd] drivers=`echo $drivers | sed -e 's/,/ /g'` @@ -293,6 +293,10 @@ dnl else AC_MSG_WARN([The sed1520 driver needs a parallel port.]) fi ;; + serialPOS) + DRIVERS="$DRIVERS serialPOS${SO}" + actdrivers=["$actdrivers serialPOS"] + ;; serialVFD) DRIVERS="$DRIVERS serialVFD${SO}" actdrivers=["$actdrivers serialVFD"] diff --git a/docs/lcdproc-user/drivers.docbook b/docs/lcdproc-user/drivers.docbook index 94c07a1..3c428ed 100644 --- a/docs/lcdproc-user/drivers.docbook +++ b/docs/lcdproc-user/drivers.docbook @@ -35,6 +35,7 @@ well as the configuration of LCDd. &pylcd; &sed1330; &sed1520; +&serialPOS; &serialVFD; &sli; &stv5730; diff --git a/docs/lcdproc-user/lcdproc-user.docbook b/docs/lcdproc-user/lcdproc-user.docbook index a835d10..518a18e 100644 --- a/docs/lcdproc-user/lcdproc-user.docbook +++ b/docs/lcdproc-user/lcdproc-user.docbook @@ -41,6 +41,7 @@ + diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index ace6427..c0c67d8 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -19,7 +19,7 @@ AM_LDFLAGS = @LDSHARED@ #LIBS = pkglib_PROGRAMS = @DRIVERS@ -EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD pyramid sed1330 sed1520 serialVFD stv5730 svga t6963 text tyan sli ula200 xosd +EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD pyramid sed1330 sed1520 serialPOS serialVFD stv5730 svga t6963 text tyan sli ula200 xosd noinst_LIBRARIES = libLCD.a libbignum.a IOWarrior_CFLAGS = @libusb_cflags@ $(AM_CFLAGS) @@ -46,6 +46,7 @@ mtc_s16209x_LDADD = libLCD.a MtxOrb_LDADD = libLCD.a libbignum.a NoritakeVFD_LDADD = libLCD.a pyramid_LDADD = libLCD.a +serialPOS_LDADD = libLCD.a libbignum.a serialVFD_LDADD = libLCD.a libbignum.a svga_LDADD = @LIBSVGA@ t6963_LDADD = libLCD.a @@ -87,6 +88,7 @@ NoritakeVFD_SOURCES = lcd.h lcd_lib.h NoritakeVFD.c NoritakeVFD.h report.h pyramid_SOURCES = lcd.h pylcd.c pylcd.h sed1330_SOURCES = lcd.h sed1330.h sed1330.c port.h lpt-port.h timing.h report.h sed1520_SOURCES = lcd.h sed1520.c sed1520.h sed1520fm.c sed1520fm.h port.h report.h +serialPOS_SOURCES = lcd.h lcd_lib.h serialPOS.c serialPOS.h report.h adv_bignum.h serialVFD_SOURCES = lcd.h lcd_lib.h serialVFD.c serialVFD.h report.h adv_bignum.h serialVFD_displays.c serialVFD_displays.h serialVFD_io.c serialVFD_io.h stv5730_SOURCES = lcd.h stv5730.c stv5730.h report.h svga_SOURCES = lcd.h svgalib_drv.c svgalib_drv.h report.h