Merge branch 'fix/fix_the_wifi_config_init' into 'main'

fix(ext_cli): init the wifi config in esp_cli_custom_command_init

See merge request espressif/esp-thread-br!184

Author: zwx1995esp

.gitlab-ci.yml

@@ -6,7 +6,7 @@ variables:
     CI_DOCKER_REGISTRY: "ciregistry.espressif.cn:8443"
     ESP_THREAD_BR_PATH: "$CI_PROJECT_DIR"
     CI_TOOLS_PATH: "$CI_PROJECT_DIR/tools/ci"
-    ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v6.0:1"
+    ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v6.0:2"
     ESP_IDF_HTTP: "https://gitlab-ci-token:${CI_JOB_TOKEN}@${ESP_GITLAB}/espressif/esp-idf.git"
 
 pre_commit:

components/esp_ot_cli_extension/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.3.5"
+version: "1.4.0"
 description: Espressif OpenThread CLI Extension
 url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_ot_cli_extension
 dependencies:

components/esp_ot_cli_extension/src/esp_ot_cli_extension.c

@@ -57,6 +57,9 @@ static const otCliCommand kCommands[] = {
 
 void esp_cli_custom_command_init()
 {
+#if CONFIG_OPENTHREAD_CLI_WIFI
+    ESP_ERROR_CHECK(esp_ot_wifi_config_init());
+#endif
     esp_ot_heap_diag_init();
     otInstance *instance = esp_openthread_get_instance();
     otCliSetUserCommands(kCommands, (sizeof(kCommands) / sizeof(kCommands[0])), instance);

components/esp_ot_cli_extension/src/esp_ot_wifi_cmd.c

@@ -364,8 +364,12 @@ otError esp_ot_process_wifi_cmd(void *aContext, uint8_t aArgsLength, char *aArgs
 
 esp_err_t esp_ot_wifi_config_init(void)
 {
-    esp_err_t err = nvs_open("wifi_config", NVS_READWRITE, &s_wifi_config_nvs_handle);
-    ESP_RETURN_ON_ERROR(err, OT_EXT_CLI_TAG, "Failed to open wifi_config NVS namespace (0x%x)", err);
+    static bool s_wifi_config_init = false;
+    if (!s_wifi_config_init) {
+        esp_err_t err = nvs_open("wifi_config", NVS_READWRITE, &s_wifi_config_nvs_handle);
+        ESP_RETURN_ON_ERROR(err, OT_EXT_CLI_TAG, "Failed to open wifi_config NVS namespace (0x%x)", err);
+        s_wifi_config_init = true;
+    }
     return ESP_OK;
 }
 

examples/basic_thread_border_router/main/idf_component.yml

@@ -2,7 +2,7 @@
 dependencies:
   espressif/mdns: "^1.0.0"
   espressif/esp_ot_cli_extension:
-    version: "~1.3.0"
+    version: "~1.4.0"
   espressif/esp_rcp_update:
     version: "~1.4.0"
   esp_br_http_ota:

examples/common/thread_border_router/src/border_router_launch.c

@@ -104,9 +104,6 @@ static void rcp_failure_handler(void)
 
 static void ot_br_init(void *ctx)
 {
-#if CONFIG_OPENTHREAD_CLI_WIFI
-    ESP_ERROR_CHECK(esp_ot_wifi_config_init());
-#endif
 #if CONFIG_OPENTHREAD_BR_AUTO_START
 #if CONFIG_EXAMPLE_CONNECT_WIFI || CONFIG_EXAMPLE_CONNECT_ETHERNET
     bool wifi_or_ethernet_connected = false;

examples/m5stack_thread_border_router/main/idf_component.yml

@@ -2,7 +2,7 @@
 dependencies:
   espressif/mdns: "^1.0.0"
   espressif/esp_ot_cli_extension:
-    version: "~1.3.0"
+    version: "~1.4.0"
   espressif/esp_rcp_update:
     version: "~1.4.0"
   esp_br_http_ota: