mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-22 18:26:30 +00:00
Fix ESP32 reset 5,6 regression from yesterday
This commit is contained in:
parent
a34f75f44c
commit
861c76baca
@ -144,24 +144,20 @@ void SettingsErase(uint8_t type) {
|
|||||||
// main - Tasmota Settings data
|
// main - Tasmota Settings data
|
||||||
int32_t r1, r2, r3;
|
int32_t r1, r2, r3;
|
||||||
switch (type) {
|
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.
|
// nvs_flash_erase(); // Erase RTC, PHY, sta.mac, ap.sndchan, ap.mac, Tasmota etc.
|
||||||
r1 = NvmErase("qpc");
|
r1 = NvmErase("qpc");
|
||||||
r2 = NvmErase("main");
|
r2 = NvmErase("main");
|
||||||
r3 = TfsDeleteFile(TASM_FILE_SETTINGS);
|
r3 = TfsDeleteFile(TASM_FILE_SETTINGS);
|
||||||
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " Tasmota data (%d,%d,%d)"), r1, r2, r3);
|
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " Tasmota data (%d,%d,%d)"), r1, r2, r3);
|
||||||
break;
|
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 = esp_phy_erase_cal_data_in_nvs();
|
||||||
// r1 = NvmErase("cal_data");
|
// r1 = NvmErase("cal_data");
|
||||||
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " PHY data (%d)"), r1);
|
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " PHY data (%d)"), r1);
|
||||||
break;
|
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)
|
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.
|
// nvs_flash_erase(); // Erase RTC, PHY, sta.mac, ap.sndchan, ap.mac, Tasmota etc.
|
||||||
r1 = NvmErase("qpc");
|
r1 = NvmErase("qpc");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user