Merge pull request #39 from adafruit/partial_uc

Partial uc

Author: ladyada

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);
       }
     }
   }

src/Adafruit_EPD.h

@@ -20,7 +20,7 @@
 #ifndef _ADAFRUIT_EPD_H_
 #define _ADAFRUIT_EPD_H_
 
-#define EPD_DEBUG
+//#define EPD_DEBUG
 
 #define RAMBUFSIZE 64 ///< size of the ram buffer
 
@@ -43,6 +43,13 @@ enum {
   EPD_NUM_COLORS
 };
 
+typedef enum {
+  THINKINK_MONO,
+  THINKINK_TRICOLOR,
+  THINKINK_GRAYSCALE4,
+  THINKINK_MONO_PARTIAL,
+} thinkinkmode_t;
+
 #define EPD_swap(a, b)                                                         \
   {                                                                            \
     int16_t t = a;                                                             \
@@ -72,7 +79,15 @@ class Adafruit_EPD : public Adafruit_GFX {
   void setColorBuffer(int8_t index, bool inverted);
   void display(bool sleep = false);
 
+  thinkinkmode_t getMode(void) { return inkmode; }
+
 protected:
+  void writeRAMFramebufferToEPD(uint8_t *buffer, uint32_t buffer_size,
+                                uint8_t EPDlocation, bool invertdata = false);
+  void writeSRAMFramebufferToEPD(uint16_t SRAM_buffer_addr,
+                                 uint32_t buffer_size, uint8_t EPDlocation,
+                                 bool invertdata = false);
+
   /**************************************************************************/
   /*!
     @brief Send the specific command to start writing to EPD display RAM
@@ -164,6 +179,10 @@ class Adafruit_EPD : public Adafruit_GFX {
 
   bool use_sram; ///< true if we are using an SRAM chip as a framebuffer
 
+  thinkinkmode_t inkmode; // Ink mode passed to begin()
+
+  uint8_t partialsSinceLastFullUpdate = 0;
+
 #if defined(BUSIO_USE_FAST_PINIO)
   BusIO_PortReg *csPort, *dcPort;
   BusIO_PortMask csPinMask, dcPinMask;

src/Adafruit_ThinkInk.h

@@ -3,12 +3,6 @@
 
 #include "Adafruit_EPD.h"
 
-typedef enum {
-  THINKINK_MONO,
-  THINKINK_TRICOLOR,
-  THINKINK_GRAYSCALE4,
-} thinkinkmode_t;
-
 #include "panels/ThinkInk_154_Tricolor_RW.h"
 #include "panels/ThinkInk_154_Tricolor_Z17.h"
 #include "panels/ThinkInk_213_Tricolor_RW.h"