Fixes for new board def

Author: nitko12

src/Inkplate.cpp

@@ -26,18 +26,7 @@ Inkplate::Inkplate() : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_W
 Inkplate::Inkplate(uint8_t _mode) : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_WIDTH, E_INK_HEIGHT)
 #endif
 {
-#ifndef ARDUINO_INKPLATECOLOR
     setDisplayMode(_mode);
-    for (uint32_t i = 0; i < 256; ++i)
-        pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
-                    (((i & B11100000) >> 5) << 25);
-#endif
-
-#ifdef ARDUINO_ESP32_DEV
-    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, HIGH);
-#else
-    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, LOW);
-#endif
 }
 
 /**

src/boards/Inkplate10.cpp

@@ -42,6 +42,19 @@ bool Inkplate::begin(uint8_t lightWaveform)
         return 0;
 
     Wire.begin();
+
+#ifndef ARDUINO_INKPLATECOLOR
+    for (uint32_t i = 0; i < 256; ++i)
+        pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
+                    (((i & B11100000) >> 5) << 25);
+#endif
+
+#ifdef ARDUINO_ESP32_DEV
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, HIGH);
+#else
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, LOW);
+#endif
+
     memset(mcpRegsInt, 0, 22);
     memset(mcpRegsEx, 0, 22);
     mcpBegin(MCP23017_INT_ADDR, mcpRegsInt);

src/boards/Inkplate5.cpp

@@ -36,6 +36,20 @@ bool Inkplate::begin(void)
         return 0;
 
     Wire.begin();
+
+#ifndef ARDUINO_INKPLATECOLOR
+    setDisplayMode(_mode);
+    for (uint32_t i = 0; i < 256; ++i)
+        pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
+                    (((i & B11100000) >> 5) << 25);
+#endif
+
+#ifdef ARDUINO_ESP32_DEV
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, HIGH);
+#else
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, LOW);
+#endif
+
     memset(mcpRegsInt, 0, 22);
     memset(mcpRegsEx, 0, 22);
     mcpBegin(MCP23017_INT_ADDR, mcpRegsInt);

src/boards/Inkplate6.cpp

@@ -39,6 +39,19 @@ bool Inkplate::begin(void)
         return 0;
 
     Wire.begin();
+
+#ifndef ARDUINO_INKPLATECOLOR
+    for (uint32_t i = 0; i < 256; ++i)
+        pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
+                    (((i & B11100000) >> 5) << 25);
+#endif
+
+#ifdef ARDUINO_ESP32_DEV
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, HIGH);
+#else
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, LOW);
+#endif
+
     memset(mcpRegsInt, 0, 22);
     mcpBegin(MCP23017_ADDR, mcpRegsInt);
     pinModeInternal(MCP23017_INT_ADDR, mcpRegsInt, VCOM, OUTPUT);

src/boards/Inkplate6plus.cpp

@@ -87,7 +87,21 @@ bool Inkplate::begin(void)
 {
     if (_beginDone == 1)
         return 0;
+
     Wire.begin();
+
+#ifndef ARDUINO_INKPLATECOLOR
+    for (uint32_t i = 0; i < 256; ++i)
+        pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
+                    (((i & B11100000) >> 5) << 25);
+#endif
+
+#ifdef ARDUINO_ESP32_DEV
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, HIGH);
+#else
+    digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, LOW);
+#endif
+
     memset(mcpRegsInt, 0, 22);
     memset(mcpRegsEx, 0, 22);
     mcpBegin(MCP23017_INT_ADDR, mcpRegsInt);

src/boards/InkplateColor.cpp

@@ -40,6 +40,8 @@ bool Inkplate::begin(void)
     // buffer and clear frame buffer
     if (!_beginDone)
     {
+        Wire.begin();
+
         _beginDone = true;
         SPI.begin();
         pinMode(EPAPER_BUSY_PIN, INPUT);

src/include/Image.h

@@ -24,7 +24,6 @@
 #include "Arduino.h"
 #include "ImageDitherColorKernels.h"
 #include "NetworkClient.h"
-#include "WiFiClient.h"
 #include "defines.h"
 
 /**