From fe5f5e4fab8b4c45bd7822e5b3e3fb284c6887a3 Mon Sep 17 00:00:00 2001 From: ohmytime Date: Sat, 25 Nov 2023 21:06:59 +0800 Subject: [PATCH 1/3] Fix MEM store bug on AM --- TEF6686_ESP32.ino | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index b076d52..a9a1985 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -1703,9 +1703,11 @@ void SelectBand() { if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN; BWreset = true; BWset = BWsetAM; - if (band == BAND_LW) freqold = frequency_LW; - if (band == BAND_MW) freqold = frequency_MW; - if (band == BAND_SW) freqold = frequency_SW; + switch (band) { + case BAND_LW: freqold = frequency_LW; frequency_AM = frequency_LW; break; + case BAND_MW: freqold = frequency_MW; frequency_AM = frequency_LW; break; + case BAND_SW: freqold = frequency_SW; frequency_AM = frequency_SW; break; + } LimitAMFrequency(); if (!externaltune) CheckBandForbiddenAM(); radio.SetFreqAM(frequency_AM); @@ -2317,7 +2319,6 @@ void ShowMemoryPos() { if (tunemode == TUNE_MEM) { int memposcolor = 0; int memposcolorsmooth = 0; - log_e("memoryposstatus %d:", memoryposstatus); switch (memoryposstatus) { case MEM_DARK: memposcolor = InsignificantColor; @@ -2397,6 +2398,11 @@ void ShowFreq(int mode) { detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A)); detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B)); if (band > BAND_GAP) { + switch (band) { + case BAND_LW: frequency_AM = frequency_LW; break; + case BAND_MW: frequency_AM = frequency_MW; break; + case BAND_SW: frequency_AM = frequency_SW; break; + } FrequencySprite.fillSprite(BackgroundColor); FrequencySprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); FrequencySprite.drawString(String(frequency_AM) + " ", 218, -6); From 83b4f1bb4e32d22c648b219845136a573d5a1527 Mon Sep 17 00:00:00 2001 From: ohmytime Date: Sat, 25 Nov 2023 21:08:01 +0800 Subject: [PATCH 2/3] Revert "Fix MEM store bug on AM" This reverts commit fe5f5e4fab8b4c45bd7822e5b3e3fb284c6887a3. --- TEF6686_ESP32.ino | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index a9a1985..b076d52 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -1703,11 +1703,9 @@ void SelectBand() { if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN; BWreset = true; BWset = BWsetAM; - switch (band) { - case BAND_LW: freqold = frequency_LW; frequency_AM = frequency_LW; break; - case BAND_MW: freqold = frequency_MW; frequency_AM = frequency_LW; break; - case BAND_SW: freqold = frequency_SW; frequency_AM = frequency_SW; break; - } + if (band == BAND_LW) freqold = frequency_LW; + if (band == BAND_MW) freqold = frequency_MW; + if (band == BAND_SW) freqold = frequency_SW; LimitAMFrequency(); if (!externaltune) CheckBandForbiddenAM(); radio.SetFreqAM(frequency_AM); @@ -2319,6 +2317,7 @@ void ShowMemoryPos() { if (tunemode == TUNE_MEM) { int memposcolor = 0; int memposcolorsmooth = 0; + log_e("memoryposstatus %d:", memoryposstatus); switch (memoryposstatus) { case MEM_DARK: memposcolor = InsignificantColor; @@ -2398,11 +2397,6 @@ void ShowFreq(int mode) { detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A)); detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B)); if (band > BAND_GAP) { - switch (band) { - case BAND_LW: frequency_AM = frequency_LW; break; - case BAND_MW: frequency_AM = frequency_MW; break; - case BAND_SW: frequency_AM = frequency_SW; break; - } FrequencySprite.fillSprite(BackgroundColor); FrequencySprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); FrequencySprite.drawString(String(frequency_AM) + " ", 218, -6); From 6da9a1c8947452231209dfd3b42a149739f6b5af Mon Sep 17 00:00:00 2001 From: ohmytime Date: Sat, 25 Nov 2023 21:11:00 +0800 Subject: [PATCH 3/3] Fix MEM store bug on AM --- TEF6686_ESP32.ino | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index b076d52..2ee8525 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -1703,9 +1703,11 @@ void SelectBand() { if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN; BWreset = true; BWset = BWsetAM; - if (band == BAND_LW) freqold = frequency_LW; - if (band == BAND_MW) freqold = frequency_MW; - if (band == BAND_SW) freqold = frequency_SW; + switch (band) { + case BAND_LW: freqold = frequency_LW; frequency_AM = frequency_LW; break; + case BAND_MW: freqold = frequency_MW; frequency_AM = frequency_MW; break; + case BAND_SW: freqold = frequency_SW; frequency_AM = frequency_SW; break; + } LimitAMFrequency(); if (!externaltune) CheckBandForbiddenAM(); radio.SetFreqAM(frequency_AM); @@ -2317,7 +2319,6 @@ void ShowMemoryPos() { if (tunemode == TUNE_MEM) { int memposcolor = 0; int memposcolorsmooth = 0; - log_e("memoryposstatus %d:", memoryposstatus); switch (memoryposstatus) { case MEM_DARK: memposcolor = InsignificantColor; @@ -2397,6 +2398,11 @@ void ShowFreq(int mode) { detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A)); detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B)); if (band > BAND_GAP) { + switch (band) { + case BAND_LW: frequency_AM = frequency_LW; break; + case BAND_MW: frequency_AM = frequency_MW; break; + case BAND_SW: frequency_AM = frequency_SW; break; + } FrequencySprite.fillSprite(BackgroundColor); FrequencySprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); FrequencySprite.drawString(String(frequency_AM) + " ", 218, -6);