Fix: Menu was not correct closed after starting FMDX Scan
This commit is contained in:
+7
-1
@@ -1992,6 +1992,7 @@ void ModeButtonPress() {
|
|||||||
menupage = INDEX;
|
menupage = INDEX;
|
||||||
menuitem = 0;
|
menuitem = 0;
|
||||||
UpdateFonts(1);
|
UpdateFonts(1);
|
||||||
|
if (spispeed == 7) tft.setSPISpeed(30);
|
||||||
BuildMenu();
|
BuildMenu();
|
||||||
menu = true;
|
menu = true;
|
||||||
ScreensaverTimerSet(OFF);
|
ScreensaverTimerSet(OFF);
|
||||||
@@ -2037,6 +2038,7 @@ void ModeButtonPress() {
|
|||||||
menuoption = ITEM1;
|
menuoption = ITEM1;
|
||||||
menupage = INDEX;
|
menupage = INDEX;
|
||||||
menuitem = 0;
|
menuitem = 0;
|
||||||
|
if (spispeed == 7) tft.setSPISpeed(30);
|
||||||
BuildMenu();
|
BuildMenu();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2665,7 +2667,7 @@ void ShowFreq(int mode) {
|
|||||||
attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A), read_encoder, CHANGE);
|
attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A), read_encoder, CHANGE);
|
||||||
attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B), read_encoder, CHANGE);
|
attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B), read_encoder, CHANGE);
|
||||||
|
|
||||||
setAutoSpeedSPI();
|
if (spispeed == 7) setAutoSpeedSPI();
|
||||||
rdsreset = true;
|
rdsreset = true;
|
||||||
licold = 254;
|
licold = 254;
|
||||||
ECCold = 253;
|
ECCold = 253;
|
||||||
@@ -3957,6 +3959,10 @@ void endMenu() {
|
|||||||
menu = false;
|
menu = false;
|
||||||
menuopen = false;
|
menuopen = false;
|
||||||
LowLevelInit = true;
|
LowLevelInit = true;
|
||||||
|
submenu = false;
|
||||||
|
menuoption = ITEM1;
|
||||||
|
menupage = INDEX;
|
||||||
|
menuitem = 0;
|
||||||
EEPROM.writeByte(EE_BYTE_VOLSET, VolSet);
|
EEPROM.writeByte(EE_BYTE_VOLSET, VolSet);
|
||||||
EEPROM.writeUInt(EE_UINT16_CONVERTERSET, ConverterSet);
|
EEPROM.writeUInt(EE_UINT16_CONVERTERSET, ConverterSet);
|
||||||
EEPROM.writeUInt(EE_UINT16_FMLOWEDGESET, LowEdgeSet);
|
EEPROM.writeUInt(EE_UINT16_FMLOWEDGESET, LowEdgeSet);
|
||||||
|
|||||||
Reference in New Issue
Block a user