Made some fixes on IP7 library

Author: rsoric

.github/workflows/compile.yml

@@ -63,6 +63,7 @@ jobs:
             - name: ArduinoJson
             - name: Time
             - source-url: https://github.com/SolderedElectronics/Soldered-MFRC522-RFID-Reader-Arduino-Library.git
+            - source-url: https://github.com/SolderedElectronics/Soldered-WS2812-Smart-Leds-Arduino-Library.git
             - source-url: https://github.com/SolderedElectronics/Soldered-BME280-BME680-Gas-Sensor-Arduino-Library.git
           sketch-paths: |
             ${{ matrix.additional-sketch-paths }}

examples/Inkplate7/Advanced/Communication/Inkplate7_Second_SPI/Inkplate7_Second_SPI.ino

@@ -58,7 +58,7 @@ void setup()
 
     // Set bigger text and print messages on the screen
     display.setTextSize(3);
-    display.drawTextWithShadow(0, 0, "Second SPI example", INKPLATE_BLACK, INKPLATE_RED);
+    display.drawTextWithShadow(0, 0, "Second SPI example", INKPLATE7_BLACK, INKPLATE7_RED);
 
     display.setTextSize(2);
     display.println("\n\n\nOpen the Serial Monitor at 115200\nbaud rate to see what's happening");

examples/Inkplate7/Advanced/DeepSleep/Inkplate7_Wake_Up_Button/Inkplate7_Wake_Up_Button.ino

@@ -74,15 +74,15 @@ void displayInfo()
 
     // Set text cursor and size
     display.setCursor(10, 180);
-    display.setTextColor(INKPLATE_BLACK);
+    display.setTextColor(INKPLATE7_BLACK);
     display.setTextSize(2);
 
     display.print(F("Boot count: "));
     display.println(bootCount, DEC); // Print the number
 
     // Set next line cursor position
     display.setCursor(10, 220);
-    display.setTextColor(INKPLATE_RED);
+    display.setTextColor(INKPLATE7_RED);
 
     // Display wake up reason
     esp_sleep_wakeup_cause_t wakeup_reason;

examples/Inkplate7/Advanced/SD/Inkplate7_SD_Pictures/Inkplate7_SD_Pictures.ino

@@ -49,7 +49,9 @@ void setup()
             // removing the parameter completely
             Serial.println("Image open error");
         }
+        Serial.print("Display before");
         display.display();
+        Serial.print("Display done");
         delay(5000);
 
         // Now try to load image using SdFat library class (for more advanced users) and display image on epaper.

examples/Inkplate7/Advanced/WEB_WiFi/Inkplate7_HTTPS_POST_Request/Inkplate7_HTTPS_POST_Request.ino

@@ -53,13 +53,13 @@ void setup()
 
     // Clear the display and print message
     display.clearDisplay();
-    display.setTextColor(INKPLATE_BLACK);
+    display.setTextColor(INKPLATE7_BLACK);
     display.setTextSize(3);
     display.println("HTTPS POST Request example");
     display.println();
 
     display.setTextSize(2);
-    display.setTextColor(INKPLATE_RED);
+    display.setTextColor(INKPLATE7_RED);
     display.println("Open Serial Monitor at 115200 baud rate to see what'shappening");
     display.display();
 

examples/Inkplate7/Advanced/WEB_WiFi/Inkplate7_HTTP_POST_Request/Inkplate7_HTTP_POST_Request.ino

@@ -62,13 +62,13 @@ void setup()
     display.clearDisplay();
 
     // Set text color and size
-    display.setTextColor(INKPLATE_BLACK);
+    display.setTextColor(INKPLATE7_BLACK);
     display.setTextSize(3);
 
     // Display a message
     display.println("HTTP POST request example");
     display.println();
-    display.setTextColor(INKPLATE_RED);
+    display.setTextColor(INKPLATE7_RED);
     display.setTextSize(2);
     display.println("Open Serial Monitor at 115200 baud rate to see what'shappening");
     display.display();

