From 686eb92879192e2b55a61466654b93b71e65a324 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 15 Jun 2023 09:55:35 +0800 Subject: [PATCH 1/3] fix stepsize error when bands switch bands switch FM -> LW, stepsize should not > 3 --- TEF6686_ESP32.ino | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index f1f8a13..78e25ab 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -591,7 +591,10 @@ void PWRButtonPress() { ESP.restart(); } else { if (tunemode != 2) { - if (band == BAND_FM) band = BAND_LW; + if (band == BAND_FM) { + band = BAND_LW; + if (stepsize > 3) stepsize = 3; + } else if (band == BAND_LW) band = BAND_MW; else if (band == BAND_MW) band = BAND_SW; else if (band == BAND_SW) band = BAND_FM; From 05b1f4a5f00dbdba4f9675530108fc5c293b4983 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 15 Jun 2023 10:48:24 +0800 Subject: [PATCH 2/3] Fix display mis-match of iMS EQ Y mis-match of iMS and EQ with updateiMS() and updateEQ() --- TEF6686_ESP32.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 78e25ab..265cd5a 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -673,10 +673,10 @@ void SelectBand() { tft.drawBitmap(110, 5, RDSLogo, 67, 22, TFT_GREYOUT); tft.drawRoundRect(249, 56, 30, 20, 5, TFT_GREYOUT); tft.setTextColor(TFT_GREYOUT); - tft.drawCentreString("iMS", 265, 58, GFXFF); + tft.drawCentreString("iMS", 265, 54, GFXFF); tft.drawRoundRect(287, 56, 30, 20, 5, TFT_GREYOUT); tft.setTextColor(TFT_GREYOUT); - tft.drawCentreString("EQ", 303, 58, GFXFF); + tft.drawCentreString("EQ", 303, 54, GFXFF); } else { LowLevelInit == false; BWreset = true; From 994f9303a3f2852cd989c08da0e31c76e94528db Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 15 Jun 2023 16:10:39 +0800 Subject: [PATCH 3/3] Fix recall error of stepsize When you set stepsize to 4 and then switch to LW Band and turn off radio immediately , when turn on again, then stepsize will remain 4 ,this is not suitable for LW and MW. --- TEF6686_ESP32.ino | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 265cd5a..86a8afc 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -252,8 +252,14 @@ void setup() { if (iMSset == 0 && EQset == 0) iMSEQ = 1; switch (band) { - case BAND_LW: frequency_LW = frequency_AM; break; - case BAND_MW: frequency_MW = frequency_AM; break; + case BAND_LW: + frequency_LW = frequency_AM; + if (stepsize > 3) stepsize = 3; + break; + case BAND_MW: + frequency_MW = frequency_AM; + if (stepsize > 3) stepsize = 3; + break; case BAND_SW: frequency_SW = frequency_AM; break; default: break; }