Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear WiFi fix

Browse Source
This commit is contained in:
iranl
2024-11-18 21:03:19 +01:00
parent b55164919b
commit 62b6d4c301
2 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/PreferencesKeys.h
View File

@@ -3,7 +3,7 @@
#include <vector> #include <vector>
#include "Config.h" #include "Config.h"
#ifndef CONFIG_IDF_TARGET_ESP32H2 #ifndef CONFIG_IDF_TARGET_ESP32H2
#include "esp_wifi.h" #include <WiFi.h>
#endif #endif
//CHANGE REQUIRES REBOOT TO TAKE EFFECT //CHANGE REQUIRES REBOOT TO TAKE EFFECT
@@ -143,7 +143,7 @@ inline void initPreferences(Preferences* preferences)
if(firstStart) if(firstStart)
{ {
Serial.println("First start, setting preference defaults"); Serial.println("First start, setting preference defaults");
preferences->putBool(preference_started_before, true); preferences->putBool(preference_started_before, true);
preferences->putBool(preference_lock_enabled, true); preferences->putBool(preference_lock_enabled, true);
uint32_t aclPrefs[17] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; uint32_t aclPrefs[17] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
@@ -156,29 +156,8 @@ inline void initPreferences(Preferences* preferences)
preferences->putBytes(preference_conf_lock_advanced_acl, (byte*)(&advancedLockConfigAclPrefs), sizeof(advancedLockConfigAclPrefs)); preferences->putBytes(preference_conf_lock_advanced_acl, (byte*)(&advancedLockConfigAclPrefs), sizeof(advancedLockConfigAclPrefs));
uint32_t advancedOpenerConfigAclPrefs[21] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; uint32_t advancedOpenerConfigAclPrefs[21] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
preferences->putBytes(preference_conf_opener_advanced_acl, (byte*)(&advancedOpenerConfigAclPrefs), sizeof(advancedOpenerConfigAclPrefs)); preferences->putBytes(preference_conf_opener_advanced_acl, (byte*)(&advancedOpenerConfigAclPrefs), sizeof(advancedOpenerConfigAclPrefs));
#ifndef CONFIG_IDF_TARGET_ESP32H2
wifi_config_t wifi_cfg;
if(esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK)
{
Serial.println("Failed to get Wi-Fi configuration in RAM");
}
if (esp_wifi_set_storage(WIFI_STORAGE_FLASH) != ESP_OK)
{
Serial.println("Failed to set storage Wi-Fi");
}
memset(wifi_cfg.sta.ssid, 0, sizeof(wifi_cfg.sta.ssid));
memset(wifi_cfg.sta.password, 0, sizeof(wifi_cfg.sta.password));
if (esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK)
{
Serial.println("Failed to clear NVS Wi-Fi configuration");
}
#endif
preferences->putString(preference_mqtt_lock_path, "nukihub"); preferences->putString(preference_mqtt_lock_path, "nukihub");
preferences->putBool(preference_check_updates, true); preferences->putBool(preference_check_updates, true);
preferences->putBool(preference_opener_continuous_mode, false); preferences->putBool(preference_opener_continuous_mode, false);
preferences->putBool(preference_official_hybrid_enabled, false); preferences->putBool(preference_official_hybrid_enabled, false);
@@ -219,7 +198,12 @@ inline void initPreferences(Preferences* preferences)
preferences->putInt(preference_query_interval_lockstate, 1800); preferences->putInt(preference_query_interval_lockstate, 1800);
preferences->putInt(preference_query_interval_configuration, 3600); preferences->putInt(preference_query_interval_configuration, 3600);
preferences->putInt(preference_query_interval_battery, 1800); preferences->putInt(preference_query_interval_battery, 1800);
preferences->putInt(preference_query_interval_keypad, 1800); preferences->putInt(preference_query_interval_keypad, 1800);
#ifndef CONFIG_IDF_TARGET_ESP32H2
WiFi.begin();
WiFi.disconnect(true, true);
#endif
} }
else else
{ {

8
src/networkDevices/WifiDevice.cpp
View File

@@ -111,13 +111,7 @@ void WifiDevice::initialize()
} }
} }
memset(wifi_cfg.sta.ssid, 0, sizeof(wifi_cfg.sta.ssid)); WiFi.disconnect(true, true);
memset(wifi_cfg.sta.password, 0, sizeof(wifi_cfg.sta.password));
if (esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK)
{
Log->println("Failed to clear NVS Wi-Fi configuration");
}
if(found) if(found)
{ {