Merge pull request #190 from SolderedElectronics/Inkplate2-DrawImage3Color-And-Examples

Inkplate2 branch to dev

Author: BornaBiro

.github/workflows/compile.yml

@@ -39,9 +39,13 @@ jobs:
               fqbn: Inkplate_Boards:esp32:Inkplate5
             additional-sketch-paths: |
               - examples/Inkplate5
+          - board:
+              fqbn: Inkplate_Boards:esp32:Inkplate2
+            additional-sketch-paths: |
+              - examples/Inkplate2
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install ESP32 platform dependencies
         run: pip3 install pyserial
       - name: Compile examples

examples/Inkplate10/Advanced/DeepSleep/Inkplate10_Wake_Up_On_Touchpads/Inkplate10_Wake_Up_On_Touchpads.ino

@@ -6,18 +6,18 @@
    https://soldered.com/learn/add-inkplate-6-board-definition-to-arduino-ide/
 
    Here is shown how to use I/O Expander and ESP interrupts to wake up the MCU from deepsleep when touchpad is pressed.
-   
-   NOTE: This is an example for the old Inkplates that have touchpads. 
-         If you select new Inkplate boards, you won't be able to compile the example.
+
+   NOTE: This is an example for the old Inkplates that have touchpads.
 
    Want to learn more about Inkplate? Visit www.inkplate.io
    Looking to get support? Write on our forums: https://forum.soldered.com/
    15 March 2023 by Soldered
 */
 
 // Next 3 lines are a precaution, you can ignore those, and the example would also work without them
-#if !defined(ARDUINO_INKPLATE10)
-#error "Wrong board selection for this example, please select e-radionica Inkplate10 in the boards menu."
+#if !defined(ARDUINO_INKPLATE10) && !defined(ARDUINO_INKPLATE10V2)
+#error                                                                                                                 \
+    "Wrong board selection for this example, please select e-radionica Inkplate10 or Soldered Inkplate10 in the boards menu."
 #endif
 
 #include <Inkplate.h>
@@ -44,10 +44,16 @@ void setup()
     display.begin();
 
     // Set interrupt pins
+#if defined(ARDUINO_INKPLATE10)
     display.setIntOutput(1, false, false, HIGH, IO_INT_ADDR);
     display.setIntPin(PAD1, RISING, IO_INT_ADDR);
     display.setIntPin(PAD2, RISING, IO_INT_ADDR);
     display.setIntPin(PAD3, RISING, IO_INT_ADDR);
+#elif defined(ARDUINO_INKPLATE10V2)
+    display.setIntPin(PAD1, IO_INT_ADDR);
+    display.setIntPin(PAD2, IO_INT_ADDR);
+    display.setIntPin(PAD3, IO_INT_ADDR);
+#endif
 
     ++bootCount;
 
@@ -58,8 +64,14 @@ void setup()
     esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
 
     // Enable wakup from deep sleep on gpio 34
+#if defined(ARDUINO_INKPLATE10)
+    // MCP I/O expander sends logic HIGH pulse signal as interrupt.
     esp_sleep_enable_ext1_wakeup(TOUCHPAD_WAKE_MASK, ESP_EXT1_WAKEUP_ANY_HIGH);
-    
+#elif defined(ARDUINO_INKPLATE10V2)
+    // PCAL I/O expander sends logic LOW pulse signal as interrupt.
+    esp_sleep_enable_ext1_wakeup(TOUCHPAD_WAKE_MASK, ESP_EXT1_WAKEUP_ALL_LOW);
+#endif
+
     // Go to sleep
     esp_deep_sleep_start();
 }

examples/Inkplate2/Advanced/Communications/Inkplate2_Bluetooth_Peripheral_Mode/Inkplate2_Bluetooth_Peripheral_Mode.ino

