Skip to content

Commit 119f064

Browse files
author
Clang Robot
committed
Committing clang-format changes
1 parent 855091f commit 119f064

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

‎src/boards/Inkplate5V2.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ void Inkplate::display1b(bool leaveOn)
334334
delayMicroseconds(230);
335335
}
336336

337-
//vscan_start();
337+
// vscan_start();
338338
if (!leaveOn)
339339
einkOff();
340340

@@ -377,10 +377,14 @@ void Inkplate::display3b(bool leaveOn)
377377
uint8_t *_DMemoryNewPtrFlipped = (dp + E_INK_WIDTH / 2) - 1;
378378
for (int j = 0; j < (E_INK_WIDTH / 4); j += 4)
379379
{
380-
_dmaLineBuffer[j + 2] = (GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
381-
_dmaLineBuffer[j + 3] = (GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
382-
_dmaLineBuffer[j] = (GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
383-
_dmaLineBuffer[j + 1] = (GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
380+
_dmaLineBuffer[j + 2] =
381+
(GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
382+
_dmaLineBuffer[j + 3] =
383+
(GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
384+
_dmaLineBuffer[j] =
385+
(GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
386+
_dmaLineBuffer[j + 1] =
387+
(GLUT2[k * 256 + (*(_DMemoryNewPtrFlipped--))] | GLUT[k * 256 + (*(_DMemoryNewPtrFlipped--))]);
384388
dp += 8;
385389
}
386390
sendDataI2S(myI2S, _dmaI2SDesc);
@@ -392,7 +396,7 @@ void Inkplate::display3b(bool leaveOn)
392396
// Set the drivers inside epaper panel into dischare state.
393397
clean(3, 1);
394398

395-
//vscan_start();
399+
// vscan_start();
396400

397401
// If is needed to leave the epaper power supply on, do not turn it of.
398402
if (!leaveOn)
@@ -482,7 +486,7 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
482486
delayMicroseconds(230);
483487
}
484488
clean(2, 2);
485-
//vscan_start();
489+
// vscan_start();
486490

487491
if (!leaveOn)
488492
einkOff();

‎src/boards/Inkplate5V2.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@
3030
#define E_INK_HEIGHT 720
3131

3232
// Last element (index = 8) in waveform array is not used!
33-
#define WAVEFORM3BIT \
34-
{ \
35-
{0, 0, 1, 1, 2, 1, 1, 1, 0}, \
36-
{1, 1, 2, 2, 1, 2, 1, 1, 0}, \
37-
{0, 1, 2, 2, 1, 1, 2, 1, 0}, \
38-
{0, 0, 1, 1, 1, 1, 1, 2, 0}, \
39-
{1, 2, 1, 2, 1, 1, 1, 2, 0}, \
40-
{0, 1, 1, 1, 2, 0, 1, 2, 0}, \
41-
{1, 1, 1, 2, 2, 2, 1, 2, 0}, \
42-
{0, 0, 0, 0, 0, 0, 0, 0, 0} \
43-
}; \
33+
#define WAVEFORM3BIT \
34+
{{0, 0, 1, 1, 2, 1, 1, 1, 0}, {1, 1, 2, 2, 1, 2, 1, 1, 0}, {0, 1, 2, 2, 1, 1, 2, 1, 0}, \
35+
{0, 0, 1, 1, 1, 1, 1, 2, 0}, {1, 2, 1, 2, 1, 1, 1, 2, 0}, {0, 1, 1, 1, 2, 0, 1, 2, 0}, \
36+
{1, 1, 1, 2, 2, 2, 1, 2, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0}};
4437

4538
#endif

‎src/include/Pcal.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
#if defined(ARDUINO_INKPLATE10V2) || defined(ARDUINO_INKPLATE6V2) || defined(ARDUINO_INKPLATE6PLUSV2) || \
2020
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATECOOL) || defined(ARDUINO_INKPLATE5) || \
21-
defined(ARDUINO_INKPLATE5V2) || defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7) || defined(ARDUINO_INKPLATE4TEMPERA)
21+
defined(ARDUINO_INKPLATE5V2) || defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7) || \
22+
defined(ARDUINO_INKPLATE4TEMPERA)
2223

2324
#include "Pcal.h"
2425

‎src/include/System.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ int16_t System::sdCardInit()
152152
{
153153
// New Soldered Inkplate boards use P-MOS to disable supply to the uSD card to reduce power in deep sleep.
154154
#if defined(ARDUINO_INKPLATE6V2) || defined(ARDUINO_INKPLATE10V2) || defined(ARDUINO_INKPLATE6PLUSV2) || \
155-
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATE5) || defined(ARDUINO_INKPLATE5V2) || defined(ARDUINO_INKPLATE4) || \
156-
defined(ARDUINO_INKPLATE7) || defined(ARDUINO_INKPLATE4TEMPERA)
155+
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATE5) || defined(ARDUINO_INKPLATE5V2) || \
156+
defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7) || defined(ARDUINO_INKPLATE4TEMPERA)
157157
pinModeInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, OUTPUT);
158158
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, LOW);
159159
delay(50);
@@ -169,8 +169,8 @@ int16_t System::sdCardInit()
169169
void System::sdCardSleep()
170170
{
171171
#if defined(ARDUINO_INKPLATE6V2) || defined(ARDUINO_INKPLATE10V2) || defined(ARDUINO_INKPLATE6PLUSV2) || \
172-
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATE5) || defined(ARDUINO_INKPLATE5V2) || defined(ARDUINO_INKPLATE4) || \
173-
defined(ARDUINO_INKPLATE7) || defined(ARDUINO_INKPLATE4TEMPERA)
172+
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATE5) || defined(ARDUINO_INKPLATE5V2) || \
173+
defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7) || defined(ARDUINO_INKPLATE4TEMPERA)
174174
// Set SPI pins to input to reduce power consumption in deep sleep
175175
pinMode(12, INPUT);
176176
pinMode(13, INPUT);

‎src/include/System.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@
8686
#endif
8787

8888
#if defined(ARDUINO_INKPLATE10V2) || defined(ARDUINO_INKPLATE6V2) || defined(ARDUINO_INKPLATE6PLUSV2) || \
89-
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATECOOL) || defined(ARDUINO_INKPLATE5) || defined(ARDUINO_INKPLATE5V2) || \
90-
defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7) || defined(ARDUINO_INKPLATE4TEMPERA)
89+
defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATECOOL) || defined(ARDUINO_INKPLATE5) || \
90+
defined(ARDUINO_INKPLATE5V2) || defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7) || \
91+
defined(ARDUINO_INKPLATE4TEMPERA)
9192
#include "Pcal.h"
9293
#endif
9394

0 commit comments

Comments
 (0)