Skip to content

Commit 34d8209

Browse files
committed
remainders
1 parent fa806b1 commit 34d8209

8 files changed

+10
-34
lines changed

src/Adafruit_ThinkInk.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
#include "panels/ThinkInk_270_Tricolor_C44.h"
1111
#include "panels/ThinkInk_270_Tricolor_Z70.h"
1212
#include "panels/ThinkInk_290_Tricolor_Z10.h"
13+
#include "panels/ThinkInk_290_Tricolor_RH.h"
1314
#include "panels/ThinkInk_420_Tricolor_RW.h"
1415

1516
#include "panels/ThinkInk_154_Grayscale4_T8.h"
1617
#include "panels/ThinkInk_213_Grayscale4_T5.h"
18+
#include "panels/ThinkInk_270_Grayscale4_W3.h"
1719
#include "panels/ThinkInk_290_Grayscale4_T5.h"
1820

1921
#include "panels/ThinkInk_154_Mono_D27.h"
@@ -24,6 +26,7 @@
2426
#include "panels/ThinkInk_213_Mono_BN.h"
2527
#include "panels/ThinkInk_213_Mono_M21.h"
2628
#include "panels/ThinkInk_290_Mono_M06.h"
29+
#include "panels/ThinkInk_290_Mono_BN.h"
2730
#include "panels/ThinkInk_420_Mono_BN.h"
2831

2932
#endif // _ADAFRUIT_THINKINK_H_

