From 7541cb37f0e0192224e162be464a94604862cb0a Mon Sep 17 00:00:00 2001
From: lovyan03 <42724151+lovyan03@users.noreply.github.com>
Date: Wed, 13 Mar 2019 21:21:22 +0900
Subject: [PATCH] Add setFS function. ( Support for file systems other than
 SPIFFS. )

---
 Extensions/Smooth_font.cpp | 10 ++++------
 Extensions/Smooth_font.h   |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Extensions/Smooth_font.cpp b/Extensions/Smooth_font.cpp
index 6e5f89d..07b8bef 100644
--- a/Extensions/Smooth_font.cpp
+++ b/Extensions/Smooth_font.cpp
@@ -77,12 +77,12 @@ void TFT_eSPI::loadFont(String fontName)
    unloadFont();
     
   // Avoid a crash on the ESP32 if the file does not exist
-  if (SPIFFS.exists("/" + fontName + ".vlw") == false) {
+  if ((_pFS ? *_pFS : SPIFFS).exists("/" + fontName + ".vlw") == false) {
     Serial.println("Font file " + fontName + " not found!");
     return;
   }
 
-  fontFile = SPIFFS.open( "/" + fontName + ".vlw", "r");
+  fontFile = (_pFS ? *_pFS : SPIFFS).open( "/" + fontName + ".vlw", "r");
 
   if(!fontFile) return;
 
@@ -452,11 +452,10 @@ void TFT_eSPI::drawGlyph(uint16_t code)
     int16_t cy = cursor_y + gFont.maxAscent - gdY[gNum];
     int16_t cx = cursor_x + gdX[gNum];
 
-    startWrite(); // Avoid slow ESP32 transaction overhead for every pixel
-
     for (int y = 0; y < gHeight[gNum]; y++)
     {
       fontFile.read(pbuffer, gWidth[gNum]); //<//
+      startWrite(); // Avoid slow ESP32 transaction overhead for every pixel
       for (int x = 0; x < gWidth[gNum]; x++)
       {
         uint8_t pixel = pbuffer[x]; //<//
@@ -483,6 +482,7 @@ void TFT_eSPI::drawGlyph(uint16_t code)
         }
       }
       if (dl) { drawFastHLine( xs, y + cy, dl, fg); dl = 0; }
+      endWrite();
     }
 
     cursor_x += gxAdvance[gNum];
@@ -493,8 +493,6 @@ void TFT_eSPI::drawGlyph(uint16_t code)
     drawRect(cursor_x, cursor_y + gFont.maxAscent - gFont.ascent, gFont.spaceWidth, gFont.ascent, fg);
     cursor_x += gFont.spaceWidth + 1;
   }
-
-  endWrite();
 }
 
 /***************************************************************************************
diff --git a/Extensions/Smooth_font.h b/Extensions/Smooth_font.h
index c1cc483..eb1b50a 100644
--- a/Extensions/Smooth_font.h
+++ b/Extensions/Smooth_font.h
@@ -41,7 +41,8 @@ fontMetrics gFont = { 0, 0, 0, 0, 0, 0, 0 };
 
   bool     fontLoaded = false; // Flags when a anti-aliased font is loaded
 
+  void setFS(fs::FS& fs) { _pFS = &fs; }
  private:
-
+  fs::FS* _pFS = NULL;
   void     loadMetrics(uint16_t gCount);
   uint32_t readInt32(void);