Fixes on WiFi
1. When wifi menu was open and mode button press, software crash 2. When wifi disabled in menu, battery indicator was not working.
This commit is contained in:
Sjef Verhoeven PE5PVB
+74
-70
@@ -1774,77 +1774,81 @@ void ModeButtonPress() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
OStatusold = 1000;
|
if (menuopen) {
|
||||||
Stereostatusold = false;
|
ButtonPress();
|
||||||
SStatusold = 2000;
|
} else {
|
||||||
BWOld = 0;
|
OStatusold = 1000;
|
||||||
radio.clearRDS(fullsearchrds);
|
Stereostatusold = false;
|
||||||
RDSstatus = false;
|
SStatusold = 2000;
|
||||||
if (frequency % 10 != 0) {
|
BWOld = 0;
|
||||||
if (fmdefaultstepsize == 1) Round100K(frequency); else Round50K(frequency);
|
radio.clearRDS(fullsearchrds);
|
||||||
EEPROM.writeUInt(EE_UINT16_FREQUENCY_FM, frequency);
|
RDSstatus = false;
|
||||||
|
if (frequency % 10 != 0) {
|
||||||
|
if (fmdefaultstepsize == 1) Round100K(frequency); else Round50K(frequency);
|
||||||
|
EEPROM.writeUInt(EE_UINT16_FREQUENCY_FM, frequency);
|
||||||
|
}
|
||||||
|
radio.clearRDS(fullsearchrds);
|
||||||
|
CheckBandForbiddenFM();
|
||||||
|
CheckBandForbiddenAM();
|
||||||
|
BuildDisplay();
|
||||||
|
ShowSignalLevel();
|
||||||
|
ShowBW();
|
||||||
|
menu = false;
|
||||||
|
menuopen = false;
|
||||||
|
LowLevelInit = true;
|
||||||
|
EEPROM.writeInt(EE_BYTE_VOLSET, VolSet);
|
||||||
|
EEPROM.writeUInt(EE_UINT16_CONVERTERSET, ConverterSet);
|
||||||
|
EEPROM.writeUInt(EE_UINT16_FMLOWEDGESET, LowEdgeSet);
|
||||||
|
EEPROM.writeUInt(EE_UINT16_FMHIGHEDGESET, HighEdgeSet);
|
||||||
|
EEPROM.writeByte(EE_BYTE_CONTRASTSET, ContrastSet);
|
||||||
|
EEPROM.writeByte(EE_BYTE_STEREOLEVEL, StereoLevel);
|
||||||
|
EEPROM.writeByte(EE_BYTE_BANDFM, bandFM);
|
||||||
|
EEPROM.writeByte(EE_BYTE_BANDAM, bandAM);
|
||||||
|
EEPROM.writeByte(EE_BYTE_HIGHCUTLEVEL, HighCutLevel);
|
||||||
|
EEPROM.writeByte(EE_BYTE_HIGHCUTOFFSET, HighCutOffset);
|
||||||
|
EEPROM.writeByte(EE_BYTE_LEVELOFFSET, LevelOffset);
|
||||||
|
EEPROM.writeByte(EE_BYTE_RTBUFFER, radio.rds.rtbuffer);
|
||||||
|
EEPROM.writeByte(EE_BYTE_EDGEBEEP, edgebeep);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SOFTMUTEAM, softmuteam);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SOFTMUTEFM, softmutefm);
|
||||||
|
EEPROM.writeByte(EE_BYTE_LANGUAGE, language);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SHOWRDSERRORS, showrdserrors);
|
||||||
|
EEPROM.writeInt(EE_BYTE_LOWLEVELSET, LowLevelSet);
|
||||||
|
EEPROM.writeByte(EE_BYTE_REGION, region);
|
||||||
|
EEPROM.writeByte(EE_BYTE_RDS_UNDERSCORE, radio.rds.underscore);
|
||||||
|
EEPROM.writeByte(EE_BYTE_USBMODE, USBmode);
|
||||||
|
EEPROM.writeByte(EE_BYTE_WIFI, wifi);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SUBNETCLIENT, subnetclient);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SHOWSWMIBAND, showSWMIBand);
|
||||||
|
EEPROM.writeByte(EE_BYTE_RDS_FILTER, radio.rds.filter);
|
||||||
|
EEPROM.writeByte(EE_BYTE_RDS_PIERRORS, radio.rds.pierrors);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SHOWSQUELCH, showsquelch);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SHOWMODULATION, showmodulation);
|
||||||
|
EEPROM.writeByte(EE_BYTE_AM_NB, amnb);
|
||||||
|
EEPROM.writeByte(EE_BYTE_FM_NB, fmnb);
|
||||||
|
EEPROM.writeByte(EE_BYTE_AUDIOMODE, audiomode);
|
||||||
|
EEPROM.writeByte(EE_BYTE_TOUCH_ROTATING, touchrotating);
|
||||||
|
EEPROM.writeUInt(EE_UINT16_LOWEDGEOIRTSET, LowEdgeOIRTSet);
|
||||||
|
EEPROM.writeUInt(EE_UINT16_HIGHEDGEOIRTSET, HighEdgeOIRTSet);
|
||||||
|
EEPROM.writeByte(EE_BYTE_HARDWARE_MODEL, hardwaremodel);
|
||||||
|
EEPROM.writeByte(EE_BYTE_POWEROPTIONS, poweroptions);
|
||||||
|
EEPROM.writeByte(EE_BYTE_CURRENTTHEME, CurrentTheme);
|
||||||
|
EEPROM.writeByte(EE_BYTE_FMDEFAULTSTEPSIZE, fmdefaultstepsize);
|
||||||
|
EEPROM.writeByte(EE_BYTE_SCREENSAVERSET, screensaverset);
|
||||||
|
EEPROM.writeInt(EE_INT16_AMLEVELOFFSET, AMLevelOffset);
|
||||||
|
EEPROM.writeByte(EE_BYTE_UNIT, unit);
|
||||||
|
EEPROM.writeByte(EE_BYTE_AF, af);
|
||||||
|
EEPROM.writeByte(EE_BYTE_STEREO, StereoToggle);
|
||||||
|
EEPROM.writeByte(EE_BYTE_BATTERY_OPTIONS, batteryoptions);
|
||||||
|
EEPROM.commit();
|
||||||
|
Serial.end();
|
||||||
|
if (wifi) remoteip = IPAddress (WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], subnetclient);
|
||||||
|
if (USBmode) Serial.begin(19200); else Serial.begin(115200);
|
||||||
|
doBandSelectionFM();
|
||||||
|
doBandSelectionAM();
|
||||||
|
ScreensaverTimerSet(screensaverOptions[screensaverset]);
|
||||||
|
if (screensaverset) ScreensaverTimerRestart();
|
||||||
}
|
}
|
||||||
radio.clearRDS(fullsearchrds);
|
|
||||||
CheckBandForbiddenFM();
|
|
||||||
CheckBandForbiddenAM();
|
|
||||||
BuildDisplay();
|
|
||||||
ShowSignalLevel();
|
|
||||||
ShowBW();
|
|
||||||
menu = false;
|
|
||||||
menuopen = false;
|
|
||||||
LowLevelInit = true;
|
|
||||||
EEPROM.writeInt(EE_BYTE_VOLSET, VolSet);
|
|
||||||
EEPROM.writeUInt(EE_UINT16_CONVERTERSET, ConverterSet);
|
|
||||||
EEPROM.writeUInt(EE_UINT16_FMLOWEDGESET, LowEdgeSet);
|
|
||||||
EEPROM.writeUInt(EE_UINT16_FMHIGHEDGESET, HighEdgeSet);
|
|
||||||
EEPROM.writeByte(EE_BYTE_CONTRASTSET, ContrastSet);
|
|
||||||
EEPROM.writeByte(EE_BYTE_STEREOLEVEL, StereoLevel);
|
|
||||||
EEPROM.writeByte(EE_BYTE_BANDFM, bandFM);
|
|
||||||
EEPROM.writeByte(EE_BYTE_BANDAM, bandAM);
|
|
||||||
EEPROM.writeByte(EE_BYTE_HIGHCUTLEVEL, HighCutLevel);
|
|
||||||
EEPROM.writeByte(EE_BYTE_HIGHCUTOFFSET, HighCutOffset);
|
|
||||||
EEPROM.writeByte(EE_BYTE_LEVELOFFSET, LevelOffset);
|
|
||||||
EEPROM.writeByte(EE_BYTE_RTBUFFER, radio.rds.rtbuffer);
|
|
||||||
EEPROM.writeByte(EE_BYTE_EDGEBEEP, edgebeep);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SOFTMUTEAM, softmuteam);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SOFTMUTEFM, softmutefm);
|
|
||||||
EEPROM.writeByte(EE_BYTE_LANGUAGE, language);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SHOWRDSERRORS, showrdserrors);
|
|
||||||
EEPROM.writeInt(EE_BYTE_LOWLEVELSET, LowLevelSet);
|
|
||||||
EEPROM.writeByte(EE_BYTE_REGION, region);
|
|
||||||
EEPROM.writeByte(EE_BYTE_RDS_UNDERSCORE, radio.rds.underscore);
|
|
||||||
EEPROM.writeByte(EE_BYTE_USBMODE, USBmode);
|
|
||||||
EEPROM.writeByte(EE_BYTE_WIFI, wifi);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SUBNETCLIENT, subnetclient);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SHOWSWMIBAND, showSWMIBand);
|
|
||||||
EEPROM.writeByte(EE_BYTE_RDS_FILTER, radio.rds.filter);
|
|
||||||
EEPROM.writeByte(EE_BYTE_RDS_PIERRORS, radio.rds.pierrors);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SHOWSQUELCH, showsquelch);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SHOWMODULATION, showmodulation);
|
|
||||||
EEPROM.writeByte(EE_BYTE_AM_NB, amnb);
|
|
||||||
EEPROM.writeByte(EE_BYTE_FM_NB, fmnb);
|
|
||||||
EEPROM.writeByte(EE_BYTE_AUDIOMODE, audiomode);
|
|
||||||
EEPROM.writeByte(EE_BYTE_TOUCH_ROTATING, touchrotating);
|
|
||||||
EEPROM.writeUInt(EE_UINT16_LOWEDGEOIRTSET, LowEdgeOIRTSet);
|
|
||||||
EEPROM.writeUInt(EE_UINT16_HIGHEDGEOIRTSET, HighEdgeOIRTSet);
|
|
||||||
EEPROM.writeByte(EE_BYTE_HARDWARE_MODEL, hardwaremodel);
|
|
||||||
EEPROM.writeByte(EE_BYTE_POWEROPTIONS, poweroptions);
|
|
||||||
EEPROM.writeByte(EE_BYTE_CURRENTTHEME, CurrentTheme);
|
|
||||||
EEPROM.writeByte(EE_BYTE_FMDEFAULTSTEPSIZE, fmdefaultstepsize);
|
|
||||||
EEPROM.writeByte(EE_BYTE_SCREENSAVERSET, screensaverset);
|
|
||||||
EEPROM.writeInt(EE_INT16_AMLEVELOFFSET, AMLevelOffset);
|
|
||||||
EEPROM.writeByte(EE_BYTE_UNIT, unit);
|
|
||||||
EEPROM.writeByte(EE_BYTE_AF, af);
|
|
||||||
EEPROM.writeByte(EE_BYTE_STEREO, StereoToggle);
|
|
||||||
EEPROM.writeByte(EE_BYTE_BATTERY_OPTIONS, batteryoptions);
|
|
||||||
EEPROM.commit();
|
|
||||||
Serial.end();
|
|
||||||
if (wifi) remoteip = IPAddress (WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], subnetclient);
|
|
||||||
if (USBmode) Serial.begin(19200); else Serial.begin(115200);
|
|
||||||
doBandSelectionFM();
|
|
||||||
doBandSelectionAM();
|
|
||||||
ScreensaverTimerSet(screensaverOptions[screensaverset]);
|
|
||||||
if (screensaverset) ScreensaverTimerRestart();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while (digitalRead(MODEBUTTON) == LOW) delay(50);
|
while (digitalRead(MODEBUTTON) == LOW) delay(50);
|
||||||
|
|||||||
@@ -549,6 +549,9 @@ void tryWiFi() {
|
|||||||
wifi = true;
|
wifi = true;
|
||||||
} else {
|
} else {
|
||||||
if (!setupmode) tftPrint(0, myLanguage[language][56], 155, 128, SignificantColor, SignificantColorSmooth, 28);
|
if (!setupmode) tftPrint(0, myLanguage[language][56], 155, 128, SignificantColor, SignificantColorSmooth, 28);
|
||||||
|
Server.end();
|
||||||
|
Udp.stop();
|
||||||
|
WiFi.mode(WIFI_OFF);
|
||||||
wifi = false;
|
wifi = false;
|
||||||
XDRGTKTCP = false;
|
XDRGTKTCP = false;
|
||||||
RDSSPYTCP = false;
|
RDSSPYTCP = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user