Merge pull request #90 from e-radionicacom/dev

Dev

Author: PericR

library.properties

@@ -1,5 +1,5 @@
 name=InkplateLibrary
-version=4.0.0
+version=4.0.1
 author=e-radionica.com <[email protected]>
 maintainer=David Zovko <[email protected]>
 sentence=Inkplate boards driver library

src/Inkplate.cpp

@@ -118,13 +118,15 @@ void Inkplate::einkOff()
  *
  * @note        its important to use this order when turning epaper on.
  *              using wrong order can irreparably damage epaper
+ *
+ * @return      1 if succesfully turned on, 0 if failed
  */
-void Inkplate::einkOn()
+int Inkplate::einkOn()
 {
     if (getPanelState() == 1)
         return;
     WAKEUP_SET;
-    delay(1);
+    delay(2);
     PWRUP_SET;
 
     // Enable all rails
@@ -153,11 +155,13 @@ void Inkplate::einkOn()
         WAKEUP_CLEAR;
         VCOM_CLEAR;
         PWRUP_CLEAR;
-        return;
+        return 0;
     }
 
     OE_SET;
     setPanelState(1);
+
+    return 1;
 }
 
 /**

src/boards/Inkplate10.cpp

@@ -200,7 +200,10 @@ void Inkplate::display1b()
     uint32_t _pos;
     uint8_t data;
     uint8_t dram;
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
     clean(0, 10);
     clean(1, 10);
     clean(0, 10);
@@ -248,7 +251,10 @@ void Inkplate::display1b()
  */
 void IRAM_ATTR Inkplate::display3b()
 {
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
     clean(0, 10);
     clean(1, 10);
     clean(0, 10);
@@ -332,7 +338,10 @@ void Inkplate::partialUpdate(bool _forced)
         }
     }
 
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
     for (int k = 0; k < 5; ++k)
     {
         vscan_start();

src/boards/Inkplate5.cpp

@@ -203,7 +203,12 @@ void Inkplate::display1b()
     uint32_t _pos;
     uint8_t data;
     uint8_t dram;
-    einkOn();
+
+    if (!einkOn())
+    {
+        return;
+    }
+
     clean(0, 17);
     clean(1, 17);
     clean(0, 17);
@@ -279,7 +284,10 @@ void Inkplate::display1b()
  */
 void IRAM_ATTR Inkplate::display3b()
 {
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
     clean(0, 17);
     clean(1, 17);
     clean(0, 17);
@@ -362,7 +370,11 @@ void Inkplate::partialUpdate(bool _forced)
         }
     }
 
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
+
     for (int k = 0; k < 5; k++)
     {
         vscan_start();

src/boards/Inkplate6.cpp

@@ -184,7 +184,11 @@ void Inkplate::display1b()
     uint32_t _send;
     uint8_t data;
     uint8_t dram;
-    einkOn();
+
+    if (!einkOn())
+    {
+        return;
+    }
 
     clean(0, 1);
     clean(1, 21);
@@ -294,7 +298,10 @@ void Inkplate::display1b()
  */
 void Inkplate::display3b()
 {
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
     clean(0, 1);
     clean(1, 21);
     clean(2, 1);
@@ -381,7 +388,11 @@ void Inkplate::partialUpdate(bool _forced)
         }
     }
 
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
+
     for (int k = 0; k < 5; ++k)
     {
         vscan_start();

src/boards/Inkplate6plus.cpp

@@ -271,7 +271,10 @@ void Inkplate::display1b()
     uint32_t _pos;
     uint8_t data;
     uint8_t dram;
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
 
     clean(0, 1);
     clean(1, 15);
@@ -349,7 +352,10 @@ void Inkplate::display1b()
  */
 void Inkplate::display3b()
 {
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
     clean(0, 1);
     clean(1, 15);
     clean(2, 1);
@@ -434,7 +440,11 @@ void Inkplate::partialUpdate(bool _forced)
         }
     }
 
-    einkOn();
+    if (!einkOn())
+    {
+        return;
+    }
+
     for (int k = 0; k < 5; k++)
     {
         vscan_start();