mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated CFontz633 driver. Use CFontzPacket with Model=633 instead!

Browse Source
This commit is contained in:
mmdolze
2011-08-17 20:48:26 +00:00
parent 648aeaf925
commit 30822231ad
10 changed files with 7 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -36,6 +36,7 @@ v.0.5dev (ongoing development)
+ Build system: --enable-extra-charmaps option adds language specific charmaps + Build system: --enable-extra-charmaps option adds language specific charmaps
* imonlcd: Fix spinning of disc icon (E. Pooch) * imonlcd: Fix spinning of disc icon (E. Pooch)
* SureElec: Change port initialization (SF 3212891) * SureElec: Change port initialization (SF 3212891)
- Remove deprecated CFontz633 driver. Use CFontzPacket with Model=633 instead!
v0.5.4 v0.5.4
* Update driver includes and LDFLAGS (fixed glk and bayrad binding error) * Update driver includes and LDFLAGS (fixed glk and bayrad binding error)
LCDd.conf
+1 -29
View File
@@ -44,7 +44,7 @@ DriverPath=server/drivers/
# driver specific section. # driver specific section.
# #
# The following drivers are supported: # The following drivers are supported:
# bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, ea65, # bayrad, CFontz, CFontzPacket, curses, CwLnx, ea65,
# EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, imonlcd, # EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, imonlcd,
# IOWarrior, irman, joy, lb216, lcdm001, lcterm, lirc, lis, MD8800, # IOWarrior, irman, joy, lb216, lcdm001, lcterm, lirc, lis, MD8800,
# mdm166a, ms6931, mtc_s16209x, MtxOrb, mx5000, NoritakeVFD, picolcd, # mdm166a, ms6931, mtc_s16209x, MtxOrb, mx5000, NoritakeVFD, picolcd,
@@ -185,34 +185,6 @@ Reboot=no
## CrystalFontz633 driver (for CF633 only) ##
[CFontz633]
# Note: Use of this driver is deprecated, please use CFontzPacket driver
# with Model=633 instead.
# Select the output device to use [default: /dev/lcd]
Device=/dev/ttyS0
# Select the LCD type (size) [default: 16x2]
Size=16x2
# Set the initial contrast [default: 560; legal: 0 - 1000]
Contrast=350
# Set the initial brightness [default: 1000; legal: 0 - 1000]
Brightness=1000
# Set the initial off-brightness [default: 0; legal: 0 - 1000]
# This value is used when the display is normally
# switched off in case LCDd is inactive
OffBrightness=50
# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
Speed=19200
# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
#NewFirmware=no
# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
# I want to reboot the LCD to make sure we start from a known state
Reboot=yes
## CrystalFontz packet driver (for CFA533, CFA631, CFA633 & CFA635) ## ## CrystalFontz packet driver (for CFA533, CFA631, CFA633 & CFA635) ##
[CFontzPacket] [CFontzPacket]
acinclude.m4
+3 -12
View File
@@ -8,7 +8,7 @@ AC_ARG_ENABLE(drivers,
[ --enable-drivers=<list> compile drivers for LCDs in <list>,] [ --enable-drivers=<list> compile drivers for LCDs in <list>,]
[ which is a comma-separated list of drivers.] [ which is a comma-separated list of drivers.]
[ Possible drivers are:] [ Possible drivers are:]
[ bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,] [ bayrad,CFontz,CFontzPacket,curses,CwLnx,]
[ ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,] [ ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,]
[ icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,] [ icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,]
[ joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,] [ joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,]
@@ -20,9 +20,9 @@ AC_ARG_ENABLE(drivers,
[ 'all' compiles all drivers;] [ 'all' compiles all drivers;]
[ 'all,!xxx,!yyy' de-selects previously selected drivers], [ 'all,!xxx,!yyy' de-selects previously selected drivers],
drivers="$enableval", drivers="$enableval",
drivers=[bayrad,CFontz,CFontz633,curses,CwLnx,glk,lb216,lcdm001,MtxOrb,pyramid,text]) drivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,glk,lb216,lcdm001,MtxOrb,pyramid,text])
allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,t6963,text,tyan,ula200,xosd] allDrivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,t6963,text,tyan,ula200,xosd]
if test "$debug" = yes; then if test "$debug" = yes; then
allDrivers=["${allDrivers},debug"] allDrivers=["${allDrivers},debug"]
fi fi
@@ -58,15 +58,6 @@ for driver in $selectdrivers ; do
DRIVERS="$DRIVERS CFontz${SO}" DRIVERS="$DRIVERS CFontz${SO}"
actdrivers=["$actdrivers CFontz"] actdrivers=["$actdrivers CFontz"]
;; ;;
CFontz633)
DRIVERS="$DRIVERS CFontz633${SO}"
actdrivers=["$actdrivers CFontz633"]
AC_CHECK_FUNCS(select, [
AC_CHECK_HEADERS(sys/select.h)
],[
AC_MSG_WARN([The CFontz633 driver needs the select() function])
])
;;
CFontzPacket) CFontzPacket)
DRIVERS="$DRIVERS CFontzPacket${SO}" DRIVERS="$DRIVERS CFontzPacket${SO}"
actdrivers=["$actdrivers CFontzPacket"] actdrivers=["$actdrivers CFontzPacket"]
docs/LCDd.8.in
+1 -4
View File
@@ -87,11 +87,8 @@ BayRAD LCD modules by EMAC Inc.
.B CFontz .B CFontz
CrystalFontz CFA-632 and CFA-634 serial LCD displays CrystalFontz CFA-632 and CFA-634 serial LCD displays
.TP .TP
.B CFontz633
CrystalFontz CFA-633 serial/USB LCD displays
.TP
.B CFontzPacket .B CFontzPacket
CrystalFontz CFA-631, CFA-633 and CFA-635 serial/USB LCD displays CrystalFontz CFA-533, CFA-631, CFA-633 and CFA-635 serial/USB LCD displays
.TP .TP
.B curses .B curses
Standard video display using the (n)curses library Standard video display using the (n)curses library
docs/lcdproc-user/drivers.docbook
-1
View File
@@ -9,7 +9,6 @@ well as the configuration of LCDd.
&bayrad; &bayrad;
&CFontz; &CFontz;
&CFontz633;
&CFontzPacket; &CFontzPacket;
&curses; &curses;
&CwLnx; &CwLnx;
docs/lcdproc-user/drivers/CFontz633.docbook
-121
View File
@@ -1,121 +0,0 @@
<sect1 id="CFontz633-howto">
<title>The CFontz633 Driver</title>
<para>
This section talks about using LCDproc with LCD displays that use the
CFontz633 chipset.
</para>
<warning>
<para>
This driver is deprecated. Please use the <code>CFontzPacket</code> driver
with <literal>Model=633</literal> instead. This driver will be removed in
a future version.
</para>
</warning>
<!-- ## CrystalFontz633 driver (for CF633 only) ## -->
<sect2 id="CFontz633-config">
<title>Configuration in LCDd.conf</title>
<sect3 id="CFontz633-config-section">
<title>[CFontz633]</title>
<variablelist>
<varlistentry>
<term>
<property>Device</property> =
<parameter><replaceable>DEVICE</replaceable></parameter>
</term>
<listitem><para>
Select the output device to use [default: <filename>/dev/lcd</filename>]
may be serial device or USB device in serial emulation mode.
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>Size</property> = &parameters.size;
</term>
<listitem><para>
Select the LCD type (size) [default: <literal>16x2</literal>]
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>Contrast</property> =
<parameter><replaceable>CONTRAST</replaceable></parameter>
</term>
<listitem><para>
Set the initial contrast.
Legal values for <replaceable>CONTRAST</replaceable> are <literal>0</literal> - <literal>1000</literal>.
If not specified, it defaults to <literal>560</literal>.
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>Brightness</property> =
<parameter><replaceable>BRIGHTNESS</replaceable></parameter>
</term>
<listitem><para>
Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>OffBrightness</property> =
<parameter><replaceable>BRIGHTNESS</replaceable></parameter>
</term>
<listitem><para>
Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
This value is used when the display is normally
switched off in case LCDd is inactive
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>Speed</property> =
{
<parameter><literal>1200</literal></parameter> |
<parameter><literal>2400</literal></parameter> |
<parameter><literal>9600</literal></parameter> |
<emphasis><parameter><literal>19200</literal></parameter></emphasis> |
<parameter><literal>115200</literal></parameter>
}
</term>
<listitem><para>
Set the the baud rate for communication with the LCD.
If not specified, the default is <emphasis>19200</emphasis>.
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>NewFirmware</property> = &parameters.yesnodef;
</term>
<listitem><para>
Set the firmware version (<emphasis>New</emphasis> means >= 2.0) [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
</para></listitem>
</varlistentry>
<varlistentry>
<term>
<property>Reboot</property> = &parameters.yesnodef;
</term>
<listitem><para>
Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
I want to reboot the LCD to make sure we start from a known state
</para></listitem>
</varlistentry>
</variablelist>
</sect3>
</sect2>
</sect1>
docs/lcdproc-user/lcdproc-user.docbook
-1
View File
@@ -16,7 +16,6 @@
<!ENTITY bayrad SYSTEM "drivers/bayrad.docbook"> <!ENTITY bayrad SYSTEM "drivers/bayrad.docbook">
<!ENTITY CFontz SYSTEM "drivers/CFontz.docbook"> <!ENTITY CFontz SYSTEM "drivers/CFontz.docbook">
<!ENTITY CFontz633 SYSTEM "drivers/CFontz633.docbook">
<!ENTITY CFontzPacket SYSTEM "drivers/CFontzPacket.docbook"> <!ENTITY CFontzPacket SYSTEM "drivers/CFontzPacket.docbook">
<!ENTITY curses SYSTEM "drivers/curses.docbook"> <!ENTITY curses SYSTEM "drivers/curses.docbook">
<!ENTITY CwLnx SYSTEM "drivers/CwLnx.docbook"> <!ENTITY CwLnx SYSTEM "drivers/CwLnx.docbook">
server/drivers/CFontz633.c
-1069
View File
File diff suppressed because it is too large Load Diff
server/drivers/CFontz633.h
-47
View File
@@ -1,47 +0,0 @@
#ifndef CFONTZ633_H
#define CFONTZ633_H
#define DEFAULT_CELL_WIDTH 6
#define DEFAULT_CELL_HEIGHT 8
#define DEFAULT_CONTRAST 560
#define DEFAULT_DEVICE "/dev/lcd"
#define DEFAULT_SPEED 19200
#define DEFAULT_SPEED_CF631 115200
#define DEFAULT_SPEED_CF633 19200
#define DEFAULT_SPEED_CF635 115200
#define DEFAULT_BRIGHTNESS 1000
#define DEFAULT_OFFBRIGHTNESS 0
#define DEFAULT_SIZE "16x2"
#define DEFAULT_SIZE_CF631 "20x2"
#define DEFAULT_SIZE_CF633 "16x2"
#define DEFAULT_SIZE_CF635 "20x4"
MODULE_EXPORT int CFontz633_init (Driver *drvthis);
MODULE_EXPORT void CFontz633_close (Driver *drvthis);
MODULE_EXPORT int CFontz633_width (Driver *drvthis);
MODULE_EXPORT int CFontz633_height (Driver *drvthis);
MODULE_EXPORT int CFontz633_cellwidth (Driver *drvthis);
MODULE_EXPORT int CFontz633_cellheight (Driver *drvthis);
MODULE_EXPORT void CFontz633_clear (Driver *drvthis);
MODULE_EXPORT void CFontz633_flush (Driver *drvthis);
MODULE_EXPORT void CFontz633_string (Driver *drvthis, int x, int y, const char string[]);
MODULE_EXPORT void CFontz633_chr (Driver *drvthis, int x, int y, char c);
MODULE_EXPORT const char *CFontz633_get_key (Driver *drvthis);
MODULE_EXPORT void CFontz633_vbar (Driver *drvthis, int x, int y, int len, int promille, int options);
MODULE_EXPORT void CFontz633_hbar (Driver *drvthis, int x, int y, int len, int promille, int options);
MODULE_EXPORT void CFontz633_num (Driver *drvthis, int x, int num);
MODULE_EXPORT int CFontz633_icon(Driver *drvthis, int x, int y, int icon);
MODULE_EXPORT int CFontz633_get_free_chars (Driver *drvthis);
MODULE_EXPORT void CFontz633_set_char (Driver *drvthis, int n, unsigned char *dat);
MODULE_EXPORT int CFontz633_get_contrast (Driver *drvthis);
MODULE_EXPORT void CFontz633_set_contrast (Driver *drvthis, int promille);
MODULE_EXPORT int CFontz633_get_brightness (Driver *drvthis, int state);
MODULE_EXPORT void CFontz633_set_brightness (Driver *drvthis, int state, int promille);
MODULE_EXPORT void CFontz633_backlight (Driver *drvthis, int on);
MODULE_EXPORT void CFontz633_output (Driver *drvthis, int state);
#endif /* CFONTZ633_H */
server/drivers/Makefile.am
+1 -3
View File
@@ -21,7 +21,7 @@ AM_LDFLAGS = @LDSHARED@
## Keep the lists sorted! ## Keep the lists sorted!
pkglib_PROGRAMS = @DRIVERS@ pkglib_PROGRAMS = @DRIVERS@
EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans EXTRA_PROGRAMS = bayrad CFontz CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans
noinst_LIBRARIES = libLCD.a libbignum.a noinst_LIBRARIES = libLCD.a libbignum.a
g15_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS) g15_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS)
@@ -37,7 +37,6 @@ xosd_CFLAGS = @LIBXOSD_CFLAGS@ $(AM_CFLAGS)
bayrad_LDADD = libLCD.a bayrad_LDADD = libLCD.a
CFontz_LDADD = libLCD.a libbignum.a CFontz_LDADD = libLCD.a libbignum.a
CFontz633_LDADD = libLCD.a libbignum.a
CFontzPacket_LDADD = libLCD.a libbignum.a CFontzPacket_LDADD = libLCD.a libbignum.a
curses_LDADD = @LIBCURSES@ curses_LDADD = @LIBCURSES@
CwLnx_LDADD = libLCD.a libbignum.a CwLnx_LDADD = libLCD.a libbignum.a
@@ -78,7 +77,6 @@ libbignum_a_SOURCES = adv_bignum.h adv_bignum.c
bayrad_SOURCES = lcd.h lcd_lib.h bayrad.h bayrad.c report.h bayrad_SOURCES = lcd.h lcd_lib.h bayrad.h bayrad.c report.h
CFontz_SOURCES = lcd.h lcd_lib.h CFontz.c CFontz.h CFontz-charmap.h report.h adv_bignum.h CFontz_SOURCES = lcd.h lcd_lib.h CFontz.c CFontz.h CFontz-charmap.h report.h adv_bignum.h
CFontz633_SOURCES = lcd.h lcd_lib.h CFontz633.c CFontz633.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h adv_bignum.h
CFontzPacket_SOURCES = lcd.h lcd_lib.h CFontzPacket.c CFontzPacket.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h adv_bignum.h CFontzPacket_SOURCES = lcd.h lcd_lib.h CFontzPacket.c CFontzPacket.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h adv_bignum.h
curses_SOURCES = lcd.h curses_drv.h curses_drv.c report.h curses_SOURCES = lcd.h curses_drv.h curses_drv.c report.h
CwLnx_SOURCES = lcd.h lcd_lib.h CwLnx.c CwLnx.h report.h CwLnx_SOURCES = lcd.h lcd_lib.h CwLnx.c CwLnx.h report.h