Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Blocked debug messages whilst getting other strings. STA only retries if a SSID is defined

Browse source
This commit is contained in:
Ray Jones 2019-10-27 15:24:54 +11:00
parent 5efce879ce
commit 4138d0b2f5
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Afterburner.cpp
View file

@ -564,7 +564,7 @@ void loop()
if(NVstore.getUserSettings().menuMode == 2)
bReportRecyleEvents = false;
if( CommState.is(CommStates::OEMCtrlRx) ||
CommState.is(CommStates::HeaterRx1) ||
CommState.is(CommStates::HeaterRx2) ) {
@ -1320,6 +1320,7 @@ void checkDebugCommands()
return;
}
else if(nGetString) {
DebugPort.enable(true);
if(rxVal < ' ') {
if(rxVal == 0x1b) { // ESCAPE
nGetString = 0;
@ -1349,6 +1350,7 @@ void checkDebugCommands()
else {
nGetString = 3;
DebugPort.print("\r\nPlease enter new password - ");
DebugPort.enable(false); // block other debug msgs whilst we get the password
}
return;
case 3:
@ -1356,6 +1358,7 @@ void checkDebugCommands()
if(PCline.Len <= 31) {
nGetString = 4;
DebugPort.print("\r\nPlease confirm new password - ");
DebugPort.enable(false); // block other debug msgs whilst we get the password
}
else {
DebugPort.println("\r\nNew password is longer than 31 characters - ABORTING");
@ -1384,6 +1387,7 @@ void checkDebugCommands()
else
DebugPort.print('*');
PCline.append(rxVal);
DebugPort.enable(false); // block other debug msgs whilst we get strings
return;
}
}
@ -1455,6 +1459,7 @@ void checkDebugCommands()
else if(rxVal == 'n') {
DebugPort.print("Please enter new SSID name for Access Point - ");
nGetString = 1;
DebugPort.enable(false); // block other debug msgs whilst we get strings
PCline.clear();
}
else if(rxVal == 'm') {
@ -1467,6 +1472,7 @@ void checkDebugCommands()
else if(rxVal == 'p') {
DebugPort.print("Please enter current AP password - ");
nGetString = 2;
DebugPort.enable(false); // block other debug msgs whilst we get strings
PCline.clear();
}
else if(rxVal == 's') {

3
src/WiFi/BTCWifi.cpp
View file

@ -163,7 +163,8 @@ void doWiFiManager()
WiFi.mode(WIFI_AP_STA);
wifi_config_t conf;
esp_wifi_get_config(WIFI_IF_STA, &conf);
WiFi.begin((char*)conf.sta.ssid, (char*)conf.sta.password);
if(strlen((char*)conf.sta.ssid))
WiFi.begin((char*)conf.sta.ssid, (char*)conf.sta.password);
}
}
else {