From 861c76bacaf294a88dc10eb185cec5885f7616a9 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 13 Jan 2021 12:38:35 +0100
Subject: [PATCH] Fix ESP32 reset 5,6 regression from yesterday

---
 tasmota/support_esp32.ino | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tasmota/support_esp32.ino b/tasmota/support_esp32.ino
index d56040b86..7bbad6468 100644
--- a/tasmota/support_esp32.ino
+++ b/tasmota/support_esp32.ino
@@ -144,24 +144,20 @@ void SettingsErase(uint8_t type) {
   // main     - Tasmota Settings data
   int32_t r1, r2, r3;
   switch (type) {
-    case 0:               // Reset 2, 5, 6 = Erase all flash from program end to end of physical flash
+    case 0:               // Reset 2 = Erase all flash from program end to end of physical flash
+    case 2:               // Reset 5, 6 = Erase all flash from program end to end of physical flash excluding filesystem
 //      nvs_flash_erase();  // Erase RTC, PHY, sta.mac, ap.sndchan, ap.mac, Tasmota etc.
       r1 = NvmErase("qpc");
       r2 = NvmErase("main");
       r3 = TfsDeleteFile(TASM_FILE_SETTINGS);
       AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " Tasmota data (%d,%d,%d)"), r1, r2, r3);
       break;
-    case 1: case 4:       // Reset 3 or WIFI_FORCE_RF_CAL_ERASE = SDK parameter area
+    case 1:               // Reset 3 = SDK parameter area
+    case 4:               // WIFI_FORCE_RF_CAL_ERASE = SDK parameter area
       r1 = esp_phy_erase_cal_data_in_nvs();
 //      r1 = NvmErase("cal_data");
       AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " PHY data (%d)"), r1);
       break;
-    case 2:               // Not used = QPC and Tasmota parameter area (0x0F3xxx - 0x0FBFFF)
-      r1 = NvmErase("qpc");
-      r2 = NvmErase("main");
-      r3 = TfsDeleteFile(TASM_FILE_SETTINGS);
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " Tasmota data (%d,%d,%d)"), r1, r2, r3);
-      break;
     case 3:               // QPC Reached = QPC, Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
 //      nvs_flash_erase();  // Erase RTC, PHY, sta.mac, ap.sndchan, ap.mac, Tasmota etc.
       r1 = NvmErase("qpc");