Merge branch 'dev'

Author: nitko12

examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_RTC_Alarm_Example/Inkplate_RTC_Alarm_Example.ino

@@ -59,7 +59,7 @@ void setup()
 int n = 0;
 void loop()
 {
-    display.rtcReadTime();             // Get the time and date from RTC
+    display.rtcGetRtcData();             // Get the time and date from RTC
     seconds = display.rtcGetSecond();  // Store senconds in a variable
     minutes = display.rtcGetMinute();  // Store minutes in a variable
     hour = display.rtcGetHour();       // Store hours in a variable

examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_RTC_Basic_Example/Inkplate_RTC_Basic_Example.ino

@@ -49,7 +49,7 @@ void setup()
 int n = 0;
 void loop()
 {
-    display.rtcReadTime();             // Get the time and date from RTC
+    display.rtcGetRtcData();             // Get the time and date from RTC
     seconds = display.rtcGetSecond();  // Store senconds in a variable
     minutes = display.rtcGetMinute();  // Store minutes in a variable
     hour = display.rtcGetHour();       // Store hours in a variable

examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_RTC_Interrupt_Alarm_Example/Inkplate_RTC_Interrupt_Alarm_Example.ino

@@ -55,7 +55,7 @@ void loop()
 {
     display.clearDisplay();         // Clear frame buffer of display
     display.setCursor(100, 100);    // Set position of the text
-    display.rtcReadTime();          // Get the time and date from RTC
+    display.rtcGetRtcData();          // Get the time and date from RTC
 
     // Print the time on screen
     printTime(display.rtcGetHour(), display.rtcGetMinute(), display.rtcGetSecond(), display.rtcGetDay(), display.rtcGetWeekday(), display.rtcGetMonth(), display.rtcGetYear());

examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_RTC_Timer_Example/Inkplate_RTC_Timer_Example.ino

@@ -69,7 +69,7 @@ void setup()
 int n = 0;
 void loop()
 {
-    display.rtcReadTime();             // Get the time and date from RTC
+    display.rtcGetRtcData();             // Get the time and date from RTC
     seconds = display.rtcGetSecond();  // Store senconds in a variable
     minutes = display.rtcGetMinute();  // Store minutes in a variable
     hour = display.rtcGetHour();       // Store hours in a variable

examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino

@@ -55,7 +55,7 @@ void setup()
     esp_sleep_enable_ext0_wakeup(GPIO_NUM_34, 1);
 
     // Enable wakup from deep sleep on gpio 36
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_36, 0);
+    esp_sleep_enable_ext1_wakeup((1ULL << 36), ESP_EXT1_WAKEUP_ALL_LOW);
 
     // Go to sleep
     esp_deep_sleep_start();

examples/Inkplate10/Others/Inkplate_Clean/Inkplate_Clean.ino

@@ -0,0 +1,65 @@
+/*
+   Inkplate_Clear example for e-radionica.com Inkplate 10
+   For this example you will need only USB cable and Inkplate 10.
+   Select "Inkplate 10(ESP32)" from Tools -> Board menu.
+   Don't have "Inkplate 10(ESP32)" option? Follow our tutorial and add it:
+   https://e-radionica.com/en/blog/add-inkplate-6-to-arduino-ide/
+
+   This example will try to remove heavy burn-in visible on the panel.
+   Set number of refresh / clear cycles and upload the program.
+
+   Want to learn more about Inkplate? Visit www.inkplate.io
+   Looking to get support? Write on our forums: http://forum.e-radionica.com/en/
+   12 January 2022 by e-radionica.com
+*/
+
+// Next 3 lines are a precaution, you can ignore those, and the example would also work without them
+#ifndef ARDUINO_INKPLATE10
+#error "Wrong board selection for this example, please select Inkplate 10 in the boards menu."
+#endif
+
+#include "Inkplate.h"            //Include Inkplate library to the sketch
+Inkplate display(INKPLATE_1BIT); // Create object on Inkplate library and set library to work in monochorme mode
+
+// Nubmer of clear cycles.
+#define CLEAR_CYCLES 20
+
+// Delay between clear cycles (in milliseconds)
+#define CYCLES_DELAY 5000
+
+void setup()
+{
+    display.begin();        // Init library (you should call this function ONLY ONCE)
+    display.clearDisplay(); // Clear any data that may have been in (software) frame buffer.
+
+    display.einkOn(); // Power up epaper power supply
+
+    int cycles = CLEAR_CYCLES;
+
+    // Clean it by writing clear sequence to the panel.
+    while (cycles)
+    {
+        display.clean(1, 12);
+        display.clean(2, 1);
+        display.clean(0, 9);
+        display.clean(2, 1);
+        display.clean(1, 12);
+        display.clean(2, 1);
+        display.clean(0, 9);
+        display.clean(2, 1);
+
+        delay(CYCLES_DELAY);
+        cycles--;
+    }
+
+    // Print text when clearing is done.
+    display.setTextSize(4);
+    display.setCursor(100, 100);
+    display.print("Clearing done.");
+    display.display();
+}
+
+void loop()
+{
+    // Empty...
+}

examples/Inkplate10/Others/Inkplate_Factory_Programming_VCOM/Inkplate_Factory_Programming_VCOM.ino

@@ -13,6 +13,9 @@ int EEPROMaddress = 0;
 char commandBuffer[BUFFER_SIZE + 1];
 char strTemp[2001];
 
+const char sdCardTestStringLength = 100;
+const char *testString = {"This is some test string..."};
+
 // Internal registers of MCP
 uint8_t mcpRegsInt[22];
 
@@ -26,6 +29,7 @@ void setup()
 
     if (EEPROM.read(EEPROMaddress) != 170)
     {
+        microSDCardTest();
         display.pinModeInternal(MCP23017_INT_ADDR, mcpRegsInt, 6, INPUT_PULLUP);
         writeVCOMToEEPROM(vcomVoltage);
         EEPROM.write(EEPROMaddress, 170);
@@ -500,3 +504,62 @@ void writeVCOMToEEPROM(double v)
         Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
     }
 }
+
+int checkMicroSDCard()
+{
+    int sdInitOk = 0;
+    sdInitOk = display.sdCardInit();
+
+    if (sdInitOk)
+    {
+        File file;
+
+        if (file.open("/testFile.txt", O_CREAT | O_RDWR))
+        {
+            file.print(testString);
+            file.close();
+        }
+        else
+        {
+            return 0;
+        }
+
+        delay(250);
+
+        if (file.open("/testFile.txt", O_RDWR))
+        {
+            char sdCardString[sdCardTestStringLength];
+            file.read(sdCardString, sizeof(sdCardString));
+            sdCardString[file.fileSize()] = 0;
+            int stringCompare = strcmp(testString, sdCardString);
+            file.remove();
+            file.close();
+            if (stringCompare != 0)
+                return 0;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    else
+    {
+        return 0;
+    }
+    return 1;
+}
+
+void microSDCardTest()
+{
+    display.setTextSize(5);
+    display.setCursor(100, 100);
+    display.print("microSD card slot test ");
+
+    if (!checkMicroSDCard())
+    {
+        display.print("FAIL!");
+        display.display();
+        while(1);
+    }
+    display.clearDisplay();
+}

examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_RTC_Alarm_Example/Inkplate_RTC_Alarm_Example.ino

@@ -59,7 +59,7 @@ void setup()
 int n = 0;
 void loop()
 {
-    display.rtcReadTime();             // Get the time and date from RTC
+    display.rtcGetRtcData();             // Get the time and date from RTC
     seconds = display.rtcGetSecond();  // Store senconds in a variable
     minutes = display.rtcGetMinute();  // Store minutes in a variable
     hour = display.rtcGetHour();       // Store hours in a variable

examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_RTC_Basic_Example/Inkplate_RTC_Basic_Example.ino

@@ -49,7 +49,7 @@ void setup()
 int n = 0;
 void loop()
 {
-    display.rtcReadTime();             // Get the time and date from RTC
+    display.rtcGetRtcData();             // Get the time and date from RTC
     seconds = display.rtcGetSecond();  // Store senconds in a variable
     minutes = display.rtcGetMinute();  // Store minutes in a variable
     hour = display.rtcGetHour();       // Store hours in a variable

examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_RTC_Interrupt_Alarm_Example/Inkplate_RTC_Interrupt_Alarm_Example.ino

@@ -55,7 +55,7 @@ void loop()
 {
     display.clearDisplay();         // Clear frame buffer of display
     display.setCursor(100, 100);    // Set position of the text
-    display.rtcReadTime();          // Get the time and date from RTC
+    display.rtcGetRtcData();          // Get the time and date from RTC
 
     // Print the time on screen
     printTime(display.rtcGetHour(), display.rtcGetMinute(), display.rtcGetSecond(), display.rtcGetDay(), display.rtcGetWeekday(), display.rtcGetMonth(), display.rtcGetYear());