Explorar o código

Merge branch 'bugfix/fix_enable_reset_provision_cause_device_crash' into 'master'

provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash

Closes IDFGH-4409

See merge request espressif/esp-idf!12298
Mahavir Jain %!s(int64=5) %!d(string=hai) anos
pai
achega
b8e6d8e699

+ 2 - 1
examples/provisioning/legacy/ble_prov/main/app_prov.c

@@ -283,7 +283,8 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
     *provisioned = false;
 
 #ifdef CONFIG_EXAMPLE_RESET_PROVISIONED
-    nvs_flash_erase();
+    esp_wifi_restore();
+    return ESP_OK;
 #endif
 
     /* Get WiFi Station configuration */

+ 2 - 1
examples/provisioning/legacy/console_prov/main/app_prov.c

@@ -221,7 +221,8 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
     *provisioned = false;
 
 #ifdef CONFIG_EXAMPLE_RESET_PROVISIONED
-    nvs_flash_erase();
+    esp_wifi_restore();
+    return ESP_OK;
 #endif
 
     /* Get WiFi Station configuration */

+ 2 - 1
examples/provisioning/legacy/custom_config/main/app_prov.c

@@ -246,7 +246,8 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
     *provisioned = false;
 
 #ifdef CONFIG_EXAMPLE_RESET_PROVISIONED
-    nvs_flash_erase();
+    esp_wifi_restore();
+    return ESP_OK;
 #endif
 
     /* Get WiFi Station configuration */

+ 2 - 1
examples/provisioning/legacy/softap_prov/main/app_prov.c

@@ -232,7 +232,8 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
     *provisioned = false;
 
 #ifdef CONFIG_EXAMPLE_RESET_PROVISIONED
-    nvs_flash_erase();
+    esp_wifi_restore();
+    return ESP_OK;
 #endif
 
     /* Get WiFi Station configuration */