Merge Inkplate library restructure indo dev branch

.clang-format

@@ -4,5 +4,7 @@ AlignConsecutiveMacros: 'true'
 MaxEmptyLinesToKeep: '2'
 TabWidth: '4'
 UseTab: Never
+IncludeBlocks: Preserve
+SortIncludes: false
 
 ...

.github/workflows/compile.yml

@@ -7,50 +7,44 @@ jobs:
     strategy:
       matrix:
         include:
+          - board: 
+              fqbn: soldered-inkplate-boards:esp32:Inkplate4TEMPERA
+            additional-sketch-paths: |
+              - examples/Inkplate4TEMPERA
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate5
+              fqbn: soldered-inkplate-boards:esp32:Inkplate5
             additional-sketch-paths: |
               - examples/Inkplate5
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate5V2
+              fqbn: soldered-inkplate-boards:esp32:Inkplate5V2
             additional-sketch-paths: |
               - examples/Inkplate5V2
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate6
+              fqbn: soldered-inkplate-boards:esp32:Inkplate6V2
             additional-sketch-paths: |
               - examples/Inkplate6
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate6V2
-            additional-sketch-paths: |
-              - examples/Inkplate6
-          - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate10
+              fqbn: soldered-inkplate-boards:esp32:Inkplate10
             additional-sketch-paths: |
               - examples/Inkplate10
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate10V2
+              fqbn: soldered-inkplate-boards:esp32:Inkplate10V2
             additional-sketch-paths: |
               - examples/Inkplate10
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate6plus
+              fqbn: soldered-inkplate-boards:esp32:Inkplate6plus
             additional-sketch-paths: |
               - examples/Inkplate6PLUS
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate6plusV2
+              fqbn: soldered-inkplate-boards:esp32:Inkplate6plusV2
             additional-sketch-paths: |
               - examples/Inkplate6PLUS
           - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate6Flick
+              fqbn: soldered-inkplate-boards:esp32:Inkplate6Flick
             additional-sketch-paths: |
               - examples/Inkplate6FLICK
-          - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate6COLOR
-            additional-sketch-paths: |
-              - examples/Inkplate6COLOR
-          - board:
-              fqbn: Inkplate_Boards:esp32:Inkplate2
-            additional-sketch-paths: |
-              - examples/Inkplate2
+
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -61,8 +55,8 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           platforms: |
-            - source-url: https://github.com/SolderedElectronics/Dasduino-Board-Definitions-for-Arduino-IDE/raw/master/package_Dasduino_Boards_index.json
-              name: Inkplate_Boards:esp32
+            - source-url: https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Board-Definitions-for-Arduino-IDE/refs/heads/main/package_Inkplate_Boards_index.json
+              name: soldered-inkplate-boards:esp32
 
           fqbn: ${{ matrix.board.fqbn }}
           libraries: |

examples/Inkplate10/Advanced/Communications/Inkplate10_Bluetooth_Peripheral_Mode/Peripheral.h

@@ -50,7 +50,7 @@ void run(char commandBuffer[], size_t n, Inkplate *display, BluetoothSerial *Ser
             int x, x1, x2, y, y1, y2, x3, y3, l, c, w, h, r, n, rx, ry, xc, yc, yr;
             uint8_t hr, min, sec, wday, day, mon, k, as, am, ah, ad, aw, amc, v;
             bool ie, ip;
-            System::rtcCountdownSrcClock sc;
+            System::rtc.CountdownSrcClock sc;
             uint32_t ep, ae;
             char b;
             char temp[150];
@@ -226,7 +226,7 @@ void run(char commandBuffer[], size_t n, Inkplate *display, BluetoothSerial *Ser
 
             case 'I':
                 sscanf(s + 3, "%d", &c);
-                // sprintf(temp, "display->setDisplayMode(%s)\n", c == 0 ? "INKPLATE_1BIT" : "INKPLATE_3BIT");
+                // sprintf(temp, "display->selectDisplayMode(%s)\n", c == 0 ? "INKPLATE_1BIT" : "INKPLATE_3BIT");
                 // SerialBT->print(temp);
                 if (c == 1)
                     display->selectDisplayMode(INKPLATE_1BIT);

examples/Inkplate10/Advanced/Communications/Inkplate10_EasyC/Inkplate10_EasyC.ino

@@ -64,26 +64,26 @@ void loop()
     display.setCursor(493, 65);
     display.print(bme680.readTemperature() + temperatureOffset);
     display.print(" *C");
-    display.drawImage(temperature_icon, 220, 40, temperature_icon_w, temperature_icon_h,
+    display.image.draw(temperature_icon, 220, 40, temperature_icon_w, temperature_icon_h,
                       BLACK); // Arguments are: array variable name, start X, start Y, size X, size Y, color
 
     // Display humidity icon and measured value
     display.setCursor(493, 335);
     display.print(bme680.readHumidity() / 10);
     display.print(" %");
-    display.drawImage(humidity_icon, 220, 308, humidity_icon_w, humidity_icon_h,
+    display.image.draw(humidity_icon, 220, 308, humidity_icon_w, humidity_icon_h,
                       BLACK); // Arguments are: array variable name, start X, start Y, size X, size Y, color
 
     // Display the pressure icon and measured value
     display.setTextSize(7);
     display.setCursor(493, 573);
     display.print(bme680.readPressure() * 10);
     display.print(" hPa");
-    display.drawImage(pressure_icon, 220, 535, pressure_icon_w, pressure_icon_h,
+    display.image.draw(pressure_icon, 220, 535, pressure_icon_w, pressure_icon_h,
                       BLACK); // Arguments are: array variable name, start X, start Y, size X, size Y, color
 
     // Display Soldered logo
-    display.drawImage(logo, 835, 740, 350, 70,
+    display.image.draw(logo, 835, 740, 350, 70,
                       BLACK); // Arguments are: array variable name, start X, start Y, size X, size Y, color
 
     // This part of code actually drawing on the Inkplate screen, previous lines just drawing into the frame buffer

examples/Inkplate10/Advanced/DeepSleep/Inkplate10_Partial_Update_With_Deep_Sleep/Inkplate10_Partial_Update_With_Deep_Sleep.ino

@@ -49,8 +49,6 @@ void setup()
     if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) // Check if ESP32 is reseted by deep sleep or power up / user manual
                                                     // reset (or some other reason)
     {
-        display
-            .preloadScreen(); // If is woken up by deep sleep, recreate whole screen to be same as was before deep sleep
         counter++;            // Update variable / variables
         decimal *= 1.23;
         display.clearDisplay();      // Clear everything in buffer