From c6fa0f8cee4c70c12be2973b36e490defa4da703 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Thu, 27 Jul 2023 15:03:11 +0200 Subject: [PATCH] Changed squelch to left alligned. --- TEF6686_ESP32.ino | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index c66cf94..e2f7d6b 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -4074,7 +4074,7 @@ void BuildDisplay() { } } } - if (showsquelch) tftPrint(0, "SQ:", 224, 145, ActiveColor, ActiveColorSmooth, FONT16); + if (showsquelch) tftPrint(-1, "SQ:", 212, 145, ActiveColor, ActiveColorSmooth, FONT16); tftPrint(-1, "S/N", 246, 163, ActiveColor, ActiveColorSmooth, FONT16); tftPrint(-1, "dB", 300, 163, ActiveColor, ActiveColorSmooth, FONT16); if (region == 0) tftPrint(-1, "PI:", 216, 193, ActiveColor, ActiveColorSmooth, FONT16); @@ -4520,18 +4520,18 @@ void doSquelch() { if (showsquelch && !advancedRDS && !afscreen) { if (seek == false && menu == false && Squelch != Squelchold) { if (Squelchold == -100) { - if (Squelch != Squelchold) tftPrint(0, myLanguage[language][33], 224, 163, BackgroundColor, BackgroundColor, FONT16); + if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, BackgroundColor, BackgroundColor, FONT16); } else if (Squelchold == 920) { - if (Squelch != Squelchold) tftPrint(0, "ST", 224, 163, BackgroundColor, BackgroundColor, FONT16); + if (Squelch != Squelchold) tftPrint(-1, "ST", 212, 163, BackgroundColor, BackgroundColor, FONT16); } else { - if (Squelch != Squelchold) tftPrint(0, String(Squelchold / 10), 224, 163, BackgroundColor, BackgroundColor, FONT16); + if (Squelch != Squelchold) tftPrint(-1, String(Squelchold / 10), 212, 163, BackgroundColor, BackgroundColor, FONT16); } if (Squelch == -100) { - if (Squelch != Squelchold) tftPrint(0, myLanguage[language][33], 224, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16); } else if (Squelch == 920) { - tftPrint(0, "ST", 224, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + tftPrint(-1, "ST", 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16); } else { - if (Squelch != Squelchold) tftPrint(0, String(Squelch / 10), 224, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + if (Squelch != Squelchold) tftPrint(-1, String(Squelch / 10), 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16); } } Squelchold = Squelch; @@ -4563,18 +4563,18 @@ void doSquelch() { if (screenmute == false && showsquelch == true && !advancedRDS && !afscreen) { if (Squelch != Squelchold) { if (Squelchold == -1) { - if (Squelch != Squelchold) tftPrint(0, "ST", 224, 163, BackgroundColor, BackgroundColor, FONT16); + if (Squelch != Squelchold) tftPrint(-1, "ST", 212, 163, BackgroundColor, BackgroundColor, FONT16); } else if (Squelchold == 0) { - if (Squelch != Squelchold) tftPrint(0, myLanguage[language][33], 224, 163, BackgroundColor, BackgroundColor, FONT16); + if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, BackgroundColor, BackgroundColor, FONT16); } else { - if (Squelch != Squelchold) tftPrint(0, String(Squelchold / 10), 224, 163, BackgroundColor, BackgroundColor, FONT16); + if (Squelch != Squelchold) tftPrint(-1, String(Squelchold / 10), 212, 163, BackgroundColor, BackgroundColor, FONT16); } if (Squelch == -1) { - if (Squelch != Squelchold) tftPrint(0, "ST", 224, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + if (Squelch != Squelchold) tftPrint(-1, "ST", 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16); } else if (Squelch == 0) { - if (Squelch != Squelchold) tftPrint(0, myLanguage[language][33], 224, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16); } else { - if (Squelch != Squelchold) tftPrint(0, String(Squelch / 10), 224, 163, PrimaryColor, PrimaryColorSmooth, FONT16); + if (Squelch != Squelchold) tftPrint(-1, String(Squelch / 10), 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16); } Squelchold = Squelch; } @@ -5062,11 +5062,11 @@ void Communication() { if (Squelch != Squelchold) { if (screenmute == false) { if (Squelchold == -100) { - tftPrint(0, myLanguage[language][33], 224, 163, BackgroundColor, BackgroundColor, FONT16); + tftPrint(-1, myLanguage[language][33], 212, 163, BackgroundColor, BackgroundColor, FONT16); } else if (Squelchold > 920) { - tftPrint(0, "ST", 224, 163, BackgroundColor, BackgroundColor, FONT16); + tftPrint(-1, "ST", 212, 163, BackgroundColor, BackgroundColor, FONT16); } else { - tftPrint(0, String(Squelchold / 10), 224, 163, BackgroundColor, BackgroundColor, FONT16); + tftPrint(-1, String(Squelchold / 10), 212, 163, BackgroundColor, BackgroundColor, FONT16); } } }