Font update

Misc bug fixes on fontloader

TEF6686_ESP32.ino

@@ -614,35 +614,7 @@ void setup() {
   tft.setSwapBytes(true);
   tft.fillScreen(BackgroundColor);
 
-  RadiotextSprite.createSprite(270, 19);
-  RadiotextSprite.setTextDatum(TL_DATUM);
-  RadiotextSprite.setSwapBytes(true);
-
-  FrequencySprite.createSprite(200, 50);
-  FrequencySprite.setTextDatum(TR_DATUM);
-  FrequencySprite.setSwapBytes(true);
-
-  RDSSprite.createSprite(165, 19);
-  RDSSprite.setTextDatum(TL_DATUM);
-
-  PSSprite.createSprite(150, 30);
-  PSSprite.setTextDatum(TL_DATUM);
-
-  SquelchSprite.createSprite(47, 19);
-  SquelchSprite.setTextDatum(TL_DATUM);
-  SquelchSprite.setSwapBytes(true);
-
-  FullLineSprite.createSprite(308, 20);
-  FullLineSprite.setSwapBytes(true);
-
-  OneBigLineSprite.createSprite(270, 30);
-  OneBigLineSprite.setSwapBytes(true);
-
-  SignalSprite.createSprite(80, 48);
-  SignalSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
-  SignalSprite.setTextDatum(TR_DATUM);
-  SignalSprite.setSwapBytes(true);
-
+  UpdateSprites(0);
   UpdateFonts(0);
 
   if (digitalRead(BWBUTTON) == LOW && digitalRead(ROTARY_BUTTON) == HIGH) {
@@ -4227,11 +4199,58 @@ void deepSleep() {
   esp_deep_sleep_start();
 }
 
-void UpdateFonts(bool mode) {
+void UpdateSprites(bool mode) {
+  switch (mode) {
+    case 0:
+      RadiotextSprite.createSprite(270, 19);
+      RadiotextSprite.setTextDatum(TL_DATUM);
+      RadiotextSprite.setSwapBytes(true);
+
+      FrequencySprite.createSprite(200, 50);
+      FrequencySprite.setTextDatum(TR_DATUM);
+      FrequencySprite.setSwapBytes(true);
+
+      RDSSprite.createSprite(165, 19);
+      RDSSprite.setTextDatum(TL_DATUM);
+
+      PSSprite.createSprite(150, 30);
+      PSSprite.setTextDatum(TL_DATUM);
+
+      SquelchSprite.createSprite(47, 19);
+      SquelchSprite.setTextDatum(TL_DATUM);
+      SquelchSprite.setSwapBytes(true);
+
+      FullLineSprite.createSprite(308, 20);
+      FullLineSprite.setSwapBytes(true);
+
+      OneBigLineSprite.createSprite(270, 30);
+      OneBigLineSprite.setSwapBytes(true);
+
+      SignalSprite.createSprite(80, 48);
+      SignalSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
+      SignalSprite.setTextDatum(TR_DATUM);
+      SignalSprite.setSwapBytes(true);
+      break;
+
+    case 1:
+      RadiotextSprite.deleteSprite();
+      FrequencySprite.deleteSprite();
+      RDSSprite.deleteSprite();
+      PSSprite.deleteSprite();
+      SquelchSprite.deleteSprite();
+      FullLineSprite.deleteSprite();
+      OneBigLineSprite.deleteSprite();
+      SignalSprite.deleteSprite();
+      break;
+  }
+}
+
+void UpdateFonts(byte mode) {
   switch (mode) {
     case 0:                                 // Use in radio mode
       RadiotextSprite.unloadFont();
       RDSSprite.unloadFont();
+      PSSprite.unloadFont();
 
       if (language == LANGUAGE_CHS) {
         RadiotextSprite.loadFont(FONT16_CHS);

src/gui.cpp

@@ -2021,7 +2021,7 @@ void MenuUp() {
           case ITEM1:
             language ++;
             if (language == (sizeof (myLanguage) / sizeof (myLanguage[0]))) language = 0;
-            UpdateFonts(2);
+            UpdateFonts(1);
             OneBigLineSprite.drawString(myLanguage[language][0], 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
             break;
@@ -2868,7 +2868,7 @@ void MenuDown() {
           case ITEM1:
             language --;
             if (language > (sizeof (myLanguage) / sizeof (myLanguage[0]))) language = (sizeof (myLanguage) / sizeof (myLanguage[0])) - 1;
-            UpdateFonts(2);
+            UpdateFonts(1);
             OneBigLineSprite.drawString(myLanguage[language][0], 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
             break;
@@ -4154,7 +4154,8 @@ void DoMenu() {
               tftPrint(0, "http://192.168.4.1", 155, 174, PrimaryColor, PrimaryColorSmooth, 16);
               char key [9];
               XDRGTK_key.toCharArray(key, 9);
-              UpdateFonts(3);
+              UpdateFonts(2);
+			  UpdateSprites(1);
               WiFiConnectParam XDRGTK_key_text("Set XDRGTK Password: (max 8 characters)");
               WiFiConnectParam XDRGTK_key_input("XDRGTK_key", "Password", key, 9);
               wc.addParameter(&XDRGTK_key_text);
@@ -4163,7 +4164,8 @@ void DoMenu() {
               XDRGTK_key = XDRGTK_key_input.getValue();
               EEPROM.writeString(EE_STRING_XDRGTK_KEY, XDRGTK_key);
               EEPROM.commit();
-              UpdateFonts(2);
+			  UpdateSprites(0);
+              UpdateFonts(1);
               wifi = true;
               tryWiFi();
               delay(2000);

src/gui.h

@@ -229,7 +229,8 @@ extern void TuneUp();
 extern void endMenu();
 extern void startFMDXScan();
 extern void DoMemoryPosTune();
-extern void UpdateFonts(bool mode);
+extern void UpdateFonts(byte mode);
+extern void UpdateSprites(bool mode);
 extern void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, uint8_t fontsize);
 extern void setAutoSpeedSPI();
 extern void showAutoSquelch(bool mode);

src/language.h

@@ -460,7 +460,7 @@ static const char* const myLanguage[18][228] PROGMEM = {
     "Signaal", // 221
     "Geen geluid\ntijdens scannen", // 222
     "AIR", // 223
-    "5 sec. bandbutton ingedrukt", // 224
+    "5 sec.\nbandbutton ingedrukt", // 224
     "Uitschakelen", // 225
     "Scherm uit", // 226
     "Geen functie" // 227