diff options
| author | reinelt <> | 2003-09-01 04:09:35 +0000 |
|---|---|---|
| committer | reinelt <> | 2003-09-01 04:09:35 +0000 |
| commit | 003b829ced31a74e5e229571f51a19e73f9be138 (patch) | |
| tree | eb6420cad25f7e6cc71d58b5643be4ca43e482bd /MatrixOrbital.c | |
| parent | 363c54b8c0bce6871120cdbd39271045e6d33f05 (diff) | |
| download | lcd4linux-003b829ced31a74e5e229571f51a19e73f9be138.tar.gz | |
[lcd4linux @ 2003-09-01 04:09:34 by reinelt]
icons nearly finished, but MatrixOrbital only
Diffstat (limited to 'MatrixOrbital.c')
| -rw-r--r-- | MatrixOrbital.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/MatrixOrbital.c b/MatrixOrbital.c index f392db0..bf45282 100644 --- a/MatrixOrbital.c +++ b/MatrixOrbital.c @@ -1,4 +1,4 @@ -/* $Id: MatrixOrbital.c,v 1.34 2003/08/24 05:17:58 reinelt Exp $ +/* $Id: MatrixOrbital.c,v 1.35 2003/09/01 04:09:34 reinelt Exp $ * * driver for Matrix Orbital serial display modules * @@ -20,6 +20,9 @@ * * * $Log: MatrixOrbital.c,v $ + * Revision 1.35 2003/09/01 04:09:34 reinelt + * icons nearly finished, but MatrixOrbital only + * * Revision 1.34 2003/08/24 05:17:58 reinelt * liblcd4linux patch from Patrick Schemitz * @@ -372,7 +375,7 @@ static int MO_init (LCD *Self, int protocol) Lcd.icons=Icons; } - icon_init(Lcd.rows, Lcd.cols, XRES, YRES, Icons); + icon_init(Lcd.rows, Lcd.cols, XRES, YRES, CHARS, Icons, MO_define_char); bar_init(Lcd.rows, Lcd.cols, XRES, YRES, CHARS-Icons); bar_add_segment( 0, 0,255, 32); // ASCII 32 = blank @@ -428,7 +431,7 @@ int MO_bar (int type, int row, int col, int max, int len1, int len2) } -int MO_icon (int num, int row, int col, unsigned char *bitmap) +int MO_icon_old (int num, int row, int col, unsigned char *bitmap) { // icons use last ascii codes char ascii=CHARS-num; @@ -443,6 +446,12 @@ int MO_icon (int num, int row, int col, unsigned char *bitmap) } +int MO_icon (int num, int row, int col) +{ + return icon_draw (num, row, col); +} + + int MO_gpo (int num, int val) { if (num>=Lcd.gpos) @@ -470,6 +479,11 @@ static int MO_flush (int protocol) c=bar_peek(row, col); if (c!=-1) { FrameBuffer1[row*Lcd.cols+col]=(char)c; + } else { + c=icon_peek(row, col); + if (c!=-1) { + FrameBuffer1[row*Lcd.cols+col]=(char)c; + } } } for (col=0; col<Lcd.cols; col++) { |