Better NVS reset, late disk init

Author: max-arnold

ats-mini/Storage.cpp

@@ -3,6 +3,7 @@
 #include "Themes.h"
 #include "Menu.h"
 #include <LittleFS.h>
+#include "nvs_flash.h"
 
 // Time of inactivity to start writing preferences
 #define STORE_TIME    10000
@@ -345,3 +346,11 @@ bool diskInit(bool force)
   // Serial.println("Mounted LittleFS!");
   return(true);
 }
+
+bool nvsErase()
+{
+  return(nvs_flash_erase() == ESP_OK &&
+         nvs_flash_init() == ESP_OK &&
+         nvs_flash_erase_partition(STORAGE_PARTITION) == ESP_OK &&
+         nvs_flash_init_partition(STORAGE_PARTITION) == ESP_OK);
+}

ats-mini/Storage.h

@@ -17,6 +17,7 @@ extern Preferences prefs;
 void prefsTickTime();
 void prefsInvalidate();
 bool prefsAreWritten();
+bool nvsErase();
 
 bool diskInit(bool force = false);
 

ats-mini/ats-mini.ino

@@ -108,9 +108,6 @@ void setup()
   // Enable serial port
   Serial.begin(115200);
 
-  // Initialize flash file system
-  diskInit();
-
   // Encoder pins. Enable internal pull-ups
   pinMode(ENCODER_PUSH_BUTTON, INPUT_PULLUP);
   pinMode(ENCODER_PIN_A, INPUT_PULLUP);
@@ -157,7 +154,7 @@ void setup()
   // Note: preferences reset is recommended after firmware updates
   if(digitalRead(ENCODER_PUSH_BUTTON)==LOW)
   {
-    prefsInvalidate();
+    nvsErase();
     diskInit(true);
 
     ledcWrite(PIN_LCD_BL, 255);       // Default value 255 = 100%
@@ -170,6 +167,9 @@ void setup()
     while(digitalRead(ENCODER_PUSH_BUTTON) == LOW) delay(100);
   }
 
+  // Initialize flash file system
+  diskInit();
+
   // Check for SI4732 connected on I2C interface
   // If the SI4732 is not detected, then halt with no further processing
   rx.setI2CFastModeCustom(100000);