src/panels/ThinkInk_154_Tricolor_Z17.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ThinkInk_154_Tricolor_Z17 : public Adafruit_IL0373 {
1616
: Adafruit_IL0373(152, 152, DC, RST, CS, SRCS, BUSY, spi){};
1717

1818
void begin(thinkinkmode_t mode = THINKINK_TRICOLOR) {
19-
Adafruit_EPD::begin(true);
19+
Adafruit_IL0373::begin(true);
2020
setColorBuffer(0, true); // layer 0 uninverted
2121
setBlackBuffer(1, true); // layer 1 uninverted
2222

@@ -34,11 +34,6 @@ class ThinkInk_154_Tricolor_Z17 : public Adafruit_IL0373 {
3434
setRotation(3);
3535
powerDown();
3636
}
37-
38-
thinkinkmode_t getMode(void) { return inkmode; }
39-
40-
private:
41-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4237
};
4338

4439
#endif // _THINKINK_154_TRICOLOR_Z17_H

src/panels/ThinkInk_213_Grayscale4_T5.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class ThinkInk_213_Grayscale4_T5 : public Adafruit_IL0373 {
158158
: Adafruit_IL0373(212, 104, DC, RST, CS, SRCS, BUSY, spi){};
159159

160160
void begin(thinkinkmode_t mode = THINKINK_GRAYSCALE4) {
161-
Adafruit_EPD::begin(true);
161+
Adafruit_IL0373::begin(true);
162162
setColorBuffer(0, true); // layer 0 uninverted
163163
setBlackBuffer(1, true); // layer 1 uninverted
164164

@@ -191,11 +191,6 @@ class ThinkInk_213_Grayscale4_T5 : public Adafruit_IL0373 {
191191

192192
powerDown();
193193
}
194-
195-
thinkinkmode_t getMode(void) { return inkmode; }
196-
197-
private:
198-
thinkinkmode_t inkmode; // Ink mode passed to begin()
199194
};
200195

201196
#endif // _THINKINK_213_GRAYSCALE4_T5_H

src/panels/ThinkInk_270_Tricolor_C44.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ class ThinkInk_270_Tricolor_C44 : public Adafruit_IL91874 {
3131
powerDown();
3232
}
3333

34-
thinkinkmode_t getMode(void) { return inkmode; }
35-
36-
private:
37-
thinkinkmode_t inkmode; // Ink mode passed to begin()
3834
};
3935

4036
#endif // _THINKINK_270_TRICOLOR_C44_H

src/panels/ThinkInk_290_Grayscale4_T5.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class ThinkInk_290_Grayscale4_T5 : public Adafruit_IL0373 {
158158
: Adafruit_IL0373(296, 128, DC, RST, CS, SRCS, BUSY, spi){};
159159

160160
void begin(thinkinkmode_t mode = THINKINK_GRAYSCALE4) {
161-
Adafruit_EPD::begin(true);
161+
Adafruit_IL0373::begin(true);
162162
setColorBuffer(0, true); // layer 0 uninverted
163163
setBlackBuffer(1, true); // layer 1 uninverted
164164

@@ -192,10 +192,6 @@ class ThinkInk_290_Grayscale4_T5 : public Adafruit_IL0373 {
192192
powerDown();
193193
}
194194

195-
thinkinkmode_t getMode(void) { return inkmode; }
196-
197-
private:
198-
thinkinkmode_t inkmode; // Ink mode passed to begin()
199195
};
200196

201197
#endif // _THINKINK_290_GRAYSCALE4_T5_H

src/panels/ThinkInk_290_Tricolor_RH.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ class ThinkInk_290_Tricolor_RH : public Adafruit_SSD1680 {
99
ThinkInk_290_Tricolor_RH(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST,
1010
int8_t CS, int8_t SRCS, int8_t MISO,
1111
int8_t BUSY = -1)
12-
: Adafruit_SSD1680(250, 122, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
12+
: Adafruit_SSD1680(296, 128, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
1313

1414
ThinkInk_290_Tricolor_RH(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
1515
int8_t BUSY = -1, SPIClass *spi = &SPI)
16-
: Adafruit_SSD1680(250, 122, DC, RST, CS, SRCS, BUSY, spi){};
16+
: Adafruit_SSD1680(296, 128, DC, RST, CS, SRCS, BUSY, spi){};
1717

1818
void begin(thinkinkmode_t mode = THINKINK_TRICOLOR) {
1919
Adafruit_SSD1680::begin(true);

src/panels/ThinkInk_420_Mono_BN.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ThinkInk_420_Mono_BN : public Adafruit_SSD1619 {
1515
: Adafruit_SSD1619(300, 400, DC, RST, CS, SRCS, BUSY, spi){};
1616

1717
void begin(thinkinkmode_t mode = THINKINK_MONO) {
18-
Adafruit_EPD::begin(true);
18+
Adafruit_SSD1619::begin(true);
1919
setColorBuffer(0, true); // layer 0 uninverted
2020
setBlackBuffer(0, true); // only one buffer
2121

@@ -33,10 +33,6 @@ class ThinkInk_420_Mono_BN : public Adafruit_SSD1619 {
3333
powerDown();
3434
}
3535

36-
thinkinkmode_t getMode(void) { return inkmode; }
37-
38-
private:
39-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4036
};
4137

4238
#endif // _THINKINK_420_MONO_BN_H

src/panels/ThinkInk_420_Tricolor_RW.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ThinkInk_420_Tricolor_RW : public Adafruit_SSD1619 {
1616
: Adafruit_SSD1619(300, 400, DC, RST, CS, SRCS, BUSY, spi){};
1717

1818
void begin(thinkinkmode_t mode = THINKINK_TRICOLOR) {
19-
Adafruit_EPD::begin(true);
19+
Adafruit_SSD1619::begin(true);
2020
setBlackBuffer(0, true);
2121
setColorBuffer(1, false);
2222

@@ -33,11 +33,6 @@ class ThinkInk_420_Tricolor_RW : public Adafruit_SSD1619 {
3333
setRotation(1);
3434
powerDown();
3535
}
36-
37-
thinkinkmode_t getMode(void) { return inkmode; }
38-
39-
private:
40-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4136
};
4237

4338
#endif // _THINKINK_420_TRI

0 commit comments

Comments
 (0)