Skip to content

Commit a8f8a77

Browse files
author
Clang Robot
committed
Committing clang-format changes
1 parent d5bdf50 commit a8f8a77

File tree

15 files changed

+2264
-2038
lines changed

15 files changed

+2264
-2038
lines changed

‎src/Inkplate.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
//--------------------------USER FUNCTIONS--------------------------------------------
2323
Inkplate::Inkplate(uint8_t mode) : Adafruit_GFX(E_INK_WIDTH, E_INK_HEIGHT), Graphics(E_INK_WIDTH, E_INK_HEIGHT)
2424
{
25-
_mode=mode;
25+
_mode = mode;
2626
}
2727

2828
void Inkplate::begin()
@@ -39,15 +39,14 @@ void Inkplate::begin()
3939
// Init low level driver for EPD.
4040
initDriver(this);
4141

42-
//Forward the display mode to the EPD driver
42+
// Forward the display mode to the EPD driver
4343
selectDisplayMode(_mode);
4444

4545
// Clean frame buffers.
4646
clearDisplay();
4747

4848
// Block multiple inits.
4949
_beginDone = 1;
50-
5150
}
5251
void Inkplate::writePixel(int16_t x, int16_t y, uint16_t color)
5352
{
@@ -92,6 +91,8 @@ void Inkplate::writePixel(int16_t x, int16_t y, uint16_t color)
9291

9392
void Inkplate::drawPixel(int16_t x, int16_t y, uint16_t color)
9493
{
95-
writePixel(x,y,color);
94+
writePixel(x, y, color);
9695
}
97-
void Inkplate::setRotation(uint8_t r){}
96+
void Inkplate::setRotation(uint8_t r)
97+
{
98+
}

‎src/Inkplate.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
#define __INKPLATE_H__
2222

2323
#include "Arduino.h"
24-
#include "Wire.h"
2524
#include "SPI.h"
25+
#include "Wire.h"
2626
#include "graphics/Graphics.h"
2727
//#include "include/System.h"
2828
//#include "libs/SdFat/SdFat.h"
29-
#include "system/defines.h"
30-
#include "system/InkplateBoards.h"
3129
#include "boardSelect.h"
30+
#include "system/InkplateBoards.h"
31+
#include "system/defines.h"
3232

33-
//extern SPIClass spi2;
34-
//extern SdFat sd;
33+
// extern SPIClass spi2;
34+
// extern SdFat sd;
3535

3636
class Inkplate : public Graphics, public InkplateBoardClass
3737
{
@@ -40,7 +40,7 @@ class Inkplate : public Graphics, public InkplateBoardClass
4040
void begin();
4141
void drawPixel(int16_t x, int16_t y, uint16_t color);
4242
void setRotation(uint8_t r);
43-
43+
4444

4545
protected:
4646
private:

‎src/boards/Inkplate10/Inkplate10Driver.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
2020
internalIO.beginIO(0x20);
2121
externalIO.beginIO(0x21);
2222

23-
internalIO.digitalWriteIO( 9, LOW);
23+
internalIO.digitalWriteIO(9, LOW);
2424

2525

2626
memset(internalIO._ioExpanderRegs, 0, 22);
2727
memset(externalIO._ioExpanderRegs, 0, 22);
2828

29-
internalIO.pinModeIO( VCOM, OUTPUT);
30-
internalIO.pinModeIO( PWRUP, OUTPUT);
31-
internalIO.pinModeIO( WAKEUP, OUTPUT);
32-
internalIO.pinModeIO( GPIO0_ENABLE, OUTPUT);
33-
internalIO.digitalWriteIO( GPIO0_ENABLE, 1);
29+
internalIO.pinModeIO(VCOM, OUTPUT);
30+
internalIO.pinModeIO(PWRUP, OUTPUT);
31+
internalIO.pinModeIO(WAKEUP, OUTPUT);
32+
internalIO.pinModeIO(GPIO0_ENABLE, OUTPUT);
33+
internalIO.digitalWriteIO(GPIO0_ENABLE, 1);
3434

35-
internalIO.digitalWriteIO( WAKEUP, 1);
35+
internalIO.digitalWriteIO(WAKEUP, 1);
3636
WAKEUP_SET;
3737
delay(1);
3838
Wire.beginTransmission(0x48);
@@ -43,7 +43,7 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
4343
Wire.write(0B00000000); // Power down delay (6mS per rail)
4444
Wire.endTransmission();
4545
delay(1);
46-
internalIO.digitalWriteIO( WAKEUP, 0);
46+
internalIO.digitalWriteIO(WAKEUP, 0);
4747
WAKEUP_CLEAR;
4848

4949
// Set all pins of seconds I/O expander to outputs, low.
@@ -54,18 +54,18 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
5454
pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
5555
(((i & B11100000) >> 5) << 25);
5656

57-
for(int i = 0; i < 15; i++)
57+
for (int i = 0; i < 15; i++)
5858
{
59-
externalIO.pinModeIO( i, OUTPUT);
60-
externalIO.digitalWriteIO( i, LOW);
59+
externalIO.pinModeIO(i, OUTPUT);
60+
externalIO.digitalWriteIO(i, LOW);
6161
}
6262

6363
// For same reason, unused pins of first I/O expander have to be also set as
6464
// outputs, low.
65-
internalIO.pinModeIO( 14, OUTPUT);
66-
internalIO.pinModeIO( 15, OUTPUT);
67-
internalIO.digitalWriteIO( 14, LOW);
68-
internalIO.digitalWriteIO( 15, LOW);
65+
internalIO.pinModeIO(14, OUTPUT);
66+
internalIO.pinModeIO(15, OUTPUT);
67+
internalIO.digitalWriteIO(14, LOW);
68+
internalIO.digitalWriteIO(15, LOW);
6969

7070
// Set SPI pins to input to reduce power consumption in deep sleep
7171
pinMode(12, INPUT);
@@ -74,16 +74,16 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
7474
pinMode(15, INPUT);
7575

7676
// And also disable uSD card supply
77-
internalIO.pinModeIO( SD_PMOS_PIN, INPUT);
77+
internalIO.pinModeIO(SD_PMOS_PIN, INPUT);
7878

7979
// CONTROL PINS
8080
pinMode(0, OUTPUT);
8181
pinMode(2, OUTPUT);
8282
pinMode(32, OUTPUT);
8383
pinMode(33, OUTPUT);
84-
internalIO.pinModeIO( OE, OUTPUT);
85-
internalIO.pinModeIO( GMOD, OUTPUT);
86-
internalIO.pinModeIO( SPV, OUTPUT);
84+
internalIO.pinModeIO(OE, OUTPUT);
85+
internalIO.pinModeIO(GMOD, OUTPUT);
86+
internalIO.pinModeIO(SPV, OUTPUT);
8787

8888
// DATA PINS
8989
pinMode(4, OUTPUT); // D0
@@ -95,15 +95,15 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
9595
pinMode(26, OUTPUT);
9696
pinMode(27, OUTPUT); // D7
9797

98-
internalIO.pinModeIO( 10, OUTPUT);
99-
internalIO.pinModeIO( 11, OUTPUT);
100-
internalIO.pinModeIO( 12, OUTPUT);
101-
internalIO.digitalWriteIO( 10, LOW);
102-
internalIO.digitalWriteIO( 11, LOW);
103-
internalIO.digitalWriteIO( 12, LOW);
98+
internalIO.pinModeIO(10, OUTPUT);
99+
internalIO.pinModeIO(11, OUTPUT);
100+
internalIO.pinModeIO(12, OUTPUT);
101+
internalIO.digitalWriteIO(10, LOW);
102+
internalIO.digitalWriteIO(11, LOW);
103+
internalIO.digitalWriteIO(12, LOW);
104104
// Battery voltage Switch MOSFET
105-
internalIO.pinModeIO( 9, OUTPUT);
106-
internalIO.digitalWriteIO( 9, LOW);
105+
internalIO.pinModeIO(9, OUTPUT);
106+
internalIO.digitalWriteIO(9, LOW);
107107

108108
DMemoryNew = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
109109
_partial = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
@@ -525,7 +525,7 @@ int EPDDriver::einkOn()
525525
OE_CLEAR;
526526
PWRUP_SET;
527527
setPanelState(1);
528-
528+
529529
unsigned long timer = millis();
530530
do
531531
{
@@ -584,9 +584,9 @@ void EPDDriver::pinsAsOutputs()
584584
pinMode(2, OUTPUT);
585585
pinMode(32, OUTPUT);
586586
pinMode(33, OUTPUT);
587-
internalIO.pinModeIO( OE, OUTPUT);
588-
internalIO.pinModeIO( GMOD, OUTPUT);
589-
internalIO.pinModeIO( SPV, OUTPUT);
587+
internalIO.pinModeIO(OE, OUTPUT);
588+
internalIO.pinModeIO(GMOD, OUTPUT);
589+
internalIO.pinModeIO(SPV, OUTPUT);
590590
pinMode(0, OUTPUT);
591591
pinMode(4, OUTPUT);
592592
pinMode(5, OUTPUT);
@@ -604,7 +604,7 @@ uint8_t EPDDriver::getPanelState()
604604
}
605605
void EPDDriver::setPanelState(uint8_t state)
606606
{
607-
_panelState=state;
607+
_panelState = state;
608608
}
609609

610610
/**

‎src/boards/Inkplate10/Inkplate10Driver.h‎

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -27,109 +27,106 @@
2727

2828
#define WAKEUP_SET \
2929
{ \
30-
internalIO.digitalWriteIO(WAKEUP, HIGH); \
30+
internalIO.digitalWriteIO(WAKEUP, HIGH); \
3131
}
3232
#define WAKEUP_CLEAR \
3333
{ \
34-
internalIO.digitalWriteIO(WAKEUP, LOW); \
34+
internalIO.digitalWriteIO(WAKEUP, LOW); \
3535
}
3636
#define PWRUP_SET \
3737
{ \
38-
internalIO.digitalWriteIO(PWRUP, HIGH); \
38+
internalIO.digitalWriteIO(PWRUP, HIGH); \
3939
}
4040
#define PWRUP_CLEAR \
4141
{ \
42-
internalIO.digitalWriteIO(PWRUP, LOW); \
42+
internalIO.digitalWriteIO(PWRUP, LOW); \
4343
}
4444
#define VCOM_SET \
4545
{ \
46-
internalIO.digitalWriteIO(VCOM, HIGH); \
46+
internalIO.digitalWriteIO(VCOM, HIGH); \
4747
}
4848
#define VCOM_CLEAR \
4949
{ \
50-
internalIO.digitalWriteIO(VCOM, LOW); \
50+
internalIO.digitalWriteIO(VCOM, LOW); \
5151
}
5252
#define OE_SET \
5353
{ \
54-
internalIO.digitalWriteIO(OE, HIGH); \
54+
internalIO.digitalWriteIO(OE, HIGH); \
5555
}
5656
#define OE_CLEAR \
5757
{ \
58-
internalIO.digitalWriteIO(OE, LOW); \
58+
internalIO.digitalWriteIO(OE, LOW); \
5959
}
6060
#define GMOD_SET \
6161
{ \
62-
internalIO.digitalWriteIO(GMOD, HIGH); \
62+
internalIO.digitalWriteIO(GMOD, HIGH); \
6363
}
6464
#define GMOD_CLEAR \
6565
{ \
66-
internalIO.digitalWriteIO(GMOD, LOW); \
66+
internalIO.digitalWriteIO(GMOD, LOW); \
6767
}
6868
#define SPV_SET \
6969
{ \
70-
internalIO.digitalWriteIO(SPV, HIGH); \
70+
internalIO.digitalWriteIO(SPV, HIGH); \
7171
}
7272
#define SPV_CLEAR \
7373
{ \
74-
internalIO.digitalWriteIO(SPV, LOW); \
74+
internalIO.digitalWriteIO(SPV, LOW); \
7575
}
7676

7777
class Inkplate;
7878

7979

80-
8180
class EPDDriver
8281
{
83-
public:
84-
int initDriver(Inkplate *_inkplatePtr);
85-
void display(bool _leaveOn = 0);
86-
void selectDisplayMode(uint8_t displayMode);
87-
void clearDisplay();
88-
uint32_t partialUpdate(bool _forced = false, bool leaveOn = false);
89-
void setFullUpdateThreshold(uint16_t _numberOfPartialUpdates);
90-
uint8_t getDisplayMode();
91-
92-
93-
IOExpander internalIO;
94-
IOExpander externalIO;
95-
96-
uint8_t _beginDone = 0;
97-
uint8_t _displayMode;
98-
99-
100-
uint32_t pinLUT[256];
101-
uint32_t *GLUT;
102-
uint32_t *GLUT2;
103-
uint8_t *DMemoryNew;
104-
uint8_t *_partial;
105-
uint8_t *DMemory4Bit;
106-
uint8_t *_pBuffer;
107-
uint8_t waveform3Bit[8][9] = WAVEFORM3BIT;
108-
uint16_t _partialUpdateLimiter = 10;
109-
uint16_t _partialUpdateCounter = 0;
110-
uint8_t _blockPartial = 1;
111-
112-
113-
114-
private:
115-
void calculateLUTs();
116-
uint8_t readPowerGood();
117-
void pinsAsOutputs();
118-
int einkOn();
119-
void einkOff();
120-
void display1b(bool _leaveOn);
121-
void display3b(bool _leaveOn);
122-
void pinsZstate();
123-
uint8_t getPanelState();
124-
void setPanelState(uint8_t state);
125-
void clean(uint8_t c, uint8_t rep);
126-
void vscan_start();
127-
void hscan_start(uint32_t _d);
128-
void vscan_end();
129-
uint8_t _panelState = 0;
82+
public:
83+
int initDriver(Inkplate *_inkplatePtr);
84+
void display(bool _leaveOn = 0);
85+
void selectDisplayMode(uint8_t displayMode);
86+
void clearDisplay();
87+
uint32_t partialUpdate(bool _forced = false, bool leaveOn = false);
88+
void setFullUpdateThreshold(uint16_t _numberOfPartialUpdates);
89+
uint8_t getDisplayMode();
90+
91+
92+
IOExpander internalIO;
93+
IOExpander externalIO;
94+
95+
uint8_t _beginDone = 0;
96+
uint8_t _displayMode;
97+
98+
99+
uint32_t pinLUT[256];
100+
uint32_t *GLUT;
101+
uint32_t *GLUT2;
102+
uint8_t *DMemoryNew;
103+
uint8_t *_partial;
104+
uint8_t *DMemory4Bit;
105+
uint8_t *_pBuffer;
106+
uint8_t waveform3Bit[8][9] = WAVEFORM3BIT;
107+
uint16_t _partialUpdateLimiter = 10;
108+
uint16_t _partialUpdateCounter = 0;
109+
uint8_t _blockPartial = 1;
110+
111+
112+
private:
113+
void calculateLUTs();
114+
uint8_t readPowerGood();
115+
void pinsAsOutputs();
116+
int einkOn();
117+
void einkOff();
118+
void display1b(bool _leaveOn);
119+
void display3b(bool _leaveOn);
120+
void pinsZstate();
121+
uint8_t getPanelState();
122+
void setPanelState(uint8_t state);
123+
void clean(uint8_t c, uint8_t rep);
124+
void vscan_start();
125+
void hscan_start(uint32_t _d);
126+
void vscan_end();
127+
uint8_t _panelState = 0;
130128
};
131129

132130

133-
134131
#endif
135132
#endif

‎src/boards/Inkplate10/waveforms.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
{0, 0, 0, 0, 0, 2, 1, 2, 0}, {0, 0, 0, 2, 2, 2, 2, 2, 0}};
1010

1111

12-
1312
// Pin on the internal io expander which controls MOSFET for turning on and off the SD card
1413
#define SD_PMOS_PIN IO_PIN_B2 // 10
1514

0 commit comments

Comments
 (0)