clanged

Author: ladyada

src/Adafruit_EPD.cpp

@@ -158,7 +158,7 @@ void Adafruit_EPD::begin(bool reset) {
     sram.write8(0, K640_SEQUENTIAL_MODE, MCPSRAM_WRSR);
   }
 
-  Serial.println("set pins");
+  //Serial.println("set pins");
   // set pin directions
   pinMode(_dc_pin, OUTPUT);
   pinMode(_cs_pin, OUTPUT);
@@ -176,16 +176,16 @@ void Adafruit_EPD::begin(bool reset) {
     return;
   }
 
-  Serial.println("hard reset");
+  //Serial.println("hard reset");
   if (reset) {
     hardwareReset();
   }
 
-  Serial.println("busy");
+  //Serial.println("busy");
   if (_busy_pin >= 0) {
     pinMode(_busy_pin, INPUT);
   }
-  Serial.println("done!");
+  //Serial.println("done!");
 }
 
 /**************************************************************************/
@@ -313,7 +313,6 @@ void Adafruit_EPD::writeSRAMFramebufferToEPD(uint16_t SRAM_buffer_addr,
                                              uint8_t EPDlocation,
                                              bool invertdata) {
   uint8_t c;
-
   // use SRAM
   sram.csLow();
   // send read command
@@ -327,10 +326,17 @@ void Adafruit_EPD::writeSRAMFramebufferToEPD(uint16_t SRAM_buffer_addr,
   c = writeRAMCommand(EPDlocation);
 
   dcHigh();
-  for (uint16_t i = 0; i < buffer_size; i++) {
+  for (uint32_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();
+    /*
+    Serial.print("0x"); Serial.print((byte)c, HEX); Serial.print(", ");
+    if (i % 32 == 31) {
+      Serial.println();
+      Serial.print("$"); 
+      Serial.print(i, HEX); 
+      Serial.print(": ");
+    }
+    */
   }
   csHigh();
   sram.csHigh();
@@ -358,8 +364,14 @@ void Adafruit_EPD::display(bool sleep) {
   setRAMAddress(0, 0);
 
   if (use_sram) {
+#ifdef EPD_DEBUG
+    Serial.println("  Write SRAM buff to EPD");
+#endif
     writeSRAMFramebufferToEPD(buffer1_addr, buffer1_size, 0);
   } else {
+#ifdef EPD_DEBUG
+    Serial.println("  Write RAM buff to EPD");
+#endif
     writeRAMFramebufferToEPD(buffer1, buffer1_size, 0);
   }
 

src/drivers/Adafruit_SSD1681.cpp

@@ -41,7 +41,7 @@ Adafruit_SSD1681::Adafruit_SSD1681(int width, int height, int8_t SID,
     height += 8 - (height % 8);
   }
 
-  buffer1_size = width * height / 8;
+  buffer1_size = ((uint32_t)width * (uint32_t)height) / 8;
   buffer2_size = buffer1_size;
 
   if (SRCS >= 0) {
@@ -79,7 +79,7 @@ Adafruit_SSD1681::Adafruit_SSD1681(int width, int height, int8_t DC, int8_t RST,
     height += 8 - (height % 8);
   }
 
-  buffer1_size = width * height / 8;
+  buffer1_size = ((uint32_t)width * (uint32_t)height) / 8;
   buffer2_size = buffer1_size;
 
   if (SRCS >= 0) {

src/panels/ThinkInk_154_Tricolor_Z90.h

@@ -7,12 +7,12 @@
 class ThinkInk_154_Tricolor_Z90 : public Adafruit_SSD1681 {
 public:
   ThinkInk_154_Tricolor_Z90(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)
+                            int8_t CS, int8_t SRCS, int8_t MISO,
+                            int8_t BUSY = -1)
       : Adafruit_SSD1681(200, 200, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY){};
 
   ThinkInk_154_Tricolor_Z90(int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
-                           int8_t BUSY = -1, SPIClass *spi = &SPI)
+                            int8_t BUSY = -1, SPIClass *spi = &SPI)
       : Adafruit_SSD1681(200, 200, DC, RST, CS, SRCS, BUSY, spi){};
 
   void begin(thinkinkmode_t mode = THINKINK_MONO) {