Add new anti-aliased (smooth) font examples + bug fixes

Four new examples have been added to show different methods of rendering
the anta-aliased fonts.  A few minor bugs have been corrected associated
with the font rendering. drawNumber and drawFloat handle fixed width
mono fonts with no digit movement.

Author: Bodmer

Extensions/Smooth_font.cpp

@@ -424,7 +424,7 @@ void TFT_eSPI::drawGlyph(uint16_t code)
 
     uint8_t pbuffer[gWidth[gNum]];
 
-    uint16_t xs = 0;
+    int16_t xs = 0;
     uint32_t dl = 0;
 
     int16_t cy = cursor_y + gFont.maxAscent - gdY[gNum];

Extensions/Smooth_font.h

@@ -13,7 +13,8 @@
 
   uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc);
 
-  void     drawGlyph(uint16_t code);
+  virtual void drawGlyph(uint16_t code);
+
   void     showFont(uint32_t td);
 
  fs::File   fontFile;

Extensions/Sprite.cpp

@@ -1473,10 +1473,10 @@ void TFT_eSprite::drawGlyph(uint16_t code)
     if (code == '\n') {
       if (_created)
       {
-      this->cursor_x = 0;
-      this->cursor_y += this->gFont.yAdvance;
-      if (this->cursor_y >= _height) this->cursor_y = 0;
-      return;
+        this->cursor_x = 0;
+        this->cursor_y += this->gFont.yAdvance;
+        if (this->cursor_y >= _height) this->cursor_y = 0;
+        return;
       }
       else
       {
@@ -1511,7 +1511,7 @@ void TFT_eSprite::drawGlyph(uint16_t code)
 
     uint8_t pbuffer[this->gWidth[gNum]];
 
-    uint16_t xs = 0;
+    int16_t  xs = 0;
     uint16_t dl = 0;
 
     for (int y = 0; y < this->gHeight[gNum]; y++)
@@ -1525,7 +1525,8 @@ void TFT_eSprite::drawGlyph(uint16_t code)
           if (pixel != 0xFF)
           {
             if (dl) { drawFastHLine( xs, y + this->cursor_y + this->gFont.maxAscent - this->gdY[gNum], dl, fg); dl = 0; }
-            if (pixel>127) drawPixel(x + this->cursor_x + this->gdX[gNum], y + this->cursor_y + this->gFont.maxAscent - this->gdY[gNum], alphaBlend(pixel, fg, bg));
+            if (_bpp != 1) drawPixel(x + this->cursor_x + this->gdX[gNum], y + this->cursor_y + this->gFont.maxAscent - this->gdY[gNum], alphaBlend(pixel, fg, bg));
+            else if (pixel>127) drawPixel(x + this->cursor_x + this->gdX[gNum], y + this->cursor_y + this->gFont.maxAscent - this->gdY[gNum], fg);
           }
           else
           {

TFT_eSPI.cpp

@@ -172,6 +172,7 @@ TFT_eSPI::TFT_eSPI(int16_t w, int16_t h)
   textcolor   = bitmap_fg = 0xFFFF; // White
   textbgcolor = bitmap_bg = 0x0000; // Black
   padX = 0;             // No padding
+  isDigits   = false;   // No bounding box adjustment
   textwrapX  = true;    // Wrap text at end of line when using print stream
   textwrapY  = false;   // Wrap text at bottom of screen when using print stream
   textdatum = TL_DATUM; // Top Left text alignment is default
@@ -1548,7 +1549,7 @@ void TFT_eSPI::fillCircleHelper(int32_t x0, int32_t y0, int32_t r, uint8_t corne
 ** Function name:           drawEllipse
 ** Description:             Draw a ellipse outline
 ***************************************************************************************/
-void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int16_t rx, int16_t ry, uint16_t color)
+void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color)
 {
   if (rx<2) return;
   if (ry<2) return;
@@ -1603,7 +1604,7 @@ void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int16_t rx, int16_t ry, uint1
 ** Function name:           fillEllipse
 ** Description:             draw a filled ellipse
 ***************************************************************************************/
-void TFT_eSPI::fillEllipse(int16_t x0, int16_t y0, int16_t rx, int16_t ry, uint16_t color)
+void TFT_eSPI::fillEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color)
 {
   if (rx<2) return;
   if (ry<2) return;
@@ -2102,13 +2103,14 @@ int16_t TFT_eSPI::textWidth(const char *string, int font)
           if (found)
           {
             if(str_width == 0 && gdX[gNum] < 0) str_width -= gdX[gNum];
-            if (*string) str_width += gxAdvance[gNum];
+            if (*string || isDigits) str_width += gxAdvance[gNum];
             else str_width += (gdX[gNum] + gWidth[gNum]);
           }
           else str_width += gFont.spaceWidth + 1;
         }
       }
     }
