Inkplate6Color fixes (1 bit mode).

Author: BornaBiro

src/include/ImageBMP.cpp

@@ -345,8 +345,8 @@ void Image::displayBmpLine(int16_t x, int16_t y, bitmapHeader *bmpHeader, bool d
 #if defined(ARDUINO_INKPLATECOLOR)
             if (invert)
                 val = 7 - val;
-            if (getDisplayMode() == INKPLATE_1BIT)
-                val = (~val >> 2) & 1;
+//            if (getDisplayMode() == INKPLATE_1BIT)
+//                val = (~val >> 2) & 1;
 #elif defined(ARDUINO_INKPLATE2) || defined(ARDUINO_INKPLATE4)
             if (invert)
                 val = val ^ 1;
@@ -369,8 +369,8 @@ void Image::displayBmpLine(int16_t x, int16_t y, bitmapHeader *bmpHeader, bool d
 #if defined(ARDUINO_INKPLATECOLOR)
             if (invert)
                 val = 7 - val;
-            if (getDisplayMode() == INKPLATE_1BIT)
-                val = (~val >> 2) & 1;
+//            if (getDisplayMode() == INKPLATE_1BIT)
+//                val = (~val >> 2) & 1;
 #elif defined(ARDUINO_INKPLATE2) || defined(ARDUINO_INKPLATE4)
             if (invert)
                 val = val ^ 1;
@@ -399,8 +399,8 @@ void Image::displayBmpLine(int16_t x, int16_t y, bitmapHeader *bmpHeader, bool d
 #if defined(ARDUINO_INKPLATECOLOR)
                 if (invert)
                     val = 7 - val;
-                if (getDisplayMode() == INKPLATE_1BIT)
-                    val = (~val >> 2) & 1;
+//                if (getDisplayMode() == INKPLATE_1BIT)
+//                    val = (~val >> 2) & 1;
 #elif defined(ARDUINO_INKPLATE2) || defined(ARDUINO_INKPLATE4)
                 if (invert)
                     val = val ^ 1;
@@ -441,8 +441,8 @@ void Image::displayBmpLine(int16_t x, int16_t y, bitmapHeader *bmpHeader, bool d
 #if defined(ARDUINO_INKPLATECOLOR)
             if (invert)
                 val = 7 - val;
-            if (getDisplayMode() == INKPLATE_1BIT)
-                val = (~val >> 2) & 1;
+//            if (getDisplayMode() == INKPLATE_1BIT)
+//                val = (~val >> 2) & 1;
 #elif defined(ARDUINO_INKPLATE2) || defined(ARDUINO_INKPLATE4)
             if (invert)
                 val = val ^ 1;

src/include/ImageJPEG.cpp

@@ -405,8 +405,8 @@ bool Image::drawJpegChunk(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t
 
             if (invert)
                 val = 7 - val;
-            if (_imagePtrJpeg->getDisplayMode() == INKPLATE_1BIT)
-                val = (~val >> 2) & 1;
+//            if (_imagePtrJpeg->getDisplayMode() == INKPLATE_1BIT)
+//                val = (~val >> 2) & 1;
 
             _imagePtrJpeg->writePixel(x + i, y + j, val);
 #endif

src/include/ImagePNG.cpp

@@ -90,8 +90,8 @@ void pngle_on_draw(pngle_t *pngle, uint32_t x, uint32_t y, uint32_t w, uint32_t
                     px = _imagePtrPng->ditherGetPixelBmp(RGB8BIT(r, g, b), x + i, y + j, _imagePtrPng->width(), 0);
                     if (_pngInvert)
                         px = 7 - px;
-                    if (_imagePtrPng->getDisplayMode() == INKPLATE_1BIT)
-                        px = (~px >> 2) & 1;
+//                    if (_imagePtrPng->getDisplayMode() == INKPLATE_1BIT)
+//                        px = (~px >> 2) & 1;
 #endif
                 }
                 _imagePtrPng->drawPixel(_pngX + x + i, _pngY + y + j, px);

src/include/System.cpp

@@ -94,6 +94,10 @@ uint8_t System::readTouchpad(uint8_t _pad)
     return digitalReadInternal(IO_INT_ADDR, ioRegsInt, _pad);
 }
 
+#endif
+
+
+#ifndef ARDUINO_INKPLATE2
 /**
  * @brief       readBattery reads voltage of the battery
  *