From 4e2239f50f552f1212a0b9dcd4e56c1b37d7cc37 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Sun, 19 Nov 2023 02:34:22 +0200 Subject: [PATCH 1/5] Some cosmetics --- src/gui.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gui.cpp b/src/gui.cpp index f331c88..00352f0 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -677,13 +677,13 @@ void BuildAdvancedRDS() { } tftPrint(-1, "TP", 2, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "TA", 25, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "AF", 52, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "-B", 70, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "TMC", 90, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "RT+", 127, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "EON", 155, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "S", 188, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "TA", 24, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "-B", 68, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "TMC", 88, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "RT+", 125, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16); } @@ -2152,7 +2152,7 @@ void DoMenu() { case ITEM7: Infoboxprint(myLanguage[language][199]); - if (fmdeemphasis != DEEMPHASIS_NONE) tftPrint(1, String((fmdeemphasis == DEEMPHASIS_50 ? FM_DEEMPHASIS_50 : FM_DEEMPHASIS_75), DEC), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(1, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); + if (fmdeemphasis != DEEMPHASIS_NONE) tftPrint(1, String((fmdeemphasis == DEEMPHASIS_50 ? FM_DEEMPHASIS_50 : FM_DEEMPHASIS_75), DEC), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); if (fmdeemphasis != DEEMPHASIS_NONE) tftPrint(-1, "μs", 170, 118, ActiveColor, PrimaryColorSmooth, 28); break; } @@ -2221,7 +2221,7 @@ void DoMenu() { case ITEM10: Infoboxprint(myLanguage[language][75]); if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, ActiveColor, ActiveColorSmooth, 28); - if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(1, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); + if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; @@ -2514,4 +2514,4 @@ void Infoboxprint(const char* input) { } else { tftPrint(0, input, 155, 78, ActiveColor, ActiveColorSmooth, 28); } -} \ No newline at end of file +} From dc361af3f1d7dbcd1a95aecc5418314b65ec3e29 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Sun, 19 Nov 2023 02:41:50 +0200 Subject: [PATCH 2/5] Some cosmetics --- src/rds.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/rds.cpp b/src/rds.cpp index bc5f4bd..bc70f81 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -64,7 +64,7 @@ void ShowAdvancedRDS() { 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) + (i == radio.af_counter - 1 ? " " : " | "); else afstring = myLanguage[language][87]; if (hasafold != radio.rds.hasAF) { if (!screenmute) { - if (radio.rds.hasAF) tftPrint(-1, "AF", 52, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "AF", 52, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasAF) tftPrint(-1, "AF", 50, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, 16); } hasafold = radio.rds.hasAF; } @@ -91,7 +91,7 @@ void ShowAdvancedRDS() { 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 (!screenmute) { - if (radio.rds.hasEON) tftPrint(-1, "EON", 155, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "EON", 155, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasEON) tftPrint(-1, "EON", 153, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16); } haseonold = radio.rds.hasEON; } @@ -119,7 +119,7 @@ void ShowAdvancedRDS() { 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 (!screenmute) { - if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 127, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "RT+", 127, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 125, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "RT+", 125, 51, GreyoutColor, BackgroundColor, 16); } hasrtplusold = radio.rds.hasRDSplus; } @@ -151,14 +151,14 @@ void ShowAdvancedRDS() { if (TAold != radio.rds.hasTA) { if (!screenmute) { - if (radio.rds.hasTA) tftPrint(-1, "TA", 25, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TA", 25, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasTA) tftPrint(-1, "TA", 24, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TA", 24, 51, GreyoutColor, BackgroundColor, 16); } TAold = radio.rds.hasTA; } if (afmethodBold != radio.afmethodB || rdsreset) { if (!screenmute) { - if (radio.afmethodB) tftPrint(-1, "-B", 70, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "-B", 70, 51, GreyoutColor, BackgroundColor, 16); + if (radio.afmethodB) tftPrint(-1, "-B", 68, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "-B", 68, 51, GreyoutColor, BackgroundColor, 16); } afmethodBold = radio.afmethodB; } @@ -168,17 +168,17 @@ void ShowAdvancedRDS() { switch (radio.rds.MS) { case 0: tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "S", 188, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16); break; case 1: tftPrint(-1, "M", 196, 51, PrimaryColor, PrimaryColorSmooth, 16); - tftPrint(-1, "S", 188, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16); break; case 2: tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "S", 188, 51, PrimaryColor, PrimaryColorSmooth, 16); + tftPrint(-1, "S", 185, 51, PrimaryColor, PrimaryColorSmooth, 16); break; } } @@ -193,7 +193,7 @@ void ShowAdvancedRDS() { if (hastmcold != radio.rds.hasTMC) { if (!screenmute) { - if (radio.rds.hasTMC) tftPrint(-1, "TMC", 90, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TMC", 90, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasTMC) tftPrint(-1, "TMC", 88, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TMC", 88, 51, GreyoutColor, BackgroundColor, 16); } hastmcold = radio.rds.hasTMC; } @@ -764,4 +764,4 @@ void ShowAFEON() { } } } -#pragma GCC diagnostic pop \ No newline at end of file +#pragma GCC diagnostic pop From 4b90a24c8ffde8c37f96154e73449d3a614ea6fb Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Sun, 19 Nov 2023 02:48:32 +0200 Subject: [PATCH 3/5] Some cosmetics --- src/rds.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rds.cpp b/src/rds.cpp index bc70f81..efc2662 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -119,7 +119,7 @@ void ShowAdvancedRDS() { 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 (!screenmute) { - if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 125, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "RT+", 125, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 123, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "RT+", 123, 51, GreyoutColor, BackgroundColor, 16); } hasrtplusold = radio.rds.hasRDSplus; } From 91c2aaa0dd71c0ade48809ee00cf28adab8dd8a0 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Sun, 19 Nov 2023 02:49:36 +0200 Subject: [PATCH 4/5] Some cosmetics --- src/gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui.cpp b/src/gui.cpp index 00352f0..78a81b1 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -681,7 +681,7 @@ void BuildAdvancedRDS() { tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "-B", 68, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "TMC", 88, 51, GreyoutColor, BackgroundColor, 16); - tftPrint(-1, "RT+", 125, 51, GreyoutColor, BackgroundColor, 16); + tftPrint(-1, "RT+", 123, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16); From f12eb69979320138c8aa8ef2d4a572e570a2b3ff Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Sun, 19 Nov 2023 02:53:47 +0200 Subject: [PATCH 5/5] Typo fix Greek --- src/language.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language.h b/src/language.h index a8eea61..4f08064 100644 --- a/src/language.h +++ b/src/language.h @@ -998,7 +998,7 @@ static const char* const myLanguage[18][208] = { "Τηλέφωνο", // 154 "SMS στούντιο", // 155 "SMS", // 156 *** - "Email επικοινωνία", // 157 + "Email επικοινωνίας", // 157 "Email στούντιο", // 158 "Email", // 159 "Chat", // 160