From 478afa20b721dff57ba33f0939f36b51509da486 Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 18:47:17 +0200 Subject: [PATCH 1/7] QFix - battery value blinkin TEF6686_ESP32.ino It looks like this overrides the values in percentage and value display when they reach certain values. --- TEF6686_ESP32.ino | 1 - 1 file changed, 1 deletion(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 65fa238..88dbb9e 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -2960,7 +2960,6 @@ void ShowBattery() { } else { tft.drawRect(277, 6, 37, 20, ActiveColor); tft.fillRect(313, 13, 4, 6, ActiveColor); - tft.fillRect(279, 8, 33, 16, BackgroundColor); if (!batteryoptions == BATTERY_VALUE || !batteryoptions == BATTERY_PERCENT) { tft.fillRect(279, 24 - (battery * 4), 33, battery * 4, BarInsignificantColor); } From 55a76ee71647dad09654e4e4a20bc24012729e11 Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 19:32:30 +0200 Subject: [PATCH 2/7] Changed to default SW-band selection TEF6686_ESP32.ino Since scan in AM is not implemented yet, it is probably best that this is selected on the SW band until everything works. --- TEF6686_ESP32.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 88dbb9e..7494e3a 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -154,7 +154,7 @@ byte screensaverOptions[5] = {0, 3, 10, 30, 60}; byte screensaverset; byte showmodulation; byte showSWMIBand; -byte nowToggleSWMIBand = 0; +byte nowToggleSWMIBand = 1; byte SNRold; byte stepsize; byte StereoLevel; From 20375d8e3a1306adc62cf32f9a7322e5e7051778 Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 20:37:06 +0200 Subject: [PATCH 3/7] Updated norwegian language.h --- src/language.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/language.h b/src/language.h index 6061f2a..c0c140c 100644 --- a/src/language.h +++ b/src/language.h @@ -3149,24 +3149,24 @@ static const char* const myLanguage[16][196] = { "Vis batteriprosent", // 175 "RT buffering", // 176 "Hovedinnstillinger", // 177 - "Lydinnstillinger", // 178 - "Skjerminnstillinger", // 179 - "RDS-innstillinger", // 180 - "FM innstillinger", // 181 - "AM innstillinger", // 182 + "Lyd Innstillinger", // 178 + "Skjerm Innstillinger", // 179 + "RDS Innstillinger", // 180 + "FM Innstillinger", // 181 + "AM Innstillinger", // 182 "Tilkobling", // 183 "TRYKK MODE FOR Å RETUNERE", // 184 "AM CoChannelDet", // 185 - "CoChannelDet sensitivity", // 186 - "AM CoChannelDet threshold", // 187 + "CoChannelDet følsomhet", // 186 + "AM CoChannelDet-terskel", // 187 "CoChannelDet counet", // 188 - "MAIN", // 189 - "AUDIO", // 190 - "DISPLAY", // 191 + "HOVED", // 189 + "LYD", // 190 + "SKJERM", // 191 "RDS", // 192 "FM", // 193 "AM", // 194 - "CONNECT" // 195 + "TILKOBLE" // 195 } }; From 5cd014c25b2c1201a5aaa030398a98972e27d972 Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 21:20:40 +0200 Subject: [PATCH 4/7] Add files via upload --- TEF6686_ESP32.ino | 1 + 1 file changed, 1 insertion(+) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index ba55d0f..8ea5326 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -2972,6 +2972,7 @@ void ShowBattery() { } else { tft.drawRect(277, 6, 37, 20, ActiveColor); tft.fillRect(313, 13, 4, 6, ActiveColor); + tft.fillRect(279, 8, 33, 16, BackgroundColor); if (!batteryoptions == BATTERY_VALUE || !batteryoptions == BATTERY_PERCENT) { tft.fillRect(279, 24 - (battery * 4), 33, battery * 4, BarInsignificantColor); } From 837b2f5c24638f9349b93205570df585c4c0a0b4 Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 21:23:33 +0200 Subject: [PATCH 5/7] Updated norwegian language.h --- src/language.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language.h b/src/language.h index e0f7c20..d3cc6be 100644 --- a/src/language.h +++ b/src/language.h @@ -3161,7 +3161,7 @@ static const char* const myLanguage[16][196] = { "AM CoChannelDet-terskel", // 187 "CoChannelDet counet", // 188 "HOVED", // 189 - "LYD", // 190 + "LYD ", // 190 "SKJERM", // 191 "RDS", // 192 "FM", // 193 From e4f20f0fe97933cc61eeea91498671f6361dd206 Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 21:51:16 +0200 Subject: [PATCH 6/7] Add files via upload --- src/language.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/language.h b/src/language.h index d3cc6be..a46ea66 100644 --- a/src/language.h +++ b/src/language.h @@ -3149,24 +3149,24 @@ static const char* const myLanguage[16][196] = { "Vis batteriprosent", // 175 "RT buffering", // 176 "Hovedinnstillinger", // 177 - "Lyd Innstillinger", // 178 - "Skjerm Innstillinger", // 179 - "RDS Innstillinger", // 180 - "FM Innstillinger", // 181 - "AM Innstillinger", // 182 + "Lydinnstillinger", // 178 + "Skjerminnstillinger", // 179 + "RDS-innstillinger", // 180 + "FM innstillinger", // 181 + "AM innstillinger", // 182 "Tilkobling", // 183 "TRYKK MODE FOR Å RETUNERE", // 184 "AM CoChannelDet", // 185 - "CoChannelDet følsomhet", // 186 - "AM CoChannelDet-terskel", // 187 + "CoChannelDet sensitivity", // 186 + "AM CoChannelDet threshold", // 187 "CoChannelDet counet", // 188 - "HOVED", // 189 - "LYD ", // 190 - "SKJERM", // 191 + "MAIN", // 189 + "AUDIO", // 190 + "DISPLAY", // 191 "RDS", // 192 "FM", // 193 "AM", // 194 - "TILKOBLE" // 195 + "CONNECT" // 195 } }; From 8ca0c07343cf7dd90a2141297025d4a0b16014cf Mon Sep 17 00:00:00 2001 From: Jan Ove Overland <102610897+mx4zxc@users.noreply.github.com> Date: Thu, 10 Aug 2023 21:53:49 +0200 Subject: [PATCH 7/7] Updated norwegian language.h --- src/language.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/language.h b/src/language.h index a46ea66..1c405ab 100644 --- a/src/language.h +++ b/src/language.h @@ -3151,22 +3151,22 @@ static const char* const myLanguage[16][196] = { "Hovedinnstillinger", // 177 "Lydinnstillinger", // 178 "Skjerminnstillinger", // 179 - "RDS-innstillinger", // 180 - "FM innstillinger", // 181 - "AM innstillinger", // 182 + "RDS Innstillinger", // 180 + "FM Innstillinger", // 181 + "AM Innstillinger", // 182 "Tilkobling", // 183 "TRYKK MODE FOR Å RETUNERE", // 184 "AM CoChannelDet", // 185 "CoChannelDet sensitivity", // 186 "AM CoChannelDet threshold", // 187 "CoChannelDet counet", // 188 - "MAIN", // 189 - "AUDIO", // 190 - "DISPLAY", // 191 + "HOVED", // 189 + "LYD", // 190 + "SKJERM", // 191 "RDS", // 192 "FM", // 193 "AM", // 194 - "CONNECT" // 195 + "TILKOBLE" // 195 } };