2017-02-19 16:49:17 +00:00
|
|
|
/*
|
2019-10-27 10:13:24 +00:00
|
|
|
settings.ino - user settings for Tasmota
|
2017-05-13 12:02:10 +01:00
|
|
|
|
2019-12-31 13:23:34 +00:00
|
|
|
Copyright (C) 2020 Theo Arends
|
2017-05-13 12:02:10 +01:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2017-02-19 16:49:17 +00:00
|
|
|
*/
|
|
|
|
|
2017-02-28 15:01:48 +00:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* RTC memory
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2019-03-31 10:59:04 +01:00
|
|
|
const uint16_t RTC_MEM_VALID = 0xA55A;
|
2017-02-28 15:01:48 +00:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
uint32_t rtc_settings_crc = 0;
|
2017-02-28 15:01:48 +00:00
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
uint32_t GetRtcSettingsCrc(void)
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2018-06-02 15:59:09 +01:00
|
|
|
uint32_t crc = 0;
|
2017-10-18 17:22:34 +01:00
|
|
|
uint8_t *bytes = (uint8_t*)&RtcSettings;
|
2017-02-28 15:01:48 +00:00
|
|
|
|
2020-04-19 12:08:04 +01:00
|
|
|
for (uint32_t i = 0; i < sizeof(RtcSettings); i++) {
|
2018-06-02 15:59:09 +01:00
|
|
|
crc += bytes[i]*(i+1);
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2018-06-02 15:59:09 +01:00
|
|
|
return crc;
|
2017-02-28 15:01:48 +00:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void RtcSettingsSave(void)
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2018-06-02 15:59:09 +01:00
|
|
|
if (GetRtcSettingsCrc() != rtc_settings_crc) {
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettings.valid = RTC_MEM_VALID;
|
2020-04-19 13:18:12 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
ESP.rtcUserMemoryWrite(100, (uint32_t*)&RtcSettings, sizeof(RtcSettings));
|
|
|
|
#else
|
|
|
|
RtcDataSettings = RtcSettings;
|
|
|
|
#endif
|
2018-06-02 15:59:09 +01:00
|
|
|
rtc_settings_crc = GetRtcSettingsCrc();
|
2017-02-28 15:01:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void RtcSettingsLoad(void)
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2020-04-19 13:18:12 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
ESP.rtcUserMemoryRead(100, (uint32_t*)&RtcSettings, sizeof(RtcSettings)); // 0x290
|
|
|
|
#else
|
|
|
|
RtcSettings = RtcDataSettings;
|
|
|
|
#endif
|
2017-10-18 17:22:34 +01:00
|
|
|
if (RtcSettings.valid != RTC_MEM_VALID) {
|
2020-04-19 12:08:04 +01:00
|
|
|
memset(&RtcSettings, 0, sizeof(RtcSettings));
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettings.valid = RTC_MEM_VALID;
|
2017-12-16 14:51:45 +00:00
|
|
|
RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday;
|
|
|
|
RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal;
|
2019-08-25 13:58:45 +01:00
|
|
|
RtcSettings.energy_usage = Settings.energy_usage;
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettings.pulse_counter[i] = Settings.pulse_counter[i];
|
2017-05-17 21:49:22 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettings.power = Settings.power;
|
|
|
|
RtcSettingsSave();
|
2017-02-28 15:01:48 +00:00
|
|
|
}
|
2018-06-02 15:59:09 +01:00
|
|
|
rtc_settings_crc = GetRtcSettingsCrc();
|
2017-02-28 15:01:48 +00:00
|
|
|
}
|
|
|
|
|
2019-01-28 13:08:33 +00:00
|
|
|
bool RtcSettingsValid(void)
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
return (RTC_MEM_VALID == RtcSettings.valid);
|
2017-02-28 15:01:48 +00:00
|
|
|
}
|
|
|
|
|
2018-09-04 15:22:34 +01:00
|
|
|
/********************************************************************************************/
|
|
|
|
|
|
|
|
uint32_t rtc_reboot_crc = 0;
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
uint32_t GetRtcRebootCrc(void)
|
2018-09-04 15:22:34 +01:00
|
|
|
{
|
|
|
|
uint32_t crc = 0;
|
|
|
|
uint8_t *bytes = (uint8_t*)&RtcReboot;
|
|
|
|
|
2020-04-19 12:08:04 +01:00
|
|
|
for (uint32_t i = 0; i < sizeof(RtcReboot); i++) {
|
2018-09-04 15:22:34 +01:00
|
|
|
crc += bytes[i]*(i+1);
|
|
|
|
}
|
|
|
|
return crc;
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void RtcRebootSave(void)
|
2018-09-04 15:22:34 +01:00
|
|
|
{
|
|
|
|
if (GetRtcRebootCrc() != rtc_reboot_crc) {
|
|
|
|
RtcReboot.valid = RTC_MEM_VALID;
|
2020-04-19 13:18:12 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
ESP.rtcUserMemoryWrite(100 - sizeof(RtcReboot), (uint32_t*)&RtcReboot, sizeof(RtcReboot));
|
|
|
|
#else
|
|
|
|
RtcDataReboot = RtcReboot;
|
|
|
|
#endif
|
2018-09-04 15:22:34 +01:00
|
|
|
rtc_reboot_crc = GetRtcRebootCrc();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-16 09:42:28 +00:00
|
|
|
void RtcRebootReset(void)
|
|
|
|
{
|
|
|
|
RtcReboot.fast_reboot_count = 0;
|
|
|
|
RtcRebootSave();
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void RtcRebootLoad(void)
|
2018-09-04 15:22:34 +01:00
|
|
|
{
|
2020-04-19 13:18:12 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
ESP.rtcUserMemoryRead(100 - sizeof(RtcReboot), (uint32_t*)&RtcReboot, sizeof(RtcReboot)); // 0x280
|
|
|
|
#else
|
|
|
|
RtcReboot = RtcDataReboot;
|
|
|
|
#endif
|
2018-09-04 15:22:34 +01:00
|
|
|
if (RtcReboot.valid != RTC_MEM_VALID) {
|
2020-04-19 12:08:04 +01:00
|
|
|
memset(&RtcReboot, 0, sizeof(RtcReboot));
|
2018-09-04 15:22:34 +01:00
|
|
|
RtcReboot.valid = RTC_MEM_VALID;
|
|
|
|
// RtcReboot.fast_reboot_count = 0; // Explicit by memset
|
|
|
|
RtcRebootSave();
|
|
|
|
}
|
|
|
|
rtc_reboot_crc = GetRtcRebootCrc();
|
|
|
|
}
|
|
|
|
|
2019-01-28 13:08:33 +00:00
|
|
|
bool RtcRebootValid(void)
|
2018-08-30 13:27:33 +01:00
|
|
|
{
|
2018-09-04 15:22:34 +01:00
|
|
|
return (RTC_MEM_VALID == RtcReboot.valid);
|
2018-08-30 13:27:33 +01:00
|
|
|
}
|
|
|
|
|
2017-02-19 16:49:17 +00:00
|
|
|
/*********************************************************************************************\
|
2017-04-24 17:25:53 +01:00
|
|
|
* Config - Flash
|
2020-02-24 12:27:22 +00:00
|
|
|
*
|
|
|
|
* Tasmota 1M flash usage
|
|
|
|
* 0x00000000 - Unzipped binary bootloader
|
|
|
|
* 0x00001000 - Unzipped binary code start
|
|
|
|
* ::::
|
|
|
|
* 0x000xxxxx - Unzipped binary code end
|
|
|
|
* 0x000x1000 - First page used by Core OTA
|
|
|
|
* ::::
|
|
|
|
* 0x000F3000 - Tasmota Quick Power Cycle counter (SETTINGS_LOCATION - CFG_ROTATES) - First four bytes only
|
|
|
|
* 0x000F4000 - First Tasmota rotating settings page
|
|
|
|
* ::::
|
|
|
|
* 0x000FA000 - Last Tasmota rotating settings page = Last page used by Core OTA
|
|
|
|
* 0x000FB000 - Core SPIFFS end = Core EEPROM = Tasmota settings page during OTA and when no flash rotation is active (SETTINGS_LOCATION)
|
|
|
|
* 0x000FC000 - SDK - Uses first 128 bytes for phy init data mirrored by Core in RAM. See core_esp8266_phy.cpp phy_init_data[128] = Core user_rf_cal_sector
|
|
|
|
* 0x000FD000 - SDK - Uses scattered bytes from 0x340 (iTead use as settings storage from 0x000FD000)
|
|
|
|
* 0x000FE000 - SDK - Uses scattered bytes from 0x340 (iTead use as mirrored settings storage from 0x000FE000)
|
|
|
|
* 0x000FF000 - SDK - Uses at least first 32 bytes of this page - Tasmota Zigbee persistence from 0x000FF800 to 0x000FFFFF
|
2017-02-19 16:49:17 +00:00
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
#include "spi_flash.h"
|
|
|
|
}
|
|
|
|
#include "eboot_command.h"
|
|
|
|
|
2020-04-10 17:24:08 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
|
2019-05-30 22:28:22 +01:00
|
|
|
#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
|
2017-04-24 17:25:53 +01:00
|
|
|
|
2019-05-30 22:28:22 +01:00
|
|
|
extern "C" uint32_t _SPIFFS_end;
|
2018-02-15 11:29:07 +00:00
|
|
|
// From libraries/EEPROM/EEPROM.cpp EEPROMClass
|
2019-03-31 10:59:04 +01:00
|
|
|
const uint32_t SPIFFS_END = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2019-05-30 22:28:22 +01:00
|
|
|
#else // Core > 2.5.2 and STAGE
|
|
|
|
|
2019-10-30 15:51:13 +00:00
|
|
|
#if AUTOFLASHSIZE
|
|
|
|
|
|
|
|
#include "flash_hal.h"
|
|
|
|
|
|
|
|
// From libraries/EEPROM/EEPROM.cpp EEPROMClass
|
|
|
|
const uint32_t SPIFFS_END = (FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2019-05-30 22:28:22 +01:00
|
|
|
extern "C" uint32_t _FS_end;
|
|
|
|
// From libraries/EEPROM/EEPROM.cpp EEPROMClass
|
|
|
|
const uint32_t SPIFFS_END = ((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
|
|
|
|
|
2019-10-30 15:51:13 +00:00
|
|
|
#endif // AUTOFLASHSIZE
|
|
|
|
|
|
|
|
#endif // All cores < pre-2.6.0
|
2019-05-30 22:28:22 +01:00
|
|
|
|
2017-04-24 17:25:53 +01:00
|
|
|
// Version 4.2 config = eeprom area
|
2019-03-31 10:59:04 +01:00
|
|
|
const uint32_t SETTINGS_LOCATION = SPIFFS_END; // No need for SPIFFS as it uses EEPROM area
|
2020-04-10 17:24:08 +01:00
|
|
|
|
|
|
|
#endif // ESP8266
|
|
|
|
|
2017-06-19 21:54:49 +01:00
|
|
|
// Version 5.2 allow for more flash space
|
2019-03-31 10:59:04 +01:00
|
|
|
const uint8_t CFG_ROTATES = 8; // Number of flash sectors used (handles uploads)
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t settings_location = SETTINGS_LOCATION;
|
2019-09-07 17:32:11 +01:00
|
|
|
uint32_t settings_crc32 = 0;
|
2019-03-26 17:26:50 +00:00
|
|
|
uint8_t *settings_buffer = nullptr;
|
2017-02-19 16:49:17 +00:00
|
|
|
|
|
|
|
/********************************************************************************************/
|
|
|
|
/*
|
|
|
|
* Based on cores/esp8266/Updater.cpp
|
|
|
|
*/
|
2018-11-14 13:32:09 +00:00
|
|
|
void SetFlashModeDout(void)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2020-04-10 17:24:08 +01:00
|
|
|
#ifdef ESP8266
|
2017-02-19 16:49:17 +00:00
|
|
|
uint8_t *_buffer;
|
|
|
|
uint32_t address;
|
|
|
|
|
2017-08-08 15:31:43 +01:00
|
|
|
eboot_command ebcmd;
|
|
|
|
eboot_command_read(&ebcmd);
|
|
|
|
address = ebcmd.args[0];
|
2017-02-19 16:49:17 +00:00
|
|
|
_buffer = new uint8_t[FLASH_SECTOR_SIZE];
|
2018-02-24 15:37:33 +00:00
|
|
|
|
|
|
|
if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
|
2017-08-08 15:31:43 +01:00
|
|
|
if (_buffer[2] != 3) { // DOUT
|
|
|
|
_buffer[2] = 3;
|
2019-11-21 10:12:53 +00:00
|
|
|
if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
|
|
|
|
ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
|
|
|
|
}
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
delete[] _buffer;
|
2020-04-10 17:24:08 +01:00
|
|
|
#endif // ESP8266
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
|
2020-01-07 16:01:48 +00:00
|
|
|
bool VersionCompatible(void)
|
2019-12-20 14:12:44 +00:00
|
|
|
{
|
2020-04-10 17:24:08 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
|
2019-12-20 17:24:20 +00:00
|
|
|
if (Settings.flag3.compatibility_check) {
|
2020-01-07 16:01:48 +00:00
|
|
|
return true;
|
2019-12-20 17:24:20 +00:00
|
|
|
}
|
|
|
|
|
2019-12-20 14:12:44 +00:00
|
|
|
eboot_command ebcmd;
|
|
|
|
eboot_command_read(&ebcmd);
|
|
|
|
uint32_t start_address = ebcmd.args[0];
|
|
|
|
uint32_t end_address = start_address + (ebcmd.args[2] & 0xFFFFF000) + FLASH_SECTOR_SIZE;
|
|
|
|
uint32_t* buffer = new uint32_t[FLASH_SECTOR_SIZE / 4];
|
|
|
|
|
|
|
|
uint32_t version[3] = { 0 };
|
|
|
|
bool found = false;
|
|
|
|
for (uint32_t address = start_address; address < end_address; address = address + FLASH_SECTOR_SIZE) {
|
|
|
|
ESP.flashRead(address, (uint32_t*)buffer, FLASH_SECTOR_SIZE);
|
2020-01-06 13:52:04 +00:00
|
|
|
if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
|
|
|
|
version[1] = 0xFFFFFFFF; // Ota file is gzipped and can not be checked for compatibility
|
|
|
|
found = true;
|
2020-01-07 16:01:48 +00:00
|
|
|
} else {
|
|
|
|
for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
|
|
|
|
version[0] = version[1];
|
|
|
|
version[1] = version[2];
|
|
|
|
version[2] = buffer[i];
|
|
|
|
if ((MARKER_START == version[0]) && (MARKER_END == version[2])) {
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
2019-12-20 14:12:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (found) { break; }
|
|
|
|
}
|
|
|
|
delete[] buffer;
|
|
|
|
|
|
|
|
if (!found) { version[1] = 0; }
|
|
|
|
|
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: Version 0x%08X, Compatible 0x%08X"), version[1], VERSION_COMPATIBLE);
|
|
|
|
|
2020-01-07 16:01:48 +00:00
|
|
|
if (version[1] < VERSION_COMPATIBLE) {
|
|
|
|
uint32_t eboot_magic = 0; // Abandon OTA result
|
|
|
|
ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
|
|
|
|
return false;
|
|
|
|
}
|
2019-12-20 14:12:44 +00:00
|
|
|
|
2020-04-10 17:24:08 +01:00
|
|
|
#endif // ESP8266
|
|
|
|
|
2020-01-07 16:01:48 +00:00
|
|
|
return true;
|
2019-12-20 14:12:44 +00:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsBufferFree(void)
|
2018-05-24 13:25:52 +01:00
|
|
|
{
|
2019-03-26 17:26:50 +00:00
|
|
|
if (settings_buffer != nullptr) {
|
2018-05-24 13:25:52 +01:00
|
|
|
free(settings_buffer);
|
2019-03-26 17:26:50 +00:00
|
|
|
settings_buffer = nullptr;
|
2018-05-24 13:25:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
bool SettingsBufferAlloc(void)
|
2018-05-24 13:25:52 +01:00
|
|
|
{
|
|
|
|
SettingsBufferFree();
|
|
|
|
if (!(settings_buffer = (uint8_t *)malloc(sizeof(Settings)))) {
|
|
|
|
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_UPLOAD_ERR_2)); // Not enough (memory) space
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2019-09-07 17:32:11 +01:00
|
|
|
uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2018-06-02 15:59:09 +01:00
|
|
|
uint16_t crc = 0;
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2019-08-25 13:58:45 +01:00
|
|
|
for (uint32_t i = 0; i < size; i++) {
|
2018-06-02 15:59:09 +01:00
|
|
|
if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); } // Skip crc
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2018-06-02 15:59:09 +01:00
|
|
|
return crc;
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
|
2019-09-07 17:32:11 +01:00
|
|
|
uint16_t GetSettingsCrc(void)
|
|
|
|
{
|
|
|
|
// Fix miscalculation if previous Settings was 3584 and current Settings is 4096 between 0x06060007 and 0x0606000A
|
2020-04-19 14:36:04 +01:00
|
|
|
uint32_t size = ((Settings.version < 0x06060007) || (Settings.version > 0x0606000A)) ? 3584 : sizeof(Settings);
|
2019-09-07 17:32:11 +01:00
|
|
|
return GetCfgCrc16((uint8_t*)&Settings, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size)
|
2019-09-05 15:56:02 +01:00
|
|
|
{
|
|
|
|
// https://create.stephan-brumme.com/crc32/#bitwise
|
|
|
|
uint32_t crc = 0;
|
|
|
|
|
2019-09-07 17:32:11 +01:00
|
|
|
while (size--) {
|
2019-09-05 15:56:02 +01:00
|
|
|
crc ^= *bytes++;
|
|
|
|
for (uint32_t j = 0; j < 8; j++) {
|
|
|
|
crc = (crc >> 1) ^ (-int(crc & 1) & 0xEDB88320);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ~crc;
|
|
|
|
}
|
|
|
|
|
2019-09-07 17:32:11 +01:00
|
|
|
uint32_t GetSettingsCrc32(void)
|
|
|
|
{
|
2020-04-19 14:36:04 +01:00
|
|
|
return GetCfgCrc32((uint8_t*)&Settings, sizeof(Settings) -4); // Skip crc32
|
2019-09-07 17:32:11 +01:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsSaveAll(void)
|
2017-11-21 15:06:51 +00:00
|
|
|
{
|
|
|
|
if (Settings.flag.save_state) {
|
|
|
|
Settings.power = power;
|
|
|
|
} else {
|
|
|
|
Settings.power = 0;
|
|
|
|
}
|
2017-12-25 16:41:12 +00:00
|
|
|
XsnsCall(FUNC_SAVE_BEFORE_RESTART);
|
2019-05-19 13:59:07 +01:00
|
|
|
XdrvCall(FUNC_SAVE_BEFORE_RESTART);
|
2017-11-21 15:06:51 +00:00
|
|
|
SettingsSave(0);
|
|
|
|
}
|
|
|
|
|
2019-10-16 18:00:20 +01:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Quick power cycle monitoring
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
void UpdateQuickPowerCycle(bool update)
|
|
|
|
{
|
2020-04-10 09:52:22 +01:00
|
|
|
if (Settings.flag3.fast_power_cycle_disable) { return; } // SetOption65 - Disable fast power cycle detection for device reset
|
2019-10-18 14:18:39 +01:00
|
|
|
|
2019-10-16 18:00:20 +01:00
|
|
|
uint32_t pc_register;
|
|
|
|
uint32_t pc_location = SETTINGS_LOCATION - CFG_ROTATES;
|
|
|
|
|
2020-04-19 14:36:04 +01:00
|
|
|
#ifdef ESP8266
|
2019-10-16 18:00:20 +01:00
|
|
|
ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
|
2020-04-19 14:36:04 +01:00
|
|
|
#else
|
|
|
|
QPCRead(&pc_register, sizeof(pc_register));
|
|
|
|
#endif
|
2019-10-16 18:00:20 +01:00
|
|
|
if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) {
|
|
|
|
uint32_t counter = ((pc_register & 0xF) << 1) & 0xF;
|
|
|
|
if (0 == counter) { // 4 power cycles in a row
|
2019-11-18 10:17:43 +00:00
|
|
|
SettingsErase(3); // Quickly reset all settings including QuickPowerCycle flag
|
2019-10-16 18:00:20 +01:00
|
|
|
EspRestart(); // And restart
|
|
|
|
} else {
|
|
|
|
pc_register = 0xFFA55AB0 | counter;
|
2020-04-19 14:36:04 +01:00
|
|
|
#ifdef ESP8266
|
2019-10-16 18:00:20 +01:00
|
|
|
ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
|
2020-04-19 14:36:04 +01:00
|
|
|
#else
|
|
|
|
QPCWrite(&pc_register, sizeof(pc_register));
|
|
|
|
#endif
|
2019-10-18 14:18:39 +01:00
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter);
|
2019-10-16 18:00:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (pc_register != 0xFFA55ABF) {
|
|
|
|
pc_register = 0xFFA55ABF;
|
2020-04-19 14:36:04 +01:00
|
|
|
#ifdef ESP8266
|
2019-10-16 18:00:20 +01:00
|
|
|
// Assume flash is default all ones and setting a bit to zero does not need an erase
|
2019-11-21 10:12:53 +00:00
|
|
|
if (ESP.flashEraseSector(pc_location)) {
|
|
|
|
ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
|
|
|
|
}
|
2020-04-19 14:36:04 +01:00
|
|
|
#else
|
|
|
|
QPCWrite(&pc_register, sizeof(pc_register));
|
|
|
|
#endif
|
2019-10-18 14:18:39 +01:00
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset"));
|
2019-10-16 18:00:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-12 13:51:41 +00:00
|
|
|
/*********************************************************************************************\
|
2019-12-14 12:16:55 +00:00
|
|
|
* Config Settings.text char array support
|
2019-12-12 13:51:41 +00:00
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2019-12-14 12:16:55 +00:00
|
|
|
uint32_t GetSettingsTextLen(void)
|
2019-12-12 13:51:41 +00:00
|
|
|
{
|
2019-12-22 15:53:51 +00:00
|
|
|
char* position = Settings.text_pool;
|
2019-12-14 12:16:55 +00:00
|
|
|
for (uint32_t size = 0; size < SET_MAX; size++) {
|
|
|
|
while (*position++ != '\0') { }
|
2019-12-12 13:51:41 +00:00
|
|
|
}
|
2019-12-22 15:53:51 +00:00
|
|
|
return position - Settings.text_pool;
|
2019-12-12 13:51:41 +00:00
|
|
|
}
|
|
|
|
|
2019-12-16 14:13:57 +00:00
|
|
|
bool SettingsUpdateText(uint32_t index, const char* replace_me)
|
2019-12-12 13:51:41 +00:00
|
|
|
{
|
|
|
|
if (index >= SET_MAX) {
|
|
|
|
return false; // Setting not supported - internal error
|
|
|
|
}
|
|
|
|
|
2019-12-14 12:16:55 +00:00
|
|
|
// Make a copy first in case we use source from Settings.text
|
|
|
|
uint32_t replace_len = strlen(replace_me);
|
|
|
|
char replace[replace_len +1];
|
|
|
|
memcpy(replace, replace_me, sizeof(replace));
|
2019-12-12 13:51:41 +00:00
|
|
|
|
2019-12-21 14:37:36 +00:00
|
|
|
uint32_t start_pos = 0;
|
|
|
|
uint32_t end_pos = 0;
|
2019-12-22 15:53:51 +00:00
|
|
|
char* position = Settings.text_pool;
|
2019-12-21 14:37:36 +00:00
|
|
|
for (uint32_t size = 0; size < SET_MAX; size++) {
|
|
|
|
while (*position++ != '\0') { }
|
|
|
|
if (1 == index) {
|
2019-12-22 15:53:51 +00:00
|
|
|
start_pos = position - Settings.text_pool;
|
2019-12-21 14:37:36 +00:00
|
|
|
}
|
|
|
|
else if (0 == index) {
|
2019-12-22 15:53:51 +00:00
|
|
|
end_pos = position - Settings.text_pool -1;
|
2019-12-21 14:37:36 +00:00
|
|
|
}
|
|
|
|
index--;
|
2019-12-12 13:51:41 +00:00
|
|
|
}
|
2019-12-22 15:53:51 +00:00
|
|
|
uint32_t char_len = position - Settings.text_pool;
|
2019-12-21 14:37:36 +00:00
|
|
|
|
|
|
|
uint32_t current_len = end_pos - start_pos;
|
|
|
|
int diff = replace_len - current_len;
|
|
|
|
|
|
|
|
// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TST: start %d, end %d, len %d, current %d, replace %d, diff %d"),
|
|
|
|
// start_pos, end_pos, char_len, current_len, replace_len, diff);
|
|
|
|
|
|
|
|
int too_long = (char_len + diff) - settings_text_size;
|
|
|
|
if (too_long > 0) {
|
2019-12-22 14:23:52 +00:00
|
|
|
AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_CONFIG "Text overflow by %d char(s)"), too_long);
|
2019-12-21 14:37:36 +00:00
|
|
|
return false; // Replace text too long
|
|
|
|
}
|
|
|
|
|
|
|
|
if (diff != 0) {
|
|
|
|
// Shift Settings.text up or down
|
2019-12-22 15:53:51 +00:00
|
|
|
memmove_P(Settings.text_pool + start_pos + replace_len, Settings.text_pool + end_pos, char_len - end_pos);
|
2019-12-21 14:37:36 +00:00
|
|
|
}
|
|
|
|
// Replace text
|
2019-12-22 15:53:51 +00:00
|
|
|
memmove_P(Settings.text_pool + start_pos, replace, replace_len);
|
2019-12-21 14:37:36 +00:00
|
|
|
// Fill for future use
|
2019-12-22 15:53:51 +00:00
|
|
|
memset(Settings.text_pool + char_len + diff, 0x00, settings_text_size - char_len - diff);
|
2019-12-21 14:37:36 +00:00
|
|
|
|
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG "CR %d/%d"), GetSettingsTextLen(), settings_text_size);
|
2019-12-12 13:51:41 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2019-12-16 14:13:57 +00:00
|
|
|
char* SettingsText(uint32_t index)
|
2019-12-12 13:51:41 +00:00
|
|
|
{
|
2019-12-22 15:53:51 +00:00
|
|
|
char* position = Settings.text_pool;
|
2019-12-24 16:10:50 +00:00
|
|
|
|
|
|
|
if (index >= SET_MAX) {
|
|
|
|
position += settings_text_size -1; // Setting not supported - internal error - return empty string
|
|
|
|
} else {
|
|
|
|
for (;index > 0; index--) {
|
|
|
|
while (*position++ != '\0') { }
|
|
|
|
}
|
2019-12-12 13:51:41 +00:00
|
|
|
}
|
|
|
|
return position;
|
|
|
|
}
|
|
|
|
|
2017-02-19 16:49:17 +00:00
|
|
|
/*********************************************************************************************\
|
2017-04-24 17:25:53 +01:00
|
|
|
* Config Save - Save parameters to Flash ONLY if any parameter has changed
|
2017-02-19 16:49:17 +00:00
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2020-03-29 16:41:31 +01:00
|
|
|
void UpdateBackwardCompatibility(void)
|
|
|
|
{
|
|
|
|
// Perform updates for backward compatibility
|
|
|
|
strlcpy(Settings.user_template_name, SettingsText(SET_TEMPLATE_NAME), sizeof(Settings.user_template_name));
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
uint32_t GetSettingsAddress(void)
|
2017-06-25 22:01:41 +01:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
return settings_location * SPI_FLASH_SEC_SIZE;
|
2017-06-25 22:01:41 +01:00
|
|
|
}
|
|
|
|
|
2019-01-28 13:08:33 +00:00
|
|
|
void SettingsSave(uint8_t rotate)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2017-06-30 16:54:19 +01:00
|
|
|
/* Save configuration in eeprom or one of 7 slots below
|
2017-09-02 13:37:02 +01:00
|
|
|
*
|
2017-06-30 16:54:19 +01:00
|
|
|
* rotate 0 = Save in next flash slot
|
|
|
|
* rotate 1 = Save only in eeprom flash slot until SetOption12 0 or restart
|
2017-07-25 17:05:47 +01:00
|
|
|
* rotate 2 = Save in eeprom flash slot, erase next flash slots and continue depending on stop_flash_rotate
|
2017-06-30 16:54:19 +01:00
|
|
|
* stop_flash_rotate 0 = Allow flash slot rotation (SetOption12 0)
|
|
|
|
* stop_flash_rotate 1 = Allow only eeprom flash slot use (SetOption12 1)
|
|
|
|
*/
|
2019-02-08 13:55:45 +00:00
|
|
|
#ifndef FIRMWARE_MINIMAL
|
2020-03-29 16:41:31 +01:00
|
|
|
UpdateBackwardCompatibility();
|
2019-09-07 17:32:11 +01:00
|
|
|
if ((GetSettingsCrc32() != settings_crc32) || rotate) {
|
2017-07-25 17:05:47 +01:00
|
|
|
if (1 == rotate) { // Use eeprom flash slot only and disable flash rotate from now on (upgrade)
|
|
|
|
stop_flash_rotate = 1;
|
2017-06-25 22:01:41 +01:00
|
|
|
}
|
2017-07-25 17:05:47 +01:00
|
|
|
if (2 == rotate) { // Use eeprom flash slot and erase next flash slots if stop_flash_rotate is off (default)
|
2017-10-18 17:22:34 +01:00
|
|
|
settings_location = SETTINGS_LOCATION +1;
|
2017-06-30 16:54:19 +01:00
|
|
|
}
|
2017-06-25 22:01:41 +01:00
|
|
|
if (stop_flash_rotate) {
|
2017-10-18 17:22:34 +01:00
|
|
|
settings_location = SETTINGS_LOCATION;
|
2017-06-19 21:54:49 +01:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
settings_location--;
|
|
|
|
if (settings_location <= (SETTINGS_LOCATION - CFG_ROTATES)) {
|
|
|
|
settings_location = SETTINGS_LOCATION;
|
2017-06-19 21:54:49 +01:00
|
|
|
}
|
|
|
|
}
|
2019-09-07 17:32:11 +01:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.save_flag++;
|
2019-09-05 15:56:02 +01:00
|
|
|
if (UtcTime() > START_VALID_TIME) {
|
|
|
|
Settings.cfg_timestamp = UtcTime();
|
|
|
|
} else {
|
|
|
|
Settings.cfg_timestamp++;
|
|
|
|
}
|
2020-04-19 14:36:04 +01:00
|
|
|
Settings.cfg_size = sizeof(Settings);
|
2019-09-07 17:32:11 +01:00
|
|
|
Settings.cfg_crc = GetSettingsCrc(); // Keep for backward compatibility in case of fall-back just after upgrade
|
|
|
|
Settings.cfg_crc32 = GetSettingsCrc32();
|
2019-01-04 15:05:52 +00:00
|
|
|
|
2020-04-10 17:24:08 +01:00
|
|
|
#ifdef ESP8266
|
2019-11-21 10:12:53 +00:00
|
|
|
if (ESP.flashEraseSector(settings_location)) {
|
2020-04-19 14:36:04 +01:00
|
|
|
ESP.flashWrite(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(Settings));
|
2019-11-21 10:12:53 +00:00
|
|
|
}
|
2019-01-04 15:05:52 +00:00
|
|
|
|
2017-06-30 16:54:19 +01:00
|
|
|
if (!stop_flash_rotate && rotate) {
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 1; i < CFG_ROTATES; i++) {
|
2018-02-24 15:37:33 +00:00
|
|
|
ESP.flashEraseSector(settings_location -i); // Delete previous configurations by resetting to 0xFF
|
2017-06-19 21:54:49 +01:00
|
|
|
delay(1);
|
|
|
|
}
|
|
|
|
}
|
2020-04-19 14:36:04 +01:00
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG D_SAVED_TO_FLASH_AT " %X, " D_COUNT " %d, " D_BYTES " %d"), settings_location, Settings.save_flag, sizeof(Settings));
|
2020-04-10 17:24:08 +01:00
|
|
|
#else // ESP32
|
2020-04-19 14:36:04 +01:00
|
|
|
SettingsWrite(&Settings, sizeof(Settings));
|
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG "Saved, " D_COUNT " %d, " D_BYTES " %d"), Settings.save_flag, sizeof(Settings));
|
2020-04-10 17:24:08 +01:00
|
|
|
#endif // ESP8266
|
2019-03-08 14:15:42 +00:00
|
|
|
|
2019-09-07 17:32:11 +01:00
|
|
|
settings_crc32 = Settings.cfg_crc32;
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
2019-02-08 13:55:45 +00:00
|
|
|
#endif // FIRMWARE_MINIMAL
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettingsSave();
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsLoad(void)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2020-04-19 14:36:04 +01:00
|
|
|
#ifdef ESP8266
|
2019-01-30 15:27:17 +00:00
|
|
|
// Load configuration from eeprom or one of 7 slots below if first valid load does not stop_flash_rotate
|
2020-04-19 14:36:04 +01:00
|
|
|
struct {
|
2018-06-02 15:59:09 +01:00
|
|
|
uint16_t cfg_holder; // 000
|
|
|
|
uint16_t cfg_size; // 002
|
|
|
|
unsigned long save_flag; // 004
|
2017-10-18 17:22:34 +01:00
|
|
|
} _SettingsH;
|
2019-01-30 15:27:17 +00:00
|
|
|
unsigned long save_flag = 0;
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2019-01-30 15:27:17 +00:00
|
|
|
settings_location = 0;
|
|
|
|
uint32_t flash_location = SETTINGS_LOCATION +1;
|
2019-04-02 14:47:39 +01:00
|
|
|
uint16_t cfg_holder = 0;
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < CFG_ROTATES; i++) {
|
2019-01-30 15:27:17 +00:00
|
|
|
flash_location--;
|
2020-04-19 14:36:04 +01:00
|
|
|
ESP.flashRead(flash_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(Settings));
|
2019-01-30 15:27:17 +00:00
|
|
|
bool valid = false;
|
|
|
|
if (Settings.version > 0x06000000) {
|
2019-09-07 17:32:11 +01:00
|
|
|
bool almost_valid = (Settings.cfg_crc32 == GetSettingsCrc32());
|
|
|
|
if (Settings.version < 0x0606000B) {
|
|
|
|
almost_valid = (Settings.cfg_crc == GetSettingsCrc());
|
|
|
|
}
|
2019-04-02 14:47:39 +01:00
|
|
|
// Sometimes CRC on pages below FB, overwritten by OTA, is fine but Settings are still invalid. So check cfg_holder too
|
|
|
|
if (almost_valid && (0 == cfg_holder)) { cfg_holder = Settings.cfg_holder; } // At FB always active cfg_holder
|
|
|
|
valid = (cfg_holder == Settings.cfg_holder);
|
2019-01-30 15:27:17 +00:00
|
|
|
} else {
|
2020-04-19 14:36:04 +01:00
|
|
|
ESP.flashRead((flash_location -1) * SPI_FLASH_SEC_SIZE, (uint32*)&_SettingsH, sizeof(_SettingsH));
|
2019-01-30 15:27:17 +00:00
|
|
|
valid = (Settings.cfg_holder == _SettingsH.cfg_holder);
|
|
|
|
}
|
|
|
|
if (valid) {
|
|
|
|
if (Settings.save_flag > save_flag) {
|
|
|
|
save_flag = Settings.save_flag;
|
|
|
|
settings_location = flash_location;
|
2019-02-01 13:05:55 +00:00
|
|
|
if (Settings.flag.stop_flash_rotate && (0 == i)) { // Stop only if eeprom area should be used and it is valid
|
2019-01-30 15:27:17 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
2017-06-19 21:54:49 +01:00
|
|
|
delay(1);
|
|
|
|
}
|
2019-01-30 15:27:17 +00:00
|
|
|
if (settings_location > 0) {
|
2020-04-19 14:36:04 +01:00
|
|
|
ESP.flashRead(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(Settings));
|
2019-04-02 14:47:39 +01:00
|
|
|
AddLog_P2(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %lu"), settings_location, Settings.save_flag);
|
2019-01-30 15:27:17 +00:00
|
|
|
}
|
2020-04-19 14:36:04 +01:00
|
|
|
#else // ESP32
|
|
|
|
SettingsRead(&Settings, sizeof(Settings));
|
|
|
|
AddLog_P2(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG "Loaded, " D_COUNT " %lu"), Settings.save_flag);
|
|
|
|
#endif // ESP8266 - ESP32
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2019-02-08 13:55:45 +00:00
|
|
|
#ifndef FIRMWARE_MINIMAL
|
2019-01-30 15:27:17 +00:00
|
|
|
if (!settings_location || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { // Init defaults if cfg_holder differs from user settings in my_user_config.h
|
|
|
|
SettingsDefault();
|
|
|
|
}
|
2019-09-07 17:32:11 +01:00
|
|
|
settings_crc32 = GetSettingsCrc32();
|
2019-02-08 13:55:45 +00:00
|
|
|
#endif // FIRMWARE_MINIMAL
|
2017-02-28 15:01:48 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettingsLoad();
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
|
2019-11-17 13:29:33 +00:00
|
|
|
void EspErase(uint32_t start_sector, uint32_t end_sector)
|
|
|
|
{
|
|
|
|
bool serial_output = (LOG_LEVEL_DEBUG_MORE <= seriallog_level);
|
|
|
|
for (uint32_t sector = start_sector; sector < end_sector; sector++) {
|
|
|
|
|
|
|
|
bool result = ESP.flashEraseSector(sector); // Arduino core - erases flash as seen by SDK
|
|
|
|
// bool result = !SPIEraseSector(sector); // SDK - erases flash as seen by SDK
|
|
|
|
// bool result = EsptoolEraseSector(sector); // Esptool - erases flash completely (slow)
|
|
|
|
|
|
|
|
if (serial_output) {
|
2020-01-26 13:16:44 +00:00
|
|
|
#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
|
|
|
|
Serial.printf(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n", sector, (result) ? D_OK : D_ERROR);
|
|
|
|
#else
|
2019-11-17 13:29:33 +00:00
|
|
|
Serial.printf_P(PSTR(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n"), sector, (result) ? D_OK : D_ERROR);
|
2020-01-26 13:16:44 +00:00
|
|
|
#endif
|
2019-11-17 13:29:33 +00:00
|
|
|
delay(10);
|
|
|
|
} else {
|
|
|
|
yield();
|
|
|
|
}
|
|
|
|
OsWatchLoop();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-11 08:54:13 +01:00
|
|
|
#ifdef ESP8266
|
2018-02-24 15:37:33 +00:00
|
|
|
void SettingsErase(uint8_t type)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2018-02-24 15:37:33 +00:00
|
|
|
/*
|
2019-11-15 14:42:10 +00:00
|
|
|
For Arduino core and SDK:
|
2019-11-14 14:57:52 +00:00
|
|
|
Erase only works from flash start address to SDK recognized flash end address (flashchip->chip_size = ESP.getFlashChipSize).
|
|
|
|
Addresses above SDK recognized size (up to ESP.getFlashChipRealSize) are not accessable.
|
2019-11-15 14:42:10 +00:00
|
|
|
For Esptool:
|
2019-11-14 14:57:52 +00:00
|
|
|
The only way to erase whole flash is esptool which uses direct SPI writes to flash.
|
|
|
|
|
2019-11-15 15:58:22 +00:00
|
|
|
The default erase function is EspTool (EsptoolErase)
|
2019-11-15 14:42:10 +00:00
|
|
|
|
2019-11-14 14:57:52 +00:00
|
|
|
0 = Erase from program end until end of flash as seen by SDK
|
|
|
|
1 = Erase 16k SDK parameter area near end of flash as seen by SDK (0x0xFCxxx - 0x0xFFFFF) solving possible wifi errors
|
2019-11-18 10:17:43 +00:00
|
|
|
2 = Erase Tasmota parameter area (0x0xF3xxx - 0x0xFBFFF)
|
|
|
|
3 = Erase Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
|
2020-02-25 15:49:19 +00:00
|
|
|
4 = Erase SDK parameter area used for wifi calibration (0x0FCxxx - 0x0FCFFF)
|
2018-02-24 15:37:33 +00:00
|
|
|
*/
|
|
|
|
|
2019-02-08 13:55:45 +00:00
|
|
|
#ifndef FIRMWARE_MINIMAL
|
2017-02-19 16:49:17 +00:00
|
|
|
uint32_t _sectorStart = (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 1;
|
2019-11-18 10:17:43 +00:00
|
|
|
uint32_t _sectorEnd = ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE; // Flash size as reported by hardware
|
2018-02-24 15:37:33 +00:00
|
|
|
if (1 == type) {
|
2019-11-14 14:57:52 +00:00
|
|
|
// source Esp.cpp and core_esp8266_phy.cpp
|
2019-11-18 10:17:43 +00:00
|
|
|
_sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4; // SDK parameter area
|
2018-02-24 15:37:33 +00:00
|
|
|
}
|
2019-10-16 18:00:20 +01:00
|
|
|
else if (2 == type) {
|
2019-11-18 10:17:43 +00:00
|
|
|
_sectorStart = SETTINGS_LOCATION - CFG_ROTATES; // Tasmota parameter area (0x0F3xxx - 0x0FBFFF)
|
2019-10-16 18:00:20 +01:00
|
|
|
_sectorEnd = SETTINGS_LOCATION +1;
|
|
|
|
}
|
2019-11-18 10:17:43 +00:00
|
|
|
else if (3 == type) {
|
|
|
|
_sectorStart = SETTINGS_LOCATION - CFG_ROTATES; // Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
|
|
|
|
_sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE; // Flash size as seen by SDK
|
|
|
|
}
|
2020-02-24 12:27:22 +00:00
|
|
|
else if (4 == type) {
|
2020-02-25 15:49:19 +00:00
|
|
|
// _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4; // SDK phy area and Core calibration sector (0x0FC000)
|
2020-02-24 12:27:22 +00:00
|
|
|
_sectorStart = SETTINGS_LOCATION +1; // SDK phy area and Core calibration sector (0x0FC000)
|
|
|
|
_sectorEnd = _sectorStart +1; // SDK end of phy area and Core calibration sector (0x0FCFFF)
|
|
|
|
}
|
2020-02-25 15:49:19 +00:00
|
|
|
/*
|
2020-02-24 12:27:22 +00:00
|
|
|
else if (5 == type) {
|
|
|
|
_sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4; // SDK phy area and Core calibration sector (0xxFC000)
|
|
|
|
_sectorEnd = _sectorStart +1; // SDK end of phy area and Core calibration sector (0xxFCFFF)
|
|
|
|
}
|
2020-02-25 15:49:19 +00:00
|
|
|
*/
|
2020-02-26 12:45:46 +00:00
|
|
|
else {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-24 12:27:22 +00:00
|
|
|
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2019-11-18 10:17:43 +00:00
|
|
|
// EspErase(_sectorStart, _sectorEnd); // Arduino core and SDK - erases flash as seen by SDK
|
|
|
|
EsptoolErase(_sectorStart, _sectorEnd); // Esptool - erases flash completely
|
2019-02-08 13:55:45 +00:00
|
|
|
#endif // FIRMWARE_MINIMAL
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
2020-04-11 08:54:13 +01:00
|
|
|
#endif // ESP8266
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsSdkErase(void)
|
2018-02-24 15:37:33 +00:00
|
|
|
{
|
2020-02-24 12:27:22 +00:00
|
|
|
WiFi.disconnect(false); // Delete SDK wifi config
|
2018-02-24 15:37:33 +00:00
|
|
|
SettingsErase(1);
|
|
|
|
delay(1000);
|
|
|
|
}
|
|
|
|
|
2017-02-19 16:49:17 +00:00
|
|
|
/********************************************************************************************/
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsDefault(void)
|
2017-05-03 17:19:13 +01:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog_P(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_USE_DEFAULTS));
|
|
|
|
SettingsDefaultSet1();
|
|
|
|
SettingsDefaultSet2();
|
|
|
|
SettingsSave(2);
|
2017-05-03 17:19:13 +01:00
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsDefaultSet1(void)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2020-04-19 14:36:04 +01:00
|
|
|
memset(&Settings, 0x00, sizeof(Settings));
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.cfg_holder = (uint16_t)CFG_HOLDER;
|
2020-04-19 14:36:04 +01:00
|
|
|
Settings.cfg_size = sizeof(Settings);
|
2017-10-18 17:22:34 +01:00
|
|
|
// Settings.save_flag = 0;
|
|
|
|
Settings.version = VERSION;
|
|
|
|
// Settings.bootcount = 0;
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.cfg_crc = 0;
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsDefaultSet2(void)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2020-04-19 14:36:04 +01:00
|
|
|
memset((char*)&Settings +16, 0x00, sizeof(Settings) -16);
|
2017-10-18 17:22:34 +01:00
|
|
|
|
2020-04-21 14:53:45 +01:00
|
|
|
#ifdef ESP8266
|
|
|
|
// Settings.config_version = 0; // ESP8266 (Has been 0 for long time)
|
|
|
|
#endif // ESP8266
|
|
|
|
#ifdef ESP32
|
|
|
|
Settings.config_version = 1; // ESP32
|
|
|
|
#endif // ESP32
|
|
|
|
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.stop_flash_rotate = APP_FLASH_CYCLE;
|
|
|
|
Settings.flag.global_state = APP_ENABLE_LEDLINK;
|
|
|
|
Settings.flag3.sleep_normal = APP_NORMAL_SLEEP;
|
|
|
|
Settings.flag3.no_power_feedback = APP_NO_RELAY_SCAN;
|
|
|
|
Settings.flag3.fast_power_cycle_disable = APP_DISABLE_POWERCYCLE;
|
|
|
|
Settings.flag3.bootcount_update = DEEPSLEEP_BOOTCOUNT;
|
|
|
|
Settings.flag3.compatibility_check = OTA_COMPATIBILITY;
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.save_data = SAVE_DATA;
|
2019-10-09 16:52:52 +01:00
|
|
|
Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
|
2019-11-10 11:05:09 +00:00
|
|
|
Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET; // SetOption36
|
2019-02-24 23:48:03 +00:00
|
|
|
Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.sleep = APP_SLEEP;
|
2018-12-01 17:53:42 +00:00
|
|
|
if (Settings.sleep < 50) {
|
|
|
|
Settings.sleep = 50; // Default to 50 for sleep, for now
|
|
|
|
}
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Module
|
|
|
|
// Settings.flag.interlock = 0;
|
2019-01-27 10:02:12 +00:00
|
|
|
Settings.interlock[0] = 0xFF; // Legacy support using all relays in one interlock group
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.module = MODULE;
|
2019-02-11 18:21:49 +00:00
|
|
|
ModuleDefault(WEMOS);
|
2020-04-25 10:37:36 +01:00
|
|
|
// for (uint32_t i = 0; i < ARRAY_SIZE(Settings.my_gp.io); i++) { Settings.my_gp.io[i] = GPIO_NONE; }
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME1, FRIENDLY_NAME);
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME2, FRIENDLY_NAME"2");
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME3, FRIENDLY_NAME"3");
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME4, FRIENDLY_NAME"4");
|
|
|
|
SettingsUpdateText(SET_OTAURL, OTA_URL);
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Power
|
|
|
|
Settings.flag.save_state = SAVE_STATE;
|
|
|
|
Settings.power = APP_POWER;
|
|
|
|
Settings.poweronstate = APP_POWERON_STATE;
|
|
|
|
Settings.blinktime = APP_BLINKTIME;
|
|
|
|
Settings.blinkcount = APP_BLINKCOUNT;
|
|
|
|
Settings.ledstate = APP_LEDSTATE;
|
2019-04-10 13:26:36 +01:00
|
|
|
Settings.ledmask = APP_LEDMASK;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.pulse_timer[0] = APP_PULSETIME;
|
2019-06-30 15:44:36 +01:00
|
|
|
// for (uint32_t i = 1; i < MAX_PULSETIMERS; i++) { Settings.pulse_timer[i] = 0; }
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Serial
|
2019-12-06 14:02:05 +00:00
|
|
|
Settings.serial_config = TS_SERIAL_8N1;
|
2019-08-28 11:02:27 +01:00
|
|
|
Settings.baudrate = APP_BAUDRATE / 300;
|
|
|
|
Settings.sbaudrate = SOFT_BAUDRATE / 300;
|
2018-03-20 13:31:11 +00:00
|
|
|
Settings.serial_delimiter = 0xff;
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.seriallog_level = SERIAL_LOG_LEVEL;
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Wifi
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag3.use_wifi_scan = WIFI_SCAN_AT_RESTART;
|
|
|
|
Settings.flag3.use_wifi_rescan = WIFI_SCAN_REGULARLY;
|
2019-11-08 12:00:32 +00:00
|
|
|
Settings.wifi_output_power = 170;
|
2020-04-13 11:27:53 +01:00
|
|
|
Settings.param[P_ARP_GRATUITOUS] = WIFI_ARP_INTERVAL;
|
2018-06-02 15:59:09 +01:00
|
|
|
ParseIp(&Settings.ip_address[0], WIFI_IP_ADDRESS);
|
|
|
|
ParseIp(&Settings.ip_address[1], WIFI_GATEWAY);
|
|
|
|
ParseIp(&Settings.ip_address[2], WIFI_SUBNETMASK);
|
|
|
|
ParseIp(&Settings.ip_address[3], WIFI_DNS);
|
|
|
|
Settings.sta_config = WIFI_CONFIG_TOOL;
|
2017-10-18 17:22:34 +01:00
|
|
|
// Settings.sta_active = 0;
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_STASSID1, STA_SSID1);
|
|
|
|
SettingsUpdateText(SET_STASSID2, STA_SSID2);
|
|
|
|
SettingsUpdateText(SET_STAPWD1, STA_PASS1);
|
|
|
|
SettingsUpdateText(SET_STAPWD2, STA_PASS2);
|
|
|
|
SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Syslog
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_SYSLOG_HOST, SYS_LOG_HOST);
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.syslog_port = SYS_LOG_PORT;
|
|
|
|
Settings.syslog_level = SYS_LOG_LEVEL;
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Webserver
|
|
|
|
Settings.flag2.emulation = EMULATION;
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag3.gui_hostname_ip = GUI_SHOW_HOSTNAME;
|
|
|
|
Settings.flag3.mdns_enabled = MDNS_ENABLED;
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.webserver = WEB_SERVER;
|
|
|
|
Settings.weblog_level = WEB_LOG_LEVEL;
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_WEBPWD, WEB_PASSWORD);
|
|
|
|
SettingsUpdateText(SET_CORS, CORS_DOMAIN);
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Button
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.button_restrict = KEY_DISABLE_MULTIPRESS;
|
|
|
|
Settings.flag.button_swap = KEY_SWAP_DOUBLE_PRESS;
|
|
|
|
Settings.flag.button_single = KEY_ONLY_SINGLE_PRESS;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.param[P_HOLD_TIME] = KEY_HOLD_TIME; // Default 4 seconds hold time
|
2017-10-18 17:22:34 +01:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Switch
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < MAX_SWITCHES; i++) { Settings.switchmode[i] = SWITCH_MODE; }
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// MQTT
|
|
|
|
Settings.flag.mqtt_enabled = MQTT_USE;
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.mqtt_response = MQTT_RESULT_COMMAND;
|
|
|
|
Settings.flag.mqtt_offline = MQTT_LWT_MESSAGE;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
|
|
|
|
Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
|
|
|
|
Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
|
2020-01-21 11:36:44 +00:00
|
|
|
Settings.flag.mqtt_sensor_retain = MQTT_SENSOR_RETAIN;
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.flag.mqtt_serial = 0;
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
|
|
|
|
Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
|
|
|
|
Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
|
|
|
|
Settings.flag3.no_hold_retain = MQTT_NO_HOLD_RETAIN;
|
|
|
|
Settings.flag3.use_underscore = MQTT_INDEX_SEPARATOR;
|
|
|
|
Settings.flag3.grouptopic_mode = MQTT_GROUPTOPIC_FORMAT;
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_HOST, MQTT_HOST);
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.mqtt_port = MQTT_PORT;
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_CLIENT, MQTT_CLIENT_ID);
|
|
|
|
SettingsUpdateText(SET_MQTT_USER, MQTT_USER);
|
|
|
|
SettingsUpdateText(SET_MQTT_PWD, MQTT_PASS);
|
|
|
|
SettingsUpdateText(SET_MQTT_TOPIC, MQTT_TOPIC);
|
|
|
|
SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC);
|
|
|
|
SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC);
|
|
|
|
SettingsUpdateText(SET_MQTT_GRP_TOPIC, MQTT_GRPTOPIC);
|
|
|
|
SettingsUpdateText(SET_MQTT_FULLTOPIC, MQTT_FULLTOPIC);
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.mqtt_retry = MQTT_RETRY_SECS;
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_MQTTPREFIX1, SUB_PREFIX);
|
|
|
|
SettingsUpdateText(SET_MQTTPREFIX2, PUB_PREFIX);
|
|
|
|
SettingsUpdateText(SET_MQTTPREFIX3, PUB_PREFIX2);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT1, MQTT_STATUS_OFF);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT2, MQTT_STATUS_ON);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT3, MQTT_CMND_TOGGLE);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT4, MQTT_CMND_HOLD);
|
2018-03-09 17:08:17 +00:00
|
|
|
char fingerprint[60];
|
|
|
|
strlcpy(fingerprint, MQTT_FINGERPRINT1, sizeof(fingerprint));
|
|
|
|
char *p = fingerprint;
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < 20; i++) {
|
2018-03-09 17:08:17 +00:00
|
|
|
Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16);
|
|
|
|
}
|
|
|
|
strlcpy(fingerprint, MQTT_FINGERPRINT2, sizeof(fingerprint));
|
|
|
|
p = fingerprint;
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < 20; i++) {
|
2018-03-09 17:08:17 +00:00
|
|
|
Settings.mqtt_fingerprint[1][i] = strtol(p, &p, 16);
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.tele_period = TELE_PERIOD;
|
2019-10-04 09:24:21 +01:00
|
|
|
Settings.mqttlog_level = MQTT_LOG_LEVEL;
|
2017-10-18 17:22:34 +01:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Energy
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.no_power_on_check = ENERGY_VOLTAGE_ALWAYS;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.flag2.current_resolution = 3;
|
|
|
|
// Settings.flag2.voltage_resolution = 0;
|
|
|
|
// Settings.flag2.wattage_resolution = 0;
|
|
|
|
Settings.flag2.energy_resolution = ENERGY_RESOLUTION;
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag3.dds2382_model = ENERGY_DDS2382_MODE;
|
|
|
|
Settings.flag3.hardware_energy_total = ENERGY_HARDWARE_TOTALS;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.param[P_MAX_POWER_RETRY] = MAX_POWER_RETRY;
|
2019-05-24 14:04:48 +01:00
|
|
|
// Settings.energy_power_delta = 0;
|
2018-02-03 22:25:05 +00:00
|
|
|
Settings.energy_power_calibration = HLW_PREF_PULSE;
|
|
|
|
Settings.energy_voltage_calibration = HLW_UREF_PULSE;
|
|
|
|
Settings.energy_current_calibration = HLW_IREF_PULSE;
|
2017-12-16 14:51:45 +00:00
|
|
|
// Settings.energy_kWhtoday = 0;
|
|
|
|
// Settings.energy_kWhyesterday = 0;
|
|
|
|
// Settings.energy_kWhdoy = 0;
|
|
|
|
// Settings.energy_min_power = 0;
|
|
|
|
// Settings.energy_max_power = 0;
|
|
|
|
// Settings.energy_min_voltage = 0;
|
|
|
|
// Settings.energy_max_voltage = 0;
|
|
|
|
// Settings.energy_min_current = 0;
|
|
|
|
// Settings.energy_max_current = 0;
|
2018-03-21 08:27:05 +00:00
|
|
|
// Settings.energy_max_power_limit = 0; // MaxPowerLimit
|
2017-12-16 14:51:45 +00:00
|
|
|
Settings.energy_max_power_limit_hold = MAX_POWER_HOLD;
|
|
|
|
Settings.energy_max_power_limit_window = MAX_POWER_WINDOW;
|
2018-03-21 08:27:05 +00:00
|
|
|
// Settings.energy_max_power_safe_limit = 0; // MaxSafePowerLimit
|
2017-12-16 14:51:45 +00:00
|
|
|
Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD;
|
|
|
|
Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW;
|
2018-03-21 08:27:05 +00:00
|
|
|
// Settings.energy_max_energy = 0; // MaxEnergy
|
|
|
|
// Settings.energy_max_energy_start = 0; // MaxEnergyStart
|
2017-12-16 14:51:45 +00:00
|
|
|
// Settings.energy_kWhtotal = 0;
|
|
|
|
RtcSettings.energy_kWhtotal = 0;
|
2019-08-25 13:58:45 +01:00
|
|
|
// memset((char*)&Settings.energy_usage, 0x00, sizeof(Settings.energy_usage));
|
|
|
|
memset((char*)&RtcSettings.energy_usage, 0x00, sizeof(RtcSettings.energy_usage));
|
2019-07-08 15:50:23 +01:00
|
|
|
Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
|
2017-05-08 12:21:45 +01:00
|
|
|
|
2019-05-27 10:56:14 +01:00
|
|
|
// IRRemote
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.ir_receive_decimal = IR_DATA_RADIX;
|
|
|
|
Settings.flag3.receive_raw = IR_ADD_RAW_DATA;
|
2019-05-27 10:56:14 +01:00
|
|
|
Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
|
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// RF Bridge
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.rf_receive_decimal = RF_DATA_RADIX;
|
2019-06-30 15:44:36 +01:00
|
|
|
// for (uint32_t i = 0; i < 17; i++) { Settings.rf_code[i][0] = 0; }
|
2017-10-18 17:22:34 +01:00
|
|
|
memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Domoticz
|
|
|
|
Settings.domoticz_update_timer = DOMOTICZ_UPDATE_TIMER;
|
2019-06-30 15:44:36 +01:00
|
|
|
// for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.domoticz_relay_idx[i] = 0;
|
|
|
|
// Settings.domoticz_key_idx[i] = 0;
|
|
|
|
// Settings.domoticz_switch_idx[i] = 0;
|
|
|
|
// }
|
2019-06-30 15:44:36 +01:00
|
|
|
// for (uint32_t i = 0; i < MAX_DOMOTICZ_SNS_IDX; i++) {
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.domoticz_sensor_idx[i] = 0;
|
|
|
|
// }
|
2017-10-23 11:18:15 +01:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Sensor
|
|
|
|
Settings.flag.temperature_conversion = TEMP_CONVERSION;
|
2018-11-04 15:55:12 +00:00
|
|
|
Settings.flag.pressure_conversion = PRESSURE_CONVERSION;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.flag2.pressure_resolution = PRESSURE_RESOLUTION;
|
|
|
|
Settings.flag2.humidity_resolution = HUMIDITY_RESOLUTION;
|
|
|
|
Settings.flag2.temperature_resolution = TEMP_RESOLUTION;
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag3.ds18x20_internal_pullup = DS18X20_PULL_UP;
|
|
|
|
Settings.flag3.counter_reset_on_tele = COUNTER_RESET;
|
2017-10-26 15:33:33 +01:00
|
|
|
// Settings.altitude = 0;
|
2017-11-11 11:33:30 +00:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Rules
|
2018-11-04 15:55:12 +00:00
|
|
|
// Settings.rule_enabled = 0;
|
|
|
|
// Settings.rule_once = 0;
|
2019-06-30 15:44:36 +01:00
|
|
|
// for (uint32_t i = 1; i < MAX_RULE_SETS; i++) { Settings.rules[i][0] = '\0'; }
|
2018-11-27 00:16:47 +00:00
|
|
|
Settings.flag2.calc_resolution = CALC_RESOLUTION;
|
2017-03-12 17:36:33 +00:00
|
|
|
|
2020-01-21 11:36:44 +00:00
|
|
|
// Timer
|
|
|
|
Settings.flag3.timers_enable = TIMERS_ENABLED;
|
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Home Assistant
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.hass_light = HASS_AS_LIGHT;
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Knx
|
2020-01-21 11:36:44 +00:00
|
|
|
Settings.flag.knx_enabled = KNX_ENABLED;
|
|
|
|
Settings.flag.knx_enable_enhancement = KNX_ENHANCED;
|
2017-03-12 17:36:33 +00:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Light
|
2020-01-20 17:49:57 +00:00
|
|
|
Settings.flag.pwm_control = LIGHT_MODE;
|
|
|
|
Settings.flag.ws_clock_reverse = LIGHT_CLOCK_DIRECTION;
|
|
|
|
Settings.flag.light_signal = LIGHT_PAIRS_CO2;
|
|
|
|
Settings.flag.not_power_linked = LIGHT_POWER_CONTROL;
|
|
|
|
Settings.flag.decimal_text = LIGHT_COLOR_RADIX;
|
|
|
|
Settings.flag3.pwm_multi_channels = LIGHT_CHANNEL_MODE;
|
|
|
|
Settings.flag3.slider_dimmer_stay_on = LIGHT_SLIDER_POWER;
|
|
|
|
Settings.flag4.alexa_ct_range = LIGHT_ALEXA_CT_RANGE;
|
2020-04-22 18:43:57 +01:00
|
|
|
Settings.flag4.pwm_ct_mode = LIGHT_PWM_CT_MODE;
|
2020-01-20 17:49:57 +00:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.pwm_frequency = PWM_FREQ;
|
|
|
|
Settings.pwm_range = PWM_RANGE;
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < MAX_PWMS; i++) {
|
2019-11-08 18:08:39 +00:00
|
|
|
Settings.light_color[i] = DEFAULT_LIGHT_COMPONENT;
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.pwm_value[i] = 0;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2019-04-25 17:50:04 +01:00
|
|
|
Settings.light_correction = 1;
|
2019-11-08 18:08:39 +00:00
|
|
|
Settings.light_dimmer = DEFAULT_LIGHT_DIMMER;
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.light_fade = 0;
|
2017-10-26 15:33:33 +01:00
|
|
|
Settings.light_speed = 1;
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.light_scheme = 0;
|
2017-10-26 15:33:33 +01:00
|
|
|
Settings.light_width = 1;
|
2018-06-02 15:59:09 +01:00
|
|
|
// Settings.light_wakeup = 0;
|
|
|
|
Settings.light_pixels = WS2812_LEDS;
|
|
|
|
// Settings.light_rotation = 0;
|
2019-10-30 09:57:14 +00:00
|
|
|
Settings.ws_width[WS_SECOND] = 1;
|
|
|
|
Settings.ws_color[WS_SECOND][WS_RED] = 255;
|
|
|
|
// Settings.ws_color[WS_SECOND][WS_GREEN] = 0;
|
|
|
|
Settings.ws_color[WS_SECOND][WS_BLUE] = 255;
|
|
|
|
Settings.ws_width[WS_MINUTE] = 3;
|
|
|
|
// Settings.ws_color[WS_MINUTE][WS_RED] = 0;
|
|
|
|
Settings.ws_color[WS_MINUTE][WS_GREEN] = 255;
|
|
|
|
// Settings.ws_color[WS_MINUTE][WS_BLUE] = 0;
|
|
|
|
Settings.ws_width[WS_HOUR] = 5;
|
|
|
|
Settings.ws_color[WS_HOUR][WS_RED] = 255;
|
|
|
|
// Settings.ws_color[WS_HOUR][WS_GREEN] = 0;
|
|
|
|
// Settings.ws_color[WS_HOUR][WS_BLUE] = 0;
|
2017-02-21 17:14:33 +00:00
|
|
|
|
2019-10-10 15:53:01 +01:00
|
|
|
Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
|
|
|
|
Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
|
2019-08-25 22:10:19 +01:00
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
// Display
|
2019-10-30 09:57:14 +00:00
|
|
|
// Settings.display_model = 0;
|
|
|
|
Settings.display_mode = 1;
|
|
|
|
Settings.display_refresh = 2;
|
|
|
|
Settings.display_rows = 2;
|
|
|
|
Settings.display_cols[0] = 16;
|
|
|
|
Settings.display_cols[1] = 8;
|
|
|
|
Settings.display_dimmer = 1;
|
|
|
|
Settings.display_size = 1;
|
|
|
|
Settings.display_font = 1;
|
|
|
|
// Settings.display_rotate = 0;
|
|
|
|
Settings.display_address[0] = MTX_ADDRESS1;
|
|
|
|
Settings.display_address[1] = MTX_ADDRESS2;
|
|
|
|
Settings.display_address[2] = MTX_ADDRESS3;
|
|
|
|
Settings.display_address[3] = MTX_ADDRESS4;
|
|
|
|
Settings.display_address[4] = MTX_ADDRESS5;
|
|
|
|
Settings.display_address[5] = MTX_ADDRESS6;
|
|
|
|
Settings.display_address[6] = MTX_ADDRESS7;
|
|
|
|
Settings.display_address[7] = MTX_ADDRESS8;
|
2018-06-02 15:59:09 +01:00
|
|
|
|
|
|
|
// Time
|
2018-11-01 12:00:05 +00:00
|
|
|
if (((APP_TIMEZONE > -14) && (APP_TIMEZONE < 15)) || (99 == APP_TIMEZONE)) {
|
|
|
|
Settings.timezone = APP_TIMEZONE;
|
|
|
|
Settings.timezone_minutes = 0;
|
|
|
|
} else {
|
|
|
|
Settings.timezone = APP_TIMEZONE / 60;
|
|
|
|
Settings.timezone_minutes = abs(APP_TIMEZONE % 60);
|
|
|
|
}
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_NTPSERVER1, NTP_SERVER1);
|
|
|
|
SettingsUpdateText(SET_NTPSERVER2, NTP_SERVER2);
|
|
|
|
SettingsUpdateText(SET_NTPSERVER3, NTP_SERVER3);
|
2020-01-12 12:10:21 +00:00
|
|
|
for (uint32_t i = 0; i < MAX_NTP_SERVERS; i++) {
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_NTPSERVER1 +i, ReplaceCommaWithDot(SettingsText(SET_NTPSERVER1 +i)));
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.latitude = (int)((double)LATITUDE * 1000000);
|
|
|
|
Settings.longitude = (int)((double)LONGITUDE * 1000000);
|
2019-10-30 09:57:14 +00:00
|
|
|
SettingsResetStd();
|
|
|
|
SettingsResetDst();
|
2018-08-27 11:01:20 +01:00
|
|
|
|
|
|
|
Settings.button_debounce = KEY_DEBOUNCE_TIME;
|
|
|
|
Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
|
2018-09-29 15:55:53 +01:00
|
|
|
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t j = 0; j < 5; j++) {
|
2018-09-29 15:55:53 +01:00
|
|
|
Settings.rgbwwTable[j] = 255;
|
|
|
|
}
|
2018-11-06 16:33:51 +00:00
|
|
|
|
2019-10-18 09:32:48 +01:00
|
|
|
Settings.novasds_startingoffset = STARTING_OFFSET;
|
2019-03-28 11:06:48 +00:00
|
|
|
|
2019-04-09 12:56:19 +01:00
|
|
|
SettingsDefaultWebColor();
|
|
|
|
|
2019-05-24 11:28:09 +01:00
|
|
|
memset(&Settings.monitors, 0xFF, 20); // Enable all possible monitors, displays and sensors
|
2019-11-03 16:54:39 +00:00
|
|
|
SettingsEnableAllI2cDrivers();
|
2020-01-20 17:49:57 +00:00
|
|
|
|
|
|
|
// Tuya
|
|
|
|
Settings.flag3.tuya_apply_o20 = TUYA_SETOPTION_20;
|
|
|
|
Settings.flag3.tuya_serial_mqtt_publish = MQTT_TUYA_RECEIVED;
|
|
|
|
|
|
|
|
Settings.flag3.buzzer_enable = BUZZER_ENABLE;
|
|
|
|
Settings.flag3.shutter_mode = SHUTTER_SUPPORT;
|
|
|
|
Settings.flag3.pcf8574_ports_inverted = PCF8574_INVERT_PORTS;
|
|
|
|
Settings.flag4.zigbee_use_names = ZIGBEE_FRIENDLY_NAMES;
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
|
2018-06-02 15:59:09 +01:00
|
|
|
/********************************************************************************************/
|
2017-02-19 16:49:17 +00:00
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsResetStd(void)
|
2018-05-13 18:43:48 +01:00
|
|
|
{
|
2018-05-14 22:22:29 +01:00
|
|
|
Settings.tflag[0].hemis = TIME_STD_HEMISPHERE;
|
|
|
|
Settings.tflag[0].week = TIME_STD_WEEK;
|
|
|
|
Settings.tflag[0].dow = TIME_STD_DAY;
|
|
|
|
Settings.tflag[0].month = TIME_STD_MONTH;
|
|
|
|
Settings.tflag[0].hour = TIME_STD_HOUR;
|
|
|
|
Settings.toffset[0] = TIME_STD_OFFSET;
|
|
|
|
}
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsResetDst(void)
|
2018-05-14 22:22:29 +01:00
|
|
|
{
|
|
|
|
Settings.tflag[1].hemis = TIME_DST_HEMISPHERE;
|
|
|
|
Settings.tflag[1].week = TIME_DST_WEEK;
|
|
|
|
Settings.tflag[1].dow = TIME_DST_DAY;
|
|
|
|
Settings.tflag[1].month = TIME_DST_MONTH;
|
|
|
|
Settings.tflag[1].hour = TIME_DST_HOUR;
|
|
|
|
Settings.toffset[1] = TIME_DST_OFFSET;
|
|
|
|
}
|
|
|
|
|
2019-04-09 12:56:19 +01:00
|
|
|
void SettingsDefaultWebColor(void)
|
|
|
|
{
|
|
|
|
char scolor[10];
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < COL_LAST; i++) {
|
2019-04-09 12:56:19 +01:00
|
|
|
WebHexCode(i, GetTextIndexed(scolor, sizeof(scolor), i, kWebColors));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-03 16:54:39 +00:00
|
|
|
void SettingsEnableAllI2cDrivers(void)
|
|
|
|
{
|
|
|
|
Settings.i2c_drivers[0] = 0xFFFFFFFF;
|
|
|
|
Settings.i2c_drivers[1] = 0xFFFFFFFF;
|
|
|
|
Settings.i2c_drivers[2] = 0xFFFFFFFF;
|
|
|
|
}
|
|
|
|
|
2017-02-19 16:49:17 +00:00
|
|
|
/********************************************************************************************/
|
|
|
|
|
2018-11-14 13:32:09 +00:00
|
|
|
void SettingsDelta(void)
|
2017-02-19 16:49:17 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
if (Settings.version != VERSION) { // Fix version dependent changes
|
2020-04-10 17:24:08 +01:00
|
|
|
|
|
|
|
#ifdef ESP8266
|
2018-06-02 15:59:09 +01:00
|
|
|
if (Settings.version < 0x06000000) {
|
2020-04-19 14:36:04 +01:00
|
|
|
Settings.cfg_size = sizeof(Settings);
|
2018-06-02 15:59:09 +01:00
|
|
|
Settings.cfg_crc = GetSettingsCrc();
|
|
|
|
}
|
2018-06-28 13:28:14 +01:00
|
|
|
if (Settings.version < 0x06000002) {
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
|
2018-06-28 13:28:14 +01:00
|
|
|
if (i < 4) {
|
2019-01-25 16:46:27 +00:00
|
|
|
Settings.switchmode[i] = Settings.interlock[i];
|
2018-06-28 13:28:14 +01:00
|
|
|
} else {
|
|
|
|
Settings.switchmode[i] = SWITCH_MODE;
|
|
|
|
}
|
|
|
|
}
|
2020-04-25 10:37:36 +01:00
|
|
|
for (uint32_t i = 0; i < ARRAY_SIZE(Settings.my_gp.io); i++) {
|
2018-06-28 13:28:14 +01:00
|
|
|
if (Settings.my_gp.io[i] >= GPIO_SWT5) { // Move up from GPIO_SWT5 to GPIO_KEY1
|
|
|
|
Settings.my_gp.io[i] += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-07-03 11:48:56 +01:00
|
|
|
if (Settings.version < 0x06000003) {
|
2018-11-04 15:55:12 +00:00
|
|
|
Settings.flag.mqtt_serial_raw = 0; // Was rules_enabled until 5.14.0b
|
|
|
|
Settings.flag.pressure_conversion = 0; // Was rules_once until 5.14.0b
|
2018-07-03 11:48:56 +01:00
|
|
|
Settings.flag3.data = 0;
|
|
|
|
}
|
2018-07-20 15:12:37 +01:00
|
|
|
if (Settings.version < 0x06010103) {
|
|
|
|
Settings.flag3.timers_enable = 1;
|
|
|
|
}
|
2018-08-27 11:01:20 +01:00
|
|
|
if (Settings.version < 0x0601010C) {
|
|
|
|
Settings.button_debounce = KEY_DEBOUNCE_TIME;
|
|
|
|
Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
|
|
|
|
}
|
2018-09-29 15:55:53 +01:00
|
|
|
if (Settings.version < 0x0602010A) {
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t j = 0; j < 5; j++) {
|
2018-09-29 15:55:53 +01:00
|
|
|
Settings.rgbwwTable[j] = 255;
|
|
|
|
}
|
|
|
|
}
|
2018-11-01 12:00:05 +00:00
|
|
|
if (Settings.version < 0x06030002) {
|
|
|
|
Settings.timezone_minutes = 0;
|
|
|
|
}
|
2018-11-06 16:33:51 +00:00
|
|
|
if (Settings.version < 0x06030004) {
|
2019-05-24 11:28:09 +01:00
|
|
|
memset(&Settings.monitors, 0xFF, 20); // Enable all possible monitors, displays and sensors
|
2018-11-06 16:33:51 +00:00
|
|
|
}
|
2018-12-01 17:53:42 +00:00
|
|
|
if (Settings.version < 0x0603000E) {
|
|
|
|
Settings.flag2.calc_resolution = CALC_RESOLUTION;
|
|
|
|
}
|
2018-12-01 16:47:25 +00:00
|
|
|
if (Settings.version < 0x0603000F) {
|
|
|
|
if (Settings.sleep < 50) {
|
2018-12-01 17:53:42 +00:00
|
|
|
Settings.sleep = 50; // Default to 50 for sleep, for now
|
2018-12-01 16:47:25 +00:00
|
|
|
}
|
2018-11-18 15:49:02 +00:00
|
|
|
}
|
2019-01-03 16:30:54 +00:00
|
|
|
if (Settings.version < 0x06040105) {
|
2019-01-14 09:57:01 +00:00
|
|
|
Settings.flag3.mdns_enabled = MDNS_ENABLED;
|
2019-01-03 16:30:54 +00:00
|
|
|
Settings.param[P_MDNS_DELAYED_START] = 0;
|
|
|
|
}
|
2019-01-25 16:46:27 +00:00
|
|
|
if (Settings.version < 0x0604010B) {
|
2019-01-27 10:02:12 +00:00
|
|
|
Settings.interlock[0] = 0xFF; // Legacy support using all relays in one interlock group
|
2019-06-30 15:44:36 +01:00
|
|
|
for (uint32_t i = 1; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
|
2019-01-25 16:46:27 +00:00
|
|
|
}
|
2019-01-30 13:34:31 +00:00
|
|
|
if (Settings.version < 0x0604010D) {
|
2019-11-10 11:05:09 +00:00
|
|
|
Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET; // SetOption36
|
2019-01-30 13:34:31 +00:00
|
|
|
}
|
2019-02-11 18:21:49 +00:00
|
|
|
if (Settings.version < 0x06040110) {
|
|
|
|
ModuleDefault(WEMOS);
|
|
|
|
}
|
2019-02-25 10:14:33 +00:00
|
|
|
if (Settings.version < 0x06040113) {
|
2019-02-24 23:48:03 +00:00
|
|
|
Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
|
|
|
|
}
|
2019-03-28 11:06:48 +00:00
|
|
|
if (Settings.version < 0x06050003) {
|
2019-10-18 09:32:48 +01:00
|
|
|
Settings.novasds_startingoffset = STARTING_OFFSET;
|
2019-03-28 11:06:48 +00:00
|
|
|
}
|
2019-04-09 12:56:19 +01:00
|
|
|
if (Settings.version < 0x06050006) {
|
|
|
|
SettingsDefaultWebColor();
|
|
|
|
}
|
2019-04-10 13:26:36 +01:00
|
|
|
if (Settings.version < 0x06050007) {
|
|
|
|
Settings.ledmask = APP_LEDMASK;
|
|
|
|
}
|
2019-05-13 14:56:01 +01:00
|
|
|
if (Settings.version < 0x0605000A) {
|
|
|
|
Settings.my_adc0 = ADC0_NONE;
|
|
|
|
}
|
2019-05-27 10:56:14 +01:00
|
|
|
if (Settings.version < 0x0605000D) {
|
|
|
|
Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
|
|
|
|
}
|
2019-07-08 13:16:33 +01:00
|
|
|
if (Settings.version < 0x06060001) {
|
|
|
|
Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
|
|
|
|
}
|
2019-08-25 13:58:45 +01:00
|
|
|
if (Settings.version < 0x06060007) {
|
2020-04-19 14:36:04 +01:00
|
|
|
memset((char*)&Settings +0xE00, 0x00, sizeof(Settings) -0xE00);
|
2019-08-27 16:01:12 +01:00
|
|
|
}
|
|
|
|
if (Settings.version < 0x06060008) {
|
2019-08-25 22:10:19 +01:00
|
|
|
// Move current tuya dimmer range to the new param.
|
2019-10-25 07:05:12 +01:00
|
|
|
if (Settings.flag3.tuya_serial_mqtt_publish) { // ex Settings.flag3.ex_tuya_dimmer_range_255 SetOption
|
2019-10-10 15:53:01 +01:00
|
|
|
Settings.param[P_ex_DIMMER_MAX] = 100;
|
2019-08-25 22:10:19 +01:00
|
|
|
} else {
|
2019-10-10 15:53:01 +01:00
|
|
|
Settings.param[P_ex_DIMMER_MAX] = 255;
|
2019-08-25 22:10:19 +01:00
|
|
|
}
|
2019-08-25 13:58:45 +01:00
|
|
|
}
|
2019-08-28 11:02:27 +01:00
|
|
|
if (Settings.version < 0x06060009) {
|
2019-12-13 11:05:07 +00:00
|
|
|
Settings.baudrate = APP_BAUDRATE / 300;
|
|
|
|
Settings.sbaudrate = SOFT_BAUDRATE / 300;
|
2019-08-28 11:02:27 +01:00
|
|
|
}
|
2019-09-03 11:23:44 +01:00
|
|
|
if (Settings.version < 0x0606000A) {
|
|
|
|
uint8_t tuyaindex = 0;
|
2019-10-18 14:18:39 +01:00
|
|
|
if (Settings.param[P_BACKLOG_DELAY] > 0) { // ex SetOption34
|
2019-09-05 09:41:08 +01:00
|
|
|
Settings.tuya_fnid_map[tuyaindex].fnid = 21; // TUYA_MCU_FUNC_DIMMER - Move Tuya Dimmer Id to Map
|
2019-10-09 16:52:52 +01:00
|
|
|
Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_BACKLOG_DELAY];
|
2019-09-03 11:23:44 +01:00
|
|
|
tuyaindex++;
|
2019-10-18 14:18:39 +01:00
|
|
|
} else if (Settings.flag3.fast_power_cycle_disable == 1) { // ex SetOption65
|
2019-09-05 09:41:08 +01:00
|
|
|
Settings.tuya_fnid_map[tuyaindex].fnid = 11; // TUYA_MCU_FUNC_REL1 - Create FnID for Switches
|
2019-09-03 11:23:44 +01:00
|
|
|
Settings.tuya_fnid_map[tuyaindex].dpid = 1;
|
|
|
|
tuyaindex++;
|
|
|
|
}
|
2020-04-07 13:07:00 +01:00
|
|
|
if (Settings.param[P_ARP_GRATUITOUS] > 0) { // Was P_ex_TUYA_RELAYS
|
|
|
|
for (uint8_t i = 0 ; i < Settings.param[P_ARP_GRATUITOUS]; i++) { // ex SetOption41
|
2019-09-05 09:41:08 +01:00
|
|
|
Settings.tuya_fnid_map[tuyaindex].fnid = 12 + i; // TUYA_MCU_FUNC_REL2 - Create FnID for Switches
|
2019-09-03 11:23:44 +01:00
|
|
|
Settings.tuya_fnid_map[tuyaindex].dpid = i + 2;
|
|
|
|
tuyaindex++;
|
|
|
|
}
|
|
|
|
}
|
2019-09-05 09:41:08 +01:00
|
|
|
if (Settings.param[P_ex_TUYA_POWER_ID] > 0) { // ex SetOption46
|
|
|
|
Settings.tuya_fnid_map[tuyaindex].fnid = 31; // TUYA_MCU_FUNC_POWER - Move Tuya Power Id to Map
|
|
|
|
Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_POWER_ID];
|
2019-09-03 11:23:44 +01:00
|
|
|
tuyaindex++;
|
|
|
|
}
|
2019-09-05 09:41:08 +01:00
|
|
|
if (Settings.param[P_ex_TUYA_VOLTAGE_ID] > 0) { // ex SetOption44
|
|
|
|
Settings.tuya_fnid_map[tuyaindex].fnid = 33; // TUYA_MCU_FUNC_VOLTAGE - Move Tuya Voltage Id to Map
|
|
|
|
Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_VOLTAGE_ID];
|
2019-09-03 11:23:44 +01:00
|
|
|
tuyaindex++;
|
|
|
|
}
|
2019-09-05 09:41:08 +01:00
|
|
|
if (Settings.param[P_ex_TUYA_CURRENT_ID] > 0) { // ex SetOption45
|
|
|
|
Settings.tuya_fnid_map[tuyaindex].fnid = 32; // TUYA_MCU_FUNC_CURRENT - Move Tuya Current Id to Map
|
|
|
|
Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_CURRENT_ID];
|
2019-09-03 11:23:44 +01:00
|
|
|
}
|
|
|
|
}
|
2019-09-10 15:18:23 +01:00
|
|
|
if (Settings.version < 0x0606000C) {
|
2019-10-31 11:12:48 +00:00
|
|
|
memset((char*)&Settings +0x1D6, 0x00, 16);
|
2019-09-10 15:18:23 +01:00
|
|
|
}
|
2019-10-07 09:34:40 +01:00
|
|
|
if (Settings.version < 0x0606000F) {
|
2019-12-21 17:59:00 +00:00
|
|
|
Settings.ex_shutter_accuracy = 0;
|
|
|
|
Settings.ex_mqttlog_level = MQTT_LOG_LEVEL;
|
2019-10-07 09:34:40 +01:00
|
|
|
}
|
2019-10-09 16:52:52 +01:00
|
|
|
if (Settings.version < 0x06060011) {
|
|
|
|
Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
|
|
|
|
}
|
2019-10-10 15:53:01 +01:00
|
|
|
if (Settings.version < 0x06060012) {
|
|
|
|
Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
|
2019-10-11 10:23:53 +01:00
|
|
|
Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
|
2019-10-10 15:53:01 +01:00
|
|
|
if (TUYA_DIMMER == Settings.module) {
|
|
|
|
if (Settings.flag3.ex_tuya_dimmer_min_limit) {
|
|
|
|
Settings.dimmer_hw_min = 25;
|
|
|
|
} else {
|
|
|
|
Settings.dimmer_hw_min = 1;
|
|
|
|
}
|
2019-10-11 10:23:53 +01:00
|
|
|
Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
|
|
|
|
}
|
|
|
|
else if (PS_16_DZ == Settings.module) {
|
|
|
|
Settings.dimmer_hw_min = 10;
|
|
|
|
Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
|
2019-10-10 15:53:01 +01:00
|
|
|
}
|
|
|
|
}
|
2019-10-18 14:18:39 +01:00
|
|
|
if (Settings.version < 0x06060014) {
|
|
|
|
// Clear unused parameters for future use
|
2019-10-25 17:27:14 +01:00
|
|
|
/*
|
2019-10-25 07:05:12 +01:00
|
|
|
Settings.flag3.tuya_serial_mqtt_publish = 0; // ex Settings.flag3.ex_tuya_dimmer_range_255
|
2019-10-18 14:18:39 +01:00
|
|
|
Settings.flag3.ex_tuya_dimmer_min_limit = 0;
|
|
|
|
Settings.param[P_ex_TUYA_RELAYS] = 0;
|
|
|
|
Settings.param[P_ex_DIMMER_MAX] = 0;
|
|
|
|
Settings.param[P_ex_TUYA_VOLTAGE_ID] = 0;
|
|
|
|
Settings.param[P_ex_TUYA_CURRENT_ID] = 0;
|
|
|
|
Settings.param[P_ex_TUYA_POWER_ID] = 0;
|
|
|
|
Settings.ex_baudrate = 0;
|
|
|
|
Settings.ex_sbaudrate = 0;
|
2019-10-25 17:27:14 +01:00
|
|
|
*/
|
2019-10-18 14:18:39 +01:00
|
|
|
Settings.flag3.fast_power_cycle_disable = 0;
|
2019-10-18 14:33:58 +01:00
|
|
|
Settings.energy_power_delta = Settings.ex_energy_power_delta;
|
|
|
|
Settings.ex_energy_power_delta = 0;
|
2019-10-18 14:18:39 +01:00
|
|
|
}
|
2019-10-22 15:34:25 +01:00
|
|
|
if (Settings.version < 0x06060015) {
|
2019-12-22 10:52:54 +00:00
|
|
|
if ((EX_WIFI_SMARTCONFIG == Settings.ex_sta_config) || (EX_WIFI_WPSCONFIG == Settings.ex_sta_config)) {
|
2019-12-21 17:59:00 +00:00
|
|
|
Settings.ex_sta_config = WIFI_MANAGER;
|
2019-10-22 15:34:25 +01:00
|
|
|
}
|
|
|
|
}
|
2019-10-10 15:53:01 +01:00
|
|
|
|
2019-11-02 12:25:23 +00:00
|
|
|
if (Settings.version < 0x07000002) {
|
2019-11-02 13:50:24 +00:00
|
|
|
Settings.web_color2[0][0] = Settings.web_color[0][0];
|
|
|
|
Settings.web_color2[0][1] = Settings.web_color[0][1];
|
|
|
|
Settings.web_color2[0][2] = Settings.web_color[0][2];
|
2019-11-02 12:25:23 +00:00
|
|
|
}
|
2019-11-03 16:54:39 +00:00
|
|
|
if (Settings.version < 0x07000003) {
|
|
|
|
SettingsEnableAllI2cDrivers();
|
|
|
|
}
|
2019-11-08 12:00:32 +00:00
|
|
|
if (Settings.version < 0x07000004) {
|
2019-12-21 17:59:00 +00:00
|
|
|
Settings.ex_wifi_output_power = 170;
|
2019-11-08 12:00:32 +00:00
|
|
|
}
|
2019-12-06 14:02:05 +00:00
|
|
|
if (Settings.version < 0x07010202) {
|
2019-12-21 17:59:00 +00:00
|
|
|
Settings.ex_serial_config = TS_SERIAL_8N1;
|
2019-12-06 14:02:05 +00:00
|
|
|
}
|
2019-11-29 17:28:25 +00:00
|
|
|
if (Settings.version < 0x07010204) {
|
2020-04-14 16:18:34 +01:00
|
|
|
if (Settings.flag3.mqtt_buttons == 1) {
|
|
|
|
strlcpy(Settings.ex_cors_domain, CORS_ENABLED_ALL, sizeof(Settings.ex_cors_domain));
|
|
|
|
} else {
|
|
|
|
Settings.ex_cors_domain[0] = 0;
|
|
|
|
}
|
2019-11-29 17:28:25 +00:00
|
|
|
}
|
2019-12-13 11:05:07 +00:00
|
|
|
if (Settings.version < 0x07010205) {
|
|
|
|
Settings.seriallog_level = Settings.ex_seriallog_level; // 09E -> 452
|
|
|
|
Settings.sta_config = Settings.ex_sta_config; // 09F -> EC7
|
|
|
|
Settings.sta_active = Settings.ex_sta_active; // 0A0 -> EC8
|
|
|
|
memcpy((char*)&Settings.rule_stop, (char*)&Settings.ex_rule_stop, 47); // 1A7 -> EC9
|
|
|
|
}
|
2019-12-14 12:16:55 +00:00
|
|
|
if (Settings.version < 0x07010206) {
|
|
|
|
Settings.flag4 = Settings.ex_flag4; // 1E0 -> EF8
|
|
|
|
Settings.mqtt_port = Settings.ex_mqtt_port; // 20A -> EFC
|
|
|
|
memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5); // 1E4 -> EFE
|
|
|
|
}
|
2019-12-21 14:37:36 +00:00
|
|
|
if (Settings.version < 0x08000000) {
|
2019-12-22 15:53:51 +00:00
|
|
|
char temp[strlen(Settings.text_pool) +1]; strncpy(temp, Settings.text_pool, sizeof(temp)); // Was ota_url
|
|
|
|
char temp21[strlen(Settings.ex_mqtt_prefix[0]) +1]; strncpy(temp21, Settings.ex_mqtt_prefix[0], sizeof(temp21));
|
|
|
|
char temp22[strlen(Settings.ex_mqtt_prefix[1]) +1]; strncpy(temp22, Settings.ex_mqtt_prefix[1], sizeof(temp22));
|
|
|
|
char temp23[strlen(Settings.ex_mqtt_prefix[2]) +1]; strncpy(temp23, Settings.ex_mqtt_prefix[2], sizeof(temp23));
|
|
|
|
char temp31[strlen(Settings.ex_sta_ssid[0]) +1]; strncpy(temp31, Settings.ex_sta_ssid[0], sizeof(temp31));
|
|
|
|
char temp32[strlen(Settings.ex_sta_ssid[1]) +1]; strncpy(temp32, Settings.ex_sta_ssid[1], sizeof(temp32));
|
|
|
|
char temp41[strlen(Settings.ex_sta_pwd[0]) +1]; strncpy(temp41, Settings.ex_sta_pwd[0], sizeof(temp41));
|
|
|
|
char temp42[strlen(Settings.ex_sta_pwd[1]) +1]; strncpy(temp42, Settings.ex_sta_pwd[1], sizeof(temp42));
|
|
|
|
char temp5[strlen(Settings.ex_hostname) +1]; strncpy(temp5, Settings.ex_hostname, sizeof(temp5));
|
|
|
|
char temp6[strlen(Settings.ex_syslog_host) +1]; strncpy(temp6, Settings.ex_syslog_host, sizeof(temp6));
|
|
|
|
char temp7[strlen(Settings.ex_mqtt_host) +1]; strncpy(temp7, Settings.ex_mqtt_host, sizeof(temp7));
|
|
|
|
char temp8[strlen(Settings.ex_mqtt_client) +1]; strncpy(temp8, Settings.ex_mqtt_client, sizeof(temp8));
|
|
|
|
char temp9[strlen(Settings.ex_mqtt_user) +1]; strncpy(temp9, Settings.ex_mqtt_user, sizeof(temp9));
|
|
|
|
char temp10[strlen(Settings.ex_mqtt_pwd) +1]; strncpy(temp10, Settings.ex_mqtt_pwd, sizeof(temp10));
|
|
|
|
char temp11[strlen(Settings.ex_mqtt_topic) +1]; strncpy(temp11, Settings.ex_mqtt_topic, sizeof(temp11));
|
|
|
|
char temp12[strlen(Settings.ex_button_topic) +1]; strncpy(temp12, Settings.ex_button_topic, sizeof(temp12));
|
|
|
|
char temp13[strlen(Settings.ex_mqtt_grptopic) +1]; strncpy(temp13, Settings.ex_mqtt_grptopic, sizeof(temp13));
|
|
|
|
|
|
|
|
memset(Settings.text_pool, 0x00, settings_text_size);
|
2019-12-16 14:13:57 +00:00
|
|
|
SettingsUpdateText(SET_OTAURL, temp);
|
|
|
|
SettingsUpdateText(SET_MQTTPREFIX1, temp21);
|
|
|
|
SettingsUpdateText(SET_MQTTPREFIX2, temp22);
|
|
|
|
SettingsUpdateText(SET_MQTTPREFIX3, temp23);
|
|
|
|
SettingsUpdateText(SET_STASSID1, temp31);
|
|
|
|
SettingsUpdateText(SET_STASSID2, temp32);
|
|
|
|
SettingsUpdateText(SET_STAPWD1, temp41);
|
|
|
|
SettingsUpdateText(SET_STAPWD2, temp42);
|
|
|
|
SettingsUpdateText(SET_HOSTNAME, temp5);
|
|
|
|
SettingsUpdateText(SET_SYSLOG_HOST, temp6);
|
2019-12-21 14:37:36 +00:00
|
|
|
#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
|
2019-12-22 15:53:51 +00:00
|
|
|
if (!strlen(Settings.ex_mqtt_user)) {
|
2019-12-21 14:37:36 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_HOST, temp7);
|
|
|
|
SettingsUpdateText(SET_MQTT_USER, temp9);
|
|
|
|
} else {
|
|
|
|
char aws_mqtt_host[66];
|
|
|
|
snprintf_P(aws_mqtt_host, sizeof(aws_mqtt_host), PSTR("%s%s"), temp9, temp7);
|
2019-12-21 21:38:49 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_HOST, aws_mqtt_host);
|
2019-12-21 14:37:36 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_USER, "");
|
|
|
|
}
|
|
|
|
#else
|
2019-12-18 13:29:05 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_HOST, temp7);
|
|
|
|
SettingsUpdateText(SET_MQTT_USER, temp9);
|
2019-12-21 14:37:36 +00:00
|
|
|
#endif
|
|
|
|
SettingsUpdateText(SET_MQTT_CLIENT, temp8);
|
2019-12-18 13:29:05 +00:00
|
|
|
SettingsUpdateText(SET_MQTT_PWD, temp10);
|
|
|
|
SettingsUpdateText(SET_MQTT_TOPIC, temp11);
|
|
|
|
SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, temp12);
|
|
|
|
SettingsUpdateText(SET_MQTT_GRP_TOPIC, temp13);
|
2019-12-19 09:06:23 +00:00
|
|
|
|
2019-12-22 15:53:51 +00:00
|
|
|
SettingsUpdateText(SET_WEBPWD, Settings.ex_web_password);
|
|
|
|
SettingsUpdateText(SET_CORS, Settings.ex_cors_domain);
|
|
|
|
SettingsUpdateText(SET_MQTT_FULLTOPIC, Settings.ex_mqtt_fulltopic);
|
|
|
|
SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, Settings.ex_switch_topic);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT1, Settings.ex_state_text[0]);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT2, Settings.ex_state_text[1]);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT3, Settings.ex_state_text[2]);
|
|
|
|
SettingsUpdateText(SET_STATE_TXT4, Settings.ex_state_text[3]);
|
|
|
|
SettingsUpdateText(SET_NTPSERVER1, Settings.ex_ntp_server[0]);
|
|
|
|
SettingsUpdateText(SET_NTPSERVER2, Settings.ex_ntp_server[1]);
|
|
|
|
SettingsUpdateText(SET_NTPSERVER3, Settings.ex_ntp_server[2]);
|
|
|
|
SettingsUpdateText(SET_MEM1, Settings.script_pram[0]);
|
|
|
|
SettingsUpdateText(SET_MEM2, Settings.script_pram[1]);
|
|
|
|
SettingsUpdateText(SET_MEM3, Settings.script_pram[2]);
|
|
|
|
SettingsUpdateText(SET_MEM4, Settings.script_pram[3]);
|
|
|
|
SettingsUpdateText(SET_MEM5, Settings.script_pram[4]);
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME1, Settings.ex_friendlyname[0]);
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME2, Settings.ex_friendlyname[1]);
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME3, Settings.ex_friendlyname[2]);
|
|
|
|
SettingsUpdateText(SET_FRIENDLYNAME4, Settings.ex_friendlyname[3]);
|
2019-12-16 14:13:57 +00:00
|
|
|
}
|
2020-03-29 16:41:31 +01:00
|
|
|
if (Settings.version < 0x08020003) {
|
|
|
|
SettingsUpdateText(SET_TEMPLATE_NAME, Settings.user_template_name);
|
2020-04-11 17:50:46 +01:00
|
|
|
Settings.zb_channel = 0; // set channel to zero to force reinit of zigbee parameters
|
2020-03-29 16:41:31 +01:00
|
|
|
}
|
2020-04-10 17:24:08 +01:00
|
|
|
#endif // ESP8266
|
2019-12-16 14:13:57 +00:00
|
|
|
|
2020-04-17 10:57:09 +01:00
|
|
|
if (Settings.version < 0x08020004) {
|
|
|
|
#ifdef ESP8266
|
|
|
|
Settings.config_version = 0; // ESP8266 (Has been 0 for long time)
|
|
|
|
#endif // ESP8266
|
|
|
|
#ifdef ESP32
|
|
|
|
Settings.config_version = 1; // ESP32
|
|
|
|
#endif // ESP32
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.version = VERSION;
|
|
|
|
SettingsSave(1);
|
2017-02-19 16:49:17 +00:00
|
|
|
}
|
|
|
|
}
|