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

fix IOWarrior driver to allow use with 4-line displays not 20 chars wide

Browse Source
This commit is contained in:
marschap
2008-08-03 13:47:10 +00:00
parent c01503bef1
commit 2ebf0ac31a
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -47,8 +47,9 @@ v.0.5dev (ongoing development)
* hd44780 driver: "euro" character mapping table (Markus Dolze) * hd44780 driver: "euro" character mapping table (Markus Dolze)
* CwLnx driver: support for CW12832 * CwLnx driver: support for CW12832
+ new driver mx5000 for Logitech MX5000 keyboards (Christian Jodar) + new driver mx5000 for Logitech MX5000 keyboards (Christian Jodar)
* update debian inits scripts to allow multiple instances of clients * update debian init scripts to allow multiple instances of clients
+ serialVFD driver: support for 4 more display types (Stefan Herdler) + serialVFD driver: support for 4 more display types (Stefan Herdler)
* IOWarrior driver: fixed 4-line display use
v.0.5.2 v.0.5.2
* fix switching on/off the Load screen in lcdproc client using the menu * fix switching on/off the Load screen in lcdproc client using the menu
server/drivers/IOWarrior.c
+14 -23
View File
@@ -1,6 +1,6 @@
/* This is the LCDproc driver for IO-Warrior devices (http://www.codemercs.de) /* This is the LCDproc driver for IO-Warrior devices (http://www.codemercs.de)
Copyright(C) 2004-2006 Peter Marschall <peter@adpm.de> Copyright(C) 2004-2008 Peter Marschall <peter@adpm.de>
based on GPL'ed code: based on GPL'ed code:
@@ -161,16 +161,22 @@ static int iowlcd_write_data(usb_dev_handle *udh, int size, int len, unsigned ch
return len; return len;
} }
static int iowlcd_set_pos(usb_dev_handle *udh, int size, int x, int y) static int iowlcd_set_pos(usb_dev_handle *udh, int size, int width, int x, int y)
{ {
const unsigned char lineOff[4] = { 0x00, 0x40, 0x14, 0x54 }; /* HD44780 character offset layout:
unsigned char addr = lineOff[y] + x; * - 1st line starts at 0x0
* - (2n)th line starts at 0x40 behind (2n-1)th line
* - 3rd line starts at an offset equal to the display's width
*/
unsigned char addr = ((y % 2) * 0x40)
+ ((y >= 2) * width)
+ x;
return iowlcd_set_ddram_addr(udh, size, addr); return iowlcd_set_ddram_addr(udh, size, addr);
} }
static int iowlcd_set_text(usb_dev_handle *udh, int size, int x, int y, int len, unsigned char *data) static int iowlcd_set_text(usb_dev_handle *udh, int size, int width, int x, int y, int len, unsigned char *data)
{ {
if (iowlcd_set_pos(udh, size, x, y) == IOW_ERROR) if (iowlcd_set_pos(udh, size, width, x, y) == IOW_ERROR)
return IOW_ERROR; return IOW_ERROR;
return iowlcd_write_data(udh, size, len, data); return iowlcd_write_data(udh, size, len, data);
} }
@@ -543,25 +549,10 @@ int count;
buffer[count] = HD44780_charmap[(unsigned char) p->framebuf[offset+count]]; buffer[count] = HD44780_charmap[(unsigned char) p->framebuf[offset+count]];
p->backingstore[offset+count] = p->framebuf[offset+count]; p->backingstore[offset+count] = p->framebuf[offset+count];
} }
iowlcd_set_text(p->udh, IOWLCD_SIZE, 0, y, count, buffer); iowlcd_set_text(p->udh, IOWLCD_SIZE, p->width, 0, y, count, buffer);
debug(RPT_DEBUG, "%s: flushed %d chars at (%d,%d)", debug(RPT_DEBUG, "%s: flushed %d chars at (%d,%d)",
drvthis->name, count, 0, y); drvthis->name, count, 0, y);
// /* Alternative: update the LCD in chunks of max 6 bytes
// * since IOWarrior needs only one command for it
// */
// char buffer[7];
//
// count = (y+1) * p->width - offset - x;
// count = (count > 6) ? 6 : count;
// for (i = 0; i < count; i++) {
// buffer[i] = HD44780_charmap[(unsigned char) p->framebuf[offset+x+i]];
// p->backingstore[offset+x+i] = p->framebuf[offset+x+i];
// }
// iowlcd_set_text(p->udh, IOWLCD_SIZE, x, y, count, buffer);
// debug(RPT_DEBUG, "%s: flushed %d chars at (%d,%d)",
// drvthis->name, count, x, y);
x += count-1; x += count-1;
} }
} }
@@ -797,7 +788,7 @@ IOWarrior_cursor (Driver *drvthis, int x, int y, int state)
{ {
PrivateData *p = drvthis->private_data; PrivateData *p = drvthis->private_data;
iowlcd_set_pos(p->udh, IOWLCD_SIZE, x, y); iowlcd_set_pos(p->udh, IOWLCD_SIZE, p->width, x, y);
switch (state) { switch (state) {
case CURSOR_OFF: case CURSOR_OFF: