diff --git a/CREDITS b/CREDITS index 0fe2659..6e8f14f 100644 --- a/CREDITS +++ b/CREDITS @@ -240,6 +240,7 @@ Thomas Jarosch - support reporting in hd44780's ConnectionType functions - build-system clean up: use pkg-config for some libs - HD44780 connection type for a USB connection via a FTDI FT2232D chip + - i2500vfd driver diff --git a/ChangeLog b/ChangeLog index ec0a492..439da9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ v.0.5dev (ongoing development) * clean up build system (T. Jarosch, with tests/fixes by M. Dolze) + hd44780 driver: new ConnectionType ftdi (Thomas Jarosch) * shuttleVFD driver: fix VendorID, support newer models (Miska Sulander) + + i2500vfd driver for a graphocal Noritake VFD (Thomas Jarosch) v.0.5.2 * fix switching on/off the Load screen in lcdproc client using the menu diff --git a/acinclude.m4 b/acinclude.m4 index 2061d6c..7b44a69 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -13,13 +13,13 @@ AC_ARG_ENABLE(drivers, [ irman,joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,ms6931,] [ mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,] [ sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,svga,] - [ t6963,text,tyan,ula200,xosd] + [ t6963,text,tyan,ula200,xosd,i2500vfd] [ '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,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd] +allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd,i2500vfd] drivers=`echo $drivers | sed -e 's/,/ /g'` @@ -426,6 +426,14 @@ dnl else AC_MSG_WARN([The xosd driver needs xosd.h]) ]) ;; + i2500vfd) + if test "$enable_libftdi" = yes ; then + DRIVERS="$DRIVERS i2500vfd${SO}" + actdrivers=["$actdrivers i2500vfd"] + else + AC_MSG_WARN([The i2500vfd driver needs the ftdi library]) + fi + ;; *) AC_MSG_ERROR([Unknown driver $driver]) ;; diff --git a/docs/LCDd.8.in b/docs/LCDd.8.in index ef2e3eb..e96e2e5 100644 --- a/docs/LCDd.8.in +++ b/docs/LCDd.8.in @@ -254,6 +254,9 @@ ULA-200 device from ELV (http://www.elv.de) .TP .B xosd On Screen Display on X11 +.TP +.B i2500vfd +140x32 pixel VFD Display of the Intra2net Intranator 2500 appliance .PP Multiple drivers can be used simultaneously; thus, for example, a Matrix Orbital display (MtxOrb driver) can be combined with an infrared driver (irmanin driver). diff --git a/docs/lcdproc-user/drivers.docbook b/docs/lcdproc-user/drivers.docbook index 690e966..68c2644 100644 --- a/docs/lcdproc-user/drivers.docbook +++ b/docs/lcdproc-user/drivers.docbook @@ -49,6 +49,7 @@ well as the configuration of LCDd. &tyan; &ula200; &xosd; +&i2500vfd; &ppttrouble; diff --git a/docs/lcdproc-user/drivers/Makefile.am b/docs/lcdproc-user/drivers/Makefile.am index 764d83c..12fa51b 100644 --- a/docs/lcdproc-user/drivers/Makefile.am +++ b/docs/lcdproc-user/drivers/Makefile.am @@ -40,6 +40,7 @@ EXTRA_DIST = bayrad.docbook \ text.docbook \ tyan.docbook \ ula200.docbook \ - xosd.docbook + xosd.docbook \ + i2500vfd.docbook ## EOF diff --git a/docs/lcdproc-user/lcdproc-user.docbook b/docs/lcdproc-user/lcdproc-user.docbook index bc4c6ae..7b58438 100644 --- a/docs/lcdproc-user/lcdproc-user.docbook +++ b/docs/lcdproc-user/lcdproc-user.docbook @@ -25,6 +25,7 @@ + diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index d68f345..94cdad9 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 ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 svga t6963 text tyan sli ula200 xosd +EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 svga t6963 text tyan sli ula200 xosd i2500vfd noinst_LIBRARIES = libLCD.a libbignum.a IOWarrior_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS) @@ -29,6 +29,7 @@ lis_CFLAGS = @LIBUSB_CFLAGS@ @LIBFTDI_CFLAGS@ $(AM_CFLAGS) picolcd_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS) shuttleVFD_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS) ula200_CFLAGS = @LIBFTDI_CFLAGS@ $(AM_CFLAGS) +i2500vfd_CFLAGS = @LIBFTDI_CFLAGS@ $(AM_CFLAGS) CFontz_LDADD = libLCD.a libbignum.a CFontz633_LDADD = libLCD.a libbignum.a @@ -61,6 +62,7 @@ tyan_LDADD = libLCD.a libbignum.a ula200_LDADD = libLCD.a @LIBFTDI_LIBS@ sli_LDADD = libLCD.a xosd_LDADD = @LIBXOSD@ +i2500vfd_LDADD = libLCD.a @LIBFTDI_LIBS@ libLCD_a_SOURCES = lcd_lib.h lcd_lib.c libbignum_a_SOURCES = adv_bignum.h adv_bignum.c @@ -109,6 +111,7 @@ tyan_SOURCES = lcd.h lcd_lib.h tyan_lcdm.h tyan_lcdm.c report.h adv_bignum ula200_SOURCES = lcd.h lcd_lib.h ula200.h ula200.c report.h sli_SOURCES = lcd.h lcd_lib.h wirz-sli.h wirz-sli.c report.h xosd_SOURCES = lcd.h xosdlib_drv.c xosdlib_drv.h report.h +i2500vfd_SOURCES = lcd.h i2500vfd.c i2500vfd.h i2500vfdfm.c i2500vfdfm.h report.h AM_CPPFLAGS = -I$(top_srcdir)