From ef5ef770de8b4b5d682d24efff30c6cc084d8cc4 Mon Sep 17 00:00:00 2001 From: reinelt Date: Tue, 9 Sep 2003 11:47:47 +0000 Subject: [lcd4linux @ 2003-09-09 11:47:47 by reinelt] basic icon support for HD44780 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@234 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- HD44780.c | 29 +++++++++++++++++++++++++++-- MatrixOrbital.c | 11 +++++------ USBLCD.c | 11 +++++------ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/HD44780.c b/HD44780.c index 0fe36a5..245e2ca 100644 --- a/HD44780.c +++ b/HD44780.c @@ -1,4 +1,4 @@ -/* $Id: HD44780.c,v 1.37 2003/09/09 06:54:43 reinelt Exp $ +/* $Id: HD44780.c,v 1.38 2003/09/09 11:47:47 reinelt Exp $ * * driver for display modules based on the HD44780 chip * @@ -27,6 +27,9 @@ * * * $Log: HD44780.c,v $ + * Revision 1.38 2003/09/09 11:47:47 reinelt + * basic icon support for HD44780 + * * Revision 1.37 2003/09/09 06:54:43 reinelt * new function 'cfg_number()' * @@ -195,6 +198,7 @@ #include "cfg.h" #include "display.h" #include "bar.h" +#include "icon.h" #include "parport.h" #include "udelay.h" @@ -216,6 +220,7 @@ static LCD Lcd; +static int Icons; static int Bits=0; static int GPO=0; static int Controllers = 0; @@ -387,7 +392,10 @@ int HD_clear (int full) { memset (FrameBuffer1, ' ', Lcd.rows*Lcd.cols*sizeof(char)); + + icon_clear(); bar_clear(); + GPO=0; if (full) { @@ -491,7 +499,15 @@ int HD_init (LCD *Self) HD_command (0x03, 0x0c, 1640); // Display on, cursor off, blink off, wait 1.64 ms HD_command (0x03, 0x06, 40); // curser moves to right, no shift - bar_init(rows, cols, XRES, YRES, CHARS); + if (cfg_number("Icons", 0, 0, 8, &Icons)<0) return -1; + if (Icons>0) { + info ("reserving %d of %d user-defined characters for icons", Icons, CHARS); + icon_init(Lcd.rows, Lcd.cols, XRES, YRES, CHARS, Icons, HD_define_char); + Self->icons=Icons; + Lcd.icons=Icons; + } + + bar_init(rows, cols, XRES, YRES, CHARS-Icons); bar_add_segment( 0, 0,255, 32); // ASCII 32 = blank bar_add_segment(255,255,255,255); // ASCII 255 = block @@ -535,6 +551,12 @@ int HD_bar (int type, int row, int col, int max, int len1, int len2) } +int HD_icon (int num, int seq, int row, int col) +{ + return icon_draw (num, seq, row, col); +} + + int HD_gpo (int num, int val) { if (num>=Lcd.gpos) @@ -559,6 +581,7 @@ int HD_flush (void) for (row=0; row