Added support for huge font sizes

Author: bitbank2

fontconvert/main.c

@@ -22,7 +22,7 @@
 #include FT_GLYPH_H
 #include FT_MODULE_H
 #include FT_TRUETYPE_DRIVER_H
-#include "../../../src/g5enc.inl" // Group5 image compression library
+#include "../src/g5enc.inl" // Group5 image compression library
 G5ENCIMAGE g5enc; // Group5 encoder state
 
 #define DPI 141 // Approximate resolution of common displays
@@ -259,21 +259,6 @@ int main(int argc, char *argv[])
         bitmap = &face->glyph->bitmap;
         g = (FT_BitmapGlyphRec *)glyph;
 
-        // Minimal font and per-glyph information is stored to
-        // reduce flash space requirements.  Glyph bitmaps are
-        // fully bit-packed; no per-scanline pad, though end of
-        // each character may be padded to next byte boundary
-        // when needed.  16-bit offset means 64K max for bitmaps,
-        // code currently doesn't check for overflow.  (Doesn't
-        // check that size & offsets are within bounds either for
-        // that matter...please convert fonts responsibly.)
-	
-	// Check that the requested font size fits within the limits
-        // of the 8-bit member variables
-        if (bitmap->width > 255 || (face->glyph->advance.x>>6) > 255) {
-            printf("The requested size is too large to fit in the BB_GLYPH member vars\nEither request a smaller size or change the member variables to be 16-bits\n");
-            return -1;
-        }
         pGlyphs[index].bitmapOffset = iOffset;
         pGlyphs[index].width = bitmap->width;
         pGlyphs[index].height = bitmap->rows;

src/FastEPD.h

