Improved profiles which use all of the built-in LUTs of the gen2/Xiao panels

Author: bitbank2

lib/bb_epaper/src/bb_ep.inl

@@ -49,6 +49,12 @@ BBEP_GRAY3, BBEP_GRAY2, BBEP_GRAY1, BBEP_GRAY0, BBEP_GRAY3, BBEP_GRAY2, BBEP_GRA
 BBEP_GRAY3, BBEP_GRAY2, BBEP_GRAY1, BBEP_GRAY0, BBEP_GRAY3, BBEP_GRAY2, BBEP_GRAY1, BBEP_GRAY0
 };
 
+// 2-bit grayscale mode (some swapped)
+const uint8_t u8Colors_4gray_v2[16] = {
+BBEP_GRAY3, BBEP_GRAY1, BBEP_GRAY2, BBEP_GRAY0, BBEP_GRAY3, BBEP_GRAY1, BBEP_GRAY2, BBEP_GRAY0,
+BBEP_GRAY3, BBEP_GRAY2, BBEP_GRAY1, BBEP_GRAY0, BBEP_GRAY3, BBEP_GRAY1, BBEP_GRAY2, BBEP_GRAY0
+}; 
+
 // the 4-color mode
 const uint8_t u8Colors_4clr[16] = {  // black white red yellow
     BBEP_BLACK, BBEP_WHITE, BBEP_RED, BBEP_YELLOW, BBEP_BLACK, BBEP_WHITE, BBEP_RED, BBEP_YELLOW,
@@ -646,7 +652,7 @@ const uint8_t epd75_init_sequence_partial[] PROGMEM = {
 };
 const uint8_t epd75_init_fast_gen2[] PROGMEM = {
     0x02, 0x00, 0x1f, // panel setting
-    0x03, 0x50, 0x10, 0x07,
+    0x03, 0x50, 0x21, 0x07,
     0x01, 0x04, // power on
     BUSY_WAIT,
     0x05, 0x06, 0x27, 0x27, 0x18, 0x17,
@@ -656,14 +662,17 @@ const uint8_t epd75_init_fast_gen2[] PROGMEM = {
 };
 
 const uint8_t epd75_init_partial_gen2[] PROGMEM = {
+    0x01, 0x04, // power on
+    BUSY_WAIT,
+    0x02, 0xe0, 0x02,
+    0x02, 0xe5, 0x5a,    
     0x02, 0x00, 0x1f, // panel setting
-//    0x03, 0x50, 0x10, 0x07,
+    0x03, 0x50, 0x21, 0x07,
     0x01, 0x04, // power on
     BUSY_WAIT,
     0x05, 0x06, 0x27, 0x27, 0x18, 0x17,
     0x02, 0xe0, 0x02,
     0x02, 0xe5, 0x6e,
-    0x03, 0x50, 0xa9, 0x07,
     0
 };
 
@@ -2095,8 +2104,8 @@ const EPD_PANEL panelDefs[] PROGMEM = {
     {240, 416, 0, epd37_init_sequence_full, NULL, epd37_init_sequence_part, 0, BBEP_CHIP_UC81xx, u8Colors_2clr}, // EP37_240x416
     {104, 212, 0, epd213_inky_init_sequence_full, NULL, NULL, 0, BBEP_CHIP_UC81xx, u8Colors_2clr}, // EP213_104x212, older InkyPHAT black and white
     {800, 480, 0, epd75_init_sequence_full, epd75_init_sequence_fast, epd75_init_sequence_partial, 0, BBEP_CHIP_UC81xx, u8Colors_2clr}, // EP75_800x480
-    {800, 480, 0, epd75_init_sequence_full, epd75_init_fast_gen2, epd75_init_sequence_partial, 0, BBEP_CHIP_UC81xx, u8Colors_2clr}, // EP75_800x480_GEN2
-    {800, 480, 0, epd75_gray_init, NULL, NULL, BBEP_4GRAY, BBEP_CHIP_UC81xx, u8Colors_4gray}, // EP75_800x480_4GRAY_GEN2
+    {800, 480, 0, epd75_init_sequence_full, epd75_init_fast_gen2, epd75_init_partial_gen2, 0, BBEP_CHIP_UC81xx, u8Colors_2clr}, // EP75_800x480_GEN2
+    {800, 480, 0, epd75_gray_init, NULL, NULL, BBEP_4GRAY, BBEP_CHIP_UC81xx, u8Colors_4gray_v2}, // EP75_800x480_4GRAY_GEN2
     {800, 480, 0, epd75_old_gray_init, NULL, NULL, BBEP_4GRAY, BBEP_CHIP_UC81xx, u8Colors_4gray}, // EP75_800x480_4GRAY
     {800, 480, 0, epd75_old_gray_init2, NULL, NULL, BBEP_4GRAY, BBEP_CHIP_UC81xx, u8Colors_4gray}, // EP75_800x480_4GRAY_V2
     {128, 296, 0, epd29_init_sequence_full, epd29_init_sequence_fast, epd29_init_sequence_part, 0, BBEP_CHIP_UC81xx, u8Colors_2clr}, // Badger 2040

src/bl.cpp

@@ -262,7 +262,7 @@ void bl_init(void)
 
   WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
 
-// uncomment this to hardcode WiFi credentials (useful for testing wifi errors, etc.)
+// uncdcomment this to hardcode WiFi credentials (useful for testing wifi errors, etc.)
 // #define HARDCODED_WIFI
 #ifdef HARDCODED_WIFI
   WifiCredentials hardcodedCreds = {.ssid = "ssid-goes-here", .pswd = "password-goes-here"};

src/display.cpp

@@ -10,10 +10,9 @@
 #include "bb_epaper.h"
 
 const DISPLAY_PROFILE dpList[4] = { // 1-bit and 2-bit display types for each profile
-    {EP75_800x480, EP75_800x480_4GRAY_GEN2/*EP75_800x480_4GRAY*/}, // default (for original EPD)
+    {EP75_800x480, EP75_800x480_4GRAY}, // default (for original EPD)
     {EP75_800x480_GEN2, EP75_800x480_4GRAY_GEN2}, // a = uses built-in fast + 4-gray 
-    {EP75_800x480, EP75_800x480_4GRAY_V2}, // b
-    {EP75_800x480_GEN2, EP75_800x480_4GRAY_GEN2}, // c
+    {EP75_800x480, EP75_800x480_4GRAY_V2}, // b = darker grays
 };
 BBEPAPER bbep(EP75_800x480);
 // Counts the number of partial updates to know when to do a full update
@@ -366,6 +365,15 @@ void ReduceBpp(int iDestBpp, int iPixelType, uint8_t *pPalette, uint8_t *pSrc, u
         *d++ = u8;
     }
 } /* ReduceBpp() */
+enum {
+    PNG_1_BIT = 0,
+    PNG_1_BIT_INVERTED,
+    PNG_2_BIT_0,
+    PNG_2_BIT_1,
+    PNG_2_BIT_BOTH,
+    PNG_2_BIT_INVERTED,
+};
+
 /** 
  * @brief Callback function for each line of PNG decoded
  * @param PNGDRAW structure containing the current line and relevant info
@@ -376,6 +384,7 @@ int png_draw(PNGDRAW *pDraw)
     int x;
     uint8_t ucBppChanged = 0, ucInvert = 0;
     uint8_t uc, ucMask, src, *s, *d, *pTemp = bbep.getCache(); // get some scratch memory (not from the stack)
+    int iPlane = *(int *)pDraw->pUser;
 
     if (pDraw->iPixelType == PNG_PIXEL_INDEXED || pDraw->iBpp > 2) {
         if (pDraw->iBpp == 1) { // 1-bit output, just see which color is brighter
@@ -395,8 +404,9 @@ int png_draw(PNGDRAW *pDraw)
     }
     s = (ucBppChanged) ? pTemp : (uint8_t *)pDraw->pPixels;
     d = pTemp;
-    if (!pDraw->pUser) {
+    if (iPlane == PNG_1_BIT || iPlane == PNG_1_BIT_INVERTED) {
         // 1-bit output, decode the single plane and write it
+        if (iPlane == PNG_1_BIT_INVERTED) ucInvert = ~ucInvert; // to do PLANE_FALSE_DIFF
         for (x=0; x<pDraw->iWidth; x+= 8) {
           d[0] = s[0] ^ ucInvert;
           d++; s++;
@@ -405,8 +415,10 @@ int png_draw(PNGDRAW *pDraw)
         src = *s++;
         src ^= ucInvert;
         uc = 0; // suppress warning/error
-        if (*(int *)pDraw->pUser > 1) { // draw 2bpp data as 1-bit to use for partial update
-            ucInvert = ~ucInvert; // the invert rule is backwards for grayscale data
+        if (iPlane == PNG_2_BIT_BOTH || iPlane == PNG_2_BIT_INVERTED) { // draw 2bpp data as 1-bit to use for partial update
+            if (iPlane == PNG_2_BIT_BOTH) {
+                ucInvert = ~ucInvert; // the invert rule is backwards for grayscale data
+            }
             src = ~src;
             for (x=0; x<pDraw->iWidth; x++) {
                 uc <<= 1;
@@ -423,7 +435,7 @@ int png_draw(PNGDRAW *pDraw)
                 }
             } // for x
         } else { // normal 0/1 split plane
-            ucMask = (*(int *)pDraw->pUser == 0) ? 0x40 : 0x80; // lower or upper source bit
+            ucMask = (iPlane == PNG_2_BIT_0) ? 0x40 : 0x80; // lower or upper source bit
             for (x=0; x<pDraw->iWidth; x++) {
                 uc <<= 1;
                 if (src & ucMask) {
@@ -516,10 +528,9 @@ int i, iColors;
  * @param size of the PNG file
  * @return refresh mode based on image type and presence of old image
  */
-
 int png_to_epd(const uint8_t *pPNG, int iDataSize)
 {
-int iPlane, rc = -1;
+int iPlane = PNG_1_BIT, rc = -1;
 PNG *png = new PNG();
 
     if (!png) return PNG_MEM_ERROR; // not enough memory for the decoder instance
@@ -539,26 +550,37 @@ PNG *png = new PNG();
                 bbep.startWrite(PLANE_0); // start writing image data to plane 0
                 png->openRAM((uint8_t *)pPNG, iDataSize, png_draw);
                 if (png->getBpp() == 1 || png->getBpp() > 2) {
-                    png->decode(NULL, 0);
+                    iPlane = PNG_1_BIT;
+                    png->decode(&iPlane, 0);
                 } else { // convert the 2-bit image to 1-bit output
                     Log_info("%s [%d]: Current png only has 2 unique colors!\n", __FILE__, __LINE__);
-                    iPlane = 2;
+                    iPlane = PNG_2_BIT_BOTH;
                     if (png->decode(&iPlane, 0) != PNG_SUCCESS) {
                         Log_info("%s [%d]: Error decoding image = %d\n", __FILE__, __LINE__, png->getLastError());
                     }
                 }
                 png->close();
+                if (iTempProfile != 0) { // need to write the inverted plane to do PLANE_FALSE_DIFF
+                    bbep.startWrite(PLANE_1); // start writing image data to plane 1
+                    png->openRAM((uint8_t *)pPNG, iDataSize, png_draw);
+                    if (iPlane == PNG_1_BIT) {
+                        iPlane = PNG_1_BIT_INVERTED; // inverted 1-bit to second memory plane
+                    } else { // convert the 2-bit image to 1-bit output
+                        iPlane = PNG_2_BIT_INVERTED; // inverted 2-bit -> 1-bit to second plane
+                    }
+                    png->decode(&iPlane, 0);
+                } // temp profile needs the second plane written
             } else { // 2-bpp
                 bbep.setPanelType(dpList[iTempProfile].TwoBit);
                 rc = REFRESH_FULL; // 4gray mode must be full refresh
                 iUpdateCount = 0; // grayscale mode resets the partial update counter
                 bbep.startWrite(PLANE_0); // start writing image data to plane 0
-                iPlane = 0;
+                iPlane = PNG_2_BIT_0;
                 Log_info("%s [%d]: decoding 4-gray plane 0\r\n", __FILE__, __LINE__);
                 png->openRAM((uint8_t *)pPNG, iDataSize, png_draw);
                 png->decode(&iPlane, 0); // tell PNGDraw to use bits for plane 0
                 png->close(); // start over for plane 1
-                iPlane = 1;
+                iPlane = PNG_2_BIT_1;
                 Log_info("%s [%d]: decoding 4-gray plane 1\r\n", __FILE__, __LINE__);
                 png->openRAM((uint8_t *)pPNG, iDataSize, png_draw);
                 bbep.startWrite(PLANE_1); // start writing image data to plane 1