@@ -0,0 +1,66 @@
+/*
+    Inkplate2_Bluetooth_Peripheral_Mode example for Soldered Inkplate 2
+    For this example you will need USB cable, an Inkplate 2 and bluetooth supporting device
+    like phone or laptop. If you are using phone, you will need to download app which
+    allows you to send commands via bluetooth like "Bluetooth serial monitor".
+    Select "Soldered Inkplate2" from Tools -> Board menu.
+    Don't have "Soldered Inkplate2" option? Follow our tutorial and add it:
+    https://soldered.com/learn/add-inkplate-6-board-definition-to-arduino-ide/
+
+    This example shows how to use Inkplate as a peripheral device over Bluetooth.
+
+    Want to learn more about Inkplate? Visit www.inkplate.io
+    Looking to get support? Write on our forums: https://forum.soldered.com/
+    29 March 2022 by Soldered
+*/
+
+// Next 3 lines are a precaution, you can ignore those, and the example would also work without them
+#ifndef ARDUINO_INKPLATE2
+#error "Wrong board selection for this example, please select Soldered Inkplate2 in the boards menu."
+#endif
+
+#include "Inkplate.h"
+
+#include "BluetoothSerial.h"
+
+// Size of the receive buffer for commands (in bytes).
+#define BUFFER_SIZE 1000
+
+#include "Peripheral.h"
+
+// Declare Inkplate and SerialBluetooth objects
+Inkplate display;
+BluetoothSerial SerialBT;
+
+// Temporary data buffer for Peripheral mode code
+char commandBuffer[BUFFER_SIZE + 1];
+
+void setup() // Initialize everything
+{
+    Serial.begin(115200); // Initialize UART communication with PC
+
+    if (!SerialBT.begin("Inkplate2")) // Check if bluetooth is initialized successfully
+    {
+        Serial.println("An error occurred initializing Bluetooth"); // If not, print error message
+    }
+
+    display.begin(); // Initialize Inkplate library.
+}
+
+void loop()
+{
+    while (SerialBT.available()) // When there is some data available save it and pass to Peripheral.h code
+    {
+        for (int i = 0; i < (BUFFER_SIZE - 1); i++) // Loop through all commands
+        {
+            commandBuffer[i] = commandBuffer[i + 1];
+        }
+        commandBuffer[BUFFER_SIZE - 1] = SerialBT.read(); // Save incoming command in buffer
+        Serial.print(commandBuffer[BUFFER_SIZE - 1]);
+    }
+
+    // Function in peripheral.h
+    run(commandBuffer, BUFFER_SIZE);
+
+    delay(50);
+}

examples/Inkplate2/Advanced/Communications/Inkplate2_Bluetooth_Peripheral_Mode/Peripheral.h

