jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OTA corruption on large file uploads usinf -minimal

Browse Source
This commit is contained in:
Theo Arends 2020-05-03 11:42:10 +02:00
parent 315744b548
commit 5c744b573e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasmota/settings.ino
View File

@ -346,6 +346,7 @@ void SettingsSaveAll(void)
void UpdateQuickPowerCycle(bool update) void UpdateQuickPowerCycle(bool update)
{ {
#ifndef FIRMWARE_MINIMAL
if (Settings.flag3.fast_power_cycle_disable) { return; } // SetOption65 - Disable fast power cycle detection for device reset if (Settings.flag3.fast_power_cycle_disable) { return; } // SetOption65 - Disable fast power cycle detection for device reset
uint32_t pc_register; uint32_t pc_register;
@ -353,9 +354,9 @@ void UpdateQuickPowerCycle(bool update)
#ifdef ESP8266 #ifdef ESP8266
ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register)); ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
#else #else // ESP32
QPCRead(&pc_register, sizeof(pc_register)); QPCRead(&pc_register, sizeof(pc_register));
#endif #endif // ESP8266 - ESP32
if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) { if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) {
uint32_t counter = ((pc_register & 0xF) << 1) & 0xF; uint32_t counter = ((pc_register & 0xF) << 1) & 0xF;
if (0 == counter) { // 4 power cycles in a row if (0 == counter) { // 4 power cycles in a row
@ -365,9 +366,9 @@ void UpdateQuickPowerCycle(bool update)
pc_register = 0xFFA55AB0 | counter; pc_register = 0xFFA55AB0 | counter;
#ifdef ESP8266 #ifdef ESP8266
ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register)); ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
#else #else // ESP32
QPCWrite(&pc_register, sizeof(pc_register)); QPCWrite(&pc_register, sizeof(pc_register));
#endif #endif // ESP8266 - ESP32
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter);
} }
} }
@ -378,11 +379,12 @@ void UpdateQuickPowerCycle(bool update)
if (ESP.flashEraseSector(pc_location)) { if (ESP.flashEraseSector(pc_location)) {
ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register)); ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
} }
#else #else // ESP32
QPCWrite(&pc_register, sizeof(pc_register)); QPCWrite(&pc_register, sizeof(pc_register));
#endif #endif // ESP8266 - ESP32
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset")); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset"));
} }
#endif // FIRMWARE_MINIMAL
} }
/*********************************************************************************************\ /*********************************************************************************************\