chenjintao/lucky-cat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化了NVS的擦除问题。当前连接WS成功

Browse Source
This commit is contained in:
CSBOOK\44744
2026-06-26 11:57:01 +08:00
parent 61762b98fb
commit 8c6f5c7a78
4 changed files with 113 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/platform/src/wifi_portal_bridge.cpp
+37 -4
View File
@@ -40,6 +40,23 @@ static wifi_portal_behavior_hooks_t s_behavior_hooks = {};
static esp_err_t apply_sta_stability_policy(void);
static void log_saved_wifi_candidates(const char *context)
{
const auto &ssid_list = SsidManager::GetInstance().GetSsidList();
ESP_LOGI(TAG,
"%s: %u saved Wi-Fi credential candidate(s)",
context != NULL ? context : "Wi-Fi credentials",
(unsigned)ssid_list.size());
for (size_t i = 0; i < ssid_list.size(); ++i) {
ESP_LOGI(TAG,
"%s: candidate[%u] SSID=\"%s\"",
context != NULL ? context : "Wi-Fi credentials",
(unsigned)i,
ssid_list[i].ssid.c_str());
}
}
struct PortalUnlockGuard {
~PortalUnlockGuard()
{
@@ -146,15 +163,26 @@ static esp_err_t ensure_wifi_manager_initialized(void)
static void seed_default_credentials(const char *ssid, const char *password)
{
auto &manager = SsidManager::GetInstance();
if (!manager.GetSsidList().empty()) {
return;
}
const auto saved_count = manager.GetSsidList().size();
if (ssid == NULL || ssid[0] == '\0') {
ESP_LOGI(TAG,
"No configured Wi-Fi SSID; using %u saved credential candidate(s)",
(unsigned)saved_count);
log_saved_wifi_candidates("Configured Wi-Fi empty; NVS fallback");
return;
}
if (saved_count > 0U) {
ESP_LOGI(TAG,
"Configured Wi-Fi SSID \"%s\" overrides %u saved credential candidate(s)",
ssid,
(unsigned)saved_count);
manager.Clear();
}
manager.AddSsid(ssid, password != NULL ? password : "");
ESP_LOGI(TAG, "Seeded Wi-Fi credentials for SSID \"%s\"", ssid);
ESP_LOGI(TAG, "Configured Wi-Fi credentials for SSID \"%s\"", ssid);
}
static int normalize_connect_timeout_ms(int timeout_ms)
@@ -238,6 +266,11 @@ esp_err_t wifi_portal_connect_sta(int timeout_ms)
return ESP_ERR_NOT_FOUND;
}
ESP_LOGI(TAG,
"Starting STA connection with %u saved credential candidate(s)",
(unsigned)SsidManager::GetInstance().GetSsidList().size());
log_saved_wifi_candidates("STA connect");
ESP_RETURN_ON_ERROR(ensure_wifi_manager_initialized(), TAG, "Failed to initialize Wi-Fi manager");
auto &manager = WifiManager::GetInstance();