From c084e6b800e4fbfd1bc668d39f38c4c612942b36 Mon Sep 17 00:00:00 2001 From: mmdolze Date: Sat, 13 Feb 2010 17:33:27 +0000 Subject: [PATCH] Update documentation for CFontzPacket changes. --- docs/lcdproc-user/drivers/CFontz633.docbook | 9 ++- .../lcdproc-user/drivers/CFontzPacket.docbook | 74 ++++++++++++++----- server/drivers/CFontzPacket.c | 2 +- 3 files changed, 63 insertions(+), 22 deletions(-) diff --git a/docs/lcdproc-user/drivers/CFontz633.docbook b/docs/lcdproc-user/drivers/CFontz633.docbook index d8abd1e..6985b42 100644 --- a/docs/lcdproc-user/drivers/CFontz633.docbook +++ b/docs/lcdproc-user/drivers/CFontz633.docbook @@ -6,6 +6,14 @@ This section talks about using LCDproc with LCD displays that use the CFontz633 chipset. + + + This driver is deprecated. Please use the CFontzPacket driver + with Model=633 instead. This driver will be removed in + a future version. + + + Configuration in LCDd.conf @@ -22,7 +30,6 @@ CFontz633 chipset. Select the output device to use [default: /dev/lcd] may be serial device or USB device in serial emulation mode. - diff --git a/docs/lcdproc-user/drivers/CFontzPacket.docbook b/docs/lcdproc-user/drivers/CFontzPacket.docbook index 550e896..189f347 100644 --- a/docs/lcdproc-user/drivers/CFontzPacket.docbook +++ b/docs/lcdproc-user/drivers/CFontzPacket.docbook @@ -21,6 +21,8 @@ Currently this line of modules comprises the models: keypad with 4 keys: Up, Down, enter & Escape USB connection for data and power mounting bracket to fit into 3,5" drive bays + Optional (via add-on board) temperature sensor, fan and + ATX power control connectors (all unsupported by LCDproc) @@ -29,10 +31,25 @@ Currently this line of modules comprises the models: CFA-633 - 16x2 character LCDi with backlight + 16x2 character LCD with backlight keypad with 6 keys: 4 directions, Enter & Escape serial or USB connection mounting bracket to fit into 5,25" drive bays + Temperature sensor and fan control connectors (both + unsupported by LCDproc) + + + + + + CFA-533 + + + + This is the same as CFA-633 except it misses the fan control + capabilities. The temperature monitoring is not supported in LCDproc + though. + @@ -41,7 +58,7 @@ Currently this line of modules comprises the models: CFA-635 - 20x4 characters LCDi with backlight + 20x4 characters LCD with backlight keypad with 6 keys: 4 directions, Enter & Escape USB connection for data and power four bi-color LEDs to show status information @@ -52,7 +69,7 @@ Currently this line of modules comprises the models: - + Configuration in LCDd.conf @@ -64,6 +81,7 @@ Currently this line of modules comprises the models: Model = { + 533 | 631 | 633 | 635 @@ -72,6 +90,7 @@ Currently this line of modules comprises the models: Select the LCD model that is connected. Legal values for this option are 631, + 533, 633, or 635, with the default being 633. @@ -97,15 +116,27 @@ Currently this line of modules comprises the models: + + + USB = ¶meters.yesnodef; + + + Enable this flag if the device is connected to an USB port. For serial ports + leave it disabled. [default: no; legal: yes, + no] + + + Size = ¶meters.size; - Select the LCD size [default: depending on model: 635: 20x4, - 631: 20x2, - 633: 16x2] - + Select the LCD size. This overrides the size the driver uses for the + selected model (631: 20x2, 533/633: 16x2, + 635: 20x4). + You should usually not need to set this value! + @@ -146,27 +177,30 @@ Currently this line of modules comprises the models: Speed = { - 1200 | - 2400 | - 9600 | 19200 | 115200 } - - Set the the baud rate for communication with the LCD. - If not specified, the default depends on the model: it is 9600 - for the CFA633 and 115200 for the CFA631 and CFA635. - + + + Override the default baud rate the driver uses for communication with the + selected LCD model. Allowed values are 19200 (default for + CFA-533 and CFA-633) and 115200 (default for the CFA631 + and CFA635). + + You should usually not need to set this value! + - NewFirmware = ¶meters.yesnodef; + OldFirmware = ¶meters.yesnodef; - 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. ;=) + Very old 633 firmware versions do not support partial screen updates using + 'Send Data to LCD' command (31). For those devices it may be necessary to + enable this flag. [default: no; legal: yes, + no] @@ -175,8 +209,8 @@ Currently this line of modules comprises the models: Reboot = ¶meters.yesnodef; - 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 + Reinitialize the LCD's BIOS [default: no; legal: + yes, no]. diff --git a/server/drivers/CFontzPacket.c b/server/drivers/CFontzPacket.c index 8801d42..c7d7e51 100644 --- a/server/drivers/CFontzPacket.c +++ b/server/drivers/CFontzPacket.c @@ -280,7 +280,7 @@ CFontzPacket_init (Driver *drvthis) tmp = drvthis->config_get_int(drvthis->name, "Speed", 0, p->model_desc->speed); debug(RPT_INFO, "%s: Speed (in config) is '%d'", __FUNCTION__, tmp); if ((tmp != 19200) && (tmp != 115200)) { - report(RPT_WARNING, "%s: Speed must be 19200 or 11500; using default %d", + report(RPT_WARNING, "%s: Speed must be 19200 or 115200; using default %d", drvthis->name, p->model_desc->speed); tmp = p->model_desc->speed; }