diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 8a1dea86..60d4c519 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -347,32 +347,6 @@ result doSetWiFiPasswrd(eventMask e, navNode &nav, prompt &item) { wifiPass.trim(); return proceed; } -result doSetWiFiSSID2(eventMask e, navNode &nav, prompt &item) { -#ifdef DEBUG_ARDUINOMENU - Serial.printf("-->[MENU] Setting WiFi SSID to #%s#\n", tempWiFiSSID); - Serial.print(F("-->[MENU] action1 event:")); - Serial.println(e); - Serial.flush(); -#endif - // Serial.printf("tempWiFiSSID: #%s#\n", tempWiFiSSID); - wifiSSID2 = String(tempWiFiSSID2); - // Serial.printf("wifiSSID: #%s#\n", wifiSSID.c_str()); - wifiSSID2.trim(); - // Serial.printf("wifiSSID: #%s#\n", wifiSSID.c_str()); - return proceed; -} - -result doSetWiFiPasswrd2(eventMask e, navNode &nav, prompt &item) { -#ifdef DEBUG_ARDUINOMENU - Serial.printf("-->[MENU] Setting WiFi Password to #%s#\n", tempWiFiPasswrd); - Serial.print(F("-->[MENU] action1 event:")); - Serial.println(e); - Serial.flush(); -#endif - wifiPass2 = String(tempWiFiPasswrd2); - wifiPass2.trim(); - return proceed; -} result doSetHostName(eventMask e, navNode &nav, prompt &item) { #ifdef DEBUG_ARDUINOMENU @@ -962,11 +936,9 @@ void loadTempArraysWithActualValues() { #endif copyStringToCharArray(rightPad(wifiSSID, 30), tempWiFiSSID, 30, "tempWiFiSSID"); - copyStringToCharArray(rightPad(wifiSSID2, 30), tempWiFiSSID2, 30, "tempWiFiSSID2"); #ifdef WIFI_PRIVACY copyStringToCharArray(rightPad(" ", 30), tempWiFiPasswrd, 30, "tempWiFiPasswrd"); - copyStringToCharArray(rightPad(" ", 30), tempWiFiPasswrd2, 30, "tempWiFiPasswrd2"); #else copyStringToCharArray(rightPad(wifiPass, 30), tempWiFiPasswrd, 30, "tempWiFiPasswrd"); #endif diff --git a/CO2_Gadget_WIFI.h b/CO2_Gadget_WIFI.h index 44025088..37f7f3f4 100644 --- a/CO2_Gadget_WIFI.h +++ b/CO2_Gadget_WIFI.h @@ -720,7 +720,6 @@ void wifiClientLoop() { if (activeWIFI && troubledWIFI && (millis() - timeTroubledWIFI >= timeToRetryTroubledWIFI * 1000)) { initWifi(); } - // This is a workaround until I can directly determine whether the Wi-Fi data has been changed via BLE // Only checks for SSID changed (not password) if ((WiFi.SSID() != wifiSSID) && (!inMenu)) {