Added show_jpeg example and improved epd row control

Author: bitbank2

examples/Linux/compressed_images/main.cpp

@@ -13,8 +13,8 @@ int main(int argc, char *argv[])
 // This configuration for this PCB contians info about the Eink connections and display type
     epaper.initPanel(BB_PANEL_RPI);
     epaper.setPanelSize(BBEP_DISPLAY_EC060KD1);
+    epaper.setPasses(4,4);
     epaper.fillScreen(BBEP_WHITE);
-    epaper.fullUpdate();
   // The smiley image is 100x100 pixels; draw it at various scales from 0.5 to 2.0
   i = 0;
   f = 0.5f; // start at 1/2 size (50x50)
@@ -23,7 +23,6 @@ int main(int argc, char *argv[])
     i += (int)(100.0f * f);
     f += 0.5f;
   }
-  epaper.setPasses(3,3);
   epaper.fullUpdate(CLEAR_FAST, false); // the flag (false) tells it to turn off eink power after the update
   epaper.einkPower(0);
   epaper.deInit(); // save power by shutting down the TI power controller and I/O extender

examples/Linux/gif_player/main.cpp

@@ -105,7 +105,7 @@ printf("gif_player - optionally pass the name of a GIF to play\n");
   epaper.getStringBox("FastEPD GIF Demo", &rect); // get the rectangle around the text
   epaper.drawString("FastEPD GIF Demo", (epaper.width() - rect.w)/2, 90); // center horizontally
   epaper.fullUpdate(CLEAR_SLOW, true); // start with a full update and leave the power ON
- epaper.setPasses(4, 4);
+ epaper.setPasses(1, 1);
   iFrame = 0;
   if (argc == 2) { // use passed a name
       FILE * ihandle = fopen(argv[1], "r+b");

examples/Linux/show_jpeg/Makefile

@@ -0,0 +1,13 @@
+CFLAGS=-D__LINUX__ -Wall -O2 -I../../
+LIBS=-lFastEPD -lJPEGDEC -lgpiod 
+
+all: show_jpeg
+
+show_jpeg: main.o
+	$(CXX) main.o $(LIBS) -o show_jpeg 
+
+main.o: main.cpp
+	$(CXX) $(CFLAGS) -c main.cpp
+
+clean:
+	rm -rf *.o show_jpeg 

examples/Linux/show_jpeg/it_cartoon.h

@@ -0,0 +1,68 @@
+//
+// Example to show a JPEG image
+// as 16-gray levels
+//
+#include <FastEPD.h>
+#include <JPEGDEC.h>
+#include "it_cartoon.h"
+JPEGDEC jpg;
+FASTEPD epaper;
+
+int JPEGDraw(JPEGDRAW *pDraw)
+{
+  int x, y, iPitch = epaper.width()/2;
+  uint8_t *s, *d, *pBuffer = epaper.currentBuffer();
+  for (y=0; y<pDraw->iHeight; y++) {
+    d = &pBuffer[((pDraw->y + y)*iPitch) + (pDraw->x/2)];
+    s = (uint8_t *)pDraw->pPixels;
+    s += (y * pDraw->iWidth);
+    for (x=0; x<pDraw->iWidth; x+=2) {
+        *d++ = (s[0] & 0xf0) | (s[1] >> 4);
+        s += 2;
+    } // for x
+  } // for y
+  return 1;
+} /* JPEGDraw() */
+
+int main(int argc, char *argv[]) {
+// If a filename is passed on the command line, open it, otherwise use the
+// pre-loaded cartoon image
+uint8_t *pData;
+int iDataSize, iCenterX, iCenterY;
+
+  epaper.initPanel(BB_PANEL_RPI);
+  epaper.setPanelSize(BBEP_DISPLAY_EC060KD1);
+  epaper.setMode(BB_MODE_4BPP);
+  epaper.fillScreen(0xf);
+  if (argc == 2) { // load from file
+      FILE *ihandle;
+      ihandle = fopen(argv[1], "r+b");
+      if (!ihandle) {
+          printf("Error opening file: %s\n", argv[1]);
+          return -1;
+      }
+      fseek(ihandle, 0, SEEK_END);
+      iDataSize = (int)ftell(ihandle);
+      fseek(ihandle, 0, SEEK_SET);
+      pData = (uint8_t *)malloc(iDataSize);
+      fread(pData, 1, iDataSize, ihandle);
+      fclose(ihandle);
+  } else { // use internal image
+      pData = (uint8_t *)it_cartoon;
+      iDataSize = sizeof(it_cartoon);
+  }
+  if (jpg.openFLASH(pData, iDataSize, JPEGDraw)) {
+      if (jpg.getWidth() > epaper.width() || jpg.getHeight() > epaper.height()) {
+          printf("Image larger than display; exiting...\n");
+          return -1;
+      }
+      iCenterX = (epaper.width() - jpg.getWidth()) / 2;
+      iCenterY = (epaper.height() - jpg.getHeight()) / 2;
+      jpg.setPixelType(EIGHT_BIT_GRAYSCALE);
+      jpg.decode(iCenterX, iCenterY, 0);
+      jpg.close();
+      epaper.fullUpdate(CLEAR_FAST);
+  }
+  return 0;
+} /* main() */ 
+

examples/Linux/show_jpeg/main.cpp

@@ -1621,9 +1621,9 @@ void bbepClear(FASTEPDSTATE *pState, uint8_t val, uint8_t count, BB_RECT *pRect)
                 memcpy(pState->dma_buf, u8Cache, pState->native_width / 4);
             }
             bbepWriteRow(pState, pState->dma_buf, pState->native_width / 4, (i!=0));
