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/network.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/network.c')
-rw-r--r-- | glcddrivers/network.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/glcddrivers/network.c b/glcddrivers/network.c index 367962b..40399bc 100644 --- a/glcddrivers/network.c +++ b/glcddrivers/network.c @@ -30,19 +30,13 @@ namespace GLCD { cDriverNetwork::cDriverNetwork(cDriverConfig * config) -: config(config) +: cDriver(config) { - oldConfig = new cDriverConfig(*config); childTid = 0; running = false; clientConnected = false; } -cDriverNetwork::~cDriverNetwork() -{ - delete oldConfig; -} - int cDriverNetwork::Init() { width = config->width; @@ -137,7 +131,7 @@ void cDriverNetwork::SetPixel(int x, int y, uint32_t data) pos = 7 - pos; // reverse bit position } - if (data == GLCD::cColor::White) + if (data == GRAPHLCD_White) newLCD[lineSize * y + x / 8] |= (1 << pos); else newLCD[lineSize * y + x / 8] &= ( 0xFF ^ (1 << pos) ); |