diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 0e1d982..172c28b 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -1006,7 +1006,7 @@ void loop() { if (shouldScan) { if (scanmute && scanholdonsignal) { radio.setMute(); - if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); + if (!screenmute) 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(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } } @@ -2354,7 +2354,7 @@ void SelectBand() { } if (band > BAND_GAP) { - if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) 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(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) 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(); @@ -2548,7 +2548,7 @@ void ModeButtonPress() { freq_in = 0; } else { if (!BWtune && !menu) { - if (!screenmute && !afscreen) { + if (!screenmute) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } memorystore = false; @@ -2757,7 +2757,7 @@ void ButtonPress() { } } } else { - if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) 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(); @@ -3678,7 +3678,7 @@ void doSquelch() { if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 100 && OStatus > -100) && (!scandxmode || (scandxmode && !scanmute))) { if (SQ || BWreset) { if (!seek) radio.setUnMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } autosquelchtimer = millis(); @@ -3687,7 +3687,7 @@ void doSquelch() { } else { if ((!SQ || BWreset) && (millis() >= autosquelchtimer + 1000)) { radio.setMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } autosquelchtimer = millis(); @@ -3697,13 +3697,13 @@ void doSquelch() { } else { if ((USN < amscansens * 30) && (OStatus < 2 && OStatus > -2) && (!scandxmode || (scandxmode && !scanmute))) { if (!seek) radio.setUnMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } SQ = false; } else { radio.setMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } SQ = true; @@ -3737,13 +3737,13 @@ void doSquelch() { if (Squelch != -1) { if (Squelch < SStatus || Squelch == -100 || Squelch == 0) { if (!seek) radio.setUnMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } SQ = false; } else { radio.setMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } SQ = true; @@ -3751,13 +3751,13 @@ void doSquelch() { } else { if (Stereostatus) { radio.setUnMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } SQ = false; } else { radio.setMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } SQ = true; @@ -3786,13 +3786,13 @@ void doSquelch() { if (Squelch != 920) { if (Squelch < SStatus || Squelch == -100 || Squelch == 0) { if (!seek) radio.setUnMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } SQ = false; } else { radio.setMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } SQ = true; @@ -3800,13 +3800,13 @@ void doSquelch() { } else { if (Stereostatus) { if (!seek) radio.setUnMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } SQ = false; } else { radio.setMute(); - if (!screenmute && !seek && !afscreen) { + if (!screenmute && !seek) { 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(281, 3, WiFi4, 33, 25, BackgroundColor); + tft.drawBitmap(282, 3, WiFi4, 30, 25, BackgroundColor); } else if (rssi > -50 && rssi < 0) { - tft.drawBitmap(281, 3, WiFi4, 33, 25, WifiColorHigh); + tft.drawBitmap(282, 3, WiFi4, 30, 25, WifiColorHigh); } else if (rssi > -60) { - tft.drawBitmap(281, 3, WiFi4, 33, 25, GreyoutColor); - tft.drawBitmap(281, 3, WiFi3, 33, 25, WifiColorHigh); + tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor); + tft.drawBitmap(282, 3, WiFi3, 30, 25, WifiColorHigh); } else if (rssi > -70) { - tft.drawBitmap(281, 3, WiFi4, 33, 25, GreyoutColor); - tft.drawBitmap(281, 3, WiFi2, 33, 25, WifiColorLow); + tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor); + tft.drawBitmap(282, 3, WiFi2, 30, 25, WifiColorLow); } else if (rssi < -70) { - tft.drawBitmap(281, 3, WiFi4, 33, 25, GreyoutColor); - tft.drawBitmap(281, 3, WiFi1, 33, 25, WifiColorLow); + tft.drawBitmap(282, 3, WiFi4, 30, 25, GreyoutColor); + tft.drawBitmap(282, 3, WiFi1, 30, 25, WifiColorLow); } } } @@ -4409,12 +4409,12 @@ void EdgeBeeper() { radio.tone(50, -5, 2000); if (radio.mute) { radio.setMute(); - if (!screenmute && !afscreen) { + if (!screenmute) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } } else { radio.setUnMute(); - if (!screenmute && !afscreen) { + if (!screenmute) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } } @@ -4431,7 +4431,7 @@ void Seek(bool mode) { seekinit = false; } - if (!screenmute && !afscreen) { + if (!screenmute) { tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); } if (!mode) TuneDown(); else TuneUp(); @@ -4447,7 +4447,7 @@ void Seek(bool mode) { if ((USN < fmscansens * 30) && (WAM < 230) && (OStatus < 80 && OStatus > -80) && (Squelch < SStatus || Squelch == 920)) { seek = false; radio.setUnMute(); - if (!screenmute && !afscreen) { + if (!screenmute) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } store = true; @@ -4461,7 +4461,7 @@ void Seek(bool mode) { if ((USN < amscansens * 30) && (OStatus < 2 && OStatus > -2) && (Squelch < SStatus || Squelch == 920)) { seek = false; radio.setUnMute(); - if (!screenmute && !afscreen) { + if (!screenmute) { tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); } store = true; diff --git a/src/comms.cpp b/src/comms.cpp index 2c7d372..2cc2714 100644 --- a/src/comms.cpp +++ b/src/comms.cpp @@ -732,7 +732,7 @@ void XDRGTKRoutine() { case '\0': radio.setMute(); - if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); + if (!screenmute) 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(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) 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(249, 4, Speaker, 28, 24, PrimaryColor); + if (!screenmute) tft.drawBitmap(249, 4, Speaker, 28, 24, PrimaryColor); XDRMute = true; SQ = true; } else { radio.setUnMute(); - if (!screenmute && !afscreen) tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) 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(249, 4, Speaker, 28, 24, GreyoutColor); + if (!screenmute) 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 b38790c..b196901 100644 --- a/src/constants.h +++ b/src/constants.h @@ -570,115 +570,114 @@ 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, 0x00, - 0x00, 0x00, 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 + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 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, 0x80, 0x00, + 0x00, 0x0f, 0xc0, 0x00, + 0x00, 0x0f, 0xc0, 0x00, + 0x00, 0x0f, 0x80, 0x00, + 0x00, 0x03, 0x00, 0x00, + 0x00, 0x00, 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, 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 + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0f, 0xe0, 0x00, + 0x00, 0x3f, 0xf0, 0x00, + 0x00, 0x7f, 0xf8, 0x00, + 0x00, 0xff, 0xfc, 0x00, + 0x00, 0xff, 0xfc, 0x00, + 0x00, 0xff, 0xfc, 0x00, + 0x00, 0x7f, 0xf8, 0x00, + 0x00, 0x3f, 0xf0, 0x00, + 0x00, 0x1f, 0xe0, 0x00, + 0x00, 0x0f, 0x80, 0x00, + 0x00, 0x03, 0x00, 0x00, + 0x00, 0x00, 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, - 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 + 0x00, 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, 0x80, 0x00, + 0x00, 0x3f, 0xf0, 0x00, + 0x00, 0x7f, 0xfc, 0x00, + 0x01, 0xff, 0xfe, 0x00, + 0x03, 0xff, 0xff, 0x00, + 0x03, 0xff, 0xff, 0x80, + 0x07, 0xff, 0xff, 0x80, + 0x0f, 0xff, 0xff, 0xc0, + 0x0f, 0xff, 0xff, 0xc0, + 0x07, 0xff, 0xff, 0x80, + 0x03, 0xff, 0xff, 0x00, + 0x01, 0xff, 0xfe, 0x00, + 0x00, 0xff, 0xfc, 0x00, + 0x00, 0x7f, 0xf8, 0x00, + 0x00, 0x3f, 0xf0, 0x00, + 0x00, 0x1f, 0xc0, 0x00, + 0x00, 0x0f, 0x80, 0x00, + 0x00, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; static const uint8_t WiFi4[] PROGMEM = { - 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 + 0x00, 0x07, 0xc0, 0x00, + 0x00, 0x3f, 0xf8, 0x00, + 0x00, 0xff, 0xfe, 0x00, + 0x03, 0xff, 0xff, 0x00, + 0x07, 0xff, 0xff, 0x80, + 0x0f, 0xff, 0xff, 0xc0, + 0x1f, 0xff, 0xff, 0xe0, + 0x3f, 0xff, 0xff, 0xf0, + 0x3f, 0xff, 0xff, 0xf0, + 0x7f, 0xff, 0xff, 0xf8, + 0xff, 0xff, 0xff, 0xfc, + 0x7f, 0xff, 0xff, 0xf8, + 0x3f, 0xff, 0xff, 0xf0, + 0x1f, 0xff, 0xff, 0xe0, + 0x0f, 0xff, 0xff, 0xc0, + 0x07, 0xff, 0xff, 0x80, + 0x03, 0xff, 0xff, 0x00, + 0x01, 0xff, 0xfe, 0x00, + 0x00, 0xff, 0xfc, 0x00, + 0x00, 0x7f, 0xf8, 0x00, + 0x00, 0x3f, 0xf0, 0x00, + 0x00, 0x1f, 0xc0, 0x00, + 0x00, 0x0f, 0x80, 0x00, + 0x00, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; static const uint16_t openradiologo[] PROGMEM = { diff --git a/src/gui.cpp b/src/gui.cpp index 11339ec..24740b6 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -36,8 +36,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = TealSmooth; BarSignificantColor = Red; BarInsignificantColor = Green; - ModBarSignificantColor = Green; - ModBarInsignificantColor = Red; + ModBarSignificantColor = Crimson; + ModBarInsignificantColor = Green; BWAutoColor = Teal; BWAutoColorSmooth = TealSmooth; BatteryValueColor = Teal; @@ -68,9 +68,9 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColor = CyanDark; RDSDropoutColorSmooth = CyanDarkSmooth; BarSignificantColor = Purple; - BarInsignificantColor = Cyan; - ModBarSignificantColor = Cyan; - ModBarInsignificantColor = Blue; + BarInsignificantColor = Skyblue; + ModBarSignificantColor = Blue; + ModBarInsignificantColor = Cyan; BWAutoColor = Teal; BWAutoColorSmooth = TealSmooth; BatteryValueColor = Teal; @@ -102,8 +102,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = CrimsonDarkSmooth; BarSignificantColor = Yellow; BarInsignificantColor = Crimson; - ModBarSignificantColor = Watermelon; - ModBarInsignificantColor = Yellow; + ModBarSignificantColor = Orange; + ModBarInsignificantColor = Coral; BWAutoColor = Coral; BWAutoColorSmooth = CoralSmooth; BatteryValueColor = Watermelon; @@ -135,8 +135,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = Black; BarSignificantColor = Honeydew; BarInsignificantColor = White; - ModBarSignificantColor = White; - ModBarInsignificantColor = Honeydew; + ModBarSignificantColor = Honeydew; + ModBarInsignificantColor = White; BWAutoColor = PureGrey; BWAutoColorSmooth = Black; BatteryValueColor = White; @@ -168,8 +168,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = DallasSmooth; BarSignificantColor = Red; BarInsignificantColor = Orange; - ModBarSignificantColor = Orange; - ModBarInsignificantColor = Cherry; + ModBarSignificantColor = Cherry; + ModBarInsignificantColor = Tangerine; BWAutoColor = Tangerine; BWAutoColorSmooth = TangerineSmooth; BatteryValueColor = Tangerine; @@ -199,8 +199,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSColorSmooth = GreenDark; RDSDropoutColor = Laurel; RDSDropoutColorSmooth = LaurelSmooth; - BarSignificantColor = Cabbage; - BarInsignificantColor = Green; + BarSignificantColor = Green; + BarInsignificantColor = Cabbage; ModBarSignificantColor = Green; ModBarInsignificantColor = Teal; BWAutoColor = Cabbage; @@ -234,7 +234,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = SakuraGreySmooth; BarSignificantColor = Violet; BarInsignificantColor = Sakura; - ModBarSignificantColor = Sakura; + ModBarSignificantColor = Cherry; ModBarInsignificantColor = Pink; BWAutoColor = Cherry; BWAutoColorSmooth = CherrySmooth; @@ -267,8 +267,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = White; BarSignificantColor = PureGrey; BarInsignificantColor = Black; - ModBarSignificantColor = Black; - ModBarInsignificantColor = PureGrey; + ModBarSignificantColor = PureGrey; + ModBarInsignificantColor = Black; BWAutoColor = PureGrey; BWAutoColorSmooth = White; BatteryValueColor = Black; @@ -298,10 +298,10 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSColorSmooth = IndigoSmooth; RDSDropoutColor = Copper; RDSDropoutColorSmooth = CopperSmooth; - BarSignificantColor = Tangerine; - BarInsignificantColor = Yellow; + BarSignificantColor = Cherry; + BarInsignificantColor = Yolk; ModBarSignificantColor = Yellow; - ModBarInsignificantColor = Orange; + ModBarInsignificantColor = Tangerine; BWAutoColor = Yolk; BWAutoColorSmooth = YolkSmooth; BatteryValueColor = Yolk; @@ -331,9 +331,9 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSColorSmooth = OceanSmooth; RDSDropoutColor = Cove; RDSDropoutColorSmooth = CoveSmooth; - BarSignificantColor = Skyblue; + BarSignificantColor = Cyan; BarInsignificantColor = Ocean; - ModBarSignificantColor = Ocean; + ModBarSignificantColor = Blue; ModBarInsignificantColor = Deepsky; BWAutoColor = Deepsky; BWAutoColorSmooth = DeepskySmooth; @@ -366,8 +366,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = LoganSmooth; BarSignificantColor = Cherry; BarInsignificantColor = Indigo; - ModBarSignificantColor = Indigo; - ModBarInsignificantColor = Purple; + ModBarSignificantColor = Purple; + ModBarInsignificantColor = Violet; BWAutoColor = Violet; BWAutoColorSmooth = VioletSmooth; BatteryValueColor = Violet; @@ -400,8 +400,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = LoganSmooth; BarSignificantColor = Yolk; BarInsignificantColor = Cherry; - ModBarSignificantColor = Cherry; - ModBarInsignificantColor = Violet; + ModBarSignificantColor = Orange; + ModBarInsignificantColor = Crimson; BWAutoColor = Violet; BWAutoColorSmooth = VioletSmooth; BatteryValueColor = Purple; @@ -432,9 +432,9 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSColorSmooth = YellowSmooth; RDSDropoutColor = Teal; RDSDropoutColorSmooth = TealSmooth; - BarSignificantColor = Ocean; - BarInsignificantColor = Cherry; - ModBarSignificantColor = Green; + BarSignificantColor = Red; + BarInsignificantColor = Green; + ModBarSignificantColor = Cherry; ModBarInsignificantColor = Blue; BWAutoColor = Teal; BWAutoColorSmooth = TealSmooth; @@ -468,7 +468,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de RDSDropoutColorSmooth = LoganSmooth; BarSignificantColor = Violet; BarInsignificantColor = Teal; - ModBarSignificantColor = Teal; + ModBarSignificantColor = Purple; ModBarInsignificantColor = Pink; BWAutoColor = Violet; BWAutoColorSmooth = VioletSmooth; diff --git a/src/language.h b/src/language.h index 6422f9d..b4bcb6c 100644 --- a/src/language.h +++ b/src/language.h @@ -3052,8 +3052,8 @@ static const char* const myLanguage[21][300] PROGMEM = { "Висок край на\nчестотната лента", // 23 "Отместване на\nнивото", // 24 "Праг на стерео разделяне", // 25 - "Честота на\nHigh Cut", // 26 - "Праг на High Cut", // 27 + "Честота на висок отрез", // 26 + "Праг на висок отрез", // 27 "Праг за слаб сигнал", // 28 "Яркост на дисплея", // 29 "Изкллючв.", // 30 @@ -3063,7 +3063,7 @@ static const char* const myLanguage[21][300] PROGMEM = { "СКЕНИРАНЕ...", // 34 "Тунерът не\nе разпознат!", // 35 "Усилване на\nAM антена", // 36 - "FM AGC", // 37 + "FM АУР", // 37 "Показване на\nRDS грешки", // 38 "Език", // 39 "Изберете език", // 40 @@ -3128,16 +3128,16 @@ static const char* const myLanguage[21][300] PROGMEM = { "Използване на AF", // 99 "Избор на FM лента", // 100 "Избор на AM лента", // 101 - "Дълги вълни", // 102 - "Средни вълни", // 103 - "Къси вълни", // 104 - "FM", // 105 + "ДВ", // 102 + "СВ", // 103 + "КВ", // 104 + "ЧМ", // 105 "ОИРТ", // 106 "Спиране на събуждане\nна екрана", // 107 "Избор на модел", // 108 "База", // 109 - "Портативен", // 110 - "Портативен с\nдокосване", // 111 + "Преносим", // 110 + "Преносимо докосване", // 111 "Заглавие", // 112 "Албум", // 113 "Песен", // 114 @@ -3224,7 +3224,7 @@ static const char* const myLanguage[21][300] PROGMEM = { "СВЪРЗАНЕ", // 195 "DX РЕЖИМ", // 196 "АВТОМАТИЧНА ПАМЕТ", // 197 - "AM AGC", // 198 + "AM АУР", // 198 "FM деемфаза", // 199 "Малък", // 200 "Голям", // 201 @@ -3324,7 +3324,7 @@ static const char* const myLanguage[21][300] PROGMEM = { "Не може да се добави запис!\nДневникът е пълен!", // 295 "Автоматичен дневник", // 296 "Автоматично лятно\nвреме по NTP", // 297 - "Задаване на отместване\nна NTP време", // 298 + "Отместване на NTP", // 298 "Дневникът съдържа над 130 записа, които не могат да бъдат обработени. Моля, изтеглете CSV файла за обработка." // 299 }, @@ -3973,7 +3973,7 @@ static const char* const myLanguage[21][300] PROGMEM = { "Mostra errori RDS", // 38 "Lingua", // 39 "Scegli lingua", // 40 - "PI agganc. su CT sync", // 41 + "PI bloccato CT sync", // 41 "Errore! Nessun segnale RDS", // 42 "Softmute FM", // 43 "Softmute AM", // 44 @@ -4137,7 +4137,7 @@ static const char* const myLanguage[21][300] PROGMEM = { "Tutto", // 202 "PS veloce", // 203 "Predefinito", // 204 - "Spegni schermo se connesso XDRGTK", // 205 + "Disattiva schermo su\nconnessione XDRGTK", // 205 "Miglioramento stereo FMSI", // 206 "Funzione disponibile solo su TEF6687/6689!", // 207 "Funzione non disponibile su skin selezionata!", // 208 @@ -4156,7 +4156,7 @@ static const char* const myLanguage[21][300] PROGMEM = { "Segnale", // 221 "Disattiva audio\nmentre scansiona", // 222 "AEREO", // 223 - "Premi x 5 sec. pulsante banda", // 224 + "Premi per 5 sec. il pulsante di banda", // 224 "Spegni", // 225 "Schermo spento", // 226 "Disabilitato", // 227 @@ -6349,4 +6349,4 @@ static const char* const myLanguage[21][300] PROGMEM = { } }; -#endif +#endif \ No newline at end of file