Fixed partial update that bad merge caused

PericR · PericR · commit a49cda341140 · 2021-04-19T10:23:01.000+02:00
diff --git a/src/boards/Inkplate10.cpp b/src/boards/Inkplate10.cpp
@@ -235,6 +235,7 @@ void Inkplate::display1b()
     clean(3, 1);
     vscan_start();
     einkOff();
+    _blockPartial = 0;
 }
 
 /**
@@ -298,7 +299,7 @@ void Inkplate::partialUpdate(bool _forced)
 {
     if (getDisplayMode() == 1)
         return;
-    if (_blockPartial == 1 && _forced)
+    if (_blockPartial == 1 && !_forced)
     {
         display1b();
         return;
diff --git a/src/boards/Inkplate5.cpp b/src/boards/Inkplate5.cpp
@@ -266,6 +266,8 @@ void Inkplate::display1b()
     clean(3, 1);
     vscan_start();
     einkOff();
+    _blockPartial = 0;
+
 }
 
 /**
@@ -330,7 +332,7 @@ void Inkplate::partialUpdate(bool _forced)
     if (getDisplayMode() == 1)
         return;
 
-    if (_blockPartial == 1 && _forced)
+    if (_blockPartial == 1 && !_forced)
     {
         display1b();
         return;
diff --git a/src/boards/Inkplate6.cpp b/src/boards/Inkplate6.cpp
@@ -282,6 +282,7 @@ void Inkplate::display1b()
 
     vscan_start();
     einkOff();
+    _blockPartial = 0;
 }
 
 /**
@@ -348,7 +349,7 @@ void Inkplate::partialUpdate(bool _forced)
     if (getDisplayMode() == 1)
         return;
 
-    if (_blockPartial == 1 && _forced)
+    if (_blockPartial == 1 && !_forced)
     {
         display1b();
         return;
diff --git a/src/boards/Inkplate6plus.cpp b/src/boards/Inkplate6plus.cpp
@@ -330,6 +330,8 @@ void Inkplate::display1b()
     clean(3, 1);
     vscan_start();
     einkOff();
+    _blockPartial = 0;
+
 }
 
 /**
@@ -401,7 +403,7 @@ void Inkplate::partialUpdate(bool _forced)
 {
     if (getDisplayMode() == 1)
         return;
-    if (_blockPartial == 1 && _forced)
+    if (_blockPartial == 1 && !_forced)
     {
         display1b();
         return;

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,7 @@ void Inkplate::display1b()`
`235`	`235`	`clean(3, 1);`
`236`	`236`	`vscan_start();`
`237`	`237`	`einkOff();`
	`238`	`+ _blockPartial = 0;`
`238`	`239`	`}`
`239`	`240`
`240`	`241`	`/**`
`@@ -298,7 +299,7 @@ void Inkplate::partialUpdate(bool _forced)`
`298`	`299`	`{`
`299`	`300`	`if (getDisplayMode() == 1)`
`300`	`301`	`return;`
`301`		`- if (_blockPartial == 1 && _forced)`
	`302`	`+ if (_blockPartial == 1 && !_forced)`
`302`	`303`	`{`
`303`	`304`	`display1b();`
`304`	`305`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,7 @@ void Inkplate::display1b()`
`282`	`282`
`283`	`283`	`vscan_start();`
`284`	`284`	`einkOff();`
	`285`	`+ _blockPartial = 0;`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`/**`
`@@ -348,7 +349,7 @@ void Inkplate::partialUpdate(bool _forced)`
`348`	`349`	`if (getDisplayMode() == 1)`
`349`	`350`	`return;`
`350`	`351`
`351`		`- if (_blockPartial == 1 && _forced)`
	`352`	`+ if (_blockPartial == 1 && !_forced)`
`352`	`353`	`{`
`353`	`354`	`display1b();`
`354`	`355`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,8 @@ void Inkplate::display1b()`
`330`	`330`	`clean(3, 1);`
`331`	`331`	`vscan_start();`
`332`	`332`	`einkOff();`
	`333`	`+ _blockPartial = 0;`
	`334`	`+`
`333`	`335`	`}`
`334`	`336`
`335`	`337`	`/**`
`@@ -401,7 +403,7 @@ void Inkplate::partialUpdate(bool _forced)`
`401`	`403`	`{`
`402`	`404`	`if (getDisplayMode() == 1)`
`403`	`405`	`return;`
`404`		`- if (_blockPartial == 1 && _forced)`
	`406`	`+ if (_blockPartial == 1 && !_forced)`
`405`	`407`	`{`
`406`	`408`	`display1b();`
`407`	`409`	`return;`