Skip to content

Commit ca04133

Browse files
committed
update esp-idf v3.1.3
1 parent 767c2f5 commit ca04133

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

components/general/param/test/param_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void param_test()
4242
};
4343
esp_err_t ret;
4444
esp_err_t err = nvs_flash_init();
45-
if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
45+
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
4646
// NVS partition was truncated and needs to be erased
4747
// Retry nvs_flash_init
4848
ESP_ERROR_CHECK(nvs_flash_erase());

components/hmi/gdrivers/ginput/touch/FT5X06/gmouse_lld_FT5x06.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static bool_t init_board(GMouse *m, unsigned driverinstance)
6565
dev = iot_ft5x06_create(i2c_bus, FT5X06_ADDR_DEF);
6666

6767
esp_err_t err = nvs_flash_init();
68-
if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
68+
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
6969
// NVS partition was truncated and needs to be erased
7070
// Retry nvs_flash_init
7171
ESP_ERROR_CHECK(nvs_flash_erase());

components/hmi/gdrivers/ginput/touch/XPT2046/gmouse_lld_XPT2046.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static bool_t touch_init_board(GMouse *m, unsigned driverinstance)
4545
board_touch_init();
4646

4747
esp_err_t err = nvs_flash_init();
48-
if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
48+
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
4949
// NVS partition was truncated and needs to be erased
5050
// Retry nvs_flash_init
5151
ESP_ERROR_CHECK(nvs_flash_erase());

components/wifi/iot_espnow/test/espnow_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void espnow_recv_test()
209209
{
210210
// Initialize NVS
211211
esp_err_t ret = nvs_flash_init();
212-
if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
212+
if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
213213
ESP_ERROR_CHECK(nvs_flash_erase());
214214
ret = nvs_flash_init();
215215
}
@@ -221,7 +221,7 @@ void espnow_send_test()
221221
{
222222
// Initialize NVS
223223
esp_err_t ret = nvs_flash_init();
224-
if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
224+
if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
225225
ESP_ERROR_CHECK(nvs_flash_erase());
226226
ret = nvs_flash_init();
227227
}

submodule/esp-idf

Submodule esp-idf updated 99 files

0 commit comments

Comments
 (0)