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

Merge pull request #781 from MCelliotG/main

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-02-08 09:33:29 +01:00
committed by GitHub
parent c4acdc6272 884ec74f9c
commit c0d5ec0039
5 changed files with 171 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
TEF6686_ESP32.ino
View File

@@ -1006,7 +1006,7 @@ void loop() {
if (shouldScan) {
if (scanmute && scanholdonsignal) {
radio.setMute();
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
SQ = true;
}
scanholdflag = false;
@@ -1048,7 +1048,7 @@ void loop() {
if (scanmute && scanholdonsignal) {
radio.setUnMute();
SQ = false;
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
}
@@ -1104,7 +1104,7 @@ void loop() {
if (radio.af_counter == 0) {
if (findMemoryAF && radio.rds.correctPI != 0 && tunemode == TUNE_MEM && (USN > 250 || WAM > 250)) {
radio.setMute();
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
SQ = true;
if (!screenmute) {
if (advancedRDS) {
@@ -1148,7 +1148,7 @@ void loop() {
radio.setUnMute();
SQ = false;
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
findMemoryAF = false;
} else {
@@ -2354,7 +2354,7 @@ void SelectBand() {
}
if (band > BAND_GAP) {
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN;
BWreset = true;
BWset = BWsetAM;
@@ -2483,7 +2483,7 @@ void BWButtonPress() {
} else {
if (!usesquelch) radio.setUnMute();
if (!BWtune && !menu) {
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
unsigned long counterold = millis();
unsigned long counter = millis();
while (digitalRead(BWBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
@@ -2549,7 +2549,7 @@ void ModeButtonPress() {
} else {
if (!BWtune && !menu) {
if (!screenmute && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
memorystore = false;
unsigned long counterold = millis();
@@ -2757,7 +2757,7 @@ void ButtonPress() {
}
}
} else {
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
unsigned long counterold = millis();
unsigned long counter = millis();
while (digitalRead(ROTARY_BUTTON) == LOW && counter - counterold <= 1000) counter = millis();
@@ -3679,7 +3679,7 @@ void doSquelch() {
if (SQ || BWreset) {
if (!seek) radio.setUnMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
autosquelchtimer = millis();
SQ = false;
@@ -3688,7 +3688,7 @@ void doSquelch() {
if ((!SQ || BWreset) && (millis() >= autosquelchtimer + 1000)) {
radio.setMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
autosquelchtimer = millis();
SQ = true;
@@ -3698,13 +3698,13 @@ void doSquelch() {
if ((USN < amscansens * 30) && (OStatus < 2 && OStatus > -2) && (!scandxmode || (scandxmode && !scanmute))) {
if (!seek) radio.setUnMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
SQ = false;
} else {
radio.setMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
SQ = true;
}
@@ -3738,13 +3738,13 @@ void doSquelch() {
if (Squelch < SStatus || Squelch == -100 || Squelch == 0) {
if (!seek) radio.setUnMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
SQ = false;
} else {
radio.setMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
SQ = true;
}
@@ -3752,13 +3752,13 @@ void doSquelch() {
if (Stereostatus) {
radio.setUnMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
SQ = false;
} else {
radio.setMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
SQ = true;
}
@@ -3787,13 +3787,13 @@ void doSquelch() {
if (Squelch < SStatus || Squelch == -100 || Squelch == 0) {
if (!seek) radio.setUnMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
SQ = false;
} else {
radio.setMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
SQ = true;
}
@@ -3801,13 +3801,13 @@ void doSquelch() {
if (Stereostatus) {
if (!seek) radio.setUnMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
SQ = false;
} else {
radio.setMute();
if (!screenmute && !seek && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
SQ = true;
}
@@ -4114,18 +4114,18 @@ void ShowRSSI() {
if (rssiold != rssi) {
rssiold = rssi;
if (rssi == 0) {
tft.drawBitmap(250, 4, WiFi4, 25, 23, GreyoutColor);
tft.drawBitmap(281, 3, WiFi4, 33, 25, BackgroundColor);
} else if (rssi > -50 && rssi < 0) {
tft.drawBitmap(250, 4, WiFi4, 25, 23, WifiColorHigh);
tft.drawBitmap(281, 3, WiFi4, 33, 25, WifiColorHigh);
} else if (rssi > -60) {
tft.drawBitmap(250, 4, WiFi4, 25, 23, GreyoutColor);
tft.drawBitmap(250, 4, WiFi3, 25, 23, WifiColorHigh);
tft.drawBitmap(281, 3, WiFi4, 33, 25, GreyoutColor);
tft.drawBitmap(281, 3, WiFi3, 33, 25, WifiColorHigh);
} else if (rssi > -70) {
tft.drawBitmap(250, 4, WiFi4, 25, 23, GreyoutColor);
tft.drawBitmap(250, 4, WiFi2, 25, 23, WifiColorLow);
tft.drawBitmap(281, 3, WiFi4, 33, 25, GreyoutColor);
tft.drawBitmap(281, 3, WiFi2, 33, 25, WifiColorLow);
} else if (rssi < -70) {
tft.drawBitmap(250, 4, WiFi4, 25, 23, GreyoutColor);
tft.drawBitmap(250, 4, WiFi1, 25, 23, WifiColorLow);
tft.drawBitmap(281, 3, WiFi4, 33, 25, GreyoutColor);
tft.drawBitmap(281, 3, WiFi1, 33, 25, WifiColorLow);
}
}
}
@@ -4156,10 +4156,10 @@ void ShowBattery() {
} else {
tft.fillRoundRect(279, 8, 33, 16, 2, BackgroundColor);
}
} else {
tft.drawRoundRect(277, 6, 37, 20, 2, GreyoutColor);
tft.fillRoundRect(313, 13, 4, 6, 2, GreyoutColor);
tft.fillRoundRect(279, 8, 33, 16, 2, BackgroundColor);
// } else {
// tft.drawRoundRect(277, 6, 37, 20, 2, GreyoutColor);
// tft.fillRoundRect(313, 13, 4, 6, 2, GreyoutColor);
// tft.fillRoundRect(279, 8, 33, 16, 2, BackgroundColor);
}
batteryold = batteryprobe;
batteryVold = 0;
@@ -4410,12 +4410,12 @@ void EdgeBeeper() {
if (radio.mute) {
radio.setMute();
if (!screenmute && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
} else {
radio.setUnMute();
if (!screenmute && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
}
}
@@ -4432,7 +4432,7 @@ void Seek(bool mode) {
}
if (!screenmute && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
}
if (!mode) TuneDown(); else TuneUp();
delay(50);
@@ -4448,7 +4448,7 @@ void Seek(bool mode) {
seek = false;
radio.setUnMute();
if (!screenmute && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
store = true;
} else {
@@ -4462,7 +4462,7 @@ void Seek(bool mode) {
seek = false;
radio.setUnMute();
if (!screenmute && !afscreen) {
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
}
store = true;
} else {
@@ -4836,7 +4836,7 @@ void cancelDXScan() {
scandxmode = false;
if (scanmute) {
radio.setUnMute();
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
if (!flashing) {
tft.fillRoundRect(2, 80, 40, 18, 2, SecondaryColor);
@@ -5001,7 +5001,7 @@ void startFMDXScan() {
}
if (scanmute) {
radio.setMute();
tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
SQ = true;
Squelchold = -2;
}

10
src/comms.cpp
View File

@@ -732,7 +732,7 @@ void XDRGTKRoutine() {
case '\0':
radio.setMute();
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
if (!screenmute) {
tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor);
tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor);
@@ -761,7 +761,7 @@ void XDRGTKRoutine() {
XDRScan = false;
if (VolSet != 0) {
radio.setUnMute();
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
radio.setVolume(((VolSet * 10) - 40) / 10);
}
break;
@@ -799,12 +799,12 @@ void XDRGTKRoutine() {
VolSet = atoi(buff + 1);
if (VolSet == 0) {
radio.setMute();
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor);
XDRMute = true;
SQ = true;
} else {
radio.setUnMute();
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
radio.setVolume((VolSet - 40) / 10);
XDRMute = false;
}
@@ -831,7 +831,7 @@ void XDRGTKRoutine() {
store = true;
XDRMute = false;
radio.setUnMute();
if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
VolSet = EEPROM.readByte(EE_BYTE_VOLSET);
LowLevelSet = EEPROM.readByte(EE_BYTE_LOWLEVELSET);
softmuteam = EEPROM.readByte(EE_BYTE_SOFTMUTEAM);

236
src/constants.h
View File

@@ -493,26 +493,30 @@ static const uint8_t RDSLogo[] PROGMEM = {
};
static const uint8_t Speaker[] PROGMEM = {
0x00, 0x00, 0x00,
0x00, 0x20, 0x00,
0x00, 0x60, 0x00,
0x01, 0xe0, 0x00,
0x03, 0xe0, 0x00,
0x07, 0xe0, 0x00,
0xff, 0xe2, 0x10,
0xff, 0xe7, 0x38,
0xff, 0xe3, 0xf0,
0xff, 0xe1, 0xe0,
0xff, 0xe1, 0xe0,
0xff, 0xe3, 0xf0,
0xff, 0xe7, 0x38,
0xff, 0xe2, 0x10,
0x07, 0xe0, 0x00,
0x03, 0xe0, 0x00,
0x01, 0xe0, 0x00,
0x00, 0x60, 0x00,
0x00, 0x20, 0x00,
0x00, 0x00, 0x00
0x00, 0x00, 0x00, 0x00,
0x00, 0x02, 0x00, 0x00,
0x00, 0x0e, 0x00, 0x00,
0x00, 0x1e, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x7e, 0x00, 0x00,
0x00, 0xfe, 0x00, 0x00,
0x3f, 0xfe, 0x20, 0x80,
0x3f, 0xfe, 0x71, 0xc0,
0x3f, 0xfe, 0x7b, 0xc0,
0x3f, 0xfe, 0x3f, 0x80,
0x3f, 0xfe, 0x1f, 0x00,
0x3f, 0xfe, 0x1f, 0x00,
0x3f, 0xfe, 0x3f, 0x80,
0x3f, 0xfe, 0x7b, 0xc0,
0x3f, 0xfe, 0x71, 0xc0,
0x3f, 0xfe, 0x20, 0x80,
0x00, 0xfe, 0x00, 0x00,
0x00, 0x7e, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x1e, 0x00, 0x00,
0x00, 0x0e, 0x00, 0x00,
0x00, 0x02, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
};
static const uint8_t Mono[] PROGMEM = {
@@ -566,107 +570,115 @@ static const uint8_t Stereo[] PROGMEM = {
};
static const uint8_t WiFi1[] PROGMEM = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x7f, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x1c, 0x00, 0x00,
0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x07, 0xf0, 0x00, 0x00,
0x00, 0x07, 0xf0, 0x00, 0x00,
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x01, 0xc0, 0x00, 0x00,
0x00, 0x00, 0x80, 0x00, 0x00
};
static const uint8_t WiFi2[] PROGMEM = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x7f, 0x00, 0x00,
0x00, 0xff, 0x80, 0x00,
0x01, 0xff, 0xc0, 0x00,
0x01, 0xff, 0xc0, 0x00,
0x00, 0xff, 0xc0, 0x00,
0x00, 0xff, 0x80, 0x00,
0x00, 0x7f, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x1c, 0x00, 0x00,
0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x07, 0xf0, 0x00, 0x00,
0x00, 0x1f, 0xfc, 0x00, 0x00,
0x00, 0x3f, 0xfe, 0x00, 0x00,
0x00, 0x7f, 0xff, 0x00, 0x00,
0x00, 0x7f, 0xff, 0x00, 0x00,
0x00, 0x7f, 0xff, 0x00, 0x00,
0x00, 0x3f, 0xfe, 0x00, 0x00,
0x00, 0x1f, 0xfc, 0x00, 0x00,
0x00, 0x07, 0xf0, 0x00, 0x00,
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x01, 0xc0, 0x00, 0x00,
0x00, 0x00, 0x80, 0x00, 0x00
};
static const uint8_t WiFi3[] PROGMEM = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x7f, 0x00, 0x00,
0x01, 0xff, 0xc0, 0x00,
0x03, 0xff, 0xe0, 0x00,
0x07, 0xff, 0xf0, 0x00,
0x0f, 0xff, 0xf8, 0x00,
0x0f, 0xff, 0xfc, 0x00,
0x0f, 0xff, 0xf8, 0x00,
0x07, 0xff, 0xf0, 0x00,
0x03, 0xff, 0xe0, 0x00,
0x01, 0xff, 0xc0, 0x00,
0x00, 0xff, 0xc0, 0x00,
0x00, 0xff, 0x80, 0x00,
0x00, 0x7f, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x1c, 0x00, 0x00,
0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x1f, 0xfc, 0x00, 0x00,
0x00, 0x7f, 0xff, 0x00, 0x00,
0x00, 0xff, 0xff, 0x80, 0x00,
0x01, 0xff, 0xff, 0xc0, 0x00,
0x03, 0xff, 0xff, 0xe0, 0x00,
0x07, 0xff, 0xff, 0xf0, 0x00,
0x07, 0xff, 0xff, 0xf0, 0x00,
0x0f, 0xff, 0xff, 0xf0, 0x00,
0x07, 0xff, 0xff, 0xe0, 0x00,
0x01, 0xff, 0xff, 0xc0, 0x00,
0x00, 0xff, 0xff, 0x80, 0x00,
0x00, 0x7f, 0xff, 0x00, 0x00,
0x00, 0x3f, 0xfe, 0x00, 0x00,
0x00, 0x1f, 0xf8, 0x00, 0x00,
0x00, 0x07, 0xf0, 0x00, 0x00,
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x01, 0xc0, 0x00, 0x00,
0x00, 0x00, 0x80, 0x00, 0x00
};
static const uint8_t WiFi4[] PROGMEM = {
0x00, 0x3e, 0x00, 0x00,
0x01, 0xff, 0xc0, 0x00,
0x07, 0xff, 0xf0, 0x00,
0x0f, 0xff, 0xf8, 0x00,
0x1f, 0xff, 0xfc, 0x00,
0x3f, 0xff, 0xfe, 0x00,
0x7f, 0xff, 0xff, 0x00,
0x7f, 0xff, 0xff, 0x80,
0x7f, 0xff, 0xff, 0x00,
0x3f, 0xff, 0xfe, 0x00,
0x1f, 0xff, 0xfc, 0x00,
0x0f, 0xff, 0xfc, 0x00,
0x0f, 0xff, 0xf8, 0x00,
0x07, 0xff, 0xf0, 0x00,
0x03, 0xff, 0xe0, 0x00,
0x01, 0xff, 0xc0, 0x00,
0x00, 0xff, 0xc0, 0x00,
0x00, 0xff, 0x80, 0x00,
0x00, 0x7f, 0x00, 0x00,
0x00, 0x3e, 0x00, 0x00,
0x00, 0x1c, 0x00, 0x00,
0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x1f, 0xfe, 0x00, 0x00,
0x00, 0xff, 0xff, 0x80, 0x00,
0x01, 0xff, 0xff, 0xc0, 0x00,
0x03, 0xff, 0xff, 0xf0, 0x00,
0x0f, 0xff, 0xff, 0xf8, 0x00,
0x0f, 0xff, 0xff, 0xfc, 0x00,
0x1f, 0xff, 0xff, 0xfe, 0x00,
0x3f, 0xff, 0xff, 0xfe, 0x00,
0x7f, 0xff, 0xff, 0xff, 0x00,
0x7f, 0xff, 0xff, 0xff, 0x80,
0x7f, 0xff, 0xff, 0xff, 0x00,
0x3f, 0xff, 0xff, 0xfe, 0x00,
0x1f, 0xff, 0xff, 0xfc, 0x00,
0x0f, 0xff, 0xff, 0xf0, 0x00,
0x07, 0xff, 0xff, 0xe0, 0x00,
0x01, 0xff, 0xff, 0xc0, 0x00,
0x00, 0xff, 0xff, 0x80, 0x00,
0x00, 0x7f, 0xff, 0x00, 0x00,
0x00, 0x3f, 0xfe, 0x00, 0x00,
0x00, 0x1f, 0xf8, 0x00, 0x00,
0x00, 0x0f, 0xf0, 0x00, 0x00,
0x00, 0x03, 0xe0, 0x00, 0x00,
0x00, 0x01, 0xc0, 0x00, 0x00,
0x00, 0x00, 0x80, 0x00, 0x00
};
static const uint16_t openradiologo[] PROGMEM = {

4
src/gui.cpp
View File

@@ -2910,7 +2910,7 @@ void BuildAdvancedRDS() {
tftPrint(-1, "kHz", 205, 4, ActiveColor, ActiveColorSmooth, 28);
tft.drawBitmap(68, 5, RDSLogo, 35, 22, GreyoutColor);
tft.drawBitmap(215, 47, Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
if (!StereoToggle) {
tft.drawBitmap(38, 5, Mono, 22, 22, SecondaryColor);
@@ -3040,7 +3040,7 @@ void BuildDisplay() {
tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, 16);
tft.drawBitmap(68, 5, RDSLogo, 35, 22, GreyoutColor);
tft.drawBitmap(253, 142, Speaker, 21, 20, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
if (!StereoToggle) {
tft.drawBitmap(38, 5, Mono, 22, 22, SecondaryColor);

2
src/touch.cpp
View File

@@ -96,7 +96,7 @@ void doTouchEvent(uint16_t x, uint16_t y) {
}
if (!menu && !BWtune) { // All pages except menu
if (x > 50 && x < 90 && y > 0 && y < 30 && band < BAND_GAP) { // ---------------------
if (x > 30 && x < 65 && y > 0 && y < 30 && band < BAND_GAP) { // ---------------------
doStereoToggle(); // Stereo toggle
return;
} else if (x > 155 && x < 250 && y > 0 && y < 30) {