Skip to content

Commit 18f4682

Browse files
ladyadaladyada
committed
test & fix all 2.13
1 parent 7c61b9d commit 18f4682

File tree

10 files changed

+33
-47
lines changed

10 files changed

+33
-47
lines changed

‎examples/EPDTest/EPDTest.ino

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,27 @@
2424
//Adafruit_SSD1608 display(200, 200, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
2525
// Uncomment the following line if you are using 1.54" EPD with SSD1681
2626
//Adafruit_SSD1681 display(200, 200, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
27+
// Uncomment the following line if you are using 1.54" EPD with UC8151D
28+
Adafruit_UC8151D display(152, 152, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
2729

2830

29-
/* Uncomment the following line if you are using 2.13" tricolor EPD */
30-
Adafruit_IL0373 display(212, 104, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
31-
//#define FLEXIBLE_213
31+
//Uncomment the following line if you are using 2.13" EPD with SSD1680
32+
//Adafruit_SSD1680 display(250, 122, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
3233

33-
/* Uncomment the following line if you are using 2.13" monochrome 250*122 EPD */
34+
// Uncomment the following line if you are using 2.13" EPD with SSD1675
3435
//Adafruit_SSD1675 display(250, 122, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
3536

37+
// Uncomment the following line if you are using 2.13" EPD with SSD1675B
38+
//Adafruit_SSD1675B display(250, 122, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
39+
40+
// Uncomment the following line if you are using 2.13" EPD with UC8151D
41+
//Adafruit_UC8151D display(212, 104, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
42+
43+
//Uncomment the following line if you are using 2.13" EPD with IL0373
44+
//Adafruit_IL0373 display(212, 104, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
45+
//#define FLEXIBLE_213
46+
47+
3648
/* Uncomment the following line if you are using 2.7" tricolor or grayscale EPD */
3749
//Adafruit_IL91874 display(264, 176, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS);
3850

‎examples/ThinkInk_mono/ThinkInk_mono.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
// 1.54" Monochrome displays with 152x152 pixels and UC8151D chipset
2525
//ThinkInk_154_Mono_M10 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
2626

27+
2728
// 2.13" Monochrome displays with 250x122 pixels and SSD1675 chipset
2829
ThinkInk_213_Mono_B72 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
2930

@@ -36,6 +37,7 @@ ThinkInk_213_Mono_B72 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
3637
// 2.13" Monochrome displays with 212x104 pixels and UC8151D chipset
3738
//ThinkInk_213_Mono_M21 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
3839

40+
3941
// 2.9" 4-level Grayscale (use mono) displays with 296x128 pixels and IL0373 chipset
4042
//ThinkInk_290_Grayscale4_T5 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
4143

‎examples/ThinkInk_tricolor/ThinkInk_tricolor.ino

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,16 @@
1515
#define SRAM_CS 6 // can set to -1 to not use a pin (uses a lot of RAM!)
1616
#define EPD_RESET 8 // can set to -1 and share with chip Reset (can't deep sleep)
1717

18+
// 1.54" Tricolor EPD with SSD1680 chipset
1819
//ThinkInk_154_Tricolor_Z17 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
20+
21+
// 1.54" Tricolor EPD with SSD1680 chipset
1922
//ThinkInk_154_Tricolor_RW display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
23+
24+
// 2.13" Tricolor EPD with SSD1680 chipset
2025
//ThinkInk_213_Tricolor_RW display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
26+
27+
// 2.13" Tricolor EPD with IL0373 chipset
2128
//ThinkInk_213_Tricolor_Z16 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
2229

2330
// 2.7" Tricolor Featherwing or Breakout with IL91874 chipset

‎src/panels/ThinkInk_154_Mono_M10.h

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

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

@@ -32,11 +32,6 @@ class ThinkInk_154_Mono_M10 : public Adafruit_UC8151D {
3232
setRotation(1);
3333
powerDown();
3434
}
35-
36-
thinkinkmode_t getMode(void) { return inkmode; }
37-
38-
private:
39-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4035
};
4136

4237
#endif // _THINKINK_154_MONO_M10_H

‎src/panels/ThinkInk_213_Mono_B72.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ThinkInk_213_Mono_B72 : public Adafruit_SSD1675 {
1515
: Adafruit_SSD1675(250, 122, DC, RST, CS, SRCS, BUSY, spi){};
1616

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

@@ -32,11 +32,6 @@ class ThinkInk_213_Mono_B72 : public Adafruit_SSD1675 {
3232
setRotation(0);
3333
powerDown();
3434
}
35-
36-
thinkinkmode_t getMode(void) { return inkmode; }
37-
38-
private:
39-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4035
};
4136

4237
#endif // _THINKINK_213_MONO_B72_H

‎src/panels/ThinkInk_213_Mono_B73.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ThinkInk_213_Mono_B73 : public Adafruit_SSD1675B {
1515
: Adafruit_SSD1675B(250, 122, DC, RST, CS, SRCS, BUSY, spi){};
1616

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

@@ -32,11 +32,6 @@ class ThinkInk_213_Mono_B73 : public Adafruit_SSD1675B {
3232
setRotation(0);
3333
powerDown();
3434
}
35-
36-
thinkinkmode_t getMode(void) { return inkmode; }
37-
38-
private:
39-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4035
};
4136

4237
#endif // _THINKINK_213_MONO_B73_H

‎src/panels/ThinkInk_213_Mono_BN.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ThinkInk_213_Mono_BN : public Adafruit_SSD1680 {
1515
: Adafruit_SSD1680(250, 122, DC, RST, CS, SRCS, BUSY, spi){};
1616

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

@@ -32,11 +32,6 @@ class ThinkInk_213_Mono_BN : public Adafruit_SSD1680 {
3232
setRotation(0);
3333
powerDown();
3434
}
35-
36-
thinkinkmode_t getMode(void) { return inkmode; }
37-
38-
private:
39-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4035
};
4136

4237
#endif // _THINKINK_213_MONO_BN_H

‎src/panels/ThinkInk_213_Mono_M21.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ThinkInk_213_Mono_M21 : public Adafruit_UC8151D {
1515
: Adafruit_UC8151D(212, 104, DC, RST, CS, SRCS, BUSY, spi){};
1616

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

@@ -32,11 +32,6 @@ class ThinkInk_213_Mono_M21 : public Adafruit_UC8151D {
3232
setRotation(0);
3333
powerDown();
3434
}
35-
36-
thinkinkmode_t getMode(void) { return inkmode; }
37-
38-
private:
39-
thinkinkmode_t inkmode; // Ink mode passed to begin()
4035
};
4136

4237
#endif // _THINKINK_213_MONO_M21_H

‎src/panels/ThinkInk_213_Tricolor_RW.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class ThinkInk_213_Tricolor_RW : public Adafruit_SSD1680 {
1515
int8_t BUSY = -1, SPIClass *spi = &SPI)
1616
: Adafruit_SSD1680(250, 122, DC, RST, CS, SRCS, BUSY, spi){};
1717

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

@@ -33,11 +33,6 @@ class ThinkInk_213_Tricolor_RW : public Adafruit_SSD1680 {
3333
setRotation(0);
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_213_TRI

‎src/panels/ThinkInk_213_Tricolor_Z16.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ThinkInk_213_Tricolor_Z16 : public Adafruit_IL0373 {
1616
: Adafruit_IL0373(212, 104, 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

@@ -33,11 +33,6 @@ class ThinkInk_213_Tricolor_Z16 : public Adafruit_IL0373 {
3333

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_213_TRICOLOR_Z16_H

0 commit comments

Comments
 (0)