CFontzPacket: Report cell size according to display type (used to calculate

hBar width). Use block charcter (31d) on displays which have it instead of
the custom icon. On seamless displays do not fill the last line to avoid the
character banging together.

ChangeLog

@@ -25,6 +25,7 @@ v.0.5dev (ongoing development)
  * hd44780: Add KOI8-R character mapping (Yura Scheglyuk)
  * shuttleVFD: Add support for devices with USB VID 0x1308 again
  * CFontzPacket: Add CFA-533. Use HD44780 character mapping for CFA533/633.
+ * CFontzPacket: Report cell size correctly, use block character for icon.
  * CFontz633: Deprecate this driver. Use CFontzPacket with Model=633 instead!
  - Remove native win32 support.
 

server/drivers/CFontzPacket.c

@@ -151,12 +151,12 @@ typedef struct CFontzPacket_private_data {
 
 
 static CFA_Model CFA_ModelList[] = {
-	{533, "16x2", 19200 , HD44780_charmap, CFA_HAS_TEMP | CFA_HAS_4_TEMP_SLOTS},
-	{631, "20x2", 115200, CFontz_charmap , CFA_HAS_FAN | CFA_HAS_TEMP |
+	{533, "16x2", 5, 19200 , HD44780_charmap, CFA_HAS_TEMP | CFA_HAS_4_TEMP_SLOTS},
+	{631, "20x2", 6, 115200, CFontz_charmap , CFA_HAS_FAN | CFA_HAS_TEMP |
 						CFA_HAS_KS0073 | CFA_HAS_4_TEMP_SLOTS},
-	{633, "16x2", 19200 , HD44780_charmap, CFA_HAS_FAN | CFA_HAS_TEMP},
-	{635, "20x4", 115200, CFontz_charmap , CFA_HAS_KS0073},
-	{0, NULL, 0, NULL, 0}
+	{633, "16x2", 5, 19200 , HD44780_charmap, CFA_HAS_FAN | CFA_HAS_TEMP},
+	{635, "20x4", 6, 115200, CFontz_charmap , CFA_HAS_KS0073},
+	{0, NULL, 0, 0, NULL, 0}
 };
 
 /* Vars for the server core */
@@ -197,7 +197,6 @@ CFontzPacket_init (Driver *drvthis)
 
 	/* Initialize the PrivateData structure */
 	p->fd = -1;
-	p->cellwidth = DEFAULT_CELL_WIDTH;
 	p->cellheight = DEFAULT_CELL_HEIGHT;
 	p->ccmode = standard;
 	p->LEDstate = 0xFFFF;
@@ -243,6 +242,8 @@ CFontzPacket_init (Driver *drvthis)
 	}
 	p->width = w;
 	p->height = h;
+	p->cellwidth = p->model_desc->cell_width;
+
 
 	debug(RPT_INFO, "%s: Size used: %dx%d", __FUNCTION__, p->width, p->height);
 
@@ -634,6 +635,8 @@ CFontzPacket_chr (Driver *drvthis, int x, int y, char c)
 {
 	PrivateData *p = drvthis->private_data;
 
+	debug(RPT_INFO, "%s: x=%d, y=%d, ch=0x%02X", __FUNCTION__, x, y, c);
+
 	y--;
 	x--;
 
@@ -655,6 +658,8 @@ CFontzPacket_raw_chr (Driver *drvthis, int x, int y, unsigned char c)
 {
 	PrivateData *p = drvthis->private_data;
 
+	debug(RPT_INFO, "%s: x=%d, y=%d, ch=0x%02X", __FUNCTION__, x, y, c);
+
 	y--;
 	x--;
 
@@ -918,7 +923,7 @@ CFontzPacket_hbar (Driver *drvthis, int x, int y, int len, int promille, int opt
 
 		for (i = 1; i <= p->cellwidth; i++) {
 			/* fill pixel columns from left to right. */
-			memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar)-1);
+			memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar));
 			CFontzPacket_set_char(drvthis, i, hBar);
 		}
 	}
@@ -994,7 +999,14 @@ CFontzPacket_set_char (Driver *drvthis, int n, unsigned char *dat)
 	if (!dat)
 		return;
 
-	out[0] = n;	/* Custom char to define. xxx */
+	out[0] = n;	/* Custom char to define. */
+
+	/*
+	 * Models with a KS0073 (631, 635) have a seamless display. Clear the
+	 * last line on those to avoid the custom characters banging together
+	 * with other characters. This actually makes vBars not seamless. This
+	 * is supposed to be a feature, not a bug.
+	 */
 	if (p->model_desc->flags & CFA_HAS_KS0073)
 		dat[p->cellheight-1] = 0;
 
@@ -1019,6 +1031,8 @@ CFontzPacket_icon (Driver *drvthis, int x, int y, int icon)
 {
 	PrivateData *p = drvthis->private_data;
 
+	debug(RPT_INFO, "%s: x=%d, y=%d, icon=0x%02X", __FUNCTION__, x, y, icon);
+
 	static unsigned char heart_open[] =
 		{ b__XXXXX,
 		  b__X_X_X,
@@ -1130,7 +1144,6 @@ CFontzPacket_icon (Driver *drvthis, int x, int y, int icon)
 		  b_______,
 		  b__X_X_X,
 		  b_______ };
-	*/
 	static unsigned char block_filled[] =
 		{ b__XXXXX,
 		  b__XXXXX,
@@ -1140,13 +1153,13 @@ CFontzPacket_icon (Driver *drvthis, int x, int y, int icon)
 		  b__XXXXX,
 		  b__XXXXX,
 		  b__XXXXX };
+	*/
 
 	/* Yes we know, this is a VERY BAD implementation :-) */
 	switch (icon) {
 		case ICON_BLOCK_FILLED:
 			if (p->model_desc->flags & CFA_HAS_KS0073) {
-				CFontzPacket_set_char(drvthis, 7, block_filled);
-				CFontzPacket_chr(drvthis, x, y, 7);
+				CFontzPacket_raw_chr(drvthis, x, y, 31);
 			}
 			else
 				CFontzPacket_raw_chr(drvthis, x, y, 255);

server/drivers/CFontzPacket.h

@@ -3,7 +3,6 @@
 
 #include "lcd.h"
 
-#define DEFAULT_CELL_WIDTH	6
 #define DEFAULT_CELL_HEIGHT	8
 #define DEFAULT_CONTRAST	560
 #define DEFAULT_DEVICE		"/dev/lcd"
@@ -20,6 +19,7 @@
 typedef struct CFA_Model {
 	int model;
 	char *size;
+	int cell_width;
 	int speed;
 	const unsigned char *charmap;
 	int flags;