kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Added USN meter

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-02-10 11:59:04 +01:00
parent 080935638e
commit 7b2ba01fb8
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+18 -5
View File
@@ -318,9 +318,12 @@ int16_t SAvg;
int16_t SAvg2; int16_t SAvg2;
int16_t SAvg3; int16_t SAvg3;
int16_t SAvg4; int16_t SAvg4;
int16_t SAvg5;
int16_t SStatus; int16_t SStatus;
int16_t MP; int16_t MP;
int16_t US;
int8_t MPold = 0; int8_t MPold = 0;
int8_t USold = 0;
int8_t LevelOffset; int8_t LevelOffset;
int8_t LowLevelSet; int8_t LowLevelSet;
int8_t NTPoffset; int8_t NTPoffset;
@@ -3291,6 +3294,7 @@ void ShowSignalLevel() {
SAvg = (((SAvg * 9) + 5) / 10) + SStatus; SAvg = (((SAvg * 9) + 5) / 10) + SStatus;
SAvg2 = (((SAvg2 * 9) + 5) / 10) + CN; SAvg2 = (((SAvg2 * 9) + 5) / 10) + CN;
SAvg4 = (((SAvg4 * 9) + 5) / 10) + WAM; SAvg4 = (((SAvg4 * 9) + 5) / 10) + WAM;
SAvg5 = (((SAvg5 * 9) + 5) / 10) + USN;
float sval = 0; float sval = 0;
int16_t smeter = 0; int16_t smeter = 0;
@@ -3309,28 +3313,37 @@ void ShowSignalLevel() {
SStatus = SAvg / 10; SStatus = SAvg / 10;
CN = SAvg2 / 10; CN = SAvg2 / 10;
MP = SAvg4 / 10; MP = SAvg4 / 10;
US = SAvg5 / 10;
if (!screenmute) { if (!screenmute) {
if (millis() >= SNRupdatetimer + TIMER_SNR_TIMER) { if (millis() >= SNRupdatetimer + TIMER_SNR_TIMER) {
SNRupdatetimer = millis(); SNRupdatetimer = millis();
if (!advancedRDS) { if (!advancedRDS) {
if (CN > (CNold + 1) || CN < (CNold - 1)) { if (CN > (CNold + 1) || CN < (CNold - 1)) {
if (CNold == 0) tftPrint(1, "--", 297, 163, BackgroundColor, BackgroundColor, 16); else tftPrint(1, String(CNold), 297, 163, BackgroundColor, BackgroundColor, 16); if (CNold == 0) tftPrint(1, "--", 248, 163, BackgroundColor, BackgroundColor, 16); else tftPrint(1, String(CNold), 248, 163, BackgroundColor, BackgroundColor, 16);
if (tuned) { if (tuned) {
if (CN == 0) tftPrint(1, "--", 297, 163, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, String(CN), 297, 163, PrimaryColor, PrimaryColorSmooth, 16); if (CN == 0) tftPrint(1, "--", 248, 163, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, String(CN), 248, 163, PrimaryColor, PrimaryColorSmooth, 16);
CNold = CN; CNold = CN;
} else { } else {
tftPrint(1, "--", 297, 163, PrimaryColor, PrimaryColorSmooth, 16); tftPrint(1, "--", 248, 163, PrimaryColor, PrimaryColorSmooth, 16);
CNold = 0; CNold = 0;
} }
} }
byte MPprint; byte MPprint;
MPprint = constrain(map(MP, 0, 1000, 0, 99), 0, 99); MPprint = constrain(map(MP, 0, 1000, 0, 99), 0, 99);
if (MP != MPold) { if (MPprint != MPold) {
tftReplace(1, String(MPold), (band < BAND_GAP ? String(MPprint) : "--"), 248, 163, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16); tftReplace(1, String(MPold), (band < BAND_GAP ? String(MPprint) : "--"), 318, 163, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
MPold = MPprint; MPold = MPprint;
} }
byte USprint;
USprint = constrain(map(US, 0, 1000, 0, 99), 0, 99);
if (USprint != USold) {
tftReplace(1, String(USold), (band < BAND_GAP ? String(USprint) : "--"), 318, 145, PrimaryColor, PrimaryColorSmooth, BackgroundColor, 16);
USold = USprint;
}
} }
} }
src/gui.cpp
+5 -4
View File
@@ -3006,10 +3006,11 @@ void BuildDisplay() {
} }
} }
} }
if (usesquelch || autosquelch) tftPrint(-1, "SQ:", 212, 145, ActiveColor, ActiveColorSmooth, 16); if (usesquelch || autosquelch) tftPrint(-1, "SQ", 212, 145, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "MP", 212, 163, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, "US", 283, 145, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, "C/N", 278, 163, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, "MP", 283, 163, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "dB", 300, 163, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, "CN", 212, 163, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, "dB", 270, 163, ActiveColor, ActiveColorSmooth, 16);
tftPrint(0, "S", 7, 101, ActiveColor, ActiveColorSmooth, 16); tftPrint(0, "S", 7, 101, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "1", 24, 115, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, "1", 24, 115, ActiveColor, ActiveColorSmooth, 16);