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

UI tweaks pt 2

Browse Source 
Moved the mute icon next to squelch, but needs resizing to 22x19
Resized aviation, now we have space for date too.
This commit is contained in:
MCelliotG
2025-02-06 05:00:51 +02:00
committed by GitHub
parent 84c5107749
commit c5fe70d6c3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/comms.cpp
View File

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

4
src/gui.cpp
View File

@@ -2886,7 +2886,7 @@ void BuildAdvancedRDS() {
tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28); tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28);
tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor); tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor); tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
if (!StereoToggle) { if (!StereoToggle) {
tft.drawCircle(48, 15, 10, SecondaryColor); tft.drawCircle(48, 15, 10, SecondaryColor);
@@ -3021,7 +3021,7 @@ void BuildDisplay() {
tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, 16);
tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor); tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor); tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
if (!StereoToggle) { if (!StereoToggle) {
tft.drawCircle(48, 15, 10, SecondaryColor); tft.drawCircle(48, 15, 10, SecondaryColor);