From b481dd58d5bdbe11c2f60ae1c11f19cddba653d1 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Fri, 6 Oct 2023 17:36:03 +0200 Subject: [PATCH] Bugfix Chinese language was not visible in tickers --- TEF6686_ESP32.ino | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 4f46737..5fc1037 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -506,12 +506,20 @@ void setup() { sprite3.setTextDatum(TL_DATUM); sprite4.setTextDatum(TL_DATUM); sprite5.setTextDatum(TL_DATUM); - sprite.loadFont(FONT16); sprite1.loadFont(FREQFONT); - sprite2.loadFont(FONT16); - sprite3.loadFont(FONT16); - sprite4.loadFont(FONT16); - sprite5.loadFont(FONT16); + if (language == LANGUAGE_CHS) { + sprite.loadFont(FONT16_CHS); + sprite2.loadFont(FONT16_CHS); + sprite3.loadFont(FONT16_CHS); + sprite4.loadFont(FONT16_CHS); + sprite5.loadFont(FONT16_CHS); + } else { + sprite.loadFont(FONT16); + sprite2.loadFont(FONT16); + sprite3.loadFont(FONT16); + sprite4.loadFont(FONT16); + sprite5.loadFont(FONT16); + } if (digitalRead(BWBUTTON) == LOW && digitalRead(ROTARY_BUTTON) == HIGH) { if (rotarymode == 0) rotarymode = 1; else rotarymode = 0; @@ -1825,6 +1833,24 @@ void ModeButtonPress() { Serial.end(); if (wifi) remoteip = IPAddress (WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], subnetclient); if (USBmode) Serial.begin(19200); else Serial.begin(115200); + sprite.unloadFont(); + sprite2.unloadFont(); + sprite3.unloadFont(); + sprite4.unloadFont(); + sprite5.unloadFont(); + if (language == LANGUAGE_CHS) { + sprite.loadFont(FONT16_CHS); + sprite2.loadFont(FONT16_CHS); + sprite3.loadFont(FONT16_CHS); + sprite4.loadFont(FONT16_CHS); + sprite5.loadFont(FONT16_CHS); + } else { + sprite.loadFont(FONT16); + sprite2.loadFont(FONT16); + sprite3.loadFont(FONT16); + sprite4.loadFont(FONT16); + sprite5.loadFont(FONT16); + } doBandSelectionFM(); doBandSelectionAM(); ScreensaverTimerSet(screensaverOptions[screensaverset]); @@ -2736,7 +2762,7 @@ void doTuneMode() { ShowStepSize(); } break; - + case TUNE_MI_BAND: case TUNE_AUTO: tunemode = TUNE_MEM;