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

MOD: advanced RDS & AF/EON view now support screensavor

Browse Source
This commit is contained in:
ohmytime
2024-05-06 23:15:00 +08:00
parent e105709e69
commit 34585e17bc
2 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+15 -9
View File
@@ -1087,7 +1087,7 @@ void loop() {
if (screensaver_IRQ) if (screensaver_IRQ)
{ {
screensaver_IRQ = OFF; screensaver_IRQ = OFF;
if (!screensavertriggered && !advancedRDS && !menu) { if (!screensavertriggered && !menu) {
WakeToSleep(true); WakeToSleep(true);
} }
} }
@@ -1594,9 +1594,6 @@ void BANDBUTTONPress() {
} }
} else { } else {
if (!usesquelch) radio.setUnMute(); if (!usesquelch) radio.setUnMute();
if (afscreen) {
BuildAdvancedRDS();
} else {
unsigned long counterold = millis(); unsigned long counterold = millis();
unsigned long counter = millis(); unsigned long counter = millis();
if (!menu) { if (!menu) {
@@ -1607,8 +1604,9 @@ void BANDBUTTONPress() {
WakeToSleep(REVERSE); WakeToSleep(REVERSE);
return; return;
} }
if (afscreen) {
if (advancedRDS) { BuildAdvancedRDS();
} else if (advancedRDS) {
BuildDisplay(); BuildDisplay();
ScreensaverTimerReopen(); ScreensaverTimerReopen();
} else { } else {
@@ -1617,7 +1615,9 @@ void BANDBUTTONPress() {
StoreFrequency(); StoreFrequency();
SelectBand(); SelectBand();
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n"); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n");
else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n");
else DataPrint("M1\nT" + String(frequency_AM) + "\n");
} }
} else { } else {
scanmodeold = tunemode; scanmodeold = tunemode;
@@ -1633,7 +1633,8 @@ void BANDBUTTONPress() {
} }
if (band < BAND_GAP) { if (band < BAND_GAP) {
if (advancedRDS && !seek) BuildAFScreen(); else BuildAdvancedRDS(); if (advancedRDS && !seek) BuildAFScreen();
else BuildAdvancedRDS();
} else { } else {
WakeToSleep(true); WakeToSleep(true);
} }
@@ -1641,7 +1642,6 @@ void BANDBUTTONPress() {
} }
} }
} }
}
while (digitalRead(BANDBUTTON) == LOW) delay(50); while (digitalRead(BANDBUTTON) == LOW) delay(50);
delay(100); delay(100);
} }
@@ -3945,7 +3945,13 @@ void MuteScreen(bool setting) {
setupmode = true; setupmode = true;
tft.writecommand(0x11); tft.writecommand(0x11);
analogWrite(CONTRASTPIN, ContrastSet * 2 + 27); analogWrite(CONTRASTPIN, ContrastSet * 2 + 27);
if (band < BAND_GAP) {
if (afscreen) BuildAFScreen();
else if (advancedRDS) BuildAdvancedRDS();
else BuildDisplay();
} else {
BuildDisplay(); BuildDisplay();
}
setupmode = false; setupmode = false;
} else if (setting && !screenmute) { } else if (setting && !screenmute) {
screenmute = true; screenmute = true;
src/gui.cpp
-1
View File
@@ -1412,7 +1412,6 @@ void BuildAdvancedRDS() {
afpage = false; afpage = false;
afpagenr = 1; afpagenr = 1;
advancedRDS = true; advancedRDS = true;
ScreensaverTimerSet(OFF);
tft.fillScreen(BackgroundColor); tft.fillScreen(BackgroundColor);
tft.drawRect(0, 0, 320, 240, FrameColor); tft.drawRect(0, 0, 320, 240, FrameColor);