diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 22a76af..44a76ef 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -3231,8 +3231,8 @@ void ShowSignalLevel() { tftReplace(1, "." + String(abs(SStatusold % 10)), "." + String(abs(SStatusprint % 10)), 310, 105, FreqColor, FreqColorSmooth, BackgroundColor, 28); if (band < BAND_GAP) segments = map(SStatus / 10, 0, 70, 0, 100); else segments = (SStatus + 200) / 10; - tft.fillRect(16, 105, 2 * constrain(segments, 0, 54), 6, BarInsignificantColor); - tft.fillRect(16 + 2 * 54, 105, 2 * (constrain(segments, 54, 94) - 54), 6, BarSignificantColor); + tft.fillRect(16, 105, 2 * constrain(segments, 0, 63), 6, BarInsignificantColor); + tft.fillRect(16 + 2 * 63, 105, 2 * (constrain(segments, 63, 94) - 63), 6, BarSignificantColor); tft.fillRect(16 + 2 * constrain(segments, 0, 94), 105, 2 * (94 - constrain(segments, 0, 94)), 6, GreyoutColor); } SStatusold = SStatusprint; @@ -3432,9 +3432,9 @@ void ShowModLevel() { } } - tft.fillRect(16, 133, 2 * constrain(DisplayedSegments, 0, 54), 6, ModBarInsignificantColor); + tft.fillRect(16, 133, 2 * constrain(DisplayedSegments, 0, 63), 6, ModBarInsignificantColor); - if (DisplayedSegments > 54) tft.fillRect(16 + 2 * 54, 133, 2 * (DisplayedSegments - 54), 6, ModBarSignificantColor); + if (DisplayedSegments > 63) tft.fillRect(16 + 2 * 63, 133, 2 * (DisplayedSegments - 63), 6, ModBarSignificantColor); int greyStart = 16 + 2 * DisplayedSegments; int greyWidth = 2 * (94 - DisplayedSegments); diff --git a/src/gui.cpp b/src/gui.cpp index c517288..479147d 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -3521,7 +3521,7 @@ void MenuUp() { OneBigLineSprite.setTextDatum(TL_DATUM); OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); - OneBigLineSprite.drawString("dBμV", 155, 0); + OneBigLineSprite.drawString("dB", 155, 0); OneBigLineSprite.setTextDatum(TR_DATUM); OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); OneBigLineSprite.drawString((LevelOffset > 0 ? "+" : "") + String(LevelOffset, DEC), 135, 0); @@ -4478,7 +4478,7 @@ void MenuDown() { OneBigLineSprite.setTextDatum(TL_DATUM); OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); - OneBigLineSprite.drawString("dBμV", 155, 0); + OneBigLineSprite.drawString("dB", 155, 0); OneBigLineSprite.setTextDatum(TR_DATUM); OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); OneBigLineSprite.drawString((LevelOffset > 0 ? "+" : "") + String(LevelOffset, DEC), 135, 0);