leaveOn in display.display

nitko12 · nitko12 · commit 3236d4e30744 · 2021-09-22T09:05:24.000+02:00
diff --git a/src/Inkplate.cpp b/src/Inkplate.cpp
@@ -66,12 +66,12 @@ void Inkplate::clearDisplay()
 /**
  * @brief       display function update display with new data from buffer
  */
-void Inkplate::display()
+void Inkplate::display(bool leaveOn)
 {
     if (getDisplayMode() == 0)
-        display1b();
+        display1b(leaveOn);
     else if (getDisplayMode() == 1)
-        display3b();
+        display3b(leaveOn);
 }
 
 /**
diff --git a/src/Inkplate.h b/src/Inkplate.h
@@ -45,7 +45,7 @@ class Inkplate : public System, public Graphics
 #endif
     bool begin(void); // In boards
     void clearDisplay();
-    void display();
+    void display(bool leaveOn = false);
     // void writeRow(uint8_t data);
     void partialUpdate(bool _forced = false, bool leaveOn = false);
 
@@ -95,8 +95,8 @@ class Inkplate : public System, public Graphics
     void sendData(uint8_t *_data, int _n);
     void sendData(uint8_t _data);
 #else
-    void display1b();
-    void display3b();
+    void display1b(bool leaveOn = false);
+    void display3b(bool leaveOn = false);
 
     void vscan_start();
     void vscan_end();
diff --git a/src/boards/Inkplate10.cpp b/src/boards/Inkplate10.cpp
@@ -193,14 +193,14 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)
  *
  * @brief       display1b function writes black and white data to display
  */
-void Inkplate::display1b()
+void Inkplate::display1b(bool leaveOn)
 {
     memcpy(DMemoryNew, _partial, E_INK_WIDTH * E_INK_HEIGHT / 8);
 
     uint32_t _pos;
     uint8_t data;
     uint8_t dram;
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -241,17 +241,19 @@ void Inkplate::display1b()
 
     clean(2, 2);
     clean(3, 1);
+
     vscan_start();
-    einkOff();
+    if (!leaveOn)
+        einkOff();
     _blockPartial = 0;
 }
 
 /**
  * @brief       display3b function writes grayscale data to display
  */
-void IRAM_ATTR Inkplate::display3b()
+void IRAM_ATTR Inkplate::display3b(bool leaveOn)
 {
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -295,7 +297,9 @@ void IRAM_ATTR Inkplate::display3b()
     }
     clean(3, 1);
     vscan_start();
-    einkOff();
+
+    if (!leaveOn)
+        einkOff();
 }
 
 /**
@@ -314,7 +318,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)
         return;
     if (_blockPartial == 1 && !_forced)
     {
-        display1b();
+        display1b(leaveOn);
         return;
     }
 
diff --git a/src/boards/Inkplate5.cpp b/src/boards/Inkplate5.cpp
@@ -193,7 +193,7 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)
  *
  * @brief       display1b function writes black and white data to display
  */
-void Inkplate::display1b()
+void Inkplate::display1b(bool leaveOn)
 {
     for (int i = 0; i < (E_INK_HEIGHT * E_INK_WIDTH) / 8; i++)
     {
@@ -204,7 +204,8 @@ void Inkplate::display1b()
     uint8_t data;
     uint8_t dram;
 
-    if (!einkOn())
+
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -275,16 +276,18 @@ void Inkplate::display1b()
     clean(2, 2);
     clean(3, 1);
     vscan_start();
-    einkOff();
+
+    if (!leaveOn)
+        einkOff();
     _blockPartial = 0;
 }
 
 /**
  * @brief       display3b function writes grayscale data to display
  */
-void IRAM_ATTR Inkplate::display3b()
+void IRAM_ATTR Inkplate::display3b(bool leaveOn)
 {
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -328,7 +331,9 @@ void IRAM_ATTR Inkplate::display3b()
     }
     clean(3, 1);
     vscan_start();
-    einkOff();
+
+    if (!leaveOn)
+        einkOff();
 }
 
 /**
@@ -348,7 +353,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)
 
     if (_blockPartial == 1 && !_forced)
     {
-        display1b();
+        display1b(leaveOn);
         return;
     }
     uint32_t _pos = (E_INK_WIDTH * E_INK_HEIGHT / 8) - 1;
diff --git a/src/boards/Inkplate6.cpp b/src/boards/Inkplate6.cpp
@@ -177,15 +177,15 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)
  *
  * @brief       display1b function writes black and white data to display
  */
