Skip to content

Commit f51e590

Browse files
ladyadaladyada
committed
clanged
1 parent bae0c5c commit f51e590

23 files changed

+71
-73
lines changed

‎src/Adafruit_ThinkInk.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ typedef enum {
55
} thinkinkmode_t;
66

77
#include "panels/ThinkInk_154_Tricolor_Z17.h"
8-
#include "panels/ThinkInk_213_Tricolor_Z16.h"
98
#include "panels/ThinkInk_213_Tricolor_RW.h"
9+
#include "panels/ThinkInk_213_Tricolor_Z16.h"
1010
#include "panels/ThinkInk_270_Tricolor_C44.h"
1111
#include "panels/ThinkInk_290_Tricolor_Z10.h"
1212
#include "panels/ThinkInk_420_Tricolor_RW.h"
@@ -15,8 +15,8 @@ typedef enum {
1515
#include "panels/ThinkInk_213_Grayscale4_T5.h"
1616
#include "panels/ThinkInk_290_Grayscale4_T5.h"
1717

18-
#include "panels/ThinkInk_154_Mono_D67.h"
1918
#include "panels/ThinkInk_154_Mono_D27.h"
19+
#include "panels/ThinkInk_154_Mono_D67.h"
2020
#include "panels/ThinkInk_213_Mono_B72.h"
2121
#include "panels/ThinkInk_213_Mono_B73.h"
2222
#include "panels/ThinkInk_213_Mono_BN.h"

‎src/drivers/Adafruit_IL91874.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Adafruit_IL91874::Adafruit_IL91874(int width, int height, int8_t SID,
8888
Adafruit_IL91874::Adafruit_IL91874(int width, int height, int8_t DC, int8_t RST,
8989
int8_t CS, int8_t SRCS, int8_t BUSY,
9090
SPIClass *spi)
91-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
91+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
9292

9393
buffer1_size = ((uint32_t)width * (uint32_t)height) / 8;
9494
buffer2_size = buffer1_size;

‎src/drivers/Adafruit_SSD1608.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ Adafruit_SSD1608::Adafruit_SSD1608(int width, int height, int8_t SID,
6060
*/
6161
/**************************************************************************/
6262
Adafruit_SSD1608::Adafruit_SSD1608(int width, int height, int8_t DC, int8_t RST,
63-
int8_t CS, int8_t SRCS, int8_t BUSY, SPIClass *spi)
64-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
63+
int8_t CS, int8_t SRCS, int8_t BUSY,
64+
SPIClass *spi)
65+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
6566

6667
if ((height % 8) != 0) {
6768
height += 8 - (height % 8);

‎src/drivers/Adafruit_SSD1619.cpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const uint8_t ssd1619_default_init_code[] {
2525

2626
// clang-format on
2727

28-
2928
/**************************************************************************/
3029
/*!
3130
@brief constructor if using external SRAM chip and software SPI
@@ -81,9 +80,9 @@ Adafruit_SSD1619::Adafruit_SSD1619(int width, int height, int8_t SID,
8180
*/
8281
/**************************************************************************/
8382
Adafruit_SSD1619::Adafruit_SSD1619(int width, int height, int8_t DC, int8_t RST,
84-
int8_t CS, int8_t SRCS, int8_t BUSY,
83+
int8_t CS, int8_t SRCS, int8_t BUSY,
8584
SPIClass *spi)
86-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
85+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
8786
if ((height % 8) != 0) {
8887
height += 8 - (height % 8);
8988
}
@@ -141,8 +140,8 @@ void Adafruit_SSD1619::update() {
141140
uint8_t buf[1];
142141

143142
// display update sequence
144-
//buf[0] = 0x40;
145-
//EPD_command(SSD1619_DISP_CTRL1, buf, 1);
143+
// buf[0] = 0x40;
144+
// EPD_command(SSD1619_DISP_CTRL1, buf, 1);
146145
buf[0] = 0xC7;
147146
EPD_command(SSD1619_DISP_CTRL2, buf, 1);
148147

@@ -154,7 +153,6 @@ void Adafruit_SSD1619::update() {
154153
}
155154
}
156155

157-
158156
/**************************************************************************/
159157
/*!
160158
@brief start up the display
@@ -180,7 +178,7 @@ void Adafruit_SSD1619::powerUp() {
180178
buf[2] = 0x00;
181179
EPD_command(SSD1619_DRIVER_CONTROL, buf, 3);
182180

183-
setRAMWindow(0, 0, HEIGHT-1, WIDTH-1);
181+
setRAMWindow(0, 0, HEIGHT - 1, WIDTH - 1);
184182
}
185183

186184
/**************************************************************************/
@@ -241,20 +239,20 @@ void Adafruit_SSD1619::setRAMAddress(uint16_t x, uint16_t y) {
241239
EPD_command(SSD1619_SET_RAMYCOUNT, buf, 2);
242240
}
243241

244-
245242
/**************************************************************************/
246243
/*!
247244
@brief Some displays require setting the RAM address pointer
248245
@param x X address counter value
249246
@param y Y address counter value
250247
*/
251248
/**************************************************************************/
252-
void Adafruit_SSD1619::setRAMWindow(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
249+
void Adafruit_SSD1619::setRAMWindow(uint16_t x1, uint16_t y1, uint16_t x2,
250+
uint16_t y2) {
253251
uint8_t buf[5];
254252

255253
// Set ram X start/end postion
256-
buf[0] = x1/8;
257-
buf[1] = x2/8;
254+
buf[0] = x1 / 8;
255+
buf[1] = x2 / 8;
258256
EPD_command(SSD1619_SET_RAMXPOS, buf, 2);
259257

260258
// Set ram Y start/end postion

‎src/drivers/Adafruit_SSD1675.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@ Adafruit_SSD1675::Adafruit_SSD1675(int width, int height, int8_t SID,
7474
*/
7575
/**************************************************************************/
7676
Adafruit_SSD1675::Adafruit_SSD1675(int width, int height, int8_t DC, int8_t RST,
77-
int8_t CS, int8_t SRCS, int8_t BUSY, SPIClass *spi)
78-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
77+
int8_t CS, int8_t SRCS, int8_t BUSY,
78+
SPIClass *spi)
79+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
7980
if ((height % 8) != 0) {
8081
height += 8 - (height % 8);
8182
}

‎src/drivers/Adafruit_SSD1675B.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Adafruit_SSD1675B::Adafruit_SSD1675B(int width, int height, int8_t SID,
7676
Adafruit_SSD1675B::Adafruit_SSD1675B(int width, int height, int8_t DC,
7777
int8_t RST, int8_t CS, int8_t SRCS,
7878
int8_t BUSY, SPIClass *spi)
79-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
79+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
8080
if ((height % 8) != 0) {
8181
height += 8 - (height % 8);
8282
}

‎src/drivers/Adafruit_SSD1680.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#define BUSY_WAIT 500
55

6-
76
// clang-format off
87

98
const uint8_t ssd1680_default_init_code[] {
@@ -22,7 +21,6 @@ const uint8_t ssd1680_default_init_code[] {
2221

2322
// clang-format on
2423

25-
2624
/**************************************************************************/
2725
/*!
2826
@brief constructor if using external SRAM chip and software SPI
@@ -78,8 +76,9 @@ Adafruit_SSD1680::Adafruit_SSD1680(int width, int height, int8_t SID,
7876
*/
7977
/**************************************************************************/
8078
Adafruit_SSD1680::Adafruit_SSD1680(int width, int height, int8_t DC, int8_t RST,
81-
int8_t CS, int8_t SRCS, int8_t BUSY, SPIClass *spi)
82-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
79+
int8_t CS, int8_t SRCS, int8_t BUSY,
80+
SPIClass *spi)
81+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
8382
if ((height % 8) != 0) {
8483
height += 8 - (height % 8);
8584
}
@@ -184,21 +183,18 @@ void Adafruit_SSD1680::powerUp() {
184183
buf[3] = (WIDTH - 1) >> 8;
185184
EPD_command(SSD1680_SET_RAMYPOS, buf, 4);
186185

187-
188186
// Set LUT
189187
/*
190188
buf[0] = LUT_DATA[74];
191189
EPD_command(SSD1680_WRITE_LUT, buf, 1);
192190
EPD_command(SSD1680_WRITE_LUT, LUT_DATA, 70);
193191
*/
194192

195-
196193
// Set display size and driver output control
197194
buf[0] = (WIDTH - 1);
198195
buf[1] = (WIDTH - 1) >> 8;
199196
buf[2] = 0x00;
200197
EPD_command(SSD1680_DRIVER_CONTROL, buf, 3);
201-
202198
}
203199

204200
/**************************************************************************/

‎src/drivers/Adafruit_SSD1681.cpp

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const uint8_t ssd1681_default_init_code[] {
1717

1818
// clang-format on
1919

20-
2120
/**************************************************************************/
2221
/*!
2322
@brief constructor if using external SRAM chip and software SPI
@@ -73,9 +72,9 @@ Adafruit_SSD1681::Adafruit_SSD1681(int width, int height, int8_t SID,
7372
*/
7473
/**************************************************************************/
7574
Adafruit_SSD1681::Adafruit_SSD1681(int width, int height, int8_t DC, int8_t RST,
76-
int8_t CS, int8_t SRCS, int8_t BUSY,
75+
int8_t CS, int8_t SRCS, int8_t BUSY,
7776
SPIClass *spi)
78-
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
77+
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
7978
if ((height % 8) != 0) {
8079
height += 8 - (height % 8);
8180
}
@@ -164,11 +163,8 @@ void Adafruit_SSD1681::updatePartial(void) {
164163
}
165164
}
166165

167-
168-
169-
170166
void Adafruit_SSD1681::displayPartial(uint16_t x1, uint16_t y1, uint16_t x2,
171-
uint16_t y2) {
167+
uint16_t y2) {
172168
uint8_t buf[7];
173169
uint8_t c;
174170

@@ -219,9 +215,9 @@ void Adafruit_SSD1681::displayPartial(uint16_t x1, uint16_t y1, uint16_t x2,
219215
powerUp();
220216

221217
// display....
222-
//setRAMWindow(0, 0, 16/8, 16);
223-
setRAMWindow(x1/8, y1, x2/8, y2);
224-
setRAMAddress(x1/8, y1);
218+
// setRAMWindow(0, 0, 16/8, 16);
219+
setRAMWindow(x1 / 8, y1, x2 / 8, y2);
220+
setRAMAddress(x1 / 8, y1);
225221

226222
// write image
227223
writeRAMCommand(0);
@@ -233,7 +229,7 @@ void Adafruit_SSD1681::displayPartial(uint16_t x1, uint16_t y1, uint16_t x2,
233229
for (uint16_t x = x1; x < x2; x += 8) {
234230
uint16_t i = (x / 8) + y * 25;
235231
SPItransfer(black_buffer[i]);
236-
//SPItransfer(0xAA);
232+
// SPItransfer(0xAA);
237233
}
238234
}
239235
csHigh();
@@ -249,10 +245,8 @@ void Adafruit_SSD1681::displayPartial(uint16_t x1, uint16_t y1, uint16_t x2,
249245
#endif
250246

251247
powerDown();
252-
253248
}
254249

255-
256250
/**************************************************************************/
257251
/*!
258252
@brief start up the display
@@ -278,7 +272,6 @@ void Adafruit_SSD1681::powerUp() {
278272
buf[2] = 0x00;
279273
EPD_command(SSD1681_DRIVER_CONTROL, buf, 3);
280274

281-
282275
setRAMWindow(0, 0, (HEIGHT / 8) - 1, WIDTH - 1);
283276
}
284277

@@ -336,19 +329,19 @@ void Adafruit_SSD1681::setRAMAddress(uint16_t x, uint16_t y) {
336329

337330
// set RAM y address count
338331
buf[0] = y;
339-
buf[1] = y>>8;
332+
buf[1] = y >> 8;
340333
EPD_command(SSD1681_SET_RAMYCOUNT, buf, 2);
341334
}
342335

343-
344336
/**************************************************************************/
345337
/*!
346338
@brief Some displays require setting the RAM address pointer
347339
@param x X address counter value
348340
@param y Y address counter value
349341
*/
350342
/**************************************************************************/
351-
void Adafruit_SSD1681::setRAMWindow(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
343+
void Adafruit_SSD1681::setRAMWindow(uint16_t x1, uint16_t y1, uint16_t x2,
344+
uint16_t y2) {
352345
uint8_t buf[5];
353346

354347
// Set ram X start/end postion

‎src/panels/ThinkInk_154_Grayscale4_T8.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,12 @@ class ThinkInk_154_Grayscale4_T8 : public Adafruit_IL0373 {
147147
private:
148148
public:
149149
ThinkInk_154_Grayscale4_T8(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST,
150-
int8_t CS, int8_t SRCS, int8_t MISO, int8_t BUSY = -1)
150+
int8_t CS, int8_t SRCS, int8_t MISO,
151+
int8_t BUSY = -1)
151152
: Adafruit_IL0373(152, 152, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
152153

153154
ThinkInk_154_Grayscale4_T8(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
154-
int8_t BUSY = -1, SPIClass *spi = &SPI)
155+
int8_t BUSY = -1, SPIClass *spi = &SPI)
155156
: Adafruit_IL0373(152, 152, DC, RST, CS, SRCS, BUSY, spi){};
156157

157158
void begin(thinkinkmode_t mode = THINKINK_GRAYSCALE4) {

‎src/panels/ThinkInk_154_Mono_D27.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ class ThinkInk_154_Mono_D27 : public Adafruit_SSD1608 {
77
private:
88
public:
99
ThinkInk_154_Mono_D27(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST,
10-
int8_t CS, int8_t SRCS, int8_t MISO, int8_t BUSY = -1)
10+
int8_t CS, int8_t SRCS, int8_t MISO, int8_t BUSY = -1)
1111
: Adafruit_SSD1608(200, 200, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
1212

1313
ThinkInk_154_Mono_D27(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
14-
int8_t BUSY = -1, SPIClass *spi = &SPI)
14+
int8_t BUSY = -1, SPIClass *spi = &SPI)
1515
: Adafruit_SSD1608(200, 200, DC, RST, CS, SRCS, BUSY, spi){};
1616

1717
void begin(thinkinkmode_t mode = THINKINK_MONO) {

0 commit comments

Comments
 (0)