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/control_plane/src/runtime/control_plane_connectivity_runtime.c
+5
View File
@@ -172,6 +172,11 @@ esp_err_t control_plane_bootstrap_connectivity(const char *seed_ssid,
int connect_timeout_ms,
const char *config_ap_ssid_prefix)
{
ESP_LOGI(TAG,
"Boot Wi-Fi config SSID=%s timeout_ms=%d",
(seed_ssid != NULL && seed_ssid[0] != '\0') ? seed_ssid : "<empty>",
connect_timeout_ms);
esp_err_t err = control_plane_prepare_runtime_storage();
if (err != ESP_OK) {
return err;
components/platform/src/runtime/platform_core_runtime.c
+66
View File
@@ -20,6 +20,67 @@ static const char *TAG = "platform_core";
static bool s_initialized;
static const char *k_identity_nvs_namespace = "ota";
static const char *const s_known_nvs_namespaces[] = {
"wifi",
"ota",
"auth",
"auth_key",
"fortune",
};
static void platform_log_nvs_stats(void)
{
nvs_stats_t stats = {0};
esp_err_t err = nvs_get_stats(NULL, &stats);
if (err != ESP_OK) {
ESP_LOGW(TAG, "NVS stats unavailable: %s", esp_err_to_name(err));
return;
}
ESP_LOGI(TAG,
"NVS stats: used_entries=%u free_entries=%u total_entries=%u namespace_count=%u",
(unsigned)stats.used_entries,
(unsigned)stats.free_entries,
(unsigned)stats.total_entries,
(unsigned)stats.namespace_count);
for (size_t i = 0; i < sizeof(s_known_nvs_namespaces) / sizeof(s_known_nvs_namespaces[0]); ++i) {
const char *ns = s_known_nvs_namespaces[i];
nvs_handle_t handle = 0;
size_t used_entries = 0;
err = nvs_open(ns, NVS_READONLY, &handle);
if (err == ESP_ERR_NVS_NOT_FOUND) {
ESP_LOGI(TAG,
"NVS namespace \"%s\": used_entries=0 free_entries_shared=%u",
ns,
(unsigned)stats.free_entries);
continue;
}
if (err != ESP_OK) {
ESP_LOGW(TAG,
"NVS namespace \"%s\" open failed: %s",
ns,
esp_err_to_name(err));
continue;
}
err = nvs_get_used_entry_count(handle, &used_entries);
nvs_close(handle);
if (err != ESP_OK) {
ESP_LOGW(TAG,
"NVS namespace \"%s\" stats unavailable: %s",
ns,
esp_err_to_name(err));
continue;
}
ESP_LOGI(TAG,
"NVS namespace \"%s\": used_entries=%u free_entries_shared=%u",
ns,
(unsigned)used_entries,
(unsigned)stats.free_entries);
}
}
static bool platform_read_nvs_string(const char *ns, const char *key, char *out, size_t out_len)
{
if (ns == NULL || key == NULL || out == NULL || out_len == 0U) {
@@ -75,12 +136,17 @@ esp_err_t platform_prepare_storage(void)
{
esp_err_t err = nvs_flash_init();
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
ESP_LOGW(TAG, "Default NVS init failed with %s; erasing default NVS partition",
esp_err_to_name(err));
err = nvs_flash_erase();
if (err != ESP_OK) {
return err;
}
err = nvs_flash_init();
}
if (err == ESP_OK) {
platform_log_nvs_stats();
}
return err;
}
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();
sdkconfig.defaults
+5 -2
View File
@@ -76,8 +76,11 @@ CONFIG_MDNS_MEMORY_ALLOC_SPIRAM=y
CONFIG_MULTIMODAL_DEVICE_ID=""
CONFIG_MULTIMODAL_SERIAL_NUMBER=""
CONFIG_MULTIMODAL_WIFI_SSID="csy2"
CONFIG_MULTIMODAL_WIFI_PASSWORD="csy19881023"
CONFIG_MULTIMODAL_WIFI_SSID=""
CONFIG_MULTIMODAL_WIFI_PASSWORD=""
CONFIG_ESPTOOLPY_BAUD_921600B=y
CONFIG_ESPTOOLPY_MONITOR_BAUD=921600
CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600
CONFIG_MULTIMODAL_DEVICE_TOKEN_URL="https://gz.api.talkingq.com/token/api/device/token"
CONFIG_FORTUNE_ENABLE=y
CONFIG_FORTUNE_API_URL="https://gz.api.talkingq.com/token/api/device/fortune/daily-wealth"