diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-09-16 17:59:04 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-09-16 17:59:04 +0200 |
| commit | 7178bcc48bc3377c4027e362ba217e9f3815cea5 (patch) | |
| tree | 8f7cab76d7e5207128da9058b1d1e2d54f5e3a3a /glcddrivers/dm140gink.c | |
| parent | 73ba3e0dd78c96a92e8297e62270bd4e5cd35a44 (diff) | |
| download | graphlcd-base-7178bcc48bc3377c4027e362ba217e9f3815cea5.tar.gz graphlcd-base-7178bcc48bc3377c4027e362ba217e9f3815cea5.tar.bz2 | |
move config/oldConfig + it's initialisation to base class cDriver; libglcddrivers.so no longer link-dependent on libglcdgraphics.so
Diffstat (limited to 'glcddrivers/dm140gink.c')
| -rw-r--r-- | glcddrivers/dm140gink.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/glcddrivers/dm140gink.c b/glcddrivers/dm140gink.c index 0b00a5f..ec3a3e1 100644 --- a/glcddrivers/dm140gink.c +++ b/glcddrivers/dm140gink.c @@ -31,16 +31,10 @@ namespace GLCD { cDriverDM140GINK::cDriverDM140GINK(cDriverConfig * config) -: config(config), +: cDriver(config), fd(-1), framebuff(0) { - oldConfig = new cDriverConfig(*config); -} - -cDriverDM140GINK::~cDriverDM140GINK() -{ - delete oldConfig; } /* hack - fix improper signed char handling - it's seeing 0x80 as a negative value*/ @@ -268,7 +262,7 @@ void cDriverDM140GINK::SetPixel(int x, int y, uint32_t data) int offset = (y/8) * width + x; char mask = (1 << (7 - (y%8))); - if (data == GLCD::cColor::White) + if (data == GRAPHLCD_White) framebuff[offset] |= mask; else framebuff[offset] &= (0xFF ^ mask); @@ -287,7 +281,7 @@ void cDriverDM140GINK::Set8Pixels(int x, int y, unsigned char data) for (int n = 0; n < 8; ++n) { if (data & (0x80 >> n)) // if bit is set - SetPixel(x + n, y, GLCD::cColor::White); + SetPixel(x + n, y, GRAPHLCD_White); } } #endif |