Merge pull request #75 from squix78/fix-black-string-drawing

squix78 · web-flow · commit 103f756f5910 · 2016-08-12T10:17:21.000+02:00
Fix internal black drawing
diff --git a/OLEDDisplay.cpp b/OLEDDisplay.cpp
@@ -728,13 +728,13 @@ void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t widt
       if (yOffset >= 0) {
         switch (this->color) {
           case WHITE:   buffer[dataPos] |= currentByte << yOffset; break;
-          case BLACK:   buffer[dataPos] &= currentByte << yOffset; break;
+          case BLACK:   buffer[dataPos] &= ~(currentByte << yOffset); break;
           case INVERSE: buffer[dataPos] ^= currentByte << yOffset; break;
         }
         if (dataPos < (DISPLAY_BUFFER_SIZE - DISPLAY_WIDTH)) {
           switch (this->color) {
             case WHITE:   buffer[dataPos + DISPLAY_WIDTH] |= currentByte >> (8 - yOffset); break;
-            case BLACK:   buffer[dataPos + DISPLAY_WIDTH] &= currentByte >> (8 - yOffset); break;
+            case BLACK:   buffer[dataPos + DISPLAY_WIDTH] &= ~(currentByte >> (8 - yOffset)); break;
             case INVERSE: buffer[dataPos + DISPLAY_WIDTH] ^= currentByte >> (8 - yOffset); break;
           }
         }
@@ -744,7 +744,7 @@ void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t widt
 
         switch (this->color) {
           case WHITE:   buffer[dataPos] |= currentByte >> yOffset; break;
-          case BLACK:   buffer[dataPos] &= currentByte >> yOffset; break;
+          case BLACK:   buffer[dataPos] &= ~(currentByte >> yOffset); break;
           case INVERSE: buffer[dataPos] ^= currentByte >> yOffset; break;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -728,13 +728,13 @@ void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t widt`
`728`	`728`	`if (yOffset >= 0) {`
`729`	`729`	`switch (this->color) {`
`730`	`730`	`case WHITE: buffer[dataPos] \|= currentByte << yOffset; break;`
`731`		`- case BLACK: buffer[dataPos] &= currentByte << yOffset; break;`
	`731`	`+ case BLACK: buffer[dataPos] &= ~(currentByte << yOffset); break;`
`732`	`732`	`case INVERSE: buffer[dataPos] ^= currentByte << yOffset; break;`
`733`	`733`	`}`
`734`	`734`	`if (dataPos < (DISPLAY_BUFFER_SIZE - DISPLAY_WIDTH)) {`
`735`	`735`	`switch (this->color) {`
`736`	`736`	`case WHITE: buffer[dataPos + DISPLAY_WIDTH] \|= currentByte >> (8 - yOffset); break;`
`737`		`- case BLACK: buffer[dataPos + DISPLAY_WIDTH] &= currentByte >> (8 - yOffset); break;`
	`737`	`+ case BLACK: buffer[dataPos + DISPLAY_WIDTH] &= ~(currentByte >> (8 - yOffset)); break;`
`738`	`738`	`case INVERSE: buffer[dataPos + DISPLAY_WIDTH] ^= currentByte >> (8 - yOffset); break;`
`739`	`739`	`}`
`740`	`740`	`}`
`@@ -744,7 +744,7 @@ void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t widt`
`744`	`744`
`745`	`745`	`switch (this->color) {`
`746`	`746`	`case WHITE: buffer[dataPos] \|= currentByte >> yOffset; break;`
`747`		`- case BLACK: buffer[dataPos] &= currentByte >> yOffset; break;`
	`747`	`+ case BLACK: buffer[dataPos] &= ~(currentByte >> yOffset); break;`
`748`	`748`	`case INVERSE: buffer[dataPos] ^= currentByte >> yOffset; break;`
`749`	`749`	`}`
`750`	`750`