jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-30 14:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Quietly allow settings update"

Browse Source 
This reverts commit 999f0a3f920223c5078f8c30f1a5c56a255bbf39.
This commit is contained in:
Theo Arends 2018-11-16 09:18:40 +01:00
parent 3363f0238d
commit a1ff029335
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sonoff/settings.ino
View File

@ -257,6 +257,7 @@ void SettingsSave(byte rotate)
* stop_flash_rotate 0 = Allow flash slot rotation (SetOption12 0) * stop_flash_rotate 0 = Allow flash slot rotation (SetOption12 0)
* stop_flash_rotate 1 = Allow only eeprom flash slot use (SetOption12 1) * stop_flash_rotate 1 = Allow only eeprom flash slot use (SetOption12 1)
*/ */
#ifndef BE_MINIMAL
if ((GetSettingsCrc() != settings_crc) || rotate) { if ((GetSettingsCrc() != settings_crc) || rotate) {
if (1 == rotate) { // Use eeprom flash slot only and disable flash rotate from now on (upgrade) if (1 == rotate) { // Use eeprom flash slot only and disable flash rotate from now on (upgrade)
stop_flash_rotate = 1; stop_flash_rotate = 1;
@ -289,6 +290,7 @@ void SettingsSave(byte rotate)
settings_crc = Settings.cfg_crc; settings_crc = Settings.cfg_crc;
} }
#endif // BE_MINIMAL
RtcSettingsSave(); RtcSettingsSave();
} }
@ -317,8 +319,10 @@ void SettingsLoad(void)
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %d"), settings_location, Settings.save_flag); snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %d"), settings_location, Settings.save_flag);
AddLog(LOG_LEVEL_DEBUG); AddLog(LOG_LEVEL_DEBUG);
#ifndef BE_MINIMAL
if (bad_crc || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { SettingsDefault(); } if (bad_crc || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { SettingsDefault(); }
settings_crc = GetSettingsCrc(); settings_crc = GetSettingsCrc();
#endif // BE_MINIMAL
RtcSettingsLoad(); RtcSettingsLoad();
} }