examples/Inkplate7/Advanced/WEB_WiFi/Inkplate7_HTTP_Request/Inkplate7_HTTP_Request.ino

@@ -35,7 +35,7 @@ void setup()
     Serial.begin(115200);                                 // Init serial communication
     display.begin();                                      // Init Inkplate library (you should call this function ONLY ONCE)
     display.clearDisplay();                               // Clear frame buffer of display
-    display.setTextColor(INKPLATE_BLACK, INKPLATE_WHITE); // Set text color to black and background color to white
+    display.setTextColor(INKPLATE7_BLACK, INKPLATE7_WHITE); // Set text color to black and background color to white
     Serial.println("Scanning for WiFi networks...");      // Write text
 
     // Start searching WiFi networks and put the nubmer of found WiFi networks in variable n

examples/Inkplate7/Advanced/WEB_WiFi/Inkplate7_Web_Server/Inkplate7_Web_Server.ino

@@ -49,7 +49,7 @@ void setup()
     display.begin();                      // Init Inkplate library (you should call this function ONLY ONCE)
     display.clearDisplay();               // Clear frame buffer of display
     display.setTextSize(2);               // Scale text to be two times bigger then original (5x7 px)
-    display.setTextColor(INKPLATE_BLACK); // Set text color to black and background color to white
+    display.setTextColor(INKPLATE7_BLACK); // Set text color to black and background color to white
     display.setTextWrap(true);            // If text does not fit on screen, send it to new line
 
     WiFi.begin();            // Init. WiFi library
@@ -108,7 +108,7 @@ void updatePaper()
     display.setCursor(270, 95);
     display.println(pass);
     display.setCursor(140, 150);
-    display.setTextColor(INKPLATE_RED);
+    display.setTextColor(INKPLATE7_RED);
     display.print("Open Your web browser and open");
     display.setCursor(210, 210);
     display.print("http://");
@@ -117,7 +117,7 @@ void updatePaper()
     display.println();
     display.fillRect(10, 240, 620, 4, BLACK);
     display.setCursor(0, 250);
-    display.setTextColor(INKPLATE_BLACK);
+    display.setTextColor(INKPLATE7_BLACK);
     display.println("User text:"); // Print out what user typed in web page
     display.print(txt);
     display.display(); // Send everything to screen (refresh the screen)

examples/Inkplate7/Basic/Inkplate7_Black_White_Red/Inkplate7_Black_White_Red.ino

@@ -31,8 +31,8 @@ void setup()
     display.clearDisplay(); // Clear any data that may have been in (software) frame buffer.
     //(NOTE! This does not clean image on screen, it only clears it in the frame buffer inside ESP32).
     display.setTextSize(4); // Set text size to be 4 times bigger than original (5x7 pix)
-    display.drawTextWithShadow(50, 175, "Welcome to Inkplate 7!", INKPLATE_BLACK, INKPLATE_RED); // Draw a text with shadow
-    display.setTextColor(INKPLATE_BLACK, INKPLATE_WHITE); // Set text color to black and background to white
+    display.drawTextWithShadow(50, 175, "Welcome to Inkplate 7!", INKPLATE7_BLACK, INKPLATE7_RED); // Draw a text with shadow
+    display.setTextColor(INKPLATE7_BLACK, INKPLATE7_WHITE); // Set text color to black and background to white
     display.display(); // This line actually drawing on the Inkplate screen, previous lines just drawing into the frame
                        // buffer
     delay(DELAY_MS);   // Wait a little bit
@@ -45,9 +45,9 @@ void setup()
     displayCurrentAction("Drawing two pixels in different colors"); // Function which writes small text at bottom left
                                                                     // indicating what's currently done
     // NOTE: you do not need displayCurrentAction function to use Inkplate!
