pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/nvs_version_check' into 'master'

Browse Source 
nvs_flash: Version compatibility check for nvs storage

See merge request idf/esp-idf!2855
This commit is contained in:
Angus Gratton
2018-08-07 13:31:49 +08:00
parent 39921c9db0 1df85e0039
commit 5f56f2ca01
45 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/protocols/aws_iot/subscribe_publish/main/subscribe_publish_sample.c
+1 -1
View File
@@ -321,7 +321,7 @@ void app_main()
{
// Initialize NVS.
esp_err_t err = nvs_flash_init();
if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
ESP_ERROR_CHECK(nvs_flash_erase());
err = nvs_flash_init();
}
examples/protocols/aws_iot/thing_shadow/main/thing_shadow_sample.c
+1 -1
View File
@@ -356,7 +356,7 @@ static void initialise_wifi(void)
void app_main()
{
esp_err_t err = nvs_flash_init();
if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
ESP_ERROR_CHECK(nvs_flash_erase());
err = nvs_flash_init();
}
examples/protocols/esp_http_client/main/esp_http_client_example.c
+1 -1
View File
@@ -351,7 +351,7 @@ static void http_test_task(void *pvParameters)
void app_main()
{
esp_err_t ret = nvs_flash_init();
if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
ESP_ERROR_CHECK(nvs_flash_erase());
ret = nvs_flash_init();
}