Prepare for 3.0 docs and small fix

Author: dave

examples/esp/esp32Amplifier/esp32Amplifier.emf

@@ -540,6 +540,11 @@
         "latestValue": "TITLE_ALWAYS",
         "subsystem": "THEME"
       },
+      {
+        "name": "USE_TC_UNICODE",
+        "latestValue": "false",
+        "subsystem": "THEME"
+      },
       {
         "name": "USE_SLIDER_ANALOG",
         "latestValue": "true",

examples/esp/esp32Amplifier/tcMenuTfteSpi.cpp

@@ -12,8 +12,8 @@
  * This library requires the AdaGfx library along with a suitable driver.
  */
 
-
 #include "tcMenuTfteSpi.h"
+#include "tcUnicodeHelper.h"
 #include <TFT_eSPI.h>
 
 TfteSpiDrawable::TfteSpiDrawable(TFT_eSPI *tft, int spriteHeight) : tft(tft), spriteWithConfig(nullptr), spriteHeight(spriteHeight) {}
@@ -30,7 +30,7 @@ DeviceDrawable *TfteSpiDrawable::getSubDeviceFor(const Coord &where, const Coord
     else return nullptr;
 }
 
-void TfteSpiDrawable::drawText(const Coord &where, const void *font, int mag, const char *text) {
+void TfteSpiDrawable::internalDrawText(const Coord &where, const void *font, int mag, const char *text) {
     fontPtrToNum(font, mag);
     tft->setTextColor(drawColor, drawColor); // transparent background
     tft->drawString(text, where.x, where.y);
@@ -88,12 +88,16 @@ void TfteSpiDrawable::transaction(bool isStarting, bool redrawNeeded) {
     if(isStarting) tft->setTextDatum(TL_DATUM);
 }
 
-Coord TfteSpiDrawable::textExtents(const void *font, int mag, const char *text, int *baseline) {
+Coord TfteSpiDrawable::internalTextExtents(const void *font, int mag, const char *text, int *baseline) {
     if(baseline) *baseline = 0;
     fontPtrToNum(font, mag);
     return Coord(tft->textWidth(text), tft->fontHeight());
 }
 
+void TfteSpiDrawable::drawPixel(uint16_t x, uint16_t y) {
+    tft->drawPixel(x, y, drawColor);
+}
+
 void TfteSpiDrawable::fontPtrToNum(const void* font, int mag) {
     if(font == nullptr) {
         tft->setTextFont((uint8_t) mag);
@@ -103,6 +107,10 @@ void TfteSpiDrawable::fontPtrToNum(const void* font, int mag) {
     }
 }
 
+UnicodeFontHandler *TfteSpiDrawable::createFontHandler() {
+    return fontHandler = new UnicodeFontHandler(tft, tccore::ENCMODE_UTF8);
+}
+
 //
 // Sprite object
 //
@@ -115,6 +123,10 @@ bool TftSpriteAndConfig::initSprite(const Coord &spriteWhere, const Coord &sprit
     // if the area is too big, or the sprite is in use, don't proceed.
     if(spriteSize.x > size.x || spriteSize.y > size.y) return false;
 
+    if(root->isTcUnicodeEnabled() && fontHandler == nullptr) {
+        fontHandler = new UnicodeFontHandler(&sprite, tccore::ENCMODE_UTF8);
+    }
+
     // create the sprite if needed
     if(!sprite.created()) {
         sprite.createSprite(size.x, size.y);

examples/esp/esp32Amplifier/tcMenuTfteSpi.h

@@ -34,7 +34,7 @@ class TfteSpiDrawable : public DeviceDrawable {
 
     DeviceDrawable *getSubDeviceFor(const Coord &where, const Coord& size, const color_t *palette, int paletteSize) override;
 
-    void drawText(const Coord &where, const void *font, int mag, const char *text) override;
+    void internalDrawText(const Coord &where, const void *font, int mag, const char *text) override;
 
     void drawBitmap(const Coord &where, const DrawableIcon *icon, bool selected) override;
 
@@ -46,11 +46,15 @@ class TfteSpiDrawable : public DeviceDrawable {
 
     void drawPolygon(const Coord *points, int numPoints, bool filled) override;
 
+    void drawPixel(uint16_t x, uint16_t y) override;
+
     void transaction(bool isStarting, bool redrawNeeded) override;
 
-    Coord textExtents(const void *font, int mag, const char *text, int *baseline) override;
+    Coord internalTextExtents(const void *font, int mag, const char *text, int *baseline) override;
     Coord getDisplayDimensions() override { return Coord(tft->width(), tft->height());}
     TFT_eSPI* getTFT() { return tft; }
+protected:
+    UnicodeFontHandler* createFontHandler() override;
 private:
     void fontPtrToNum(const void* font, int mag);
 };

examples/esp/esp32s2Saola/esp32s2Saola.emf

@@ -483,6 +483,11 @@
         "name": "TITLE_SHOW_MODE",
         "latestValue": "TITLE_ALWAYS",
         "subsystem": "THEME"
+      },
+      {
+        "name": "USE_TC_UNICODE",
+        "latestValue": "false",
+        "subsystem": "THEME"
       }
     ],
     "namingRecursive": true,

examples/esp/esp32s2Saola/tcMenuU8g2.cpp

@@ -17,6 +17,7 @@
 #include <U8g2lib.h>
 #include <Wire.h>
 #include "tcMenuU8g2.h"
+#include <tcUnicodeHelper.h>
 
 const uint8_t* safeGetFont(const void* fnt) {
     if(fnt) return static_cast<const uint8_t *>(fnt);
@@ -65,7 +66,7 @@ U8g2Drawable::U8g2Drawable(U8G2 *u8g2, TwoWire* wireImpl) : u8g2(u8g2) {
 #endif
 }
 
-void U8g2Drawable::drawText(const Coord &where, const void *font, int mag, const char *text) {
+void U8g2Drawable::internalDrawText(const Coord &where, const void *font, int mag, const char *text) {
     u8g2->setFont(safeGetFont(font));
     u8g2->setFontMode(drawColor == 2);
     auto extraHeight = u8g2->getMaxCharHeight();
@@ -137,7 +138,7 @@ void U8g2Drawable::transaction(bool isStarting, bool redrawNeeded) {
     }
 }
 
-Coord U8g2Drawable::textExtents(const void *font, int mag, const char *text, int *baseline) {
+Coord U8g2Drawable::internalTextExtents(const void *font, int mag, const char *text, int *baseline) {
     u8g2->setFont(safeGetFont(font));
     if(baseline) *baseline = (int)u8g2->getFontDescent();
 #ifdef TC_USE_UTF_8_ENCODING
@@ -146,3 +147,11 @@ Coord U8g2Drawable::textExtents(const void *font, int mag, const char *text, int
     return Coord(u8g2->getStrWidth(text), u8g2->getMaxCharHeight());
 #endif
 }
+
+void U8g2Drawable::drawPixel(uint16_t x, uint16_t y) {
+    u8g2->drawPixel(x, y);
+}
+
+UnicodeFontHandler* U8g2Drawable::createFontHandler() {
+    return new UnicodeFontHandler(u8g2, ENCMODE_UTF8);
+}

examples/esp/esp32s2Saola/tcMenuU8g2.h

@@ -80,7 +80,7 @@ class U8g2Drawable : public DeviceDrawable {
 
     DeviceDrawable* getSubDeviceFor(const Coord &where, const Coord &size, const color_t *palette, int paletteSize) override {return nullptr; }
 
-    void drawText(const Coord &where, const void *font, int mag, const char *text) override;
+    void internalDrawText(const Coord &where, const void *font, int mag, const char *text) override;
     void drawBitmap(const Coord &where, const DrawableIcon *icon, bool selected) override;
     void drawXBitmap(const Coord &where, const Coord &size, const uint8_t *data) override;
     void drawBox(const Coord &where, const Coord &size, bool filled) override;
@@ -89,9 +89,11 @@ class U8g2Drawable : public DeviceDrawable {
 
     Coord getDisplayDimensions() override {  return Coord(u8g2->getWidth(), u8g2->getHeight()); }
     void transaction(bool isStarting, bool redrawNeeded) override;
-    Coord textExtents(const void *font, int mag, const char *text, int *baseline) override;
-    color_t getUnderlyingColor(color_t col) { return (col<4) ? col : 1; }
-
+    Coord internalTextExtents(const void *font, int mag, const char *text, int *baseline) override;
+    color_t getUnderlyingColor(color_t col) override { return (col<4) ? col : 1; }
+protected:
+    void drawPixel(uint16_t x, uint16_t y) override;
+    UnicodeFontHandler *createFontHandler() override;
 };
 
 #endif // _TCMENU_U8G2_H_