adapt all drivers to support SetPixel() with 32bit colours; Set8Pixels() is no longer virtual (generic implementation in base class)

1 files changed, 26 insertions, 0 deletions

diff --git a/glcddrivers/hd61830.c b/glcddrivers/hd61830.c
index 7f0bd53..2f383bd 100644
--- a/glcddrivers/hd61830.c
+++ b/glcddrivers/hd61830.c
@@ -7,6 +7,8 @@
  * to the COPYING file distributed with this package.
  *
  * (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online.de>
+ * (c) 2005-2010 Andreas Regel <andreas.regel AT powarman.de>
+ * (c) 2011      Wolfgang Astleitner <mrwastl AT users.sourceforge.net>
  */
 
 #include <syslog.h>
@@ -301,6 +303,29 @@ void cDriverHD61830::Clear()
         memset(newLCD[x], 0, height);
 }
 
+
+void cDriverHD61830::SetPixel(int x, int y, uint32_t data)
+{
+    if (x >= width || y >= height)
+        return;
+
+    int pos = x % 8;
+    if (config->upsideDown)
+    {
+        x = width - 1 - x;
+        y = height - 1 - y;
+    } else {
+        pos = 7 - pos; // reverse bit position
+    }
+
+    if (data == GLCD::cColor::White)
+        newLCD[x / 8][y] |= ( 1 << pos );
+    else
+        newLCD[x / 8][y] &= ( 0xFF ^ ( 1 << pos ) );
+}
+
+
+#if 0
 void cDriverHD61830::Set8Pixels(int x, int y, unsigned char data)
 {
     if (x >= width || y >= height)
@@ -319,6 +344,7 @@ void cDriverHD61830::Set8Pixels(int x, int y, unsigned char data)
         newLCD[x / 8][y] = newLCD[x / 8][y] | data;
     }
 }
+#endif
 
 void cDriverHD61830::Refresh(bool refreshAll)
 {