-        }
-        delayMicroseconds(230);
-    }
+        } // for i
+        bbepRowControl(pState, ROW_END);
+    } // for k
 } /* bbepClear() */
 //
 // Perform a full update with a single color transition (user selected)
@@ -1679,7 +1679,7 @@ int bbepSmoothUpdate(FASTEPDSTATE *pState, bool bKeepOn, uint8_t u8Color)
                 bbepWriteRow(pState, pState->dma_buf, (pState->native_width / 4), 0);
                 bbepRowControl(pState, ROW_STEP);
             }
-            delayMicroseconds(230);
+            bbepRowControl(pState, ROW_END);
         } // for pass
     } else { // must be 4BPP mode
         int dy, iPasses = (pState->panelDef.iMatrixSize / 16); // number of passes
@@ -1715,7 +1715,7 @@ int bbepSmoothUpdate(FASTEPDSTATE *pState, bool bKeepOn, uint8_t u8Color)
                 bbepWriteRow(pState, pState->dma_buf, (pState->native_width / 4), 0);
                 bbepRowControl(pState, ROW_STEP);
             } // for i
-            delayMicroseconds(230);
+            bbepRowControl(pState, ROW_END);
         } // for pass
     } // 4bpp
     // Set the drivers inside epaper panel into discharge state.
@@ -1846,7 +1846,7 @@ int bbepFullUpdate(FASTEPDSTATE *pState, int iClearMode, bool bKeepOn, BB_RECT *
                 bbepWriteRow(pState, d, (pState->native_width / 4), (i!=0));
                 iDMAOff ^= (pState->native_width/4);
             }
-            delayMicroseconds(230);
+            bbepRowControl(pState, ROW_END);
         } // for pass
     } else { // must be 4BPP mode
         int dy, iPasses = (pState->panelDef.iMatrixSize / 16); // number of passes
@@ -1894,9 +1894,8 @@ int bbepFullUpdate(FASTEPDSTATE *pState, int iClearMode, bool bKeepOn, BB_RECT *
                 }
                 bbepWriteRow(pState, d, (pState->native_width / 4), (i!=0));
                 iDMAOff ^= (pState->native_width / 4); // toggle offset
-                //bbepRowControl(pState, ROW_STEP);
             } // for i
-            delayMicroseconds(230);
+            bbepRowControl(pState, ROW_END);
         } // for pass
     } // 4bpp
         // Set the drivers inside epaper panel into discharge state.
@@ -2009,6 +2008,7 @@ int bbepPartialUpdate(FASTEPDSTATE *pState, bool bKeepOn, int iStartLine, int iE
             dp += iDelta;
             iDMAOff ^= (pState->native_width/4);
         }
+        bbepRowControl(pState, ROW_END);
     } // for each pass
 
 // This clear to neutral step is necessary; do not remove

src/FastEPD.inl

@@ -230,6 +230,11 @@ void RPIRowControl(void *pBBEP, int iType)
     gpio_num_t le = (gpio_num_t)pState->panelDef.ioLE;
 
     if (iType == ROW_START) {
+        gpio_set_level(ckv, 1); // CKV on
+        delayMicroseconds(5);
+        gpio_set_level(ckv, 0); // CKV off
+        gpio_set_level(pState->panelDef.ioShiftMask, 1); // EP_MODE on
+        delayMicroseconds(4);
         gpio_set_level(ckv, 1); // CKV on
         delayMicroseconds(7);
         gpio_set_level(spv, 0); // SPV off
@@ -240,24 +245,22 @@ void RPIRowControl(void *pBBEP, int iType)
         delayMicroseconds(8);
         gpio_set_level(spv, 1); // SPV on
         delayMicroseconds(10);
-        gpio_set_level(ckv, 0); // CKV off
-        delayMicroseconds(1);
-        gpio_set_level(ckv, 1); // CKV on
-        delayMicroseconds(18);
-        gpio_set_level(ckv, 0); // CKV off
-        delayMicroseconds(1);
-        gpio_set_level(ckv, 1); // CKV on
-        delayMicroseconds(18);
-        gpio_set_level(ckv, 0); // CKV off
-        delayMicroseconds(1);
-        gpio_set_level(ckv, 1); // CKV on
+        for (int i=0; i<3; i++) {
+            gpio_set_level(ckv, 0); // CKV off
+            delayMicroseconds(1);
+            gpio_set_level(ckv, 1); // CKV on
+            delayMicroseconds(18);
+        }
         wait_cycles(100);
     } else if (iType == ROW_STEP) {
         gpio_set_level(ckv, 0); // CKV off
         gpio_set_level(le, 1); // LE toggle
-        wait_cycles(1);
+        wait_cycles(2);
         gpio_set_level(le, 0);
-        wait_cycles(5000);
+        wait_cycles(15000);
+    } else if (iType == ROW_END) {
+        bbepDigitalWrite(pState->panelDef.ioShiftMask, 0); // EP_MODE off
+        delayMicroseconds(230);
     }
 }
 
@@ -384,7 +387,6 @@ int vcom;
     if (bOn == pState->pwr_on) return BBEP_SUCCESS;
     if (bOn) {
         bbepDigitalWrite(pState->panelDef.ioOE, 1); // OE on
-        bbepDigitalWrite(pState->panelDef.ioShiftMask, 1); // EP_MODE on
         bbepDigitalWrite(pState->panelDef.ioPWR, 1); // TPS_PWRUP
         bbepDigitalWrite(pState->panelDef.ioShiftSTR, 1); // TPS_WAKEUP
         vTaskDelay(1); // allow time to power up