Michal
/
Prusa-Firmware-ESP32-Cam
mirror of https://github.com/prusa3d/Prusa-Firmware-ESP32-Cam
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a parameter to disable password checks for WiFi AP networks that are not encrypted.

pull/60/head
Miroslav Pivovarsky 2024-07-31 21:26:34 +02:00
parent 71de485127
commit 6bf260b72c
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ESP32_PrusaConnectCam/WebServer.cpp
View File

@ -847,7 +847,12 @@ void Server_InitWebServer_Sets() {
} }
/* check min and max length WI-FI ssid and password */ /* 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))) { 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 */ /* send OK response */
request->send(200, F("text/html"), MSG_SAVE_OK_WIFI); request->send(200, F("text/html"), MSG_SAVE_OK_WIFI);

3
ESP32_PrusaConnectCam/mcu_cfg.h
View File

@ -22,7 +22,7 @@
#define CAMERA_MODEL_ESP32_S3_CAM false #define CAMERA_MODEL_ESP32_S3_CAM false
/* ---------------- BASIC MCU CFG --------------*/ /* ---------------- 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 SW_BUILD __DATE__ " " __TIME__ ///< build number
#define CONSOLE_VERBOSE_DEBUG false ///< enable/disable verbose debug log level for console #define CONSOLE_VERBOSE_DEBUG false ///< enable/disable verbose debug log level for console
#define DEVICE_HOSTNAME "Prusa-ESP32cam" ///< device hostname #define DEVICE_HOSTNAME "Prusa-ESP32cam" ///< device hostname
@ -90,6 +90,7 @@
/* ----------------- WiFi CFG -------------------*/ /* ----------------- WiFi CFG -------------------*/
#define WIFI_STA_WDG_TIMEOUT 60000 ///< STA watchdog timeout [ms] #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 --------------------*/ /* ----------------- NTP CFG --------------------*/
#define NTP_SERVER_1 "pool.ntp.org" ///< NTP server #define NTP_SERVER_1 "pool.ntp.org" ///< NTP server

12
ESP32_PrusaConnectCam/wifi_mngt.cpp
View File

@ -230,7 +230,18 @@ void WiFiMngt::WiFiStaConnect() {
if (config->CheckActifeWifiCfgFlag() == true) { if (config->CheckActifeWifiCfgFlag() == true) {
system_led.setTimer(STATUS_LED_STA_CONNECTING); system_led.setTimer(STATUS_LED_STA_CONNECTING);
if (false == WiFiStaMultipleNetwork) { 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); WiFi.begin(WifiSsid, WifiPassword);
}
#else
WiFi.begin(WifiSsid, WifiPassword);
#endif
log->AddEvent(LogLevel_Info, F("Connecting to STA SSID")); log->AddEvent(LogLevel_Info, F("Connecting to STA SSID"));
} else if (true == WiFiStaMultipleNetwork) { } else if (true == WiFiStaMultipleNetwork) {
WiFi.begin(WifiSsid, WifiPassword, 0, WiFiStaNetworkBssid); WiFi.begin(WifiSsid, WifiPassword, 0, WiFiStaNetworkBssid);
@ -804,6 +815,7 @@ void WiFiMngt::SetEnableServiceAp(bool i_data) {
*/ */
void WiFiMngt::ConnectToSta() { void WiFiMngt::ConnectToSta() {
config->SaveWifiCfgFlag(CFG_WIFI_SETTINGS_SAVED); config->SaveWifiCfgFlag(CFG_WIFI_SETTINGS_SAVED);
WiFiStaConnect();
} }
/** /**