Diff: Display/LCD.cpp

Revision:

20:14daa48ffd4c

Parent:

18:ffa58f1a680a

Child:

21:ae0a4eedfc90

diff -r 1bdfb971b2c1 -r 14daa48ffd4c Display/LCD.cpp
--- a/Display/LCD.cpp	Mon Mar 02 10:52:26 2015 +0000
+++ b/Display/LCD.cpp	Mon Mar 23 14:08:04 2015 +0000
@@ -243,15 +243,17 @@
     // first check parameter
     if((x >= screensize_X) || (y >= screensize_Y)) return;
 
-//    if(draw_mode == NORMAL)
-//    {
-        if(color) buffer[(x + ((y>>3)*screensize_X))^1] &= ~(1 << (y&7));  // erase pixel
-        else buffer[(x + ((y>>3)*screensize_X))^1] |= (1 << (y&7));   //Black=0000, set pixel
-//    }
-//    else
-//    { // XOR mode
-//        if(color == 1) buffer[x + ((y>>3) * screensize_X)] ^= (1 << (y&7));   // xor pixel
-//    }
+    if(color) buffer[(x + ((y>>3)*screensize_X))^1] &= ~(1 << (y&7));  // erase pixel
+    else buffer[(x + ((y>>3)*screensize_X))^1] |= (1 << (y&7));   //Black=0000, set pixel
+}
+unsigned short LCD::pixelread(int x, int y)
+{
+    if(!(orientation&1)) SWAP(x,y);
+    // first check parameter
+    if((x >= screensize_X) || (y >= screensize_Y)) return 0;
+    
+    if((buffer[(x + ((y>>3)*screensize_X))^1] & (1 << (y&7)))==0) return 0xFFFF ;  // pixel not set, White
+    else return 0; // pixel set, Black
 }
 void LCD::copy_to_lcd(void)
 {