Inkplate2 merge fixes.

Author: BornaBiro

src/include/Image.h

@@ -53,10 +53,9 @@ class Image : virtual public NetworkClient, virtual public Adafruit_GFX
 
     virtual void drawPixel(int16_t x, int16_t y, uint16_t color) = 0;
 
-    virtual uint8_t getDisplayMode() = 0;
-
 #if !defined(ARDUINO_INKPLATECOLOR) && !defined(ARDUINO_INKPLATE2)
     virtual void selectDisplayMode(uint8_t _mode) = 0;
+    virtual uint8_t getDisplayMode() = 0;
 #endif
 
     virtual int16_t width() = 0;

src/include/ImageBMP.cpp

@@ -475,8 +475,8 @@ void Image::displayBmpLine(int16_t x, int16_t y, bitmapHeader *bmpHeader, bool d
 #ifndef 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/System.cpp

@@ -94,8 +94,6 @@ uint8_t System::readTouchpad(uint8_t _pad)
     return digitalReadInternal(IO_INT_ADDR, ioRegsInt, _pad);
 }
 
-#endif
-
 /**
  * @brief       readBattery reads voltage of the battery
  *
@@ -141,8 +139,6 @@ double System::readBattery()
     return (double(adc) * 2.0 / 1000);
 }
 
-#ifndef ARDUINO_INKPLATE2
-
 /**
  * @brief       sdCardInit initializes sd card trough SPI
  *

src/include/System.h

@@ -90,11 +90,12 @@
 #include "defines.h"
 
 /**
- * @brief       System class for interaction with panel harware
+ * @brief       System class for interaction with panel hardware
  */
 class System : public Esp,
+#ifndef ARDUINO_INKPLATE2
                virtual public Expander,
-
+#endif
 #if defined(ARDUINO_INKPLATE6PLUS) || defined(ARDUINO_INKPLATE6PLUSV2)
                public Touch,
                public Frontlight,