From 4b1c2ceed9073e2ad7a819bcb45267c85b20ab33 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB <76666293+PE5PVB@users.noreply.github.com> Date: Tue, 2 Jul 2024 10:35:49 +0200 Subject: [PATCH 1/4] Update language.h --- src/language.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/language.h b/src/language.h index 2896847..e3089eb 100644 --- a/src/language.h +++ b/src/language.h @@ -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 From 298488c0dcb2230fb8be1368f174186f9072dae6 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Tue, 2 Jul 2024 14:46:53 +0200 Subject: [PATCH 2/4] When no AF is found in mem mode return to last frequency --- TEF6686_ESP32.ino | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 1f69bee..0716929 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -904,6 +904,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); @@ -913,10 +914,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; From 035ed8670705ab1e515cd3b93983853f8e297163 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Tue, 2 Jul 2024 17:05:30 +0200 Subject: [PATCH 3/4] Versioning --- src/language.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language.h b/src/language.h index e3089eb..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] From c1a0d0fbd9c15d44e056ed6f865717252a30038c Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Thu, 4 Jul 2024 16:08:59 +0200 Subject: [PATCH 4/4] Fix problem where sometimes squelch mode can't be set --- src/gui.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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; }