Merge pull request #785 from MCelliotG/main

This commit is contained in:
Sjef Verhoeven PE5PVB
2025-02-09 23:07:47 +01:00
committed by GitHub
2 changed files with 7 additions and 7 deletions
+5 -5
View File
@@ -3352,11 +3352,11 @@ void ShowSignalLevel() {
} else { } else {
if (SStatusold / 10 != SStatusprint / 10) { if (SStatusold / 10 != SStatusprint / 10) {
tftReplace(1, String(SStatusold / 10), String(SStatusprint / 10), tftReplace(1, String(SStatusold / 10), String(SStatusprint / 10),
288, 105, FreqColor, FreqColorSmooth, BackgroundColor, 48); 280, 104, FreqColor, FreqColorSmooth, BackgroundColor, 48);
} }
tftReplace(1, "." + String(abs(SStatusold % 10)), tftReplace(-1, "." + String(abs(SStatusold % 100)),
"." + String(abs(SStatusprint % 10)), "." + String(abs(SStatusprint % 100)),
310, 105, FreqColor, FreqColorSmooth, BackgroundColor, 28); 285, 102, FreqColor, FreqColorSmooth, BackgroundColor, 28);
// Calculate segments for signal meter // Calculate segments for signal meter
if (band < BAND_GAP) { if (band < BAND_GAP) {
@@ -3659,7 +3659,7 @@ void showAutoSquelch(bool mode) {
SquelchSprite.setTextColor(BackgroundColor, BackgroundColor, false); SquelchSprite.setTextColor(BackgroundColor, BackgroundColor, false);
} }
SquelchSprite.fillSprite(BackgroundColor); SquelchSprite.fillSprite(BackgroundColor);
SquelchSprite.drawString(String(myLanguage[language][86]), 0, 0); SquelchSprite.drawString("A.", 0, 0);
SquelchSprite.pushSprite(235, 145); SquelchSprite.pushSprite(235, 145);
} }
+2 -2
View File
@@ -3036,8 +3036,8 @@ void BuildDisplay() {
tftPrint(-1, "100", 164, 144, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, "100", 164, 144, ActiveColor, ActiveColorSmooth, 16);
} }
tftPrint(-1, "kHz", 205, 4, ActiveColor, ActiveColorSmooth, 28); tftPrint(1, "kHz", 246, 4, ActiveColor, ActiveColorSmooth, 28);
tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, 16); tftPrint(1, unitString[unit], 316, 128, ActiveColor, ActiveColorSmooth, 16);
tft.drawBitmap(68, 5, RDSLogo, 35, 22, GreyoutColor); tft.drawBitmap(68, 5, RDSLogo, 35, 22, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);