Merge branch 'master' into morepanels

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_gray4/ThinkInk_gray4.ino

@@ -13,7 +13,7 @@
 #define EPD_CS      9  // can be any pin, but required!
 #define EPD_BUSY    7  // can set to -1 to not use a pin (will wait a fixed delay)
 #define SRAM_CS     6  // can set to -1 to not use a pin (uses a lot of RAM!)
-#define EPD_RESET   5  // can set to -1 and share with chip Reset (can't deep sleep)
+#define EPD_RESET   8  // can set to -1 and share with chip Reset (can't deep sleep)
 
 //ThinkInk_154_Grayscale4_T8 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 //ThinkInk_213_Grayscale4_T5 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);

examples/ThinkInk_mono/ThinkInk_mono.ino

@@ -12,16 +12,40 @@
 #define EPD_CS      9
 #define EPD_DC      10
 #define SRAM_CS     6
-#define EPD_RESET   5 // can set to -1 and share with microcontroller Reset!
+#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);
-//ThinkInk_213_Mono_B72 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);
+
+// 2.13" Monochrome displays with 250x122 pixels and SSD1675B chipset
 //ThinkInk_213_Mono_B73 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);
+
+// 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);
-ThinkInk_290_Grayscale4_T5 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 
 void setup() {
   Serial.begin(115200);
@@ -76,4 +100,4 @@ void testdrawtext(char *text, uint16_t color) {
   display.setTextColor(color);
   display.setTextWrap(true);
   display.print(text);
-}
+}

examples/ThinkInk_partial/ThinkInk_partial.ino

@@ -12,7 +12,7 @@
 #define EPD_CS      9
 #define EPD_DC      10
 #define SRAM_CS     6
-#define EPD_RESET   5 // can set to -1 and share with microcontroller Reset!
+#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)
 
 //ThinkInk_290_Grayscale4_T5 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);

examples/ThinkInk_tricolor/ThinkInk_tricolor.ino

@@ -13,15 +13,29 @@
 #define EPD_CS      9  // can be any pin, but required!
 #define EPD_BUSY    7  // can set to -1 to not use a pin (will wait a fixed delay)
 #define SRAM_CS     6  // can set to -1 to not use a pin (uses a lot of RAM!)
-#define EPD_RESET   5  // can set to -1 and share with chip Reset (can't deep sleep)
+#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
 //ThinkInk_270_Tricolor_C44 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
+// 2.7" Tricolor Featherwing or Breakout with EK79686 chipset
+//ThinkInk_270_Tricolor_Z70 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
 // 2.9" Tricolor Featherwing or Breakout:
 ThinkInk_290_Tricolor_Z10 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+
 //ThinkInk_420_Tricolor_RW display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 //ThinkInk_420_Tricolor_Z21 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit EPD
-version=4.0.1
+version=4.0.5
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=ePaper display driver

src/Adafruit_EPD.cpp

@@ -281,6 +281,61 @@ void Adafruit_EPD::drawPixel(int16_t x, int16_t y, uint16_t color) {
   }
 }
 
