From 6bf260b72c31f086e7f42cf73207e86f3c155fde Mon Sep 17 00:00:00 2001 From: Miroslav Pivovarsky Date: Wed, 31 Jul 2024 21:26:34 +0200 Subject: [PATCH] Added a parameter to disable password checks for WiFi AP networks that are not encrypted. --- ESP32_PrusaConnectCam/WebServer.cpp | 5 +++++ ESP32_PrusaConnectCam/mcu_cfg.h | 3 ++- ESP32_PrusaConnectCam/wifi_mngt.cpp | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ESP32_PrusaConnectCam/WebServer.cpp b/ESP32_PrusaConnectCam/WebServer.cpp index a631902..082baae 100644 --- a/ESP32_PrusaConnectCam/WebServer.cpp +++ b/ESP32_PrusaConnectCam/WebServer.cpp @@ -847,7 +847,12 @@ void Server_InitWebServer_Sets() { } /* check min and max length WI-FI ssid and password */ +#if (WIFI_DISABLE_UNENCRYPTED_STA_PASS_CHECK == false) if (((TmpPassword.length() > 0) && (TmpSsid.length() > 0)) && ((TmpPassword.length() < EEPROM_ADDR_WIFI_PASSWORD_LENGTH) && (TmpSsid.length() < EEPROM_ADDR_WIFI_SSID_LENGTH))) { +#else + if ((TmpSsid.length() > 0) && (TmpSsid.length() < EEPROM_ADDR_WIFI_SSID_LENGTH)) { +#endif + /* send OK response */ request->send(200, F("text/html"), MSG_SAVE_OK_WIFI); diff --git a/ESP32_PrusaConnectCam/mcu_cfg.h b/ESP32_PrusaConnectCam/mcu_cfg.h index 86b2245..3f34cac 100644 --- a/ESP32_PrusaConnectCam/mcu_cfg.h +++ b/ESP32_PrusaConnectCam/mcu_cfg.h @@ -22,7 +22,7 @@ #define CAMERA_MODEL_ESP32_S3_CAM false /* ---------------- BASIC MCU CFG --------------*/ -#define SW_VERSION "1.1.0-rc2" ///< SW version +#define SW_VERSION "1.1.0" ///< SW version #define SW_BUILD __DATE__ " " __TIME__ ///< build number #define CONSOLE_VERBOSE_DEBUG false ///< enable/disable verbose debug log level for console #define DEVICE_HOSTNAME "Prusa-ESP32cam" ///< device hostname @@ -90,6 +90,7 @@ /* ----------------- WiFi CFG -------------------*/ #define WIFI_STA_WDG_TIMEOUT 60000 ///< STA watchdog timeout [ms] +#define WIFI_DISABLE_UNENCRYPTED_STA_PASS_CHECK false ///< enable/disable WEP/WPA/WPA2/... encryption for STA mode . for the wifi network without encryption set to false /* ----------------- NTP CFG --------------------*/ #define NTP_SERVER_1 "pool.ntp.org" ///< NTP server diff --git a/ESP32_PrusaConnectCam/wifi_mngt.cpp b/ESP32_PrusaConnectCam/wifi_mngt.cpp index 63086d9..9e55921 100644 --- a/ESP32_PrusaConnectCam/wifi_mngt.cpp +++ b/ESP32_PrusaConnectCam/wifi_mngt.cpp @@ -230,7 +230,18 @@ void WiFiMngt::WiFiStaConnect() { if (config->CheckActifeWifiCfgFlag() == true) { system_led.setTimer(STATUS_LED_STA_CONNECTING); if (false == WiFiStaMultipleNetwork) { + +#if (WIFI_DISABLE_UNENCRYPTED_STA_PASS_CHECK == true) + if (WifiPassword == "") { + WiFi.begin(WifiSsid); + log->AddEvent(LogLevel_Info, F("Connecting to STA SSID without password")); + } else { + WiFi.begin(WifiSsid, WifiPassword); + } +#else WiFi.begin(WifiSsid, WifiPassword); +#endif + log->AddEvent(LogLevel_Info, F("Connecting to STA SSID")); } else if (true == WiFiStaMultipleNetwork) { WiFi.begin(WifiSsid, WifiPassword, 0, WiFiStaNetworkBssid); @@ -804,6 +815,7 @@ void WiFiMngt::SetEnableServiceAp(bool i_data) { */ void WiFiMngt::ConnectToSta() { config->SaveWifiCfgFlag(CFG_WIFI_SETTINGS_SAVED); + WiFiStaConnect(); } /**