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

Fix the last line not being used by custom characters (ID: 3466136). There

Browse Source 
was a lastline setting used which was neither initialized nor read from config.
While there, re-comment the file.
This commit is contained in:
mmdolze
2011-12-30 01:08:17 +00:00
parent 2228e05187
commit 6336c6c99e
4 changed files with 174 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/lis.h
+39 -54
View File
@@ -1,33 +1,18 @@
/*
Based on the lis driver Copyright (C) 2006, Bernhard Walle
Copyright (c) 2007, Daryl Fonseca-Holt <wyatt@prairieturtle.ca>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */
/*-
* Copyright (c) 2007, Daryl Fonseca-Holt <wyatt@prairieturtle.ca>
*
* Based on:
* ula200 driver, Copyright (C) 2006, Bernhard Walle
* IOWarrior driver, Copyright(C) 2004-2006 Peter Marschall <peter@adpm.de>
*
* This file is released under the GNU General Public License. Refer to the
* COPYING file distributed with this package.
*/
#ifndef LIS_H
#define LIS_H
#ifndef bool
# define bool short
# define true 1
# define false 0
#endif
/*----------------------------- Constants ---------------------------------*/
///////////////////////////////////////////////////////////////////////////////
// constants
//
#define DISPLAY_VENDOR_ID 0x0403
#define DISPLAY_PRODUCT_ID 0x6001
@@ -39,9 +24,8 @@
#define NUM_CCs 8
///////////////////////////////////////////////////////////////////////////////
// private data types
//
/*------------------------ Private data types -----------------------------*/
typedef struct cgram_cache {
unsigned char cache[CELLHEIGHT];
int clean;
@@ -50,60 +34,61 @@ typedef struct cgram_cache {
/** private data for the \c lis driver */
typedef struct lis_private_data {
// the handle for the USB FTDI library
/* the handle for the USB FTDI library */
struct ftdi_context ftdic;
// the width and the height (in number of characters) of the display
/* the width and the height (in number of characters) of the display */
int width, height;
// pixel width and height of each character
/* pixel width and height of each character */
int cellwidth, cellheight;
// The framebuffer and the framebuffer for the last contents (incr. update)
/* The framebuffer and the framebuffer for the last contents (incr. update) */
unsigned char *framebuf;
// dirty line flags
/* dirty line flags */
unsigned int *line_flags;
// child thread flag
/* child thread flag */
int child_flag;
// parent thread flag
/* parent thread flag */
int parent_flag;
// display brightness 0-1000
/* display brightness 0-1000 */
int brightness;
// ustom characters
/* custom characters */
CGram cc[NUM_CCs];
CGmode ccmode;
// USB Vendor ID
/* USB Vendor ID */
int VendorID;
// USB Product ID
/* USB Product ID */
int ProductID;
/* lastline controls the use of the last line, if pixel addressable (true, default) or */
/* underline effect (false). To avoid the underline effect in the latter case, the last */
/* line is always zeroed for whatever redefined character */
/*
* flag if the last row of each character can be set when defining
* custom characters.
*/
char lastline;
} PrivateData;
MODULE_EXPORT int lis_init(Driver *drvthis);
MODULE_EXPORT void lis_close (Driver *drvthis);
MODULE_EXPORT int lis_width (Driver *drvthis);
MODULE_EXPORT int lis_height (Driver *drvthis);
MODULE_EXPORT void lis_clear (Driver * drvthis);
MODULE_EXPORT void lis_string (Driver * drvthis, int x, int y, char string[]);
MODULE_EXPORT void lis_chr (Driver * drvthis, int x, int y, unsigned char c);
MODULE_EXPORT void lis_flush (Driver * drvthis);
MODULE_EXPORT void lis_vbar (Driver * drvthis, int x, int y, int len, int promille, int options);
MODULE_EXPORT void lis_hbar (Driver * drvthis, int x, int y, int len, int promille, int options);
MODULE_EXPORT void lis_close(Driver *drvthis);
MODULE_EXPORT int lis_width(Driver *drvthis);
MODULE_EXPORT int lis_height(Driver *drvthis);
MODULE_EXPORT void lis_clear(Driver * drvthis);
MODULE_EXPORT void lis_string(Driver * drvthis, int x, int y, char string[]);
MODULE_EXPORT void lis_chr(Driver * drvthis, int x, int y, unsigned char c);
MODULE_EXPORT void lis_flush(Driver * drvthis);
MODULE_EXPORT void lis_vbar(Driver * drvthis, int x, int y, int len, int promille, int options);
MODULE_EXPORT void lis_hbar(Driver * drvthis, int x, int y, int len, int promille, int options);
MODULE_EXPORT int lis_icon(Driver * drvthis, int x, int y, int icon);
MODULE_EXPORT int lis_cellheight (Driver *drvthis);
MODULE_EXPORT int lis_cellwidth (Driver *drvthis);
MODULE_EXPORT int lis_cellheight(Driver *drvthis);
MODULE_EXPORT int lis_cellwidth(Driver *drvthis);
MODULE_EXPORT void lis_num(Driver *drvthis, int x, int num);
MODULE_EXPORT int lis_get_free_chars(Driver *drvthis);
MODULE_EXPORT void lis_set_char(Driver *drvthis, int n, unsigned char *dat);