Skip to content

Commit 840c981

Browse files
committed
Fixed partial update bug on all boards
1 parent b6abcf3 commit 840c981

File tree

5 files changed

+26
-55
lines changed

5 files changed

+26
-55
lines changed

src/Inkplate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Inkplate : public System, public Graphics
4545
#endif
4646

4747
#ifdef ARDUINO_INKPLATE10
48-
bool begin(uint8_t lightWaveform = 0); // In boards
48+
bool begin(uint8_t lightWaveform = 0); // Special case for Inkplate10
4949
#else
5050
bool begin(void); // In boards
5151
#endif

src/boards/Inkplate10.cpp

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ void Inkplate::display1b(bool leaveOn)
205205
uint32_t _pos;
206206
uint8_t data;
207207
uint8_t dram;
208-
if (!leaveOn && !einkOn())
209-
{
208+
209+
if (!einkOn())
210210
return;
211-
}
211+
212212
clean(0, 10);
213213
clean(1, 10);
214214
clean(0, 10);
@@ -258,10 +258,9 @@ void Inkplate::display1b(bool leaveOn)
258258
*/
259259
void IRAM_ATTR Inkplate::display3b(bool leaveOn)
260260
{
261-
if (!leaveOn && !einkOn())
262-
{
261+
if (!einkOn())
263262
return;
264-
}
263+
265264
clean(0, 10);
266265
clean(1, 10);
267266
clean(0, 10);
@@ -359,13 +358,8 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
359358
}
360359
}
361360

362-
if (!leaveOn)
363-
{
364-
if (!einkOn())
365-
{
366-
return 0;
367-
}
368-
}
361+
if (!einkOn())
362+
return 0;
369363

370364
for (int k = 0; k < 5; ++k)
371365
{

src/boards/Inkplate5.cpp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,8 @@ void Inkplate::display1b(bool leaveOn)
204204
uint8_t data;
205205
uint8_t dram;
206206

207-
208-
if (!leaveOn && !einkOn())
209-
{
207+
if (!einkOn())
210208
return;
211-
}
212209

213210
clean(0, 17);
214211
clean(1, 17);
@@ -287,10 +284,9 @@ void Inkplate::display1b(bool leaveOn)
287284
*/
288285
void IRAM_ATTR Inkplate::display3b(bool leaveOn)
289286
{
290-
if (!leaveOn && !einkOn())
291-
{
287+
if (!einkOn())
292288
return;
293-
}
289+
294290
clean(0, 17);
295291
clean(1, 17);
296292
clean(0, 17);
@@ -387,13 +383,9 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
387383
}
388384
}
389385

390-
if (!leaveOn)
391-
{
392-
if (!einkOn())
393-
{
394-
return 0;
395-
}
396-
}
386+
387+
if (!einkOn())
388+
return 0;
397389

398390
for (int k = 0; k < 5; k++)
399391
{

src/boards/Inkplate6.cpp

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,8 @@ void Inkplate::display1b(bool leaveOn)
185185
uint8_t data;
186186
uint8_t dram;
187187

188-
if (!leaveOn && !einkOn())
189-
{
188+
if (!einkOn())
190189
return;
191-
}
192190

193191
clean(0, 1);
194192
clean(1, 21);
@@ -301,10 +299,9 @@ void Inkplate::display1b(bool leaveOn)
301299
*/
302300
void Inkplate::display3b(bool leaveOn)
303301
{
304-
if (!leaveOn && !einkOn())
305-
{
302+
if (!einkOn())
306303
return;
307-
}
304+
308305
clean(0, 1);
309306
clean(1, 21);
310307
clean(2, 1);
@@ -405,13 +402,8 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
405402
}
406403
}
407404

408-
if (!leaveOn)
409-
{
410-
if (!einkOn())
411-
{
412-
return 0;
413-
}
414-
}
405+
if (!einkOn())
406+
return 0;
415407

416408
for (int k = 0; k < 5; ++k)
417409
{

src/boards/Inkplate6plus.cpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,9 @@ void Inkplate::display1b(bool leaveOn)
271271
uint32_t _pos;
272272
uint8_t data;
273273
uint8_t dram;
274-
if (!leaveOn && !einkOn())
275-
{
274+
275+
if (!einkOn())
276276
return;
277-
}
278277

279278
clean(0, 1);
280279
clean(1, 15);
@@ -354,10 +353,9 @@ void Inkplate::display1b(bool leaveOn)
354353
*/
355354
void Inkplate::display3b(bool leaveOn)
356355
{
357-
if (!leaveOn && !einkOn())
358-
{
356+
if (!einkOn())
359357
return;
360-
}
358+
361359
clean(0, 1);
362360
clean(1, 15);
363361
clean(2, 1);
@@ -456,13 +454,8 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
456454
}
457455
}
458456

459-
if (!leaveOn)
460-
{
461-
if (!einkOn())
462-
{
463-
return 0;
464-
}
465-
}
457+
if (!einkOn())
458+
return 0;
466459

467460
for (int k = 0; k < 5; k++)
468461
{
@@ -554,7 +547,7 @@ void Inkplate::einkOff()
554547
Wire.endTransmission();
555548

556549
// Clearing WAKEUP pin can cause vertical lines on panel
557-
// WAKEUP_CLEAR;
550+
//WAKEUP_CLEAR;
558551

559552
pinsZstate();
560553
setPanelState(0);

0 commit comments

Comments
 (0)