From c6cba385f1f278516087df7fcf004d66b1f450cf Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 22 Feb 2020 20:23:16 +0100 Subject: [PATCH] Memory Optimizations --- src/hasp_wifi.cpp | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/hasp_wifi.cpp b/src/hasp_wifi.cpp index d4e20fb4..4bc6d869 100644 --- a/src/hasp_wifi.cpp +++ b/src/hasp_wifi.cpp @@ -28,17 +28,13 @@ static WiFiEventHandler gotIpEventHandler, disconnectedEventHandler; #ifdef WIFI_SSID char wifiSsid[32] = WIFI_SSID; -// std::string wifiSsid = WIFI_SSID; #else -char wifiSsid[32] = ""; -// std::string wifiSsid = ""; +char wifiSsid[32] = ""; #endif #ifdef WIFI_PASSW char wifiPassword[32] = WIFI_PASSW; -// std::string wifiPassword = WIFI_PASSW; #else char wifiPassword[32] = ""; -// std::string wifiPassword = ""; #endif // const byte DNS_PORT = 53; @@ -223,25 +219,6 @@ bool wifiSetConfig(const JsonObject & settings) { bool changed = false; - /* if(!settings[FPSTR(F_CONFIG_SSID)].isNull()) { - if(wifiSsid != settings[FPSTR(F_CONFIG_SSID)].as().c_str()) { - debugPrintln(F("wifiSsid set")); - } - changed |= wifiSsid != settings[FPSTR(F_CONFIG_SSID)].as().c_str(); - - wifiSsid = settings[FPSTR(F_CONFIG_SSID)].as().c_str(); - } - - if(!settings[FPSTR(F_CONFIG_PASS)].isNull() && settings[FPSTR(F_CONFIG_PASS)].as() != F("********")) { - if(wifiPassword != settings[FPSTR(F_CONFIG_PASS)].as().c_str()) { - debugPrintln(F("wifiPassword set")); - } - changed |= wifiPassword != settings[FPSTR(F_CONFIG_PASS)].as().c_str(); - - wifiPassword = settings[FPSTR(F_CONFIG_PASS)].as().c_str(); - } - */ - if(!settings[FPSTR(F_CONFIG_SSID)].isNull()) { changed |= strcmp(wifiSsid, settings[FPSTR(F_CONFIG_SSID)]) != 0; strncpy(wifiSsid, settings[FPSTR(F_CONFIG_SSID)], sizeof(wifiSsid));