Added new selectable waveform for Inkplate10, einkOff() is now board dependent due vertical lines on Inkplate6Plus.

Author: BornaBiro

src/Inkplate.cpp

@@ -82,40 +82,6 @@ void Inkplate::preloadScreen()
     memcpy(DMemoryNew, _partial, 60000);
 }
 
-/**
- * @brief       einkOff turns off epaper power supply and put all digital IO
- * pins in high Z state
- */
-void Inkplate::einkOff()
-{
-    if (getPanelState() == 0)
-        return;
-    OE_CLEAR;
-    GMOD_CLEAR;
-    GPIO.out &= ~(DATA | LE | CL);
-    CKV_CLEAR;
-    SPH_CLEAR;
-    SPV_CLEAR;
-
-    // Put TPS65186 into standby mode (leaving 3V3 SW active)
-    Wire.beginTransmission(0x48);
-    Wire.write(0x01);
-    Wire.write(0x6f);
-    Wire.endTransmission();
-
-    // Wait for all PWR rails to shut down
-    delay(100);
-
-    // Disable 3V3 to the panel
-    Wire.beginTransmission(0x48);
-    Wire.write(0x01);
-    Wire.write(0x4f);
-    Wire.endTransmission();
-
-    pinsZstate();
-    setPanelState(0);
-}
-
 /**
  * @brief       einkOn turns on supply for epaper display (TPS65186) [+15 VDC,
  * -15VDC, +22VDC, -20VDC, +3.3VDC, VCOM]
@@ -129,16 +95,27 @@ int Inkplate::einkOn()
 {
     if (getPanelState() == 1)
         return 1;
+    
     WAKEUP_SET;
+    VCOM_SET;
     delay(2);
-    PWRUP_SET;
 
     // Enable all rails
     Wire.beginTransmission(0x48);
     Wire.write(0x01);
-    Wire.write(B00111111);
+    Wire.write(B00101111);
+    Wire.endTransmission();
+
+    delay(1);
+
+    // Switch TPS65186 into active mode
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(B10101111);
     Wire.endTransmission();
+
     pinsAsOutputs();
+
     LE_CLEAR;
     OE_CLEAR;
     CL_CLEAR;
@@ -147,7 +124,6 @@ int Inkplate::einkOn()
     SPV_SET;
     CKV_CLEAR;
     OE_CLEAR;
-    VCOM_SET;
 
     unsigned long timer = millis();
     do

src/Inkplate.h

@@ -43,7 +43,13 @@ class Inkplate : public System, public Graphics
 #else
     Inkplate(uint8_t _mode);
 #endif
+
+#ifdef ARDUINO_INKPLATE10
+    bool begin(uint8_t lightWaveform = 0); // In boards
+#else
     bool begin(void); // In boards
+#endif
+
     void clearDisplay();
     void display(bool leaveOn = false);
     // void writeRow(uint8_t data);
@@ -112,7 +118,7 @@ class Inkplate : public System, public Graphics
     uint8_t _beginDone = 0;
 
 #ifdef WAVEFORM3BIT
-    const uint8_t waveform3Bit[8][9] = WAVEFORM3BIT;
+    uint8_t waveform3Bit[8][9] = WAVEFORM3BIT;
 #endif
 };
 

src/boards/Inkplate10.cpp

@@ -30,8 +30,13 @@
  * @return      True if initialization is successful, false if failed or already
  * initialized
  */
-bool Inkplate::begin(void)
+bool Inkplate::begin(uint8_t lightWaveform)
 {
+    if (lightWaveform)
+    {
+        uint8_t alternateWaveform[8][9] = WAVEFORM3BIT_LIGHT;
+        memcpy(waveform3Bit, alternateWaveform, sizeof(waveform3Bit));
+    }
     if (_beginDone == 1)
         return 0;
 
@@ -450,4 +455,41 @@ void Inkplate::clean(uint8_t c, uint8_t rep)
     }
 }
 
+/**
+ * @brief       einkOff turns off epaper power supply and put all digital IO
+ * pins in high Z state
+ */
+void Inkplate::einkOff()
+{
+    if (getPanelState() == 0)
+        return;
+    OE_CLEAR;
+    GMOD_CLEAR;
+    GPIO.out &= ~(DATA | LE | CL);
+    CKV_CLEAR;
+    SPH_CLEAR;
+    SPV_CLEAR;
+
+    // Put TPS65186 into standby mode (leaving 3V3 SW active)
+    VCOM_CLEAR;
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x6f);
+    Wire.endTransmission();
+
+    // Wait for all PWR rails to shut down
+    delay(100);
+
+    // Disable 3V3 to the panel
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x4f);
+    Wire.endTransmission();
+
+    WAKEUP_CLEAR;
+
+    pinsZstate();
+    setPanelState(0);
+}
+
 #endif