+    isDigits = false;
     return str_width;
   }
 #endif
@@ -2141,8 +2143,8 @@ int16_t TFT_eSPI::textWidth(const char *string, int font)
         {
           uniCode -= pgm_read_byte(&gfxFont->first);
           GFXglyph *glyph  = &(((GFXglyph *)pgm_read_dword(&gfxFont->glyph))[uniCode]);
-          // If this is not the  last character then use xAdvance
-          if (*string) str_width += pgm_read_byte(&glyph->xAdvance);
+          // If this is not the  last character or is a digit then use xAdvance
+          if (*string  || isDigits) str_width += pgm_read_byte(&glyph->xAdvance);
           // Else use the offset plus width since this can be bigger than xAdvance
           else str_width += ((int8_t)pgm_read_byte(&glyph->xOffset) + pgm_read_byte(&glyph->width));
         }
@@ -2156,6 +2158,7 @@ int16_t TFT_eSPI::textWidth(const char *string, int font)
 #endif
     }
   }
+  isDigits = false;
   return str_width * textsize;
 }
 
@@ -3715,11 +3718,11 @@ size_t TFT_eSPI::write(uint8_t utf8)
 
     //fontFile = SPIFFS.open( _gFontFilename, "r" );
 
-    if(!fontFile)
-    {
-      fontLoaded = false;
-      return 0;
-    }
+    //if(!fontFile)
+    //{
+    //  fontLoaded = false;
+    //  return 0;
+    //}
 
     drawGlyph(unicode);
 
@@ -4147,6 +4150,7 @@ int16_t TFT_eSPI::drawString(const char *string, int poX, int poY)
 {
   return drawString(string, poX, poY, textfont);
 }
+
 // With font number
 int16_t TFT_eSPI::drawString(const char *string, int poX, int poY, int font)
 {
@@ -4171,22 +4175,22 @@ int16_t TFT_eSPI::drawString(const char *string, int poX, int poY, int font)
   }
 #endif
 
