Small GUI update
This commit is contained in:
+3
-7
@@ -3344,7 +3344,6 @@ void ShowSignalLevel() {
|
||||
|
||||
if (MPprint != MPold) {
|
||||
tftReplace(1, String(MPold), (band < BAND_GAP ? String(MPprint) : "--"), 299, 163, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
|
||||
tftPrint(1, "%", 316, 163, PrimaryColor, PrimaryColorSmooth, 16);
|
||||
MPold = MPprint;
|
||||
}
|
||||
|
||||
@@ -3353,7 +3352,6 @@ void ShowSignalLevel() {
|
||||
|
||||
if (USprint != USold) {
|
||||
tftReplace(1, String(USold), (band < BAND_GAP ? String(USprint) : "--"), 299, 145, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
|
||||
tftPrint(1, "%", 316, 145, PrimaryColor, PrimaryColorSmooth, 16);
|
||||
USold = USprint;
|
||||
}
|
||||
}
|
||||
@@ -3741,7 +3739,7 @@ void doSquelch() {
|
||||
|
||||
if (!XDRGTKUSB && !XDRGTKTCP && usesquelch && (!scandxmode || (scandxmode && !scanmute))) {
|
||||
if (!screenmute && usesquelch && !advancedRDS && !afscreen) {
|
||||
if (!BWtune && !menu && (Squelch > Squelchold + 2 || Squelch < Squelchold - 2)) {
|
||||
if (!BWtune && !menu && (Squelch > Squelchold + 9 || Squelch < Squelchold - 9)) {
|
||||
SquelchSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
|
||||
SquelchSprite.fillSprite(BackgroundColor);
|
||||
if (Squelch == -100) {
|
||||
@@ -3751,11 +3749,9 @@ void doSquelch() {
|
||||
} else {
|
||||
SquelchSprite.drawString(String(SquelchShow), 0, 0);
|
||||
}
|
||||
if (Squelch != Squelchold) {
|
||||
SquelchSprite.pushSprite(223, 145);
|
||||
}
|
||||
SquelchSprite.pushSprite(223, 145);
|
||||
Squelchold = Squelch;
|
||||
}
|
||||
Squelchold = Squelch;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-2
@@ -2994,7 +2994,7 @@ void BuildDisplay() {
|
||||
tft.drawLine(16, 114, 189, 114, ActiveColor);
|
||||
|
||||
if (!showmodulation) tft.drawLine(16, 143, 189, 143, GreyoutColor); else tft.drawLine(16, 143, 189, 143, ActiveColor);
|
||||
|
||||
|
||||
for (byte segments = 0; segments < 93; segments++) {
|
||||
if (segments > 54) {
|
||||
if (((segments - 53) % 10) == 0) {
|
||||
@@ -3008,12 +3008,14 @@ void BuildDisplay() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (usesquelch || autosquelch) tftPrint(-1, "SQ:", 200, 145, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(-1, "US:", 261, 145, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(-1, "MP:", 261, 163, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(-1, "CN:", 200, 163, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(1, "dB", 257, 163, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(1, "%", 316, 163, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(1, "%", 316, 145, ActiveColor, ActiveColorSmooth, 16);
|
||||
|
||||
tftPrint(0, "S", 7, 101, ActiveColor, ActiveColorSmooth, 16);
|
||||
tftPrint(-1, "1", 24, 115, ActiveColor, ActiveColorSmooth, 16);
|
||||
|
||||
Reference in New Issue
Block a user