@@ -0,0 +1,225 @@
+/*
+   Inkplate_Peripheral_Mode sketch for e-radionica.com Inkplate 2
+   Select "Soldered Inkplate 2" from Tools -> Board menu.
+   Don't have "Soldered Inkplate 2" option? Follow our tutorial and add it:
+   https://e-radionica.com/en/blog/add-inkplate-6-to-arduino-ide/
+
+   Using this sketch, you don't have to program and control e-paper using Arduino code.
+   Instead, you can send UART command (explained in documentation that can be found inside folder of this sketch).
+   This give you flexibility that you can use this Inkplate 2 on any platform!
+
+   Because it uses UART, it's little bit slower and it's not recommended to send bunch of
+   drawPixel command to draw some image. Instead, load bitmaps and pictures on SD card and load image from SD.
+   If we missed some function, you can modify this and make yor own.
+   Also, every Inkplate comes with this peripheral mode right from the factory.
+
+   Learn more about Peripheral Mode in this update:
+   https://www.crowdsupply.com/e-radionica/inkplate-6/updates/successfully-funded-also-third-party-master-controllers-and-partial-updates
+
+   UART settings are: 115200 baud, standard parity, ending with "\n\r" (both)
+   You can send commands via USB port or by directly connecting to ESP32 TX and RX pins.
+   Don't forget you need to send #L(1)* after each command to show it on the display
+   (equal to display.display()).
+
+   Want to learn more about Inkplate? Visit www.inkplate.io
+   Looking to get support? Write on our forums: http://forum.e-radionica.com/en/
+   29 March 2022 by Soldered
+*/
+
+#include "Inkplate.h"
+
+extern Inkplate display;
+
+char strTemp[2001];
+
+int hexToChar(char c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    return -1;
+}
+
+void run(char commandBuffer[], size_t n)
+{
+    char *s = NULL;
+    char *e = NULL;
+    for (int i = 0; i < n; i++)
+    {
+        if (commandBuffer[i] == '#' && s == NULL)
+            s = &commandBuffer[i];
+        if (commandBuffer[i] == '*' && e == NULL)
+            e = &commandBuffer[i];
+    }
+    if (s != NULL && e != NULL)
+    {
+        if ((e - s) > 0)
+        {
+            int x, x1, x2, y, y1, y2, x3, y3, l, c, w, h, r, n, rx, ry, xc, yc;
+            char b;
+            char temp[150];
+            switch (*(s + 1))
+            {
+            case '?':
+                Serial.print("OK");
+                break;
+
+            case '0':
+                // Draw pixel
+                sscanf(s + 3, "%d,%d,%d", &x, &y, &c);
+                display.drawPixel(x, y, c);
+                break;
+
+            case '1':
+                // Draw line
+                sscanf(s + 3, "%d,%d,%d,%d,%d", &x1, &y1, &x2, &y2, &c);
+                display.drawLine(x1, y1, x2, y2, c);
+                break;
+
+            case '2':
+                // Draw fast vertical line
+                sscanf(s + 3, "%d,%d,%d,%d", &x, &y, &l, &c);
+                display.drawFastVLine(x, y, l, c);
+                break;
+
+            case '3':
+                // Draw fast horizontal line
+                sscanf(s + 3, "%d,%d,%d,%d", &x, &y, &l, &c);
+                display.drawFastHLine(x, y, l, c);
+                break;
+
+            case '4':
+                // Draw rect.
+                sscanf(s + 3, "%d,%d,%d,%d,%d", &x, &y, &w, &h, &c);
+                display.drawRect(x, y, w, h, c);
+                break;
+
+            case '5':
+                // Draw circle
+                sscanf(s + 3, "%d,%d,%d,%d", &x, &y, &r, &c);
+                display.drawCircle(x, y, r, c);
+                break;
+
+            case '6':
+                // Draw triangle
+                sscanf(s + 3, "%d,%d,%d,%d,%d,%d,%d", &x1, &y1, &x2, &y2, &x3, &y3, &c);
+                display.drawTriangle(x1, y1, x2, y2, x3, y3, c);
+                break;
+
+            case '7':
+                // Draw round rect.
+                sscanf(s + 3, "%d,%d,%d,%d,%d,%d", &x, &y, &w, &h, &r, &c);
+                display.drawRoundRect(x, y, w, h, r, c);
+                break;
+
+            case '8':
+                // Draw filled rect.
+                sscanf(s + 3, "%d,%d,%d,%d,%d", &x, &y, &w, &h, &c);
+                display.fillRect(x, y, w, h, c);
+                break;
+
+            case '9':
+                // Draw filled circle
+                sscanf(s + 3, "%d,%d,%d,%d", &x, &y, &r, &c);
+                display.fillCircle(x, y, r, c);
+                break;
+
+            case 'A':
+                // Draw filled triangle
+                sscanf(s + 3, "%d,%d,%d,%d,%d,%d,%d", &x1, &y1, &x2, &y2, &x3, &y3, &c);
+                display.fillTriangle(x1, y1, x2, y2, x3, y3, c);
+                break;
+
+            case 'B':
+                // Draw filled round rect.
+                sscanf(s + 3, "%d,%d,%d,%d,%d,%d", &x, &y, &w, &h, &r, &c);
+                display.fillRoundRect(x, y, w, h, r, c);
+                break;
+
+            case 'C':
+                // Draw a string.
+                sscanf(s + 3, "\"%2000[^\"]\"", strTemp);
+                n = strlen(strTemp);
+                for (int i = 0; i < n; i++)
+                {
+                    strTemp[i] = toupper(strTemp[i]);
+                }
+                for (int i = 0; i < n; i += 2)
+                {
+                    strTemp[i / 2] = (hexToChar(strTemp[i]) << 4) | (hexToChar(strTemp[i + 1]) & 0x0F);
+                }
+                strTemp[n / 2] = 0;
+                display.print(strTemp);
+                break;
+
+            case 'D':
+                // Set text size
+                sscanf(s + 3, "%d", &c);
+                display.setTextSize(c);
+                break;
+
+            case 'E':
+                // Set print cursor position
+                sscanf(s + 3, "%d,%d", &x, &y);
+                display.setCursor(x, y);
+                break;
+
+            case 'F':
+                // Enable or disable text wrapping.
+                sscanf(s + 3, "%c", &b);
+                if (b == 'T')
+                    display.setTextWrap(true);
+                if (b == 'F')
+                    display.setTextWrap(false);
+                break;
+
+            case 'G':
+                // Set screen rotation
+                sscanf(s + 3, "%d", &c);
+                c &= 3;
+                display.setRotation(c);
+                break;
+
+            case 'K':
+                // Clear the display (frame buffer only)
+                sscanf(s + 3, "%c", &b);
+                if (b == '1')
+                {
+                    display.clearDisplay();
+                }
+                break;
+
+            case 'L':
+                // Display image from the frame buffer
+                sscanf(s + 3, "%c", &b);
+                if (b == '1')
+                {
+                    display.display();
+                }
+                break;
+
+            case 'T':
+                // Draw thick line.
+                int t;
+                sscanf(s + 3, "%d,%d,%d,%d,%d,%d", &x1, &y1, &x2, &y2, &c, &t);
+                display.drawThickLine(x1, y1, x2, y2, c, t);
+                break;
+            case 'U':
+                // Draw elipse.
+                sscanf(s + 3, "%d,%d,%d,%d,%d", &rx, &ry, &xc, &yc, &c);
+                display.drawElipse(rx, ry, xc, yc, c);
+                break;
+            case 'V':
+                // Draw filled elipse
+                sscanf(s + 3, "%d,%d,%d,%d,%d", &rx, &ry, &xc, &yc, &c);
+                display.fillElipse(rx, ry, xc, yc, c);
+                break;
+            }
+            *s = 0;
+            *e = 0;
+        }
+    }
+}