From ef43759420f25cc8f4313ac5451b36bafd21a5c3 Mon Sep 17 00:00:00 2001 From: Luc Date: Sat, 22 Jun 2019 17:23:15 +0200 Subject: [PATCH] fix empty password not saved and generated error Need for open network --- Grbl_Esp32/commands.cpp | 6 +++--- Grbl_Esp32/grbl.h | 2 +- Grbl_Esp32/wificonfig.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Grbl_Esp32/commands.cpp b/Grbl_Esp32/commands.cpp index 7a96794d..8c0a98e8 100644 --- a/Grbl_Esp32/commands.cpp +++ b/Grbl_Esp32/commands.cpp @@ -326,7 +326,7 @@ bool COMMANDS::execute_internal_command (int cmd, String cmd_params, level_authe } Preferences prefs; prefs.begin(NAMESPACE, false); - if (prefs.putString(AP_PWD_ENTRY, parameter) == 0){ + if (prefs.putString(AP_PWD_ENTRY, parameter) != parameter.length()){ response = false; if(espresponse)espresponse->println ("Error: Set failed!"); } else if(espresponse)espresponse->println ("ok"); @@ -1223,7 +1223,7 @@ bool COMMANDS::execute_internal_command (int cmd, String cmd_params, level_authe if (! (styp == "B" || styp == "S" || styp == "A" || styp == "I" || styp == "F") ) { response = false; } - if (sval.length() == 0) { + if ((sval.length() == 0) && !((spos==AP_PWD_ENTRY) || (spos==STA_PWD_ENTRY))){ response = false; } @@ -1281,7 +1281,7 @@ bool COMMANDS::execute_internal_command (int cmd, String cmd_params, level_authe } //String value if (styp == "S") { - if (prefs.putString(spos.c_str(), sval) == 0) { + if (prefs.putString(spos.c_str(), sval) != sval.length()) { response = false; } else { #if defined (ENABLE_WIFI) diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h index f7db835a..2adca58e 100644 --- a/Grbl_Esp32/grbl.h +++ b/Grbl_Esp32/grbl.h @@ -20,7 +20,7 @@ // Grbl versioning system #define GRBL_VERSION "1.1f" -#define GRBL_VERSION_BUILD "20190518" +#define GRBL_VERSION_BUILD "20190622" //#include #include diff --git a/Grbl_Esp32/wificonfig.cpp b/Grbl_Esp32/wificonfig.cpp index b7d15cef..eec95e6f 100644 --- a/Grbl_Esp32/wificonfig.cpp +++ b/Grbl_Esp32/wificonfig.cpp @@ -475,7 +475,7 @@ void WiFiConfig::reset_settings(){ error = true; } sval = DEFAULT_STA_PWD; - if (prefs.putString(STA_PWD_ENTRY, sval) == 0){ + if (prefs.putString(STA_PWD_ENTRY, sval) != sval.length()){ error = true; } sval = DEFAULT_AP_SSID; @@ -483,7 +483,7 @@ void WiFiConfig::reset_settings(){ error = true; } sval = DEFAULT_AP_PWD; - if (prefs.putString(AP_PWD_ENTRY, sval) == 0){ + if (prefs.putString(AP_PWD_ENTRY, sval) != sval.length()){ error = true; }