Fixed warnings for Inkplate 10 and Inkplate 6

Author: nitko12

src/boards/Inkplate10.cpp

@@ -133,7 +133,7 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)
         int x = x0 >> 3;
         int x_sub = x0 & 7;
         uint8_t temp = *(_partial + ((E_INK_WIDTH >> 3) * y0) + x);
-        *(_partial + (E_INK_WIDTH / 8 * y0) + x) = ~pixelMaskLUT[x_sub] & temp | (color ? pixelMaskLUT[x_sub] : 0);
+        *(_partial + (E_INK_WIDTH / 8 * y0) + x) = (~pixelMaskLUT[x_sub] & temp) | (color ? pixelMaskLUT[x_sub] : 0);
     }
     else
     {
@@ -142,7 +142,7 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)
         int x_sub = x0 & 1;
         uint8_t temp;
         temp = *(DMemory4Bit + (E_INK_WIDTH >> 1) * y0 + x);
-        *(DMemory4Bit + (E_INK_WIDTH >> 1) * y0 + x) = pixelMaskGLUT[x_sub] & temp | (x_sub ? color : color << 4);
+        *(DMemory4Bit + (E_INK_WIDTH >> 1) * y0 + x) = (pixelMaskGLUT[x_sub] & temp) | (x_sub ? color : color << 4);
     }
 }
 

src/include/Image.h

@@ -78,35 +78,24 @@ class Image : virtual public NetworkClient, virtual public Adafruit_GFX
 
     bool drawBitmapFromBuffer(uint8_t *buf, int x, int y, bool dither, bool invert);
 
-    [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawBitmapFromSd(
-        const char *fileName, int x, int y, bool dither = 0, bool invert = 0);
+    bool drawBitmapFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0);
     bool drawBitmapFromSd(SdFile *p, int x, int y, bool dither = 0, bool invert = 0);
 
     bool drawBitmapFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0);
     bool drawBitmapFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither = 0, bool invert = 0);
 
     bool drawJpegFromBuffer(uint8_t *buf, int32_t len, int x, int y, bool dither, bool invert);
 
-    [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawJpegFromSd(
-        const char *fileName, int x, int y, bool dither = 0, bool invert = 0);
+    bool drawJpegFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0);
     bool drawJpegFromSd(SdFile *p, int x, int y, bool dither = 0, bool invert = 0);
 
-    [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawJpegFromWeb(const char *url,
-                                                                                                     int x, int y,
-                                                                                                     bool dither = 0,
-                                                                                                     bool invert = 0);
+    bool drawJpegFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0);
     bool drawJpegFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither = 0, bool invert = 0);
 
-    [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawPngFromSd(const char *fileName,
-                                                                                                   int x, int y,
-                                                                                                   bool dither = 0,
-                                                                                                   bool invert = 0);
+    bool drawPngFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0);
     bool drawPngFromSd(SdFile *p, int x, int y, bool dither = 0, bool invert = 0);
 
-    [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawPngFromWeb(const char *url,
-                                                                                                    int x, int y,
-                                                                                                    bool dither = 0,
-                                                                                                    bool invert = 0);
+    bool drawPngFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0);
     bool drawPngFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither = 0, bool invert = 0);
 
     // Should be private, but needed in a png callback :(

src/include/System.cpp

@@ -68,7 +68,7 @@ double System::readBattery()
 {
 #ifdef ARDUINO_ESP32_DEV
     digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, LOW);
-#else ›
+#else
     digitalWriteInternal(MCP23017_INT_ADDR, mcpRegsInt, 9, HIGH);
 #endif
     delay(1);