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

Fixed volume control XDRGTK

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-06-17 12:23:32 +02:00
parent 96cb481548
commit 90cebd5762
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+13 -7
View File
@@ -620,7 +620,6 @@ void GetData() {
showMS(); showMS();
showEON(); showEON();
showRadioText(); showRadioText();
showPS();
ShowStereoStatus(); ShowStereoStatus();
} }
ShowOffset(); ShowOffset();
@@ -1682,7 +1681,7 @@ void readRds() {
if (band == BAND_FM) { if (band == BAND_FM) {
RDSstatus = radio.readRDS(showrdserrors); RDSstatus = radio.readRDS(showrdserrors);
ShowRDSLogo(RDSstatus); ShowRDSLogo(RDSstatus);
if (RDSstatus == 0) { if (RDSstatus == 0 && screenmute == false) {
tft.setTextColor(TFT_SKYBLUE); tft.setTextColor(TFT_SKYBLUE);
tft.setFreeFont(FONT14); tft.setFreeFont(FONT14);
tft.drawString(PIold, 244, 183, GFXFF); tft.drawString(PIold, 244, 183, GFXFF);
@@ -1961,14 +1960,14 @@ void BuildMenu() {
void MuteScreen(int setting) { void MuteScreen(int setting) {
if (setting == 0 && screenmute == 1) { if (setting == 0 && screenmute == 1) {
screenmute = 0; screenmute = false;
setupmode = true; setupmode = true;
BuildDisplay(); BuildDisplay();
setupmode = false; setupmode = false;
} }
if (setting == 1 && screenmute == 0) { if (setting == 1 && screenmute == 0) {
screenmute = 1; screenmute = true;
tft.setFreeFont(FONT14); tft.setFreeFont(FONT14);
tft.fillScreen(TFT_BLACK); tft.fillScreen(TFT_BLACK);
tft.drawRect(0, 0, 320, 240, TFT_BLUE); tft.drawRect(0, 0, 320, 240, TFT_BLUE);
@@ -3119,12 +3118,12 @@ void XDRGTKRoutine() {
SelectBand(); SelectBand();
} }
radio.SetFreq(frequency); radio.SetFreq(frequency);
radio.clearRDS(fullsearchrds);
RDSstatus = 0;
DataPrint("M0\n"); DataPrint("M0\n");
} }
if (band == BAND_FM) DataPrint("T" + String(frequency * 10) + "\n"); else DataPrint("T" + String(frequency_AM) + "\n"); if (band == BAND_FM) DataPrint("T" + String(frequency * 10) + "\n"); else DataPrint("T" + String(frequency_AM) + "\n");
ShowFreq(0); ShowFreq(0);
radio.clearRDS(fullsearchrds);
RDSstatus = 0;
break; break;
case 'Q': case 'Q':
@@ -3223,10 +3222,12 @@ void XDRGTKRoutine() {
XDRMute = true; XDRMute = true;
SQ = true; SQ = true;
} else { } else {
radio.setVolume((VolSet - 70) / 10); radio.setUnMute();
radio.setVolume((VolSet - 40) / 10);
XDRMute = false; XDRMute = false;
} }
DataPrint("Y" + String(VolSet) + "\n"); DataPrint("Y" + String(VolSet) + "\n");
VolSet /= 10;
break; break;
case 'x': case 'x':
@@ -3236,8 +3237,13 @@ void XDRGTKRoutine() {
case 'X': case 'X':
XDRGTKTCP = false; XDRGTKTCP = false;
XDRGTKUSB = false;
store = true; store = true;
XDRMute = false; XDRMute = false;
radio.setUnMute();
VolSet = EEPROM.readInt(4);
radio.setVolume(VolSet);
if (screenmute) MuteScreen(0);
break; break;
case 'Z': case 'Z':