+void Adafruit_EPD::writeRAMFramebufferToEPD(uint8_t *framebuffer,
+                                            uint32_t framebuffer_size,
+                                            uint8_t EPDlocation,
+                                            bool invertdata) {
+  // write image
+  writeRAMCommand(EPDlocation);
+  dcHigh();
+  // Serial.printf("Writing from RAM location %04x: \n", &framebuffer);
+
+  for (uint16_t i = 0; i < framebuffer_size; i++) {
+    uint8_t d = framebuffer[i];
+    if (invertdata)
+      d = ~d;
+
+    /*
+    Serial.printf("%02x", d);
+    if ((i+1) % (WIDTH/8) == 0)
+      Serial.println();
+    */
+
+    SPItransfer(d);
+  }
+  //  Serial.println();
+  csHigh();
+  return;
+}
+
+void Adafruit_EPD::writeSRAMFramebufferToEPD(uint16_t SRAM_buffer_addr,
+                                             uint32_t buffer_size,
+                                             uint8_t EPDlocation,
+                                             bool invertdata) {
+  uint8_t c;
+
+  // use SRAM
+  sram.csLow();
+  // send read command
+  SPItransfer(MCPSRAM_READ);
+  // send address
+  SPItransfer(SRAM_buffer_addr >> 8);
+  SPItransfer(SRAM_buffer_addr & 0xFF);
+
+  // first data byte from SRAM will be transfered in at the same time
+  // as the EPD command is transferred out
+  c = writeRAMCommand(EPDlocation);
+
+  dcHigh();
+  for (uint16_t i = 0; i < buffer_size; i++) {
+    c = SPItransfer(c);
+    // Serial.print("0x"); Serial.print((byte)c, HEX); Serial.print(", ");
+    // if (i % 32 == 31) Serial.println();
+  }
+  csHigh();
+  sram.csHigh();
+}
+
 /**************************************************************************/
 /*!
     @brief Transfer the data stored in the buffer(s) to the display
@@ -303,78 +358,30 @@ void Adafruit_EPD::display(bool sleep) {
   setRAMAddress(0, 0);
 
   if (use_sram) {
-    sram.csLow();
-    // send read command
-    SPItransfer(MCPSRAM_READ);
-    // send address
-    SPItransfer(buffer1_addr >> 8);
-    SPItransfer(buffer1_addr & 0xFF);
-
-    // first data byte from SRAM will be transfered in at the same time
-    // as the EPD command is transferred out
-    c = writeRAMCommand(0);
-
-    dcHigh();
-    for (uint16_t i = 0; i < buffer1_size; i++) {
-      c = SPItransfer(c);
-      // Serial.print("0x"); Serial.print((byte)c, HEX); Serial.print(", ");
-      // if (i % 32 == 31) Serial.println();
-    }
-    csHigh();
-    sram.csHigh();
+    writeSRAMFramebufferToEPD(buffer1_addr, buffer1_size, 0);
   } else {
-    // write image
-    writeRAMCommand(0);
-    dcHigh();
-    for (uint16_t i = 0; i < buffer1_size; i++) {
-      SPItransfer(buffer1[i]);
-    }
-    csHigh();
+    writeRAMFramebufferToEPD(buffer1, buffer1_size, 0);
   }
 
-  if (buffer2_size == 0) {
-    update();
-    return;
-  }
-
-  // oh there's another buffer eh?
-  delay(2);
+  if (buffer2_size != 0) {
+    // oh there's another buffer eh?
+    delay(2);
 
-  // Set X & Y ram counters
-  setRAMAddress(0, 0);
+    // Set X & Y ram counters
+    setRAMAddress(0, 0);
 
-  if (use_sram) {
-    sram.csLow();
-    // send read command
-    SPItransfer(MCPSRAM_READ);
-    // send address
-    SPItransfer(buffer2_addr >> 8);
-    SPItransfer(buffer2_addr & 0xFF);
-
-    // first data byte from SRAM will be transfered in at the same time
-    // as the EPD command is transferred out
-    c = writeRAMCommand(1);
-
-    dcHigh();
-    for (uint16_t i = 0; i < buffer2_size; i++) {
-      c = SPItransfer(c);
-    }
-    csHigh();
-    sram.csHigh();
-  } else {
-    writeRAMCommand(1);
-    dcHigh();
-
-    for (uint16_t i = 0; i < buffer2_size; i++) {
-      SPItransfer(buffer2[i]);
+    if (use_sram) {
+      writeSRAMFramebufferToEPD(buffer2_addr, buffer2_size, 1);
+    } else {
+      writeRAMFramebufferToEPD(buffer2, buffer2_size, 1);
     }
-    csHigh();
   }
 
 #ifdef EPD_DEBUG
   Serial.println("  Update");
 #endif
   update();
+  partialsSinceLastFullUpdate = 0;
 
   if (sleep) {
 #ifdef EPD_DEBUG
@@ -441,33 +448,29 @@ void Adafruit_EPD::setColorBuffer(int8_t index, bool inverted) {
 /**************************************************************************/
 void Adafruit_EPD::clearBuffer() {
   if (use_sram) {
-    if (buffer1_size != 0) {
-      if (blackInverted) {
-        sram.erase(buffer1_addr, buffer1_size, 0xFF);
-      } else {
-        sram.erase(buffer1_addr, buffer1_size, 0x00);
-      }
+    if (blackInverted) {
+      sram.erase(blackbuffer_addr, buffer1_size, 0xFF);
+    } else {
+      sram.erase(blackbuffer_addr, buffer1_size, 0x00);
     }
-    if (buffer2_size != 0) {
-      if (colorInverted) {
-        sram.erase(buffer2_addr, buffer2_size, 0xFF);
-      } else {
-        sram.erase(buffer2_addr, buffer2_size, 0x00);
-      }
+    if (colorInverted) {
+      sram.erase(colorbuffer_addr, buffer2_size, 0xFF);
+    } else {
+      sram.erase(colorbuffer_addr, buffer2_size, 0x00);
     }
   } else {
-    if (buffer1) {
+    if (black_buffer) {
       if (blackInverted) {
-        memset(buffer1, 0xFF, buffer1_size);
+        memset(black_buffer, 0xFF, buffer1_size);
       } else {
-        memset(buffer1, 0x00, buffer1_size);
+        memset(black_buffer, 0x00, buffer1_size);
       }
     }
-    if (buffer2) {
+    if (color_buffer) {
       if (colorInverted) {
-        memset(buffer2, 0xFF, buffer2_size);
+        memset(color_buffer, 0xFF, buffer2_size);
       } else {
-        memset(buffer2, 0x00, buffer2_size);
+        memset(color_buffer, 0x00, buffer2_size);
       }
     }
   }
@@ -493,9 +496,9 @@ void Adafruit_EPD::EPD_commandList(const uint8_t *init_code) {
   uint8_t buf[64];
 
   while (init_code[0] != 0xFE) {
-    char cmd = init_code[0];
+    uint8_t cmd = init_code[0];
     init_code++;
-    int num_args = init_code[0];
+    uint8_t num_args = init_code[0];
     init_code++;
     if (cmd == 0xFF) {
       busy_wait();