really fix busywait, add two more size variants

Author: ladyada

examples/ThinkInk_mono/ThinkInk_mono.ino

@@ -18,6 +18,9 @@
 //ThinkInk_154_Mono_D67 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 //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);
 
@@ -27,11 +30,14 @@ ThinkInk_213_Mono_B72 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 // 2.13" Monochrome displays with 250x122 pixels and SSD1680 chipset
 //ThinkInk_213_Mono_BN 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);
 
 // 2.9" Monochrome displays with 296x128 pixels and UC8151D chipset
-ThinkInk_290_Mono_M06 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+//ThinkInk_290_Mono_M06 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
 // 4.2" Monochrome displays with 400x300 pixels and SSD1619 chipset
 //ThinkInk_420_Mono_BN display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);

src/Adafruit_ThinkInk.h

@@ -23,9 +23,11 @@ typedef enum {
 
 #include "panels/ThinkInk_154_Mono_D27.h"
 #include "panels/ThinkInk_154_Mono_D67.h"
+#include "panels/ThinkInk_154_Mono_M10.h"
 #include "panels/ThinkInk_213_Mono_B72.h"
 #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_M06.h"
 #include "panels/ThinkInk_420_Mono_BN.h"
 

src/drivers/Adafruit_UC8151D.cpp

@@ -99,17 +99,14 @@ Adafruit_UC8151D::Adafruit_UC8151D(int width, int height, int8_t DC, int8_t RST,
 */
 /**************************************************************************/
 void Adafruit_UC8151D::busy_wait(void) {
-  Serial.print("Waiting...");
   if (_busy_pin >= 0) {
-    EPD_command(UC8151D_FLG);
-
-    if (digitalRead(_busy_pin)) { 
+    do {
+      EPD_command(UC8151D_FLG);
       delay(10);
-    }
+    } while (!digitalRead(_busy_pin));
   } else {
     delay(BUSY_WAIT);
   }
-  Serial.println("OK!");
 }
 
 /**************************************************************************/

src/panels/ThinkInk_154_Mono_M10.h

@@ -0,0 +1,42 @@
+#ifndef _THINKINK_154_MONO_M10_H
+#define _THINKINK_154_MONO_M10_H
+
+// This file is #included by Adafruit_ThinkInk.h and does not need to
+// #include anything else to pick up the EPD header or ink mode enum.
+
+class ThinkInk_154_Mono_M10 : public Adafruit_UC8151D {
+public:
+  ThinkInk_154_Mono_M10(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST,
+                        int8_t CS, int8_t SRCS, int8_t MISO, int8_t BUSY = -1)
+      : Adafruit_UC8151D(152, 152, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
+
+  ThinkInk_154_Mono_M10(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
+                        int8_t BUSY = -1, SPIClass *spi = &SPI)
+      : Adafruit_UC8151D(152, 152, DC, RST, CS, SRCS, BUSY, spi){};
+
+  void begin(thinkinkmode_t mode = THINKINK_MONO) {
+    Adafruit_EPD::begin(true);
+    setColorBuffer(1, true); // layer 1 uninverted
+    setBlackBuffer(1, true); // only one buffer
+
+    inkmode = mode; // Preserve ink mode for ImageReader or others
+
+    layer_colors[EPD_WHITE] = 0b00;
+    layer_colors[EPD_BLACK] = 0b01;
+    layer_colors[EPD_RED] = 0b01;
+    layer_colors[EPD_GRAY] = 0b01;
+    layer_colors[EPD_LIGHT] = 0b00;
+    layer_colors[EPD_DARK] = 0b01;
+
+    default_refresh_delay = 1000;
+    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_213_Mono_M21.h

@@ -0,0 +1,42 @@
+#ifndef _THINKINK_213_MONO_M21_H
+#define _THINKINK_213_MONO_M21_H
+
+// This file is #included by Adafruit_ThinkInk.h and does not need to
+// #include anything else to pick up the EPD header or ink mode enum.
+
+class ThinkInk_213_Mono_M21 : public Adafruit_UC8151D {
+public:
+  ThinkInk_213_Mono_M21(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST,
+                        int8_t CS, int8_t SRCS, int8_t MISO, int8_t BUSY = -1)
+      : Adafruit_UC8151D(212, 104, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
+
+  ThinkInk_213_Mono_M21(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
+                        int8_t BUSY = -1, SPIClass *spi = &SPI)
+      : Adafruit_UC8151D(212, 104, DC, RST, CS, SRCS, BUSY, spi){};
+
+  void begin(thinkinkmode_t mode = THINKINK_MONO) {
+    Adafruit_EPD::begin(true);
+    setColorBuffer(1, true); // layer 1 uninverted
+    setBlackBuffer(1, true); // only one buffer
+
+    inkmode = mode; // Preserve ink mode for ImageReader or others
+
+    layer_colors[EPD_WHITE] = 0b00;
+    layer_colors[EPD_BLACK] = 0b01;
+    layer_colors[EPD_RED] = 0b01;
+    layer_colors[EPD_GRAY] = 0b01;
+    layer_colors[EPD_LIGHT] = 0b00;
+    layer_colors[EPD_DARK] = 0b01;
+
+    default_refresh_delay = 1000;
+    setRotation(0);
+    powerDown();
+  }
+
+  thinkinkmode_t getMode(void) { return inkmode; }
+
+private:
+  thinkinkmode_t inkmode; // Ink mode passed to begin()
+};
+
+#endif // _THINKINK_213_MONO_M21_H