From 41e59b746edb9d80a7492210b031712e5ae93420 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Fri, 4 Aug 2023 03:25:51 +0300 Subject: [PATCH 1/4] More GUI adjustments, fix battery language entries --- src/gui.cpp | 238 ++++++++++++++++++++++++------------------------- src/language.h | 52 +++++------ 2 files changed, 145 insertions(+), 145 deletions(-) diff --git a/src/gui.cpp b/src/gui.cpp index 4861082..e96eaa1 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -58,140 +58,140 @@ void BuildMenu() { tft.drawLine(0, 23, 320, 23, FrameColor); tftPrint(-1, myLanguage[language][41], 4, 7, PrimaryColor, PrimaryColorSmooth, FONT16); tftPrint(1, String(menupage) + "/" + String(menupagestotal), 314, 7, ActiveColor, ActiveColorSmooth, FONT16); - tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, ActiveColor); + tft.drawRoundRect(3, menuoption + 3, 315, 21, 5, ActiveColor); switch (menupage) { case 1: - tftPrint(1, "dB", 305, 36, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "MHz", 305, 56, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "MHz", 305, 76, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "MHz", 305, 96, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "dB", 305, 116, ActiveColor, ActiveColorSmooth, FONT16); - if (StereoLevel != 0) tftPrint(1, "dBμV", 305, 136, ActiveColor, ActiveColorSmooth, FONT16); - if (HighCutLevel != 0) tftPrint(1, "Hz", 305, 156, ActiveColor, ActiveColorSmooth, FONT16); - if (HighCutOffset != 0) tftPrint(1, "dBμV", 305, 176, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "dBμV", 305, 196, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "%", 305, 216, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][20], 14, 36, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][21], 14, 56, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][22], 14, 76, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][23], 14, 96, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][24], 14, 116, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][25], 14, 136, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][26], 14, 156, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][27], 14, 176, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][28], 14, 196, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][29], 14, 216, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "dB", 310, 36, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "MHz", 310, 56, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "MHz", 310, 76, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "MHz", 310, 96, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "dB", 310, 116, ActiveColor, ActiveColorSmooth, FONT16); + if (StereoLevel != 0) tftPrint(1, "dBμV", 310, 136, ActiveColor, ActiveColorSmooth, FONT16); + if (HighCutLevel != 0) tftPrint(1, "Hz", 310, 156, ActiveColor, ActiveColorSmooth, FONT16); + if (HighCutOffset != 0) tftPrint(1, "dBμV", 310, 176, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "dBμV", 310, 196, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "%", 310, 216, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][20], 8, 36, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][21], 8, 56, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][22], 8, 76, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][23], 8, 96, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][24], 8, 116, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][25], 8, 136, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][26], 8, 156, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][27], 8, 176, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][28], 8, 196, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][29], 8, 216, ActiveColor, ActiveColorSmooth, FONT16); - if (VolSet > 0) tftPrint(1, "+" + String(VolSet, DEC), 265, 36, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(VolSet, DEC), 265, 36, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, String(ConverterSet, DEC), 265, 56, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, String(LowEdgeSet / 10 + ConverterSet, DEC) + "." + String(LowEdgeSet % 10 + ConverterSet, DEC), 265, 76, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, String(HighEdgeSet / 10 + ConverterSet, DEC) + "." + String(HighEdgeSet % 10 + ConverterSet, DEC), 265, 96, PrimaryColor, PrimaryColorSmooth, FONT16); - if (LevelOffset > 0) tftPrint(1, "+" + String(LevelOffset, DEC), 265, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(LevelOffset, DEC), 265, 116, PrimaryColor, PrimaryColorSmooth, FONT16); - if (StereoLevel != 0) tftPrint(1, String(StereoLevel, DEC), 265, 136, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 136, PrimaryColor, PrimaryColorSmooth, FONT16); - if (HighCutLevel != 0) tftPrint(1, String(HighCutLevel * 100, DEC), 265, 156, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 156, PrimaryColor, PrimaryColorSmooth, FONT16); - if (HighCutOffset != 0) tftPrint(1, String(HighCutOffset, DEC), 265, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 176, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, String(LowLevelSet, DEC), 265, 196, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, String(ContrastSet, DEC), 265, 216, PrimaryColor, PrimaryColorSmooth, FONT16); + if (VolSet > 0) tftPrint(1, "+" + String(VolSet, DEC), 270, 36, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(VolSet, DEC), 270, 36, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, String(ConverterSet, DEC), 270, 56, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, String(LowEdgeSet / 10 + ConverterSet, DEC) + "." + String(LowEdgeSet % 10 + ConverterSet, DEC), 270, 76, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, String(HighEdgeSet / 10 + ConverterSet, DEC) + "." + String(HighEdgeSet % 10 + ConverterSet, DEC), 270, 96, PrimaryColor, PrimaryColorSmooth, FONT16); + if (LevelOffset > 0) tftPrint(1, "+" + String(LevelOffset, DEC), 270, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(LevelOffset, DEC), 270, 116, PrimaryColor, PrimaryColorSmooth, FONT16); + if (StereoLevel != 0) tftPrint(1, String(StereoLevel, DEC), 270, 136, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 136, PrimaryColor, PrimaryColorSmooth, FONT16); + if (HighCutLevel != 0) tftPrint(1, String(HighCutLevel * 100, DEC), 270, 156, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 156, PrimaryColor, PrimaryColorSmooth, FONT16); + if (HighCutOffset != 0) tftPrint(1, String(HighCutOffset, DEC), 270, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 176, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, String(LowLevelSet, DEC), 270, 196, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, String(ContrastSet, DEC), 270, 216, PrimaryColor, PrimaryColorSmooth, FONT16); break; case 2: - tftPrint(-1, myLanguage[language][39], 14, 36, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][38], 14, 56, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][43], 14, 76, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][44], 14, 96, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][45], 14, 116, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][46], 14, 136, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][49], 14, 156, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][50], 14, 176, ActiveColor, ActiveColorSmooth, FONT16); - if (wifi) tftPrint(-1, String(myLanguage[language][51]) + " IP: " + String(WiFi.localIP().toString()), 14, 196, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(-1, myLanguage[language][51], 14, 196, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][52], 14, 216, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][39], 8, 36, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][38], 8, 56, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][43], 8, 76, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][44], 8, 96, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][45], 8, 116, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][46], 8, 136, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][49], 8, 156, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][50], 8, 176, ActiveColor, ActiveColorSmooth, FONT16); + if (wifi) tftPrint(-1, String(myLanguage[language][51]) + " IP: " + String(WiFi.localIP().toString()), 8, 196, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(-1, myLanguage[language][51], 8, 196, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][52], 8, 216, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, myLanguage[language][0], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); - if (showrdserrors) tftPrint(1, myLanguage[language][42], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); - if (softmutefm) tftPrint(1, myLanguage[language][42], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); - if (softmuteam) tftPrint(1, myLanguage[language][42], 305, 96, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 96, PrimaryColor, PrimaryColorSmooth, FONT16); - if (edgebeep) tftPrint(1, myLanguage[language][42], 305, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 116, PrimaryColor, PrimaryColorSmooth, FONT16); - if (region == 0) tftPrint(1, myLanguage[language][47], 305, 136, PrimaryColor, PrimaryColorSmooth, FONT16); - if (region == 1) tftPrint(1, myLanguage[language][48], 305, 136, PrimaryColor, PrimaryColorSmooth, FONT16); - if (radio.rds.underscore) tftPrint(1, myLanguage[language][42], 305, 156, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 156, PrimaryColor, PrimaryColorSmooth, FONT16); - if (USBmode) tftPrint(1, "RDS Spy", 305, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, "XDRGTK", 305, 176, PrimaryColor, PrimaryColorSmooth, FONT16); - if (wifi) tftPrint(1, myLanguage[language][42], 305, 196, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 196, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, ">", 305, 216, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, myLanguage[language][0], 310, 36, PrimaryColor, PrimaryColorSmooth, FONT16); + if (showrdserrors) tftPrint(1, myLanguage[language][42], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); + if (softmutefm) tftPrint(1, myLanguage[language][42], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); + if (softmuteam) tftPrint(1, myLanguage[language][42], 310, 96, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 96, PrimaryColor, PrimaryColorSmooth, FONT16); + if (edgebeep) tftPrint(1, myLanguage[language][42], 310, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 116, PrimaryColor, PrimaryColorSmooth, FONT16); + if (region == 0) tftPrint(1, myLanguage[language][47], 310, 136, PrimaryColor, PrimaryColorSmooth, FONT16); + if (region == 1) tftPrint(1, myLanguage[language][48], 310, 136, PrimaryColor, PrimaryColorSmooth, FONT16); + if (radio.rds.underscore) tftPrint(1, myLanguage[language][42], 310, 156, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 156, PrimaryColor, PrimaryColorSmooth, FONT16); + if (USBmode) tftPrint(1, "RDS Spy", 310, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, "XDRGTK", 310, 176, PrimaryColor, PrimaryColorSmooth, FONT16); + if (wifi) tftPrint(1, myLanguage[language][42], 310, 196, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 196, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, ">", 310, 216, PrimaryColor, PrimaryColorSmooth, FONT16); break; case 3: - tftPrint(-1, myLanguage[language][58], 14, 36, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][59], 14, 56, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][60], 14, 76, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][61], 14, 96, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][62], 14, 116, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][63], 14, 136, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][64], 14, 156, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][65], 14, 176, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][67], 14, 196, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][68], 14, 216, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][58], 8, 36, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][59], 8, 56, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][60], 8, 76, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][61], 8, 96, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][62], 8, 116, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][63], 8, 136, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][64], 8, 156, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][65], 8, 176, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][67], 8, 196, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][68], 8, 216, ActiveColor, ActiveColorSmooth, FONT16); - if (amnb != 0) tftPrint(1, "%", 305, 156, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 156, ActiveColor, ActiveColorSmooth, FONT16); - if (fmnb != 0) tftPrint(1, "%", 305, 176, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 176, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); - if (showSWMIBand) tftPrint(1, myLanguage[language][42], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); - if (radio.rds.filter) tftPrint(1, myLanguage[language][42], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); - if (radio.rds.pierrors) tftPrint(1, myLanguage[language][42], 305, 96, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 96, PrimaryColor, PrimaryColorSmooth, FONT16); - if (showsquelch) tftPrint(1, myLanguage[language][42], 305, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 116, PrimaryColor, PrimaryColorSmooth, FONT16); - if (showmodulation) tftPrint(1, myLanguage[language][42], 305, 136, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 136, PrimaryColor, PrimaryColorSmooth, FONT16); - if (amnb != 0) tftPrint(1, String(amnb, DEC), 265, 156, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 156, PrimaryColor, PrimaryColorSmooth, FONT16); - if (fmnb != 0) tftPrint(1, String(fmnb, DEC), 265, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 176, PrimaryColor, PrimaryColorSmooth, FONT16); - if (audiomode) tftPrint(1, "MPX", 305, 196, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, "Stereo", 305, 196, PrimaryColor, PrimaryColorSmooth, FONT16); - if (touchrotating) tftPrint(1, myLanguage[language][42], 305, 216, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 216, PrimaryColor, PrimaryColorSmooth, FONT16); + if (amnb != 0) tftPrint(1, "%", 310, 156, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 156, ActiveColor, ActiveColorSmooth, FONT16); + if (fmnb != 0) tftPrint(1, "%", 310, 176, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 176, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 310, 36, PrimaryColor, PrimaryColorSmooth, FONT16); + if (showSWMIBand) tftPrint(1, myLanguage[language][42], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); + if (radio.rds.filter) tftPrint(1, myLanguage[language][42], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); + if (radio.rds.pierrors) tftPrint(1, myLanguage[language][42], 310, 96, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 96, PrimaryColor, PrimaryColorSmooth, FONT16); + if (showsquelch) tftPrint(1, myLanguage[language][42], 310, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 116, PrimaryColor, PrimaryColorSmooth, FONT16); + if (showmodulation) tftPrint(1, myLanguage[language][42], 310, 136, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 136, PrimaryColor, PrimaryColorSmooth, FONT16); + if (amnb != 0) tftPrint(1, String(amnb, DEC), 270, 156, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 156, PrimaryColor, PrimaryColorSmooth, FONT16); + if (fmnb != 0) tftPrint(1, String(fmnb, DEC), 270, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 176, PrimaryColor, PrimaryColorSmooth, FONT16); + if (audiomode) tftPrint(1, "MPX", 310, 196, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, "Stereo", 310, 196, PrimaryColor, PrimaryColorSmooth, FONT16); + if (touchrotating) tftPrint(1, myLanguage[language][42], 310, 216, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 216, PrimaryColor, PrimaryColorSmooth, FONT16); break; case 4: - tftPrint(-1, myLanguage[language][77], 14, 36, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][70], 14, 56, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][74], 14, 76, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][90], 14, 96, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][91], 14, 116, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][97], 14, 136, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][98], 14, 156, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][99], 14, 176, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][100], 14, 196, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][101], 14, 216, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][77], 8, 36, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][70], 8, 56, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][74], 8, 76, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][90], 8, 96, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][91], 8, 116, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][97], 8, 136, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][98], 8, 156, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][99], 8, 176, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][100], 8, 196, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][101], 8, 216, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "KHz", 305, 96, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(1, "dB", 305, 136, ActiveColor, ActiveColorSmooth, FONT16); - if (screensaverset) tftPrint(1, myLanguage[language][92], 305, 116, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 116, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, CurrentThemeString, 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, "KHz", 310, 96, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(1, "dB", 310, 136, ActiveColor, ActiveColorSmooth, FONT16); + if (screensaverset) tftPrint(1, myLanguage[language][92], 310, 116, ActiveColor, ActiveColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 116, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, CurrentThemeString, 310, 36, PrimaryColor, PrimaryColorSmooth, FONT16); switch (poweroptions) { - case DEEP_SLEEP: tftPrint(1, myLanguage[language][75], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case LCD_OFF: tftPrint(1, myLanguage[language][76], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case LCD_BRIGHTNESS_1_PERCENT: tftPrint(1, myLanguage[language][94], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case LCD_BRIGHTNESS_A_QUARTER: tftPrint(1, myLanguage[language][95], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case LCD_BRIGHTNESS_HALF: tftPrint(1, myLanguage[language][96], 305, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case DEEP_SLEEP: tftPrint(1, myLanguage[language][75], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case LCD_OFF: tftPrint(1, myLanguage[language][76], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case LCD_BRIGHTNESS_1_PERCENT: tftPrint(1, myLanguage[language][94], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case LCD_BRIGHTNESS_A_QUARTER: tftPrint(1, myLanguage[language][95], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case LCD_BRIGHTNESS_HALF: tftPrint(1, myLanguage[language][96], 310, 76, PrimaryColor, PrimaryColorSmooth, FONT16); break; } - if (fmdefaultstepsize) tftPrint(1, String(FREQ_FM_STEP_100K * 10, DEC), 265, 96, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(FREQ_FM_STEP_50K * 10, DEC), 265, 96, PrimaryColor, PrimaryColorSmooth, FONT16); - if (screensaverset) tftPrint(1, String(screensaverOptions[screensaverset], DEC), 265, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 116, PrimaryColor, PrimaryColorSmooth, FONT16); - if (AMLevelOffset > 0) tftPrint(1, "+" + String(AMLevelOffset, DEC), 265, 136, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(AMLevelOffset, DEC), 265, 136, PrimaryColor, PrimaryColorSmooth, FONT16); - if (af) tftPrint(1, myLanguage[language][42], 305, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 305, 176, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(1, unitString[unit], 305, 156, PrimaryColor, PrimaryColorSmooth, FONT16); + if (fmdefaultstepsize) tftPrint(1, String(FREQ_FM_STEP_100K * 10, DEC), 270, 96, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(FREQ_FM_STEP_50K * 10, DEC), 270, 96, PrimaryColor, PrimaryColorSmooth, FONT16); + if (screensaverset) tftPrint(1, String(screensaverOptions[screensaverset], DEC), 270, 116, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 116, PrimaryColor, PrimaryColorSmooth, FONT16); + if (AMLevelOffset > 0) tftPrint(1, "+" + String(AMLevelOffset, DEC), 270, 136, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, String(AMLevelOffset, DEC), 270, 136, PrimaryColor, PrimaryColorSmooth, FONT16); + if (af) tftPrint(1, myLanguage[language][42], 310, 176, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(1, myLanguage[language][30], 310, 176, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(1, unitString[unit], 310, 156, PrimaryColor, PrimaryColorSmooth, FONT16); ShowBandSelectionFM(false, true); ShowBandSelectionAM(false, true); break; case 5: - tftPrint(-1, myLanguage[language][108], 14, 36, ActiveColor, ActiveColorSmooth, FONT16); - tftPrint(-1, myLanguage[language][173], 14, 56, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][108], 8, 36, ActiveColor, ActiveColorSmooth, FONT16); + tftPrint(-1, myLanguage[language][173], 8, 56, ActiveColor, ActiveColorSmooth, FONT16); switch (hardwaremodel) { - case BASE_ILI9341: tftPrint(1, myLanguage[language][109], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case PORTABLE_ILI9341: tftPrint(1, myLanguage[language][110 ], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case PORTABLE_TOUCH_ILI9341: tftPrint(1, myLanguage[language][111], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case BASE_ILI9341: tftPrint(1, myLanguage[language][109], 310, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case PORTABLE_ILI9341: tftPrint(1, myLanguage[language][110 ], 310, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case PORTABLE_TOUCH_ILI9341: tftPrint(1, myLanguage[language][111], 310, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; } switch (batteryoptions) { - case BATTERY_NONE: tftPrint(1, myLanguage[language][30], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case BATTERY_VALUE: tftPrint(1, myLanguage[language][174], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); break; - case BATTERY_PERCENT: tftPrint(1, myLanguage[language][175], 305, 56, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case BATTERY_NONE: tftPrint(1, myLanguage[language][30], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case BATTERY_VALUE: tftPrint(1, myLanguage[language][174], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); break; + case BATTERY_PERCENT: tftPrint(1, myLanguage[language][175], 310, 56, PrimaryColor, PrimaryColorSmooth, FONT16); break; } break; @@ -274,15 +274,15 @@ void BuildAdvancedRDS() { } if (radio.rds.hasCT) tftPrint(1, rds_clockold, 205, 109, SecondaryColor, SecondaryColorSmooth, FONT16); - tftPrint(-1, "TP", 6, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "TA", 28, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "CT", 72, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "TMC", 90, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "RT+", 124, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "M", 185, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "S", 198, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "TP", 3, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "TA", 25, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "AF", 47, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "CT", 69, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "TMC", 89, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "RT+", 122, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "EON", 150, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "M", 183, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "S", 199, 51, GreyoutColor, BackgroundColor, FONT16); } RDSstatusold = false; @@ -442,7 +442,7 @@ void BuildDisplay() { void MenuUp() { if (menuopen == false) { - tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, BackgroundColor); + tft.drawRoundRect(3, menuoption + 3, 315, 21, 5, BackgroundColor); if (hardwaremodel == BASE_ILI9341) { menuoption += 20; if (menuoption > 210) { @@ -460,7 +460,7 @@ void MenuUp() { BuildMenu(); } } - tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, ActiveColor); + tft.drawRoundRect(3, menuoption + 3, 315, 21, 5, ActiveColor); } else { switch (menupage) { case 1: @@ -837,7 +837,7 @@ void MenuUp() { void MenuDown() { if (menuopen == false) { - tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, BackgroundColor); + tft.drawRoundRect(3, menuoption + 3, 315, 21, 5, BackgroundColor); if (hardwaremodel == BASE_ILI9341) { menuoption -= 20; if (menuoption < 30) { @@ -855,7 +855,7 @@ void MenuDown() { BuildMenu(); } } - tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, ActiveColor); + tft.drawRoundRect(3, menuoption + 3, 315, 21, 5, ActiveColor); } else { switch (menupage) { case 1: diff --git a/src/language.h b/src/language.h index 85c8189..2f50b87 100644 --- a/src/language.h +++ b/src/language.h @@ -175,8 +175,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Nederlands", // Dutch @@ -353,8 +353,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Polski", // Polish @@ -531,8 +531,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Hrvatski", // Croatian @@ -709,8 +709,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Ελληνικά", // Greek @@ -886,9 +886,9 @@ static const char* const myLanguage[16][176] = { "Μανταρινί", // 170 "Ωκεανός", // 171 "Ινδικό", // 172 - "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Επιλογές μπαταρίας", // 173 + "Εμφάνιση τάσης", // 174 + "Εμφάνιση ποσοστού" // 175 }, { "Romana", // Romanian @@ -1065,8 +1065,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Deutsch", // German @@ -1243,8 +1243,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Czech", // Czech @@ -1421,8 +1421,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Slovak", // Slovak @@ -1599,8 +1599,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Français", // French @@ -1776,9 +1776,9 @@ static const char* const myLanguage[16][176] = { "Mandarine", // 170 "Océan", // 171 "Indigo", // 172 - "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Options de batterie", // 173 + "Montrer la tension", // 174 + "Montrer le pourcentage" // 175 }, { "Български", // Bulgarian @@ -1955,8 +1955,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Русский", // Russian @@ -2489,8 +2489,8 @@ static const char* const myLanguage[16][176] = { "Ocean", // 171 "Indigo", // 172 "Battery options", // 173 - "Show battery value", // 174 - "Show battery percent" // 175 + "Show voltage", // 174 + "Show percentage" // 175 }, { "Simplified Chinese", // Simplified Chinese From f3acb150f477108d5c6a5e0fb3ca8ec691f84565 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Fri, 4 Aug 2023 03:26:48 +0300 Subject: [PATCH 2/4] More GUI adjustments and minor fixes --- TEF6686_ESP32.ino | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 2811f9d..7ddea49 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -1019,7 +1019,7 @@ void ShowBandSelectionFM(bool notglanceview, bool normaldisplay) { bandFMx = 155; bandFMy = 118; } else { - bandFMx = 305; + bandFMx = 310; bandFMy = 196; } @@ -1118,7 +1118,7 @@ void ShowBandSelectionAM(bool notglanceview, bool normaldisplay) { bandAMx = 155; bandAMy = 118; } else { - bandAMx = 305; + bandAMx = 310; bandAMy = 216; } @@ -2303,7 +2303,7 @@ void ShowAdvancedRDS() { String afstring; if (radio.rds.hasAF) for (byte i = 0; i < radio.af_counter; i++) afstring += String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10) + (radio.af[i].filler ? "(f)" : "") + (i == radio.af_counter - 1 ? " " : " | "); else afstring = myLanguage[language][87]; if (hasafold != radio.rds.hasAF) { - if (radio.rds.hasAF) tftPrint(-1, "AF", 50, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, FONT16); + if (radio.rds.hasAF) tftPrint(-1, "AF", 47, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "AF", 47, 51, GreyoutColor, BackgroundColor, FONT16); hasafold = radio.rds.hasAF; } @@ -2341,7 +2341,7 @@ void ShowAdvancedRDS() { String eonstring; if (radio.rds.hasEON) for (byte i = 0; i < radio.eon_counter; i++) eonstring += String(radio.eon[i].picode) + (radio.eon[i].ps.length() > 0 ? String(": " + String(radio.eon[i].ps)) : "") + (radio.eon[i].mappedfreq > 0 ? String(" " + String(radio.eon[i].mappedfreq / 100) + "." + String((radio.eon[i].mappedfreq % 100) / 10)) : "") + (radio.eon[i].mappedfreq2 > 0 ? String(" / " + String(radio.eon[i].mappedfreq2 / 100) + "." + String((radio.eon[i].mappedfreq2 % 100) / 10)) : "") + (radio.eon[i].mappedfreq3 > 0 ? String(" / " + String(radio.eon[i].mappedfreq3 / 100) + "." + String((radio.eon[i].mappedfreq3 % 100) / 10)) : "") + (i == radio.eon_counter - 1 ? " " : " | "); else eonstring = myLanguage[language][88]; if (haseonold != radio.rds.hasEON) { - if (radio.rds.hasEON) tftPrint(-1, "EON", 153, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, FONT16); + if (radio.rds.hasEON) tftPrint(-1, "EON", 150, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "EON", 150, 51, GreyoutColor, BackgroundColor, FONT16); haseonold = radio.rds.hasEON; } if (eonstring.length() < 20) { @@ -2378,7 +2378,7 @@ void ShowAdvancedRDS() { String rtplusstring; if (radio.rds.hasRDSplus) rtplusstring = (radio.rds.rdsplusTag1 != 169 ? String(myLanguage[language][radio.rds.rdsplusTag1]) + ": " + String(radio.rds.RTContent1) : "") + (radio.rds.rdsplusTag2 != 169 ? " - " + String(myLanguage[language][radio.rds.rdsplusTag2]) + ": " + String(radio.rds.RTContent2) : "") + " "; else rtplusstring = myLanguage[language][89]; if (hasrtplusold != radio.rds.hasRDSplus) { - if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 124, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "RT+", 124, 51, GreyoutColor, BackgroundColor, FONT16); + if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 122, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "RT+", 122, 51, GreyoutColor, BackgroundColor, FONT16); hasrtplusold = radio.rds.hasRDSplus; } if (rtplusstring.length() < 20) { @@ -2413,30 +2413,30 @@ void ShowAdvancedRDS() { rtplusstringold = rtplusstring; if (TPold != radio.rds.hasTP) { - if (radio.rds.hasTP == true) tftPrint(-1, "TP", 6, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "TP", 6, 51, GreyoutColor, BackgroundColor, FONT16); + if (radio.rds.hasTP == true) tftPrint(-1, "TP", 3, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "TP", 3, 51, GreyoutColor, BackgroundColor, FONT16); TPold = radio.rds.hasTP; } if (TAold != radio.rds.hasTA) { - if (radio.rds.hasTA == true) tftPrint(-1, "TA", 28, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "TA", 28, 51, GreyoutColor, BackgroundColor, FONT16); + if (radio.rds.hasTA == true) tftPrint(-1, "TA", 25, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "TA", 25, 51, GreyoutColor, BackgroundColor, FONT16); TAold = radio.rds.hasTA; } if (MSold != radio.rds.MS) { switch (radio.rds.MS) { case 0: - tftPrint(-1, "M", 185, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "S", 198, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "M", 183, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "S", 199, 51, GreyoutColor, BackgroundColor, FONT16); break; case 1: - tftPrint(-1, "M", 185, 51, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(-1, "S", 198, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "M", 183, 51, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(-1, "S", 199, 51, GreyoutColor, BackgroundColor, FONT16); break; case 2: - tftPrint(-1, "M", 185, 51, GreyoutColor, BackgroundColor, FONT16); - tftPrint(-1, "S", 198, 51, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(-1, "M", 183, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "S", 199, 51, PrimaryColor, PrimaryColorSmooth, FONT16); break; } MSold = radio.rds.MS; @@ -2446,10 +2446,10 @@ void ShowAdvancedRDS() { if (rds_clock != rds_clockold) { if (radio.rds.hasCT) { tftReplace(1, rds_clockold, rds_clock, 205, 109, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(-1, "CT", 72, 51, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(-1, "CT", 69, 51, PrimaryColor, PrimaryColorSmooth, FONT16); } else { tftPrint(1, rds_clock, 205, 109, BackgroundColor, BackgroundColor, FONT16); - tftPrint(-1, "CT", 72, 51, GreyoutColor, BackgroundColor, FONT16); + tftPrint(-1, "CT", 69, 51, GreyoutColor, BackgroundColor, FONT16); } rds_clockold = rds_clock; } @@ -2461,7 +2461,7 @@ void ShowAdvancedRDS() { } if (hastmcold != radio.rds.hasTMC) { - if (radio.rds.hasTMC == true) tftPrint(-1, "TMC", 90, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "TMC", 90, 51, GreyoutColor, BackgroundColor, FONT16); + if (radio.rds.hasTMC == true) tftPrint(-1, "TMC", 89, 51, PrimaryColor, PrimaryColorSmooth, FONT16); else tftPrint(-1, "TMC", 89, 51, GreyoutColor, BackgroundColor, FONT16); hastmcold = radio.rds.hasTMC; } } From f66a2d7fd6a7fc51dcdd9849323cbbc82eeca059 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Fri, 4 Aug 2023 05:03:06 +0300 Subject: [PATCH 3/4] More UI changes and themes optimization --- TEF6686_ESP32.ino | 60 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 94f40c0..48706d8 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -169,6 +169,8 @@ int AMLevelOffset; int BackgroundColor; int BarSignificantColor; int BarInsignificantColor; +int BatteryValueColor; +int BatteryValueColorSmooth; int batupdatetimer; int BWAutoColor; int BWAutoColorSmooth; @@ -1829,14 +1831,14 @@ 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); + ScreensaverTimerSet(screensaverOptions[screensaverset]); + if (screensaverset) ScreensaverTimerRestart(); doBandSelectionFM(); doBandSelectionAM(); if (touchrotating) { if (poweroptions != LCD_OFF) poweroptions = LCD_OFF; if (!screensaverset) screensaverset = 1; } - ScreensaverTimerSet(screensaverOptions[screensaverset]); - if (screensaverset) ScreensaverTimerRestart(); } } while (digitalRead(MODEBUTTON) == LOW) delay(50); @@ -2105,7 +2107,7 @@ void KeyDown() { void ShowMemoryPos() { if (tunemode == TUNE_MEM) { - if (advancedRDS) tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 215, 36, SecondaryColor, SecondaryColorSmooth, FONT16); else tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 50, 32, SecondaryColor, SecondaryColorSmooth, FONT16); + if (advancedRDS) tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 215, 36, SecondaryColor, SecondaryColorSmooth, FONT16); else tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 50, 32, PrimaryColor, PrimaryColorSmooth, FONT16); memoryposold = memorypos; } else { if (advancedRDS) tftPrint(-1, String(memorypos + 1), 215, 36, BackgroundColor, BackgroundColor, FONT16); else tftPrint(-1, String(memorypos + 1), 50, 32, BackgroundColor, BackgroundColor, FONT16); @@ -3315,7 +3317,7 @@ void updateSWMIBand() { case SW_MI_BAND_90M: case SW_MI_BAND_120M: case SW_MI_BAND_160M: - tftReplace(-1, SWMIBandstringold, SWMIBandstring, 50, 51, PrimaryColor, PrimaryColorSmooth, FONT16); + tftReplace(-1, SWMIBandstringold, SWMIBandstring, 50, 51, SecondaryColor, SecondaryColorSmooth, FONT16); if (!SWMIBandstring.equals(SWMIBandstringold)) SWMIBandstringold = SWMIBandstring; break; @@ -3575,8 +3577,8 @@ void ShowBattery() { tftPrint(-1, String(batteryVold, 1), 213, 163, BackgroundColor, BackgroundColor, FONT16); - tftPrint(-1, String(batteryV, 1), 213, 163, PrimaryColor, PrimaryColorSmooth, FONT16); - tftPrint(-1, "V", 232, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(-1, String(batteryV, 1), 213, 163, BatteryValueColor, BatteryValueColorSmooth, FONT16); + tftPrint(-1, "V", 232, 163, BatteryValueColor, BatteryValueColorSmooth, FONT16); batteryVold = batteryV; } else if (batteryoptions == BATTERY_PERCENT) { float vPer = 0.0; @@ -3586,7 +3588,7 @@ void ShowBattery() { vPer = (batteryV - BATTERY_LOW_VALUE) / (BATTERY_FULL_VALUE - BATTERY_LOW_VALUE); if (vPer >= 1) vPer = 1; - tftPrint(-1, String(vPer * 100, 0), 213, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(-1, String(vPer * 100, 0), 213, 163, BatteryValueColor, BatteryValueColorSmooth, FONT16); tftPrint(-1, "%", 230, 163, PrimaryColor, PrimaryColorSmooth, FONT16); batteryPold = batteryV; } @@ -4358,6 +4360,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = TFT_GREEN; BWAutoColor = 0x07F7; BWAutoColorSmooth = 0x0144; + BatteryValueColor = 0x07F7; + BatteryValueColorSmooth = 0x0144; CurrentThemeString = myLanguage[language][78]; break; case 1: // Cyan theme @@ -4367,7 +4371,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de SecondaryColorSmooth = 0x10E4; FrequencyColor = 0x0F3F; FrameColor = 0x01e9; - GreyoutColor = 0x4A69; + GreyoutColor = 0x2A08; BackgroundColor = TFT_BLACK; ActiveColor = TFT_WHITE; ActiveColorSmooth = 0x18E3; @@ -4383,6 +4387,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = 0x0F3F; BWAutoColor = 0x07F7; BWAutoColorSmooth = 0x0144; + BatteryValueColor = 0x07F7; + BatteryValueColorSmooth = 0x0144; CurrentThemeString = myLanguage[language][79]; break; case 2: // Crimson theme @@ -4408,6 +4414,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = 0xF8C3; BWAutoColor = 0x07F7; BWAutoColorSmooth = 0x0144; + BatteryValueColor = 0x07F7; + BatteryValueColorSmooth = 0x0144; CurrentThemeString = myLanguage[language][80]; break; case 3: // Monochrome theme @@ -4433,6 +4441,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = TFT_GREEN; BWAutoColor = 0x7BCF; BWAutoColorSmooth = 0x1082; + BatteryValueColor = TFT_WHITE; + BatteryValueColorSmooth = TFT_BLACK; CurrentThemeString = myLanguage[language][81]; break; case 4: // Volcano theme @@ -4458,6 +4468,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = TFT_ORANGE; BWAutoColor = 0x07F7; BWAutoColorSmooth = 0x0144; + BatteryValueColor = 0x07F7; + BatteryValueColorSmooth = 0x0144; CurrentThemeString = myLanguage[language][82]; break; case 5: // Dendro theme @@ -4492,7 +4504,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de SecondaryColorSmooth = 0x10E4; FrequencyColor = 0xF3D5; FrameColor = 0x3845; - GreyoutColor = 0x4A69; + GreyoutColor = 0x38C5; BackgroundColor = TFT_BLACK; ActiveColor = TFT_WHITE; ActiveColorSmooth = 0x18E3; @@ -4508,13 +4520,15 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = 0xF3D5; BWAutoColor = 0xF00A; BWAutoColorSmooth = 0x2802; + BatteryValueColor = 0xF00A; + BatteryValueColorSmooth = 0x2802; CurrentThemeString = myLanguage[language][84]; break; case 7: // Whiteout theme PrimaryColor = TFT_BLACK; - PrimaryColorSmooth = 0xDFFC; + PrimaryColorSmooth = TFT_WHITE; SecondaryColor = TFT_BLACK; - SecondaryColorSmooth = 0xDFFC; + SecondaryColorSmooth = TFT_WHITE; FrequencyColor = 0x18C3; FrameColor = 0x630C; GreyoutColor = 0x9492; @@ -4532,7 +4546,9 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarSignificantColor = TFT_BLACK; BarInsignificantColor = TFT_GREEN; BWAutoColor = 0x7BCF; - BWAutoColorSmooth = 0x1082; + BWAutoColorSmooth = TFT_WHITE; + BatteryValueColor = TFT_BLACK; + BatteryValueColorSmooth = TFT_WHITE; CurrentThemeString = myLanguage[language][85]; break; case 8: // Tangerine theme @@ -4542,7 +4558,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de SecondaryColorSmooth = 0x10E4; FrequencyColor = 0xF980; FrameColor = 0x38A1; - GreyoutColor = 0x4A69; + GreyoutColor = 0x6247; BackgroundColor = TFT_BLACK; ActiveColor = TFT_WHITE; ActiveColorSmooth = 0x18E3; @@ -4556,8 +4572,10 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSColorSmooth = 0x3080; BarSignificantColor = TFT_RED; BarInsignificantColor = TFT_GREEN; - BWAutoColor = 0x07F7; - BWAutoColorSmooth = 0x0144; + BWAutoColor = 0xED20; + BWAutoColorSmooth = 0x3940; + BatteryValueColor = 0xED20; + BatteryValueColorSmooth = 0x3940; CurrentThemeString = myLanguage[language][170]; break; case 9: // Ocean theme @@ -4567,7 +4585,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de SecondaryColorSmooth = 0x10E4; FrequencyColor = 0x01FF; FrameColor = 0x0010; - GreyoutColor = 0x08A8; + GreyoutColor = 0x420C; BackgroundColor = TFT_BLACK; ActiveColor = TFT_WHITE; ActiveColorSmooth = 0x18E3; @@ -4581,8 +4599,10 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSColorSmooth = 0x0006; BarSignificantColor = TFT_RED; BarInsignificantColor = 0x01FF; - BWAutoColor = 0x07F7; - BWAutoColorSmooth = 0x0144; + BWAutoColor = 0x051F; + BWAutoColorSmooth = 0x0106; + BatteryValueColor = 0x051F; + BatteryValueColorSmooth = 0x0106; CurrentThemeString = myLanguage[language][171]; break; case 10: // Indigo theme @@ -4592,7 +4612,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de SecondaryColorSmooth = 0x41C8; FrequencyColor = 0x881F; FrameColor = 0x6016; - GreyoutColor = 0x300c; + GreyoutColor = 0x49AC; BackgroundColor = TFT_BLACK; ActiveColor = TFT_WHITE; ActiveColorSmooth = 0x18E3; @@ -4608,6 +4628,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de BarInsignificantColor = 0x881F; BWAutoColor = 0xD01F; BWAutoColorSmooth = 0x400A; + BatteryValueColor = 0xD01F; + BatteryValueColorSmooth = 0x400A; CurrentThemeString = myLanguage[language][172]; break; } From 57504a0a8035b58c74fc89147942c6bba4a1c6d1 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Fri, 4 Aug 2023 05:03:44 +0300 Subject: [PATCH 4/4] More UI changes and themes optimization --- src/gui.cpp | 12 ++++++------ src/gui.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gui.cpp b/src/gui.cpp index e96eaa1..9b67825 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -407,13 +407,13 @@ void BuildDisplay() { tft.drawCircle(86, 15, 9, SecondaryColor); } - if (bandforbidden) bandColor = GreyoutColor; else bandColor = SecondaryColor; + if (bandforbidden) bandColor = GreyoutColor; else bandColor = PrimaryColor; switch (band) { - case BAND_LW: tftPrint(-1, myLanguage[language][102], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break; - case BAND_MW: tftPrint(-1, myLanguage[language][103], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break; - case BAND_SW: tftPrint(-1, myLanguage[language][104], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break; - case BAND_FM: tftPrint(-1, myLanguage[language][105], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break; - case BAND_OIRT: tftPrint(-1, myLanguage[language][106], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break; + case BAND_LW: tftPrint(-1, myLanguage[language][102], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break; + case BAND_MW: tftPrint(-1, myLanguage[language][103], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break; + case BAND_SW: tftPrint(-1, myLanguage[language][104], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break; + case BAND_FM: tftPrint(-1, myLanguage[language][105], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break; + case BAND_OIRT: tftPrint(-1, myLanguage[language][106], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break; } } RDSstatusold = false; diff --git a/src/gui.h b/src/gui.h index 77f1243..29816c1 100644 --- a/src/gui.h +++ b/src/gui.h @@ -92,6 +92,8 @@ extern int BackgroundColor; extern int BackgroundColorSmooth; extern int BarInsignificantColor; extern int BarSignificantColor; +extern int BatteryValueColor; +extern int BatteryValueColorSmooth; extern int FrameColor; extern int GreyoutColor; extern int menuoption;