Fix MEM store bug on AM

This commit is contained in:
ohmytime
2023-11-25 21:06:59 +08:00
parent 2f163862d7
commit fe5f5e4fab

View File

@@ -1703,9 +1703,11 @@ void SelectBand() {
if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN; if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN;
BWreset = true; BWreset = true;
BWset = BWsetAM; BWset = BWsetAM;
if (band == BAND_LW) freqold = frequency_LW; switch (band) {
if (band == BAND_MW) freqold = frequency_MW; case BAND_LW: freqold = frequency_LW; frequency_AM = frequency_LW; break;
if (band == BAND_SW) freqold = frequency_SW; case BAND_MW: freqold = frequency_MW; frequency_AM = frequency_LW; break;
case BAND_SW: freqold = frequency_SW; frequency_AM = frequency_SW; break;
}
LimitAMFrequency(); LimitAMFrequency();
if (!externaltune) CheckBandForbiddenAM(); if (!externaltune) CheckBandForbiddenAM();
radio.SetFreqAM(frequency_AM); radio.SetFreqAM(frequency_AM);
@@ -2317,7 +2319,6 @@ void ShowMemoryPos() {
if (tunemode == TUNE_MEM) { if (tunemode == TUNE_MEM) {
int memposcolor = 0; int memposcolor = 0;
int memposcolorsmooth = 0; int memposcolorsmooth = 0;
log_e("memoryposstatus %d:", memoryposstatus);
switch (memoryposstatus) { switch (memoryposstatus) {
case MEM_DARK: case MEM_DARK:
memposcolor = InsignificantColor; memposcolor = InsignificantColor;
@@ -2397,6 +2398,11 @@ void ShowFreq(int mode) {
detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A)); detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A));
detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B)); detachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B));
if (band > BAND_GAP) { 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.fillSprite(BackgroundColor);
FrequencySprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); FrequencySprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
FrequencySprite.drawString(String(frequency_AM) + " ", 218, -6); FrequencySprite.drawString(String(frequency_AM) + " ", 218, -6);