Merge pull request #66 from adafruit/z29tricolor

Z29tricolor

Author: ladyada

examples/ThinkInk_tricolor/ThinkInk_tricolor.ino

@@ -40,6 +40,8 @@
 ThinkInk_290_Tricolor_Z10 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
 // 2.9" Tricolor Featherwing or Breakout with UC8151D chipset
 //ThinkInk_290_Tricolor_Z13 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);
+// 2.9" Tricolor Featherwing or Breakout with SSD1680 chipset and negative offset
+//ThinkInk_290_Tricolor_Z94 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);

src/Adafruit_ThinkInk.h

@@ -13,6 +13,7 @@
 #include "panels/ThinkInk_290_Tricolor_RH.h"
 #include "panels/ThinkInk_290_Tricolor_Z10.h"
 #include "panels/ThinkInk_290_Tricolor_Z13.h"
+#include "panels/ThinkInk_290_Tricolor_Z94.h"
 #include "panels/ThinkInk_420_Tricolor_RW.h"
 #include "panels/ThinkInk_420_Tricolor_Z21.h"
 

src/drivers/Adafruit_SSD1680.cpp

@@ -175,8 +175,8 @@ void Adafruit_SSD1680::powerUp() {
   }
 
   // Set ram X start/end postion
-  buf[0] = 0x01;
-  buf[1] = height / 8;
+  buf[0] = _xram_offset;
+  buf[1] = height / 8 - 1 + _xram_offset;
   EPD_command(SSD1680_SET_RAMXPOS, buf, 2);
 
   // Set ram Y start/end postion
@@ -252,7 +252,7 @@ void Adafruit_SSD1680::setRAMAddress(uint16_t x, uint16_t y) {
   uint8_t buf[2];
 
   // set RAM x address count
-  buf[0] = 1;
+  buf[0] = _xram_offset;
   EPD_command(SSD1680_SET_RAMXCOUNT, buf, 1);
 
   // set RAM y address count

src/drivers/Adafruit_SSD1680.h

@@ -53,6 +53,8 @@ class Adafruit_SSD1680 : public Adafruit_EPD {
   uint8_t writeRAMCommand(uint8_t index);
   void setRAMAddress(uint16_t x, uint16_t y);
   void busy_wait();
+
+  int8_t _xram_offset = 1;
 };
 
 #endif

src/panels/ThinkInk_290_Tricolor_Z94.h

@@ -0,0 +1,40 @@
+#ifndef _THINKINK_290_TRICOLOR_Z94_H
+#define _THINKINK_290_TRICOLOR_Z94_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_290_Tricolor_Z94 : public Adafruit_SSD1680 {
+public:
+  ThinkInk_290_Tricolor_Z94(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_SSD1680(296, 128, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
+
+  ThinkInk_290_Tricolor_Z94(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
+                            int8_t BUSY = -1, SPIClass *spi = &SPI)
+      : Adafruit_SSD1680(296, 128, DC, RST, CS, SRCS, BUSY, spi){};
+
+  void begin(thinkinkmode_t mode = THINKINK_TRICOLOR) {
+    _xram_offset = 0;
+
+    Adafruit_SSD1680::begin(true);
+    setBlackBuffer(0, true);
+    setColorBuffer(1, false);
+
+    inkmode = mode; // Preserve ink mode for ImageReader or others
+
+    layer_colors[EPD_WHITE] = 0b00;
+    layer_colors[EPD_BLACK] = 0b01;
+    layer_colors[EPD_RED] = 0b10;
+    layer_colors[EPD_GRAY] = 0b10;
+    layer_colors[EPD_LIGHT] = 0b00;
+    layer_colors[EPD_DARK] = 0b01;
+
+    default_refresh_delay = 13000;
+    setRotation(0);
+    powerDown();
+  }
+};
+
+#endif // _THINKINK_290 Z94