-    display.drawPixel(300, 192, INKPLATE_BLACK); // Draw one black pixel at X = 300, Y = 192 position in black color
+    display.drawPixel(300, 192, INKPLATE7_BLACK); // Draw one black pixel at X = 300, Y = 192 position in black color
 
-    display.drawPixel(340, 192, INKPLATE_RED); // Draw one black pixel at X = 340, Y = 192 position in red color
+    display.drawPixel(340, 192, INKPLATE7_RED); // Draw one black pixel at X = 340, Y = 192 position in red color
 
     display.display(); // Send image to display. You need to call this one each time you want to transfer frame buffer
     // to the screen.
@@ -69,8 +69,8 @@ void setup()
 
     // All of those drawing fuctions originate from Adafruit GFX library, so maybe you are already familiar with those.
     // Arguments are: start X, start Y, ending X, ending Y, color.
-    display.drawLine(0, 0, E_INK_WIDTH, E_INK_HEIGHT, INKPLATE_BLACK);
-    display.drawLine(E_INK_WIDTH, 0, 0, E_INK_HEIGHT, INKPLATE_RED);
+    display.drawLine(0, 0, E_INK_WIDTH, E_INK_HEIGHT, INKPLATE7_BLACK);
+    display.drawLine(E_INK_WIDTH, 0, 0, E_INK_HEIGHT, INKPLATE7_RED);
     displayCurrentAction("Drawing two diagonal lines");
     display.display();
     delay(DELAY_MS);
@@ -99,14 +99,14 @@ void setup()
 
     // Now draw one horizontal...
     display.clearDisplay();
-    display.drawFastHLine(50, 192, 540, INKPLATE_BLACK); // Arguments are: starting X, starting Y, length, color
+    display.drawFastHLine(50, 192, 540, INKPLATE7_BLACK); // Arguments are: starting X, starting Y, length, color
     displayCurrentAction("Drawing one horizontal line");
     display.display();
     delay(DELAY_MS);
 
     //... and one vertical line
     display.clearDisplay();
-    display.drawFastVLine(320, 42, 300, INKPLATE_RED); // Arguments are: starting X, starting Y, length, color
+    display.drawFastVLine(320, 42, 300, INKPLATE7_RED); // Arguments are: starting X, starting Y, length, color
     displayCurrentAction("Drawing one vertical line");
     display.display();
     delay(DELAY_MS);
@@ -115,19 +115,19 @@ void setup()
     display.clearDisplay();
     for (int i = 0; i < E_INK_WIDTH; i += 8)
     {
-        display.drawFastVLine(i, 0, E_INK_HEIGHT, INKPLATE_BLACK);
+        display.drawFastVLine(i, 0, E_INK_HEIGHT, INKPLATE7_BLACK);
     }
     for (int i = 0; i < E_INK_HEIGHT; i += 8)
     {
-        display.drawFastHLine(0, i, E_INK_WIDTH, INKPLATE_RED);
+        display.drawFastHLine(0, i, E_INK_WIDTH, INKPLATE7_RED);
     }
     displayCurrentAction("Drawing a grid using horizontal and vertical lines");
     display.display();
     delay(DELAY_MS);
 
     // Draw rectangle at X = 150, Y = 100 and size of 340x184 pixels
     display.clearDisplay();
-    display.drawRect(150, 100, 340, 184, INKPLATE_BLACK); // Arguments are: start X, start Y, size X, size Y, color
+    display.drawRect(150, 100, 340, 184, INKPLATE7_BLACK); // Arguments are: start X, start Y, size X, size Y, color
     displayCurrentAction("Drawing a rectangle");
     display.display();
     delay(DELAY_MS);
@@ -144,7 +144,7 @@ void setup()
 
     // Draw filled black rectangle at X = 150, Y = 100, size of 340x184 pixels
     display.clearDisplay();