-  if (textdatum || padX)
-  {
 
-    // If it is not font 1 (GLCD or free font) get the baseline and pixel height of the font
+  // If it is not font 1 (GLCD or free font) get the baseline and pixel height of the font
 #ifdef SMOOTH_FONT
-    if(fontLoaded) {
-      baseline = gFont.maxAscent;
-      cheight  = fontHeight(0);
-    }
-
-    else
+  if(fontLoaded) {
+    baseline = gFont.maxAscent;
+    cheight  = fontHeight();
+  }
+  else
 #endif
-    if (font!=1) {
-      baseline = pgm_read_byte( &fontdata[font].baseline ) * textsize;
-      cheight = fontHeight(font);
-    }
+  if (font!=1) {
+    baseline = pgm_read_byte( &fontdata[font].baseline ) * textsize;
+    cheight = fontHeight(font);
+  }
+
+  if (textdatum || padX)
+  {
 
     switch(textdatum) {
       case TC_DATUM:
@@ -4418,13 +4422,15 @@ int16_t TFT_eSPI::drawRightString(const char *string, int dX, int poY, int font)
 ***************************************************************************************/
 int16_t TFT_eSPI::drawNumber(long long_num, int poX, int poY)
 {
+  isDigits = true; // Eliminate jiggle in monospaced fonts
   char str[12];
   ltoa(long_num, str, 10);
   return drawString(str, poX, poY, textfont);
 }
 
 int16_t TFT_eSPI::drawNumber(long long_num, int poX, int poY, int font)
 {
+  isDigits = true; // Eliminate jiggle in monospaced fonts
   char str[12];
   ltoa(long_num, str, 10);
   return drawString(str, poX, poY, font);
@@ -4444,6 +4450,7 @@ int16_t TFT_eSPI::drawFloat(float floatNumber, int dp, int poX, int poY)
 
 int16_t TFT_eSPI::drawFloat(float floatNumber, int dp, int poX, int poY, int font)
 {
+  isDigits = true;
   char str[14];               // Array to contain decimal string
   uint8_t ptr = 0;            // Initialise pointer for array
   int8_t  digits = 1;         // Count the digits to avoid array overflow
@@ -4572,7 +4579,7 @@ void TFT_eSPI::setTextFont(uint8_t f)
 
 
 /***************************************************************************************
-** Function name:           spiBlockWrite
+** Function name:           writeBlock
 ** Description:             Write a block of pixels of the same colour
 ***************************************************************************************/
 //Clear screen test 76.8ms theoretical. 81.5ms TFT_eSPI, 967ms Adafruit_ILI9341
@@ -4964,6 +4971,10 @@ void TFT_eSPI::getSetup(setup_t &tft_settings)
 
 #include "Extensions/Sprite.cpp"
 
+//  #ifdef ESP32
+//    #include "Extensions/pSprite.cpp"
+//  #endif
+
 #ifdef SMOOTH_FONT
   #include "Extensions/Smooth_font.cpp"
 #endif

TFT_eSPI.h

@@ -562,8 +562,8 @@ class TFT_eSPI : public Print {
            fillCircle(int32_t x0, int32_t y0, int32_t r, uint32_t color),
            fillCircleHelper(int32_t x0, int32_t y0, int32_t r, uint8_t cornername, int32_t delta, uint32_t color),
 
-           drawEllipse(int16_t x0, int16_t y0, int16_t rx, int16_t ry, uint16_t color),
-           fillEllipse(int16_t x0, int16_t y0, int16_t rx, int16_t ry, uint16_t color),
+           drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color),
+           fillEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color),
 
            drawTriangle(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, uint32_t color),
            fillTriangle(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, uint32_t color),
@@ -719,6 +719,7 @@ class TFT_eSPI : public Print {
   uint8_t  glyph_ab,  // glyph height above baseline
            glyph_bb;  // glyph height below baseline
 
+  bool     isDigits;  // adjust bounding box for numbers to reduce visual jiggling
   bool     textwrapX, textwrapY;   // If set, 'wrap' text at right and optionally bottom edge of display
   bool     _swapBytes; // Swap the byte order for TFT pushImage()
   bool     locked, inTransaction; // Transaction and mutex lock flags for ESP32
@@ -749,4 +750,9 @@ class TFT_eSPI : public Print {
 // Load the Sprite Class
 #include "Extensions/Sprite.h"
 
+//  #ifdef ESP32
+//    // Load the Sprite Class
+//    #include "Extensions/pSprite.h"
+//  #endif
+
 #endif

User_Setup.h

@@ -236,7 +236,8 @@
 // #define SPI_FREQUENCY  40000000 // Maximum to use SPIFFS
 // #define SPI_FREQUENCY  80000000
 
-#define SPI_READ_FREQUENCY  20000000 // Optional reduced SPI frequency for reading TFT
+// Optional reduced SPI frequency for reading TFT
+#define SPI_READ_FREQUENCY  20000000
 
 // The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
 #define SPI_TOUCH_FREQUENCY  2500000

User_Setup_Select.h

@@ -43,6 +43,8 @@
 //#include <User_Setups/Setup20_ILI9488.h>           // Setup file for ESP8266 and ILI9488 SPI bus TFT
 //#include <User_Setups/Setup21_ILI9488.h>           // Setup file for ESP32 and ILI9488 SPI bus TFT
 
+//#include <User_Setups/Setup43_ST7735.h>              // Setup file configured for my ST7735S 80x160
+
 //#include <User_Setups/SetupX_Template.h>
 
 

User_Setups/Setup1_ILI9341.h

@@ -197,10 +197,12 @@
 // #define SPI_FREQUENCY   5000000
 // #define SPI_FREQUENCY  10000000
 // #define SPI_FREQUENCY  20000000
-#define SPI_FREQUENCY  27000000 // Actually sets it to 26.67MHz = 80/3
-// #define SPI_FREQUENCY  40000000 // Maximum to use SPIFFS
+// #define SPI_FREQUENCY  27000000 // Actually sets it to 26.67MHz = 80/3
+#define SPI_FREQUENCY  40000000 // Maximum to use SPIFFS
 // #define SPI_FREQUENCY  80000000
 
+#define SPI_READ_FREQUENCY  20000000
+
 // The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
 #define SPI_TOUCH_FREQUENCY  2500000
 

User_Setups/Setup21_ILI9488.h

@@ -19,6 +19,9 @@
 //#define ILI9163_DRIVER
 //#define S6D02A1_DRIVER
 //#define RPI_ILI9486_DRIVER // 20MHz maximum SPI
+//#define HX8357D_DRIVER
+//#define ILI9481_DRIVER
+//#define ILI9486_DRIVER
 #define ILI9488_DRIVER
 
 // For M5Stack ESP32 module with integrated display ONLY, remove // in line below