-void Inkplate::display1b()
+void Inkplate::display1b(bool leaveOn)
 {
     memcpy(DMemoryNew, _partial, E_INK_WIDTH * E_INK_HEIGHT / 8);
 
     uint32_t _send;
     uint8_t data;
     uint8_t dram;
 
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -289,16 +289,19 @@ void Inkplate::display1b()
     delayMicroseconds(230);
 
     vscan_start();
-    einkOff();
+
+    if (!leaveOn)
+        einkOff();
+
     _blockPartial = 0;
 }
 
 /**
  * @brief       display3b function writes grayscale data to display
  */
-void Inkplate::display3b()
+void Inkplate::display3b(bool leaveOn)
 {
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -344,7 +347,9 @@ void Inkplate::display3b()
     }
     clean(3, 1);
     vscan_start();
-    einkOff();
+
+    if (!leaveOn)
+        einkOff();
 }
 
 /**
@@ -364,7 +369,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)
 
     if (_blockPartial == 1 && !_forced)
     {
-        display1b();
+        display1b(leaveOn);
         return;
     }
 
diff --git a/src/boards/Inkplate6plus.cpp b/src/boards/Inkplate6plus.cpp
@@ -261,7 +261,7 @@ void Inkplate::clean(uint8_t c, uint8_t rep)
  *
  * @brief       display1b function writes black and white data to display
  */
-void Inkplate::display1b()
+void Inkplate::display1b(bool leaveOn)
 {
     for (int i = 0; i < (E_INK_HEIGHT * E_INK_WIDTH) / 8; i++)
     {
@@ -271,7 +271,7 @@ void Inkplate::display1b()
     uint32_t _pos;
     uint8_t data;
     uint8_t dram;
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -343,16 +343,18 @@ void Inkplate::display1b()
     clean(2, 2);
     clean(3, 1);
     vscan_start();
-    einkOff();
+
+    if (leaveOn)
+        einkOff();
     _blockPartial = 0;
 }
 
 /**
  * @brief       display3b function writes grayscale data to display
  */
-void Inkplate::display3b()
+void Inkplate::display3b(bool leaveOn)
 {
-    if (!einkOn())
+    if (!leaveOn && !einkOn())
     {
         return;
     }
@@ -397,7 +399,9 @@ void Inkplate::display3b()
     }
     clean(3, 1);
     vscan_start();
-    einkOff();
+
+    if (!leaveOn)
+        einkOff();
 }
 
 /**
@@ -416,7 +420,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)
         return;
     if (_blockPartial == 1 && !_forced)
     {
-        display1b();
+        display1b(leaveOn);
         return;
     }
 
diff --git a/src/boards/InkplateColor.cpp b/src/boards/InkplateColor.cpp
@@ -117,7 +117,7 @@ bool Inkplate::begin(void)
 /**
  * @brief       display function update display with new data from buffer
  */