-    display.fillRect(150, 100, 340, 184, INKPLATE_BLACK); // Arguments are: start X, start Y, size X, size Y, color
+    display.fillRect(150, 100, 340, 184, INKPLATE7_BLACK); // Arguments are: start X, start Y, size X, size Y, color
     displayCurrentAction("Drawing a black rectangle");
     display.display();
     delay(DELAY_MS);
@@ -162,7 +162,7 @@ void setup()
     // Draw a red circle at the center of the screen with radius of 75 pixels
     display.clearDisplay();
     display.drawCircle(E_INK_WIDTH / 2, E_INK_HEIGHT / 2, 75,
-                       INKPLATE_RED); // Arguments are: start X, start Y, radius, color
+                       INKPLATE7_RED); // Arguments are: start X, start Y, radius, color
     displayCurrentAction("Drawing a circle");
     display.display();
     delay(DELAY_MS);
@@ -180,7 +180,7 @@ void setup()
     // Draw a black filled circle at the center of the screen with radius of 75 pixels
     display.clearDisplay();
     display.fillCircle(E_INK_WIDTH / 2, E_INK_HEIGHT / 2, 75,
-                       INKPLATE_BLACK); // Arguments are: start X, start Y, radius, color
+                       INKPLATE7_BLACK); // Arguments are: start X, start Y, radius, color
     displayCurrentAction("Drawing black-filled circle");
     display.display();
     delay(DELAY_MS);
@@ -198,7 +198,7 @@ void setup()
     // Draw rounded rectangle at X = 150, Y = 100 and size of 340x184 pixels and radius of 10 pixels
     display.clearDisplay();
     display.drawRoundRect(150, 100, 340, 184, 10,
-                          INKPLATE_RED); // Arguments are: start X, start Y, size X, size Y, radius, color
+                          INKPLATE7_RED); // Arguments are: start X, start Y, size X, size Y, radius, color
     displayCurrentAction("Drawing a rectangle with rounded edges");
     display.display();
     delay(DELAY_MS);
@@ -216,7 +216,7 @@ void setup()
     // Draw filled black rect at X = 150, Y = 100, size of 340x184 pixels and radius of 10 pixels
     display.clearDisplay();
     display.fillRoundRect(150, 100, 340, 184, 10,
-                          INKPLATE_BLACK); // Arguments are: start X, start Y, size X, size Y, radius, color
+                          INKPLATE7_BLACK); // Arguments are: start X, start Y, size X, size Y, radius, color
     displayCurrentAction("This is filled rectangle with rounded edges");
     display.display();
     delay(DELAY_MS);
@@ -233,28 +233,28 @@ void setup()
 
     // Draw simple triangle
     display.clearDisplay();
-    display.drawTriangle(215, 290, 320, 80, 425, 290, INKPLATE_RED); // Arguments are: X1, Y1, X2, Y2, X3, Y3, color
+    display.drawTriangle(215, 290, 320, 80, 425, 290, INKPLATE7_RED); // Arguments are: X1, Y1, X2, Y2, X3, Y3, color
     displayCurrentAction("Drawing a triangle");
     display.display();
     delay(DELAY_MS);
 
     // Draw filled triangle inside simple triangle (so no display.clearDisplay() this time)
-    display.fillTriangle(260, 260, 320, 140, 380, 260, INKPLATE_BLACK); // Arguments are: X1, Y1, X2, Y2, X3, Y3, color
+    display.fillTriangle(260, 260, 320, 140, 380, 260, INKPLATE7_BLACK); // Arguments are: X1, Y1, X2, Y2, X3, Y3, color
     displayCurrentAction("Drawing a triangle inside exsisting one"); // This will be written over the existing text so
                                                                      // that the previous text will not be seen
     display.display();
     delay(DELAY_MS);
 
     // Draws an elipse with x radius, y radius, center x, center y and color
     display.clearDisplay();
