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/gu126x64D-K610A4.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/gu126x64D-K610A4.c')
| -rw-r--r-- | glcddrivers/gu126x64D-K610A4.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/glcddrivers/gu126x64D-K610A4.c b/glcddrivers/gu126x64D-K610A4.c index 955174a..6770467 100644 --- a/glcddrivers/gu126x64D-K610A4.c +++ b/glcddrivers/gu126x64D-K610A4.c @@ -91,9 +91,8 @@ static const long ADJUST_FACTOR = 100; // used to adjust timing //----------------------------------------------------------------------------- cDriverGU126X64D_K610A4::cDriverGU126X64D_K610A4(cDriverConfig * config) - : port (0) - , config (config) - , oldConfig (0) + : cDriver (config) + , port (0) , myNumRows (0) , myDrawMem (0) , myVFDMem (0) @@ -105,14 +104,8 @@ cDriverGU126X64D_K610A4::cDriverGU126X64D_K610A4(cDriverConfig * config) , myDataPendingCounter(0) , myLogFlags (0) { - oldConfig = new cDriverConfig(*config); } // cDriverGU126X64D_K610A4::cDriverGU126X64D_K610A4() -//----------------------------------------------------------------------------- -cDriverGU126X64D_K610A4::~cDriverGU126X64D_K610A4() -{ - delete oldConfig; -} // cDriverGU126X64D_K610A4::cDriverGU126X64D_K610A4() //----------------------------------------------------------------------------- int cDriverGU126X64D_K610A4::Init() @@ -432,7 +425,7 @@ void cDriverGU126X64D_K610A4::SetPixel(int x, int y, uint32_t data) unsigned char c = 0x80 >> (y % 8); - if (data == GLCD::cColor::White) + if (data == GRAPHLCD_White) myDrawMem[x][y/8] |= c; else myDrawMem[x][y/8] &= ( 0xFF ^ c ); @@ -449,7 +442,7 @@ void cDriverGU126X64D_K610A4::Set8Pixels(int x, int y, unsigned char data) { if ((data & (0x80 >> n)) != 0) // if bit is set { - setPixel(x + n, y, GLCD::cColor::White); + setPixel(x + n, y, GRAPHLCD_White); } // if } // for } // cDriverGU126X64D_K610A4::Set8Pixels() |