src/boards/Inkplate10.h

@@ -82,8 +82,12 @@
 #define MCP23017_PIN_A7 7
 #define MCP23017_PIN_B0 8
 
-#define WAVEFORM3BIT                                                                                                   \
+#define WAVEFORM3BIT                                                                                              \
     {{0, 0, 0, 0, 0, 0, 1, 0}, {0, 0, 2, 2, 2, 1, 1, 0}, {0, 2, 1, 1, 2, 2, 1, 0}, {1, 2, 2, 1, 2, 2, 1, 0},           \
      {0, 2, 1, 2, 2, 2, 1, 0}, {2, 2, 2, 2, 2, 2, 1, 0}, {0, 0, 0, 0, 2, 1, 2, 0}, {0, 0, 2, 2, 2, 2, 2, 0}};
 
+#define WAVEFORM3BIT_LIGHT                                                                                             \
+    {{0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 2, 2, 1, 2, 1, 0}, {0, 2, 2, 1, 2, 2, 1, 0}, {0, 0, 2, 2, 2, 2, 1, 0},           \
+     {0, 0, 2, 1, 1, 1, 2, 0}, {0, 2, 2, 2, 1, 1, 2, 0}, {0, 0, 0, 2, 1, 2, 2, 0}, {0, 0, 2, 2, 2, 2, 2, 0}};
+
 #endif

src/boards/Inkplate5.cpp

@@ -493,4 +493,42 @@ void Inkplate::clean(uint8_t c, uint8_t rep)
         delayMicroseconds(230);
     }
 }
+
+/**
+ * @brief       einkOff turns off epaper power supply and put all digital IO
+ * pins in high Z state
+ */
+void Inkplate::einkOff()
+{
+    if (getPanelState() == 0)
+        return;
+    OE_CLEAR;
+    GMOD_CLEAR;
+    GPIO.out &= ~(DATA | LE | CL);
+    CKV_CLEAR;
+    SPH_CLEAR;
+    SPV_CLEAR;
+
+    // Put TPS65186 into standby mode (leaving 3V3 SW active)
+    VCOM_CLEAR;
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x6f);
+    Wire.endTransmission();
+
+    // Wait for all PWR rails to shut down
+    delay(100);
+
+    // Disable 3V3 to the panel
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x4f);
+    Wire.endTransmission();
+
+    WAKEUP_CLEAR;
+
+    pinsZstate();
+    setPanelState(0);
+}
+
 #endif

src/boards/Inkplate6.cpp

@@ -501,4 +501,41 @@ void Inkplate::clean(uint8_t c, uint8_t rep)
     }
 }
 
+/**
+ * @brief       einkOff turns off epaper power supply and put all digital IO
+ * pins in high Z state
+ */
+void Inkplate::einkOff()
+{
+    if (getPanelState() == 0)
+        return;
+    OE_CLEAR;
+    GMOD_CLEAR;
+    GPIO.out &= ~(DATA | LE | CL);
+    CKV_CLEAR;
+    SPH_CLEAR;
+    SPV_CLEAR;
+
+    // Put TPS65186 into standby mode (leaving 3V3 SW active)
+    VCOM_CLEAR;
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x6f);
+    Wire.endTransmission();
+
+    // Wait for all PWR rails to shut down
+    delay(100);
+
+    // Disable 3V3 to the panel
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x4f);
+    Wire.endTransmission();
+
+    WAKEUP_CLEAR;
+
+    pinsZstate();
+    setPanelState(0);
+}
+
 #endif

src/boards/Inkplate6plus.cpp

@@ -522,4 +522,42 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
     return changeCount;
 }
 
+/**
+ * @brief       einkOff turns off epaper power supply and put all digital IO
+ * pins in high Z state
+ */
+void Inkplate::einkOff()
+{
+    if (getPanelState() == 0)
+        return;
+    OE_CLEAR;
+    GMOD_CLEAR;
+    GPIO.out &= ~(DATA | LE | CL);
+    CKV_CLEAR;
+    SPH_CLEAR;
+    SPV_CLEAR;
+
+    // Put TPS65186 into standby mode (leaving 3V3 SW active)
+    VCOM_CLEAR;
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x6f);
+    Wire.endTransmission();
+
+    // Wait for all PWR rails to shut down
+    delay(100);
+
+    // Disable 3V3 to the panel
+    Wire.beginTransmission(0x48);
+    Wire.write(0x01);
+    Wire.write(0x4f);
+    Wire.endTransmission();
+
+    // Clearing WAKEUP pin can cause vertical lines on panel
+    //WAKEUP_CLEAR;
+
+    pinsZstate();
+    setPanelState(0);
+}
+
 #endif