diff --git a/CREDITS b/CREDITS index edb15b5..413996f 100644 --- a/CREDITS +++ b/CREDITS @@ -233,6 +233,9 @@ Nicu Pavel Daryl Fonseca-Holt - lis driver +Thien Vu + - shuttleVFD driver + Further developers in the sourceforge lcdproc team: Mindaugas Idzelis aim4min diff --git a/ChangeLog b/ChangeLog index 26c448d..f7901f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ v.0.5dev (ongoing development) * MtxOrb driver: fix VFD/VKD support (Ethan Dicks) + new driver lis for VLSystem L.I.S VFD (Daryl Fonseca-Holt) * serialPOS driver: input support, cleanup (Eric Pooch) + * new driver shuttleVFD for USB-based Shuttle VFDs (Thien Vu) v.0.5.2 * fix switching on/off the Load screen in lcdproc client using the menu diff --git a/LCDd.conf b/LCDd.conf index 94daf82..bc545c8 100644 --- a/LCDd.conf +++ b/LCDd.conf @@ -48,7 +48,8 @@ DriverPath=server/drivers/ # EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior, # irman, joy, lb216, lcdm001, lcterm, lirc, MD8800, ms6931, mtc_s16209x, # MtxOrb, NoritakeVFD, picolcd, pyramid, sed1330, sed1520, serialPOS, -# serialVFD, sli, stv5730, svga, t6963, text, tyan, ula200, xosd +# serialVFD, shuttleVFD, sli, stv5730, svga, t6963, text, tyan, ula200, +# xosd Driver=curses # Tells the driver to bind to the given interface @@ -870,7 +871,9 @@ Speed=9600 # enable ISO 8859 1 compatibility [default: yes; legal: yes, no] #ISO_8859_1=yes - +## shuttleVFD driver ## +[shuttleVFD] +# No options ## stv5730 driver ## [stv5730] diff --git a/acinclude.m4 b/acinclude.m4 index f71e4b6..ccbd30a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -8,15 +8,15 @@ AC_ARG_ENABLE(drivers, [ 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,sli,stv5730,svga,t6963,text,] - [ tyan,ula200,xosd] + [ mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,] + [ sed1520,serialPOS,serialVFD,shuttleVFD,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,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,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] drivers=`echo $drivers | sed -e 's/,/ /g'` @@ -338,6 +338,14 @@ dnl else DRIVERS="$DRIVERS serialVFD${SO}" actdrivers=["$actdrivers serialVFD"] ;; + shuttleVFD) + if test "$enable_libusb" = yes ; then + DRIVERS="$DRIVERS shuttleVFD${SO}" + actdrivers=["$actdrivers shuttleVFD"] + else + AC_MSG_WARN([The shuttleVFD driver needs the libusb library.]) + fi + ;; sli) DRIVERS="$DRIVERS sli${SO}" actdrivers=["$actdrivers sli"] diff --git a/docs/LCDd.8.in b/docs/LCDd.8.in index b22d790..3855fe6 100644 --- a/docs/LCDd.8.in +++ b/docs/LCDd.8.in @@ -222,6 +222,9 @@ SED1330/SED1335 (aka S1D13300/S1D13305) based graphical displays .B serialVFD NEC (FIPC8367 based) and FUTABA VFDs .TP +.B shuttleVFD +Shuttle VFD (USB-based) +.TP .B sli Wirz SLI driver (unknown) .TP diff --git a/docs/lcdproc-user/drivers.docbook b/docs/lcdproc-user/drivers.docbook index 116a9cb..690e966 100644 --- a/docs/lcdproc-user/drivers.docbook +++ b/docs/lcdproc-user/drivers.docbook @@ -40,6 +40,7 @@ well as the configuration of LCDd. &sed1520; &serialPOS; &serialVFD; +&shuttleVFD; &sli; &stv5730; &svga; diff --git a/docs/lcdproc-user/lcdproc-user.docbook b/docs/lcdproc-user/lcdproc-user.docbook index 91dc81c..bc4c6ae 100644 --- a/docs/lcdproc-user/lcdproc-user.docbook +++ b/docs/lcdproc-user/lcdproc-user.docbook @@ -46,6 +46,7 @@ + diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index f2b4bf8..2b6d347 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -19,13 +19,14 @@ 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 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 noinst_LIBRARIES = libLCD.a libbignum.a IOWarrior_CFLAGS = @libusb_cflags@ $(AM_CFLAGS) hd44780_CFLAGS = @libusb_cflags@ $(AM_CFLAGS) g15_CFLAGS = @libusb_cflags@ $(AM_CFLAGS) picolcd_CFLAGS = @libusb_cflags@ $(AM_CFLAGS) +shuttleVFD_CFLAGS = @libusb_cflags@ $(AM_CFLAGS) CFontz_LDADD = libLCD.a libbignum.a CFontz633_LDADD = libLCD.a libbignum.a @@ -51,6 +52,7 @@ picolcd_LDADD = @libusb_libs@ libLCD.a libbignum.a pyramid_LDADD = libLCD.a serialPOS_LDADD = libLCD.a libbignum.a serialVFD_LDADD = libLCD.a libbignum.a +shuttleVFD_LDADD = @libusb_libs@ libLCD.a libbignum.a svga_LDADD = @LIBSVGA@ t6963_LDADD = libLCD.a tyan_LDADD = libLCD.a libbignum.a @@ -96,6 +98,7 @@ sed1330_SOURCES = lcd.h sed1330.h sed1330.c port.h lpt-port.h timing.h report 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 +shuttleVFD_SOURCES = lcd.h shuttleVFD.c shuttleVFD.h report.h stv5730_SOURCES = lcd.h stv5730.c stv5730.h report.h svga_SOURCES = lcd.h svgalib_drv.c svgalib_drv.h report.h t6963_SOURCES = lcd.h lcd_lib.h t6963.c t6963.h t6963_font.h report.h