diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 012d7db..5722d55 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -935,6 +935,7 @@ void loop() { } } + bool foundmemaf = false; for (int x = 8750; x <= 10800; x += 10) { if (rotary != 0 || digitalRead(BANDBUTTON) == LOW || digitalRead(MODEBUTTON) == LOW || digitalRead(BWBUTTON) == LOW || digitalRead(ROTARY_BUTTON) == LOW) break; radio.SetFreq(x); @@ -944,10 +945,16 @@ void loop() { } if (radio.rds.correctPI == radio.getBlockA()) { frequency = x; + foundmemaf = true; break; } } + if (!foundmemaf) { + frequency = freqold; + radio.SetFreq(frequency); + } + if (!screenmute) { if (advancedRDS) { leave = true; diff --git a/src/gui.cpp b/src/gui.cpp index 2a13241..60edd93 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -1790,7 +1790,9 @@ void MenuUp() { autosquelch = false; } else if (usesquelch && !autosquelch) { usesquelch = false; + autosquelch = false; } else { + usesquelch = false; autosquelch = true; } @@ -2652,7 +2654,9 @@ void MenuDown() { autosquelch = false; } else if (usesquelch && !autosquelch) { usesquelch = false; + autosquelch = false; } else { + usesquelch = false; autosquelch = true; } diff --git a/src/language.h b/src/language.h index 2896847..e00d584 100644 --- a/src/language.h +++ b/src/language.h @@ -1,7 +1,7 @@ #ifndef LANGUAGE_H #define LANGUAGE_H -#define VERSION "v2.11" +#define VERSION "v2.11.1" // [number of languages][number of texts] @@ -2955,7 +2955,7 @@ static const char* const myLanguage[18][263] PROGMEM = { "Экран отключен!", // 31 "Чтобы включить звук, снимите флажок RF+", // 32 "ВЫКЛ.", // 33 - "СКАНИРОВАНИЕ...", // 34 + "СКАНИРОВАНИЕ", // 34 "Тюнер не обнаружен", // 35 "AM Antenna gain", // 36 "FM AGC", // 37 @@ -4776,4 +4776,4 @@ static const char* const myLanguage[18][263] PROGMEM = { "Mostrar relógio" // 262 } }; -#endif \ No newline at end of file +#endif