-    display.drawElipse(125, 75, E_INK_WIDTH / 2, E_INK_HEIGHT / 2, INKPLATE_RED);
+    display.drawElipse(125, 75, E_INK_WIDTH / 2, E_INK_HEIGHT / 2, INKPLATE7_RED);
     displayCurrentAction("Drawing an elipse");
     display.display();
     delay(DELAY_MS);
 
     // Fills an elipse with x radius, y radius, center x, center y and color
     display.clearDisplay();
-    display.fillElipse(125, 75, E_INK_WIDTH / 2, E_INK_HEIGHT / 2, INKPLATE_RED);
+    display.fillElipse(125, 75, E_INK_WIDTH / 2, E_INK_HEIGHT / 2, INKPLATE7_RED);
     displayCurrentAction("Drawing a filled elipse");
     display.display();
     delay(DELAY_MS);
@@ -281,7 +281,7 @@ void setup()
 
     // Draws a polygon, from x and y coordinate arrays of n points in color c
     display.clearDisplay();
-    display.drawPolygon(xt, yt, n, INKPLATE_BLACK);
+    display.drawPolygon(xt, yt, n, INKPLATE7_BLACK);
     displayCurrentAction("Drawing a polygon");
     display.display();
     delay(DELAY_MS);
@@ -290,15 +290,15 @@ void setup()
     // Points need to be counter clockwise sorted
     // Method can be quite slow for now, probably will improve
     display.clearDisplay();
-    display.fillPolygon(xt, yt, n, INKPLATE_RED);
+    display.fillPolygon(xt, yt, n, INKPLATE7_RED);
     displayCurrentAction("Drawing a filled polygon");
     display.display();
     delay(DELAY_MS);
 
     // Write text and rotate it by 90 deg. forever
     int r = 0;
     display.setTextSize(5);
-    display.setTextColor(INKPLATE_WHITE, INKPLATE_BLACK);
+    display.setTextColor(INKPLATE7_WHITE, INKPLATE7_BLACK);
     while (true)
     {
         display.setRotation(r % 4);

examples/Inkplate7/Basic/Inkplate7_Text_With_Shadow/Inkplate7_Text_With_Shadow.ino

@@ -32,28 +32,28 @@ void setup()
     display.begin(); 
 
     display.setTextSize(5);                               // Set text size to be 5 times bigger than original (5x7 px)
-    display.setTextColor(INKPLATE_BLACK, INKPLATE_WHITE); // Set the text color to black, and the background to white
+    display.setTextColor(INKPLATE7_BLACK, INKPLATE7_WHITE); // Set the text color to black, and the background to white
     display.setCursor(70, 80);                            // Set cursor position
 
     // Draw black text
     display.print("Inkplate 7"); // Print text in the frame buffer
 
     // Draw red text
-    display.setTextColor(INKPLATE_RED);
+    display.setTextColor(INKPLATE7_RED);
     display.setCursor(70, 130);
     display.println("Inkplate 7");
 
     // Draw text with shadow, specify color for text and background
     // (x coordinate, y coordinate, string to write, text color, shadow color)
-    display.drawTextWithShadow(70, 180, "Inkplate 7", INKPLATE_RED, INKPLATE_BLACK);
+    display.drawTextWithShadow(70, 180, "Inkplate 7", INKPLATE7_RED, INKPLATE7_BLACK);
 
     // Draw a text with shadow with swapped colors
     display.setTextSize(3);
-    display.drawTextWithShadow(300, 280, "By soldered.com", INKPLATE_BLACK, INKPLATE_RED);
+    display.drawTextWithShadow(300, 280, "By soldered.com", INKPLATE7_BLACK, INKPLATE7_RED);
 
     // Other basic drawing functions supported
-    display.drawLine(70, 250, 300, 350, INKPLATE_RED);
-    display.drawCircle(500, 150, 75, INKPLATE_BLACK);
+    display.drawLine(70, 250, 300, 350, INKPLATE7_RED);
+    display.drawCircle(500, 150, 75, INKPLATE7_BLACK);
 
     // Display to screen
     display.display();