@@ -75,6 +75,7 @@ enum {
 // Pre-configured displays
 enum {
     BBEP_DISPLAY_EC060TC1,
+    BBEP_DISPLAY_EC060KD1,
     BBEP_DISPLAY_ED0970TC1,
     BBEP_DISPLAY_ED103TC2,
     BBEP_DISPLAY_ED052TC4,

src/FastEPD.inl

@@ -246,10 +246,10 @@ static uint8_t bSlowSPH = 0;
 
 static bool s3_notify_dma_ready(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx)
 {           
-    dma_is_done = true;
     if (bSlowSPH) {
         gpio_set_level(u8SPH, 1); // CS deactivate
     }
+    dma_is_done = true;
     return false;
 }           
 
@@ -1088,7 +1088,7 @@ void bbepWriteRow(FASTEPDSTATE *pState, uint8_t *pData, int iLen, int bRowStep)
     }
     if (bSlowSPH) {
         gpio_set_level(u8SPH, 0); // SPH/CS active
-        gpio_set_level(u8CKV, 1); // CKV on
+//        gpio_set_level(u8CKV, 1); // CKV on
     }
     dma_is_done = false;
     gpio_set_level((gpio_num_t)pState->panelDef.ioCKV, 1); // CKV on
@@ -1157,6 +1157,10 @@ int bbepSetDefinedPanel(FASTEPDSTATE *pState, int iPanel)
             bbepSetPanelSize(pState, 1024, 758, BB_PANEL_FLAG_NONE);
             bbepSetCustomMatrix(pState, u8SixInchMatrix, sizeof(u8SixInchMatrix));
             break;
+        case BBEP_DISPLAY_EC060KD1:
+            bbepSetPanelSize(pState, 1448, 1072, BB_PANEL_FLAG_NONE);
+            bbepSetCustomMatrix(pState, u8SixInchMatrix, sizeof(u8SixInchMatrix));
+            break;
         case BBEP_DISPLAY_ED0970TC1:
             bbepSetPanelSize(pState, 1280, 825, BB_PANEL_FLAG_NONE);
             bbepSetCustomMatrix(pState, u8NineInchMatrix, sizeof(u8NineInchMatrix));
@@ -1250,10 +1254,17 @@ return BBEP_SUCCESS;
 //
 void bbepSetBrightness(FASTEPDSTATE *pState, uint8_t led1, uint8_t led2)
 {
+#if (ESP_IDF_VERSION_MAJOR > 4)
     ledcWrite(pState->u8LED1, led1); // PWM (0-255)
     if (pState->u8LED2 != 0xff) {
         ledcWrite(pState->u8LED2, led2);
     }
+#else // old API
+    ledcWrite(0, led1);
+    if (pState->u8LED2 != 0xff) {
+        ledcWrite(1, led2);
+    }   
+#endif
 } /* bbepSetBrightness() */
 
 //
@@ -1263,12 +1274,23 @@ void bbepInitLights(FASTEPDSTATE *pState, uint8_t led1, uint8_t led2)
 {
     pState->u8LED1 = led1;
     pState->u8LED2 = led2;
+#if (ESP_IDF_VERSION_MAJOR > 4)
     ledcAttach(led1, 5000, 8); // attach pin to channel 0
     ledcWrite(led1, 0); // set to off to start
     if (led2 != 0xff) {
         ledcAttach(led2, 5000, 8);
         ledcWrite(led2, 0); // set to off
     }
+#else // old API
+    ledcSetup(0, 5000, 8);
+    ledcAttachPin(led1, 0);
+    ledcWrite(0, 0);
+    if (led2 != 0xff) {
+        ledcSetup(1, 5000, 8);
+        ledcAttachPin(led2, 1);
+        ledcWrite(1, 0);
+    }
+#endif
 } /* bbepInitLights() */
 
 //
@@ -1565,26 +1587,26 @@ int bbepFullUpdate(FASTEPDSTATE *pState, int iClearMode, bool bKeepOn, BBEPRECT
     if (bbepEinkPower(pState, 1) != BBEP_SUCCESS) return BBEP_IO_ERROR;
     switch (iClearMode) {
         case CLEAR_SLOW:
-            bbepClear(pState, BB_CLEAR_DARKEN, 10, pRect);
-            bbepClear(pState, BB_CLEAR_LIGHTEN, 10, pRect);
-            bbepClear(pState, BB_CLEAR_DARKEN, 10, pRect);
-            bbepClear(pState, BB_CLEAR_LIGHTEN, 10, pRect);
+            bbepClear(pState, BB_CLEAR_DARKEN, 4, pRect);
+            bbepClear(pState, BB_CLEAR_LIGHTEN, 8, pRect);
+            bbepClear(pState, BB_CLEAR_DARKEN, 4, pRect);
+            bbepClear(pState, BB_CLEAR_LIGHTEN, 8, pRect);
             break;
         case CLEAR_FAST:
-            bbepClear(pState, BB_CLEAR_DARKEN, 8, pRect);
+            bbepClear(pState, BB_CLEAR_DARKEN, 2, pRect);
             bbepClear(pState, BB_CLEAR_LIGHTEN, 8, pRect);
             break;
         case CLEAR_WHITE:
-            bbepClear(pState, BB_CLEAR_LIGHTEN, 5, pRect);
+            bbepClear(pState, BB_CLEAR_LIGHTEN, 8, pRect);
             break;
         case CLEAR_BLACK: // probably a mistake
-            bbepClear(pState, BB_CLEAR_DARKEN, 5, pRect);
+            bbepClear(pState, BB_CLEAR_DARKEN, 8, pRect);
             break;
         case CLEAR_NONE: // nothing to do
         default:
             break;
     }
-
+    bbepClear(pState, BB_CLEAR_NEUTRAL, 1, pRect);
 #ifdef SHOW_TIME
     l = millis() - l;
     Serial.printf("clear time = %dms\n", (int)l);

src/Group5.h

@@ -150,8 +150,8 @@ typedef struct g5_enc_image_tag
 // Font info per character (glyph)
 typedef struct {
   uint16_t bitmapOffset; // Offset to compressed bitmap data for this glyph (starting from the end of the BB_GLYPH[] array)
-  uint8_t width;         // bitmap width in pixels
-  uint8_t xAdvance;      // total width in pixels (bitmap + padding)
+  uint16_t width;         // bitmap width in pixels
+  uint16_t xAdvance;      // total width in pixels (bitmap + padding)
   uint16_t height;        // bitmap height in pixels
   int16_t xOffset;        // left padding to upper left corner
   int16_t yOffset;        // padding from baseline to upper left corner (usually negative)

src/bb_ep_gfx.inl

@@ -892,7 +892,7 @@ int bbepWriteStringCustom(FASTEPDSTATE *pBBEP, BB_FONT *pFont, int x, int y, cha
                 continue; // skip it
             c -= first; // first char of font defined
             pGlyph = &pFont->glyphs[c]; // glyph info for this character
-            dx += pgm_read_byte(&pGlyph->xAdvance);
+            dx += pgm_read_word(&pGlyph->xAdvance);
         }
         x = (pBBEP->width - dx)/2;
         if (x < 0) x = 0;
@@ -908,17 +908,17 @@ int bbepWriteStringCustom(FASTEPDSTATE *pBBEP, BB_FONT *pFont, int x, int y, cha
             continue; // skip it
         c -= first; // first char of font defined
         pGlyph = &pFont->glyphs[c]; // glyph info for this character
-        if (pgm_read_byte(&pGlyph->width) > 1) { // skip this if drawing a space
+        if (pgm_read_word(&pGlyph->width) > 1) { // skip this if drawing a space
             x_off = pGlyph->xOffset;
             s = pBits + pgm_read_word(&pGlyph->bitmapOffset); // start of compressed bitmap data
             if (pgm_read_dword(&pFont->rotation) == 0 || pgm_read_dword(&pFont->rotation) == 180) {
                 h = pgm_read_word(&pGlyph->height);
-                w = pgm_read_byte(&pGlyph->width);
+                w = pgm_read_word(&pGlyph->width);
                 dx = x + (int16_t)pgm_read_word(&pGlyph->xOffset); // offset from character UL to start drawing
                 dy = y + (int16_t)pgm_read_word(&pGlyph->yOffset);
             } else { // rotated
                 w = pgm_read_word(&pGlyph->height);
-                h = pgm_read_byte(&pGlyph->width);
+                h = pgm_read_word(&pGlyph->width);
                 n = (int16_t)pgm_read_word(&pGlyph->yOffset); // offset from character UL to start drawing
                 dx = x;
                 if (-n < w) dx -= (w+n); // since we draw from the baseline
@@ -993,9 +993,9 @@ int bbepWriteStringCustom(FASTEPDSTATE *pBBEP, BB_FONT *pFont, int x, int y, cha
             } // non-antialased
         } // if not drawing a space
         if (pgm_read_dword(&pFont->rotation) == 0 || pgm_read_dword(&pFont->rotation) == 180) {
-            x += pgm_read_byte(&pGlyph->xAdvance); // width of this character
+            x += pgm_read_word(&pGlyph->xAdvance); // width of this character
         } else {
-            y += pgm_read_byte(&pGlyph->xAdvance);
+            y += pgm_read_word(&pGlyph->xAdvance);
         }
     } // while drawing characters
     pBBEP->iCursorX = x;