-void Inkplate::display()
+void Inkplate::display(bool leaveOn)
 {
     if (!_panelState)
         return;

Original file line number	Diff line number	Diff line change
`@@ -193,14 +193,14 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)`
`193`	`193`	`*`
`194`	`194`	`* @brief display1b function writes black and white data to display`
`195`	`195`	`*/`
`196`		`-void Inkplate::display1b()`
	`196`	`+void Inkplate::display1b(bool leaveOn)`
`197`	`197`	`{`
`198`	`198`	`memcpy(DMemoryNew, _partial, E_INK_WIDTH * E_INK_HEIGHT / 8);`
`199`	`199`
`200`	`200`	`uint32_t _pos;`
`201`	`201`	`uint8_t data;`
`202`	`202`	`uint8_t dram;`
`203`		`- if (!einkOn())`
	`203`	`+ if (!leaveOn && !einkOn())`
`204`	`204`	`{`
`205`	`205`	`return;`
`206`	`206`	`}`
`@@ -241,17 +241,19 @@ void Inkplate::display1b()`
`241`	`241`
`242`	`242`	`clean(2, 2);`
`243`	`243`	`clean(3, 1);`
	`244`	`+`
`244`	`245`	`vscan_start();`
`245`		`- einkOff();`
	`246`	`+ if (!leaveOn)`
	`247`	`+ einkOff();`
`246`	`248`	`_blockPartial = 0;`
`247`	`249`	`}`
`248`	`250`
`249`	`251`	`/**`
`250`	`252`	`* @brief display3b function writes grayscale data to display`
`251`	`253`	`*/`
`252`		`-void IRAM_ATTR Inkplate::display3b()`
	`254`	`+void IRAM_ATTR Inkplate::display3b(bool leaveOn)`
`253`	`255`	`{`
`254`		`- if (!einkOn())`
	`256`	`+ if (!leaveOn && !einkOn())`
`255`	`257`	`{`
`256`	`258`	`return;`
`257`	`259`	`}`
`@@ -295,7 +297,9 @@ void IRAM_ATTR Inkplate::display3b()`
`295`	`297`	`}`
`296`	`298`	`clean(3, 1);`
`297`	`299`	`vscan_start();`
`298`		`- einkOff();`
	`300`	`+`
	`301`	`+ if (!leaveOn)`
	`302`	`+ einkOff();`
`299`	`303`	`}`
`300`	`304`
`301`	`305`	`/**`
`@@ -314,7 +318,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)`
`314`	`318`	`return;`
`315`	`319`	`if (_blockPartial == 1 && !_forced)`
`316`	`320`	`{`
`317`		`- display1b();`
	`321`	`+ display1b(leaveOn);`
`318`	`322`	`return;`
`319`	`323`	`}`
`320`	`324`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)`
`193`	`193`	`*`
`194`	`194`	`* @brief display1b function writes black and white data to display`
`195`	`195`	`*/`
`196`		`-void Inkplate::display1b()`
	`196`	`+void Inkplate::display1b(bool leaveOn)`
`197`	`197`	`{`
`198`	`198`	`for (int i = 0; i < (E_INK_HEIGHT * E_INK_WIDTH) / 8; i++)`
`199`	`199`	`{`
`@@ -204,7 +204,8 @@ void Inkplate::display1b()`
`204`	`204`	`uint8_t data;`
`205`	`205`	`uint8_t dram;`
`206`	`206`
`207`		`- if (!einkOn())`
	`207`	`+`
	`208`	`+ if (!leaveOn && !einkOn())`
`208`	`209`	`{`
`209`	`210`	`return;`
`210`	`211`	`}`
`@@ -275,16 +276,18 @@ void Inkplate::display1b()`
`275`	`276`	`clean(2, 2);`
`276`	`277`	`clean(3, 1);`
`277`	`278`	`vscan_start();`
`278`		`- einkOff();`
	`279`	`+`
	`280`	`+ if (!leaveOn)`
	`281`	`+ einkOff();`
`279`	`282`	`_blockPartial = 0;`
`280`	`283`	`}`
`281`	`284`
`282`	`285`	`/**`
`283`	`286`	`* @brief display3b function writes grayscale data to display`
`284`	`287`	`*/`
`285`		`-void IRAM_ATTR Inkplate::display3b()`
	`288`	`+void IRAM_ATTR Inkplate::display3b(bool leaveOn)`
`286`	`289`	`{`
`287`		`- if (!einkOn())`
	`290`	`+ if (!leaveOn && !einkOn())`
`288`	`291`	`{`
`289`	`292`	`return;`
`290`	`293`	`}`
`@@ -328,7 +331,9 @@ void IRAM_ATTR Inkplate::display3b()`
`328`	`331`	`}`
`329`	`332`	`clean(3, 1);`
`330`	`333`	`vscan_start();`
`331`		`- einkOff();`
	`334`	`+`
	`335`	`+ if (!leaveOn)`
	`336`	`+ einkOff();`
`332`	`337`	`}`
`333`	`338`
`334`	`339`	`/**`
`@@ -348,7 +353,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)`
`348`	`353`
`349`	`354`	`if (_blockPartial == 1 && !_forced)`
`350`	`355`	`{`
`351`		`- display1b();`
	`356`	`+ display1b(leaveOn);`
`352`	`357`	`return;`
`353`	`358`	`}`
`354`	`359`	`uint32_t _pos = (E_INK_WIDTH * E_INK_HEIGHT / 8) - 1;`
Original file line number	Diff line number	Diff line change
`@@ -177,15 +177,15 @@ void Graphics::writePixel(int16_t x0, int16_t y0, uint16_t color)`
`177`	`177`	`*`
`178`	`178`	`* @brief display1b function writes black and white data to display`
`179`	`179`	`*/`
`180`		`-void Inkplate::display1b()`
	`180`	`+void Inkplate::display1b(bool leaveOn)`
`181`	`181`	`{`
`182`	`182`	`memcpy(DMemoryNew, _partial, E_INK_WIDTH * E_INK_HEIGHT / 8);`
`183`	`183`
`184`	`184`	`uint32_t _send;`
`185`	`185`	`uint8_t data;`
`186`	`186`	`uint8_t dram;`
`187`	`187`
`188`		`- if (!einkOn())`
	`188`	`+ if (!leaveOn && !einkOn())`
`189`	`189`	`{`
`190`	`190`	`return;`
`191`	`191`	`}`
`@@ -289,16 +289,19 @@ void Inkplate::display1b()`
`289`	`289`	`delayMicroseconds(230);`
`290`	`290`
`291`	`291`	`vscan_start();`
`292`		`- einkOff();`
	`292`	`+`
	`293`	`+ if (!leaveOn)`
	`294`	`+ einkOff();`
	`295`	`+`
`293`	`296`	`_blockPartial = 0;`
`294`	`297`	`}`
`295`	`298`
`296`	`299`	`/**`
`297`	`300`	`* @brief display3b function writes grayscale data to display`
`298`	`301`	`*/`
`299`		`-void Inkplate::display3b()`
	`302`	`+void Inkplate::display3b(bool leaveOn)`
`300`	`303`	`{`
`301`		`- if (!einkOn())`
	`304`	`+ if (!leaveOn && !einkOn())`
`302`	`305`	`{`
`303`	`306`	`return;`
`304`	`307`	`}`
`@@ -344,7 +347,9 @@ void Inkplate::display3b()`
`344`	`347`	`}`
`345`	`348`	`clean(3, 1);`
`346`	`349`	`vscan_start();`
`347`		`- einkOff();`
	`350`	`+`
	`351`	`+ if (!leaveOn)`
	`352`	`+ einkOff();`
`348`	`353`	`}`
`349`	`354`
`350`	`355`	`/**`
`@@ -364,7 +369,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)`
`364`	`369`
`365`	`370`	`if (_blockPartial == 1 && !_forced)`
`366`	`371`	`{`
`367`		`- display1b();`
	`372`	`+ display1b(leaveOn);`
`368`	`373`	`return;`
`369`	`374`	`}`
`370`	`375`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ void Inkplate::clean(uint8_t c, uint8_t rep)`
`261`	`261`	`*`
`262`	`262`	`* @brief display1b function writes black and white data to display`
`263`	`263`	`*/`
`264`		`-void Inkplate::display1b()`
	`264`	`+void Inkplate::display1b(bool leaveOn)`
`265`	`265`	`{`
`266`	`266`	`for (int i = 0; i < (E_INK_HEIGHT * E_INK_WIDTH) / 8; i++)`
`267`	`267`	`{`
`@@ -271,7 +271,7 @@ void Inkplate::display1b()`
`271`	`271`	`uint32_t _pos;`
`272`	`272`	`uint8_t data;`
`273`	`273`	`uint8_t dram;`
`274`		`- if (!einkOn())`
	`274`	`+ if (!leaveOn && !einkOn())`
`275`	`275`	`{`
`276`	`276`	`return;`
`277`	`277`	`}`
`@@ -343,16 +343,18 @@ void Inkplate::display1b()`
`343`	`343`	`clean(2, 2);`
`344`	`344`	`clean(3, 1);`
`345`	`345`	`vscan_start();`
`346`		`- einkOff();`
	`346`	`+`
	`347`	`+ if (leaveOn)`
	`348`	`+ einkOff();`
`347`	`349`	`_blockPartial = 0;`
`348`	`350`	`}`
`349`	`351`
`350`	`352`	`/**`
`351`	`353`	`* @brief display3b function writes grayscale data to display`
`352`	`354`	`*/`
`353`		`-void Inkplate::display3b()`
	`355`	`+void Inkplate::display3b(bool leaveOn)`
`354`	`356`	`{`
`355`		`- if (!einkOn())`
	`357`	`+ if (!leaveOn && !einkOn())`
`356`	`358`	`{`
`357`	`359`	`return;`
`358`	`360`	`}`
`@@ -397,7 +399,9 @@ void Inkplate::display3b()`
`397`	`399`	`}`
`398`	`400`	`clean(3, 1);`
`399`	`401`	`vscan_start();`
`400`		`- einkOff();`
	`402`	`+`
	`403`	`+ if (!leaveOn)`
	`404`	`+ einkOff();`
`401`	`405`	`}`
`402`	`406`
`403`	`407`	`/**`
`@@ -416,7 +420,7 @@ void Inkplate::partialUpdate(bool _forced, bool leaveOn)`
`416`	`420`	`return;`
`417`	`421`	`if (_blockPartial == 1 && !_forced)`
`418`	`422`	`{`
`419`		`- display1b();`
	`423`	`+ display1b(leaveOn);`
`420`	`424`	`return;`
`421`	`425`	`}`
`422`	`426`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ bool Inkplate::begin(void)`
`117`	`117`	`/**`
`118`	`118`	`* @brief display function update display with new data from buffer`
`119`	`119`	`*/`
`120`		`-void Inkplate::display()`
	`120`	`+void Inkplate::display(bool leaveOn)`
`121`	`121`	`{`
`122`	`122`	`if (!_panelState)`
`123`	`123`	`return;`