kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

simplyfy the font logic and also fix the bug where it loaded the chinese font for both chinese and latin

Browse Source
This commit is contained in:
kuba
2026-01-11 21:40:42 +01:00
parent d64c14a96b
commit da6db59e27
5 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui.cpp
+3 -5
View File
@@ -3519,14 +3519,14 @@ void MenuUpDown(bool dir) {
switch (menuoption) {
case ITEM1:
if (dir) {
language ++;
language++;
if (language == language_totalnumber) language = 0;
} else {
language --;
language--;
if (language > language_totalnumber) language = language_totalnumber - 1;
}
UpdateFonts(0);
UpdateFonts();
OneBigLineSprite.drawString(textUI(0), 135, 0);
OneBigLineSprite.pushSprite(24, 118);
break;
@@ -5222,7 +5222,6 @@ void DoMenu() {
tftPrint(ACENTER, "http://192.168.4.1", 155, 174, PrimaryColor, PrimaryColorSmooth, 16);
char key [9];
XDRGTK_key.toCharArray(key, 9);
UpdateFonts(1);
if (wifi) {
wifi = false;
tryWiFi();
@@ -5238,7 +5237,6 @@ void DoMenu() {
XDRGTK_key = XDRGTK_key_input.getValue();
EEPROM.writeString(EE_STRING_XDRGTK_KEY, XDRGTK_key);
EEPROM.commit();
UpdateFonts(0);
wifi = true;
tryWiFi();
delay(2000);
src/main.cpp
+14 -18
View File
@@ -1315,19 +1315,19 @@ void setup() {
FullLineSprite.createSprite(308, 19);
FullLineSprite.setSwapBytes(true);
FullLineSprite.loadFont(FONT16, 0);
FullLineSprite.loadFont(FONT16_CHS, 0);
FullLineSprite.loadFont(FONT16_CHS, 1);
OneBigLineSprite.createSprite(270, 30);
OneBigLineSprite.setSwapBytes(true);
OneBigLineSprite.loadFont(FONT28, 0);
OneBigLineSprite.loadFont(FONT28_CHS, 0);
OneBigLineSprite.loadFont(FONT28_CHS, 1);
SignalSprite.createSprite(80, 48);
SignalSprite.loadFont(FONT28, 0);
SignalSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
SignalSprite.setSwapBytes(true);
UpdateFonts(0);
UpdateFonts();
if (digitalRead(BWBUTTON) == LOW && digitalRead(ROTARY_BUTTON) == HIGH && digitalRead(MODEBUTTON) == HIGH && digitalRead(BANDBUTTON) == HIGH) {
if (rotarymode == 0) rotarymode = 1; else rotarymode = 0;
@@ -3903,21 +3903,17 @@ void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int colo
tft.drawString(modifiedText, x, y, selectedFont);
}
void UpdateFonts(byte mode) {
switch (mode) {
case 0:
if (language == LANGUAGE_CHS) {
if (menu) PSSprite.setTextFont(1); else PSSprite.setTextFont(3);
OneBigLineSprite.setTextFont(1);
GeneralTextSprite.setTextFont(1);
FullLineSprite.setTextFont(1);
} else {
if (menu) PSSprite.setTextFont(0); else PSSprite.setTextFont(2);
OneBigLineSprite.setTextFont(0);
GeneralTextSprite.setTextFont(0);
FullLineSprite.setTextFont(0);
}
break;
void UpdateFonts() {
if (language == LANGUAGE_CHS) {
if (menu) PSSprite.setTextFont(1); else PSSprite.setTextFont(3);
OneBigLineSprite.setTextFont(1);
GeneralTextSprite.setTextFont(1);
FullLineSprite.setTextFont(1);
} else {
if (menu) PSSprite.setTextFont(0); else PSSprite.setTextFont(2);
OneBigLineSprite.setTextFont(0);
GeneralTextSprite.setTextFont(0);
FullLineSprite.setTextFont(0);
}
}