components/nvs: avoid reading just-erased page

diff --git a/components/nvs_flash/include/nvs.h b/components/nvs_flash/include/nvs.h
index 6fff2dabf67b0c1d90edff192b2d7e377787253e..dbcd837e17be82e7097abd4c38d721c3a425121e 100644 (file)
--- a/components/nvs_flash/include/nvs.h
+++ b/components/nvs_flash/include/nvs.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <esp_err.h>
+#include "esp_err.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/components/nvs_flash/src/nvs_page.cpp b/components/nvs_flash/src/nvs_page.cpp
index cddb69393b018abc0a39ecee6ea63fb402bfea7f..3478ded461e24fb8fe9332c2a97f63ac6627abd9 100644 (file)
--- a/components/nvs_flash/src/nvs_page.cpp
+++ b/components/nvs_flash/src/nvs_page.cpp
@@ -671,7 +671,12 @@ esp_err_t Page::erase()
         mState = PageState::INVALID;
         return rc;
     }
-    return load(sector);
+    mUsedEntryCount = 0;
+    mErasedEntryCount = 0;
+    mFirstUsedEntry = INVALID_ENTRY;
+    mNextFreeEntry = INVALID_ENTRY;
+    mState = PageState::UNINITIALIZED;
+    return ESP_OK;
 }
 
 esp_err_t Page::markFreeing()