diff --git a/src/comms.cpp b/src/comms.cpp index b997373..2c7d372 100644 --- a/src/comms.cpp +++ b/src/comms.cpp @@ -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); diff --git a/src/constants.h b/src/constants.h index e6bad6f..b38790c 100644 --- a/src/constants.h +++ b/src/constants.h @@ -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 = { diff --git a/src/gui.cpp b/src/gui.cpp index 9d0dba3..11339ec 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -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); diff --git a/src/touch.cpp b/src/touch.cpp index 2eb815d..6d40b08 100644 --- a/src/touch.cpp +++ b/src/touch.cpp @@ -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) {