Merge pull request #40 from adafruit/fix_bufferlayers

Fix bufferlayers

Author: ladyada

examples/EPDTest/EPDTest.ino

@@ -16,22 +16,41 @@
 #define EPD_RESET   5 // can set to -1 and share with microcontroller Reset!
 #define EPD_BUSY    7 // can set to -1 to not use a pin (will wait a fixed delay)
 
-/* Uncomment the following line if you are using 1.54" tricolor EPD */
+// Uncomment the following line if you are using 1.54" EPD with IL0373
 //Adafruit_IL0373 display(152, 152, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
-
-/* Uncomment the following line if you are using 1.54" monochrome EPD */
+// Uncomment the following line if you are using 1.54" EPD with SSD1680
+//Adafruit_SSD1680 display(152, 152, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+// Uncomment the following line if you are using 1.54" EPD with SSD1608
 //Adafruit_SSD1608 display(200, 200, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+// Uncomment the following line if you are using 1.54" EPD with SSD1681
+//Adafruit_SSD1681 display(200, 200, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+// Uncomment the following line if you are using 1.54" EPD with UC8151D
+Adafruit_UC8151D display(152, 152, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
-/* Uncomment the following line if you are using 2.13" tricolor EPD */
-Adafruit_IL0373 display(212, 104, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
-//#define FLEXIBLE_213
 
-/* Uncomment the following line if you are using 2.13" monochrome 250*122 EPD */
+//Uncomment the following line if you are using 2.13" EPD with SSD1680
+//Adafruit_SSD1680 display(250, 122, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// Uncomment the following line if you are using 2.13" EPD with SSD1675
 //Adafruit_SSD1675 display(250, 122, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
+// Uncomment the following line if you are using 2.13" EPD with SSD1675B
+//Adafruit_SSD1675B display(250, 122, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// Uncomment the following line if you are using 2.13" EPD with UC8151D
+//Adafruit_UC8151D display(212, 104, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+//Uncomment the following line if you are using 2.13" EPD with IL0373
+//Adafruit_IL0373 display(212, 104, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+//#define FLEXIBLE_213
+
+
 /* Uncomment the following line if you are using 2.7" tricolor or grayscale EPD */
 //Adafruit_IL91874 display(264, 176, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS);
 
+// 2.7" tricolor with Adafruit_EK79686
+//Adafruit_EK79686 display(264, 176, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS);
+
 /* Uncomment the following line if you are using 2.9" EPD */
 //Adafruit_IL0373 display(296, 128, EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 //#define FLEXIBLE_290

examples/ThinkInk_mono/ThinkInk_mono.ino

@@ -15,12 +15,16 @@
 #define EPD_RESET   8 // can set to -1 and share with microcontroller Reset!
 #define EPD_BUSY    7 // can set to -1 to not use a pin (will wait a fixed delay)
 
+// 1.54" Monochrome displays with 200x200 pixels and SSD1681 chipset
 //ThinkInk_154_Mono_D67 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// 1.54" Monochrome displays with 200x200 pixels and SSD1608 chipset
 //ThinkInk_154_Mono_D27 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
 // 1.54" Monochrome displays with 152x152 pixels and UC8151D chipset
 //ThinkInk_154_Mono_M10 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
+
 // 2.13" Monochrome displays with 250x122 pixels and SSD1675 chipset
 ThinkInk_213_Mono_B72 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
@@ -33,6 +37,7 @@ ThinkInk_213_Mono_B72 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 // 2.13" Monochrome displays with 212x104 pixels and UC8151D chipset
 //ThinkInk_213_Mono_M21 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
+
 // 2.9" 4-level Grayscale (use mono) displays with 296x128 pixels and IL0373 chipset
 //ThinkInk_290_Grayscale4_T5 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 

examples/ThinkInk_tricolor/ThinkInk_tricolor.ino

@@ -15,9 +15,16 @@
 #define SRAM_CS     6  // can set to -1 to not use a pin (uses a lot of RAM!)
 #define EPD_RESET   8  // can set to -1 and share with chip Reset (can't deep sleep)
 
+// 1.54" Tricolor EPD with SSD1680 chipset
 //ThinkInk_154_Tricolor_Z17 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// 1.54" Tricolor EPD with SSD1680 chipset
 //ThinkInk_154_Tricolor_RW display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// 2.13" Tricolor EPD with SSD1680 chipset
 //ThinkInk_213_Tricolor_RW display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// 2.13" Tricolor EPD with IL0373 chipset
 //ThinkInk_213_Tricolor_Z16 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
 // 2.7" Tricolor Featherwing or Breakout with IL91874 chipset

src/Adafruit_ThinkInk.h

@@ -9,11 +9,13 @@
 #include "panels/ThinkInk_213_Tricolor_Z16.h"
 #include "panels/ThinkInk_270_Tricolor_C44.h"
 #include "panels/ThinkInk_270_Tricolor_Z70.h"
+#include "panels/ThinkInk_290_Tricolor_RH.h"
 #include "panels/ThinkInk_290_Tricolor_Z10.h"
 #include "panels/ThinkInk_420_Tricolor_RW.h"
 
 #include "panels/ThinkInk_154_Grayscale4_T8.h"
 #include "panels/ThinkInk_213_Grayscale4_T5.h"
+#include "panels/ThinkInk_270_Grayscale4_W3.h"
 #include "panels/ThinkInk_290_Grayscale4_T5.h"
 
 #include "panels/ThinkInk_154_Mono_D27.h"
@@ -23,6 +25,7 @@
 #include "panels/ThinkInk_213_Mono_B73.h"
 #include "panels/ThinkInk_213_Mono_BN.h"
 #include "panels/ThinkInk_213_Mono_M21.h"
+#include "panels/ThinkInk_290_Mono_BN.h"
 #include "panels/ThinkInk_290_Mono_M06.h"
 #include "panels/ThinkInk_420_Mono_BN.h"
 

src/drivers/Adafruit_EK79686.cpp

@@ -125,8 +125,8 @@ void Adafruit_EK79686::busy_wait(void) {
 /**************************************************************************/
 void Adafruit_EK79686::begin(bool reset) {
   Adafruit_EPD::begin(reset);
-  setBlackBuffer(1, true);  // black defaults to inverted
-  setColorBuffer(0, false); // red defaults to not-inverted
+  setBlackBuffer(0, true);  // black defaults to inverted
+  setColorBuffer(1, false); // red defaults to not-inverted
 
   powerDown();
 }

src/panels/ThinkInk_154_Grayscale4_T8.h

@@ -158,7 +158,7 @@ class ThinkInk_154_Grayscale4_T8 : public Adafruit_IL0373 {
       : Adafruit_IL0373(152, 152, DC, RST, CS, SRCS, BUSY, spi){};
 
   void begin(thinkinkmode_t mode = THINKINK_GRAYSCALE4) {
-    Adafruit_EPD::begin(true);
+    Adafruit_IL0373::begin(true);
     setColorBuffer(0, true); // layer 0 uninverted
     setBlackBuffer(1, true); // layer 1 uninverted
 
@@ -191,11 +191,6 @@ class ThinkInk_154_Grayscale4_T8 : public Adafruit_IL0373 {
     setRotation(3);
     powerDown();
   }
-
-  thinkinkmode_t getMode(void) { return inkmode; }
-
-private:
-  thinkinkmode_t inkmode; // Ink mode passed to begin()
 };
 
 #endif // _THINKINK_154_GRAYSCALE4_T8_H

src/panels/ThinkInk_154_Mono_D27.h

@@ -15,7 +15,7 @@ class ThinkInk_154_Mono_D27 : public Adafruit_SSD1608 {
       : Adafruit_SSD1608(200, 200, DC, RST, CS, SRCS, BUSY, spi){};
 
   void begin(thinkinkmode_t mode = THINKINK_MONO) {
-    Adafruit_EPD::begin(true);
+    Adafruit_SSD1608::begin(true);
     setColorBuffer(0, true); // layer 0 uninverted
     setBlackBuffer(0, true); // only one buffer
 
@@ -32,11 +32,6 @@ class ThinkInk_154_Mono_D27 : public Adafruit_SSD1608 {
     setRotation(3);
     powerDown();
   }
-
-  thinkinkmode_t getMode(void) { return inkmode; }
-
-private:
-  thinkinkmode_t inkmode; // Ink mode passed to begin()
 };
 
 #endif // _THINKINK_154_MONO_D27_H

src/panels/ThinkInk_154_Mono_D67.h

@@ -15,7 +15,7 @@ class ThinkInk_154_Mono_D67 : public Adafruit_SSD1681 {
       : Adafruit_SSD1681(200, 200, DC, RST, CS, SRCS, BUSY, spi){};
 
   void begin(thinkinkmode_t mode = THINKINK_MONO) {
-    Adafruit_EPD::begin(true);
+    Adafruit_SSD1681::begin(true);
     setColorBuffer(0, true); // layer 0 uninverted
     setBlackBuffer(0, true); // only one buffer
 
@@ -32,11 +32,6 @@ class ThinkInk_154_Mono_D67 : public Adafruit_SSD1681 {
     setRotation(3);
     powerDown();
   }
-
-  thinkinkmode_t getMode(void) { return inkmode; }
-
-private:
-  thinkinkmode_t inkmode; // Ink mode passed to begin()
 };
 
 #endif // _THINKINK_154_MONO_D67_H

src/panels/ThinkInk_154_Mono_M10.h

@@ -15,7 +15,7 @@ class ThinkInk_154_Mono_M10 : public Adafruit_UC8151D {
       : Adafruit_UC8151D(152, 152, DC, RST, CS, SRCS, BUSY, spi){};
 
   void begin(thinkinkmode_t mode = THINKINK_MONO) {
-    Adafruit_EPD::begin(true);
+    Adafruit_UC8151D::begin(true);
     setColorBuffer(1, true); // layer 1 uninverted
     setBlackBuffer(1, true); // only one buffer
 
@@ -32,11 +32,6 @@ class ThinkInk_154_Mono_M10 : public Adafruit_UC8151D {
     setRotation(1);
     powerDown();
   }
-
-  thinkinkmode_t getMode(void) { return inkmode; }
-
-private:
-  thinkinkmode_t inkmode; // Ink mode passed to begin()
 };
 
 #endif // _THINKINK_154_MONO_M10_H

src/panels/ThinkInk_154_Tricolor_RW.h

@@ -16,9 +16,7 @@ class ThinkInk_154_Tricolor_RW : public Adafruit_SSD1680 {
       : Adafruit_SSD1680(152, 152, DC, RST, CS, SRCS, BUSY, spi){};
 
   void begin(thinkinkmode_t mode = THINKINK_MONO) {
-    Adafruit_EPD::begin(true);
-    setBlackBuffer(0, true);
-    setColorBuffer(1, false);
+    Adafruit_SSD1680::begin(true);
 
     inkmode = mode; // Preserve ink mode for ImageReader or others
 
@@ -33,11 +31,6 @@ class ThinkInk_154_Tricolor_RW : public Adafruit_SSD1680 {
     setRotation(3);
     powerDown();
   }
-
-  thinkinkmode_t getMode(void) { return inkmode; }
-
-private:
-  thinkinkmode_t inkmode; // Ink mode passed to begin()
 };
 
 #endif // _THINKINK_154_TRI