From 7178bcc48bc3377c4027e362ba217e9f3815cea5 Mon Sep 17 00:00:00 2001 From: mrwastl Date: Fri, 16 Sep 2011 17:59:04 +0200 Subject: move config/oldConfig + it's initialisation to base class cDriver; libglcddrivers.so no longer link-dependent on libglcdgraphics.so --- glcddrivers/g15daemon.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'glcddrivers/g15daemon.c') diff --git a/glcddrivers/g15daemon.c b/glcddrivers/g15daemon.c index 88619c3..20049bc 100644 --- a/glcddrivers/g15daemon.c +++ b/glcddrivers/g15daemon.c @@ -107,16 +107,10 @@ namespace GLCD { cDriverG15daemon::cDriverG15daemon(cDriverConfig * config) -: config(config), +: cDriver(config), offbuff(0), sockfd(-1) { - oldConfig = new cDriverConfig(*config); -} - -cDriverG15daemon::~cDriverG15daemon() -{ - delete oldConfig; } int cDriverG15daemon::Init() @@ -193,7 +187,7 @@ void cDriverG15daemon::SetPixel(int x, int y, uint32_t data) y = height - 1 - y; } - offbuff[x + (width * y)] = ( (data == GLCD::cColor::White) ? 1 : 0 ); + offbuff[x + (width * y)] = ( (data == GRAPHLCD_White) ? 1 : 0 ); } void cDriverG15daemon::Clear() @@ -211,7 +205,7 @@ void cDriverG15daemon::Set8Pixels(int x, int y, unsigned char data) for (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 -- cgit v1.2.3