mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expand Settings area to 4k for future use 

Expand Settings area to 4k for future use
This commit is contained in:
Theo Arends 2019-08-25 14:58:45 +02:00
parent dc76792b5f
commit 6c905b65a4
4 changed files with 29 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -1,5 +1,6 @@
/*********************************************************************************************\ /*********************************************************************************************\
* 6.6.0.7 20190825 * 6.6.0.7 20190825
* Expand Settings area to 4k for future use
* *
* 6.6.0.6 20190819 * 6.6.0.6 20190819
* Add I2C display driver for SH1106 oled by Gerhard Mutz * Add I2C display driver for SH1106 oled by Gerhard Mutz

21
sonoff/settings.h
View File

@ -177,6 +177,15 @@ typedef union {
}; };
} SensorCfg1; } SensorCfg1;
typedef struct {
uint32_t usage1_kWhtotal;
uint32_t usage2_kWhtotal;
uint32_t return1_kWhtotal;
uint32_t return2_kWhtotal;
uint32_t last_usage_kWhtotal;
uint32_t last_return_kWhtotal;
} EnergyUsage;
/* /*
struct SYSCFG { struct SYSCFG {
unsigned long cfg_holder; // 000 Pre v6 header unsigned long cfg_holder; // 000 Pre v6 header
@ -337,7 +346,9 @@ struct SYSCFG {
uint16_t display_width; // 774 uint16_t display_width; // 774
uint16_t display_height; // 776 uint16_t display_height; // 776
uint8_t free_778[28]; // 778 uint8_t free_778[4]; // 778
EnergyUsage energy_usage; // 77C
// uint32_t drivers[3]; // 794 - 6.5.0.12 replaced by below three entries // uint32_t drivers[3]; // 794 - 6.5.0.12 replaced by below three entries
uint32_t adc_param1; // 794 uint32_t adc_param1; // 794
@ -356,7 +367,10 @@ struct SYSCFG {
uint16_t web_refresh; // 7CC uint16_t web_refresh; // 7CC
char mems[MAX_RULE_MEMS][10]; // 7CE char mems[MAX_RULE_MEMS][10]; // 7CE
char rules[MAX_RULE_SETS][MAX_RULE_SIZE]; // 800 uses 512 bytes in v5.12.0m, 3 x 512 bytes in v5.14.0b char rules[MAX_RULE_SETS][MAX_RULE_SIZE]; // 800 uses 512 bytes in v5.12.0m, 3 x 512 bytes in v5.14.0b
// E00 - FFF free locations
uint8_t free_e00[512]; // E00
// FFF last location
} Settings; } Settings;
struct RTCRBT { struct RTCRBT {
@ -373,7 +387,8 @@ struct RTCMEM {
unsigned long energy_kWhtotal; // 298 unsigned long energy_kWhtotal; // 298
unsigned long pulse_counter[MAX_COUNTERS]; // 29C unsigned long pulse_counter[MAX_COUNTERS]; // 29C
power_t power; // 2AC power_t power; // 2AC
uint8_t free_020[60]; // 2B0 EnergyUsage energy_usage; // 2B0
uint8_t free_038[36]; // 2C8
// 2EC - 2FF free locations // 2EC - 2FF free locations
} RtcSettings; } RtcSettings;

145
sonoff/settings.ino
View File

@ -177,6 +177,7 @@ void RtcSettingsLoad(void)
RtcSettings.valid = RTC_MEM_VALID; RtcSettings.valid = RTC_MEM_VALID;
RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday; RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday;
RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal; RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal;
RtcSettings.energy_usage = Settings.energy_usage;
for (uint32_t i = 0; i < MAX_COUNTERS; i++) { for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
RtcSettings.pulse_counter[i] = Settings.pulse_counter[i]; RtcSettings.pulse_counter[i] = Settings.pulse_counter[i];
} }
@ -260,141 +261,6 @@ const uint32_t SETTINGS_LOCATION = SPIFFS_END; // No need for SPIFFS as it uses
// Version 5.2 allow for more flash space // Version 5.2 allow for more flash space
const uint8_t CFG_ROTATES = 8; // Number of flash sectors used (handles uploads) const uint8_t CFG_ROTATES = 8; // Number of flash sectors used (handles uploads)
/*********************************************************************************************\
* Optional EEPROM support based on EEPROM library and tuned for Tasmota
\*********************************************************************************************/
//#define USE_EEPROM
#ifdef USE_EEPROM
uint32_t eeprom_sector = SPIFFS_END;
uint8_t* eeprom_data = 0;
size_t eeprom_size = 0;
bool eeprom_dirty = false;
void EepromBegin(size_t size)
{
if (size <= 0) { return; }
if (size > SPI_FLASH_SEC_SIZE - sizeof(Settings) -4) { size = SPI_FLASH_SEC_SIZE - sizeof(Settings) -4; }
size = (size + 3) & (~3);
// In case begin() is called a 2nd+ time, don't reallocate if size is the same
if (eeprom_data && size != eeprom_size) {
delete[] eeprom_data;
eeprom_data = new uint8_t[size];
} else if (!eeprom_data) {
eeprom_data = new uint8_t[size];
}
eeprom_size = size;
size_t flash_offset = SPI_FLASH_SEC_SIZE - eeprom_size;
uint8_t* flash_buffer;
flash_buffer = new uint8_t[SPI_FLASH_SEC_SIZE];
noInterrupts();
spi_flash_read(eeprom_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(flash_buffer), SPI_FLASH_SEC_SIZE);
interrupts();
memcpy(eeprom_data, flash_buffer + flash_offset, eeprom_size);
delete[] flash_buffer;
eeprom_dirty = false; // make sure dirty is cleared in case begin() is called 2nd+ time
}
size_t EepromLength(void)
{
return eeprom_size;
}
uint8_t EepromRead(int const address)
{
if (address < 0 || (size_t)address >= eeprom_size) { return 0; }
if (!eeprom_data) { return 0; }
return eeprom_data[address];
}
// Prototype needed for Arduino IDE - https://forum.arduino.cc/index.php?topic=406509.0
template<typename T> T EepromGet(int const address, T &t);
template<typename T> T EepromGet(int const address, T &t)
{
if (address < 0 || address + sizeof(T) > eeprom_size) { return t; }
if (!eeprom_data) { return 0; }
memcpy((uint8_t*) &t, eeprom_data + address, sizeof(T));
return t;
}
void EepromWrite(int const address, uint8_t const value)
{
if (address < 0 || (size_t)address >= eeprom_size) { return; }
if (!eeprom_data) { return; }
// Optimise eeprom_dirty. Only flagged if data written is different.
uint8_t* pData = &eeprom_data[address];
if (*pData != value) {
*pData = value;
eeprom_dirty = true;
}
}
// Prototype needed for Arduino IDE - https://forum.arduino.cc/index.php?topic=406509.0
template<typename T> void EepromPut(int const address, const T &t);
template<typename T> void EepromPut(int const address, const T &t)
{
if (address < 0 || address + sizeof(T) > eeprom_size) { return; }
if (!eeprom_data) { return; }
// Optimise eeprom_dirty. Only flagged if data written is different.
if (memcmp(eeprom_data + address, (const uint8_t*)&t, sizeof(T)) != 0) {
eeprom_dirty = true;
memcpy(eeprom_data + address, (const uint8_t*)&t, sizeof(T));
}
}
bool EepromCommit(void)
{
bool ret = false;
if (!eeprom_size) { return false; }
if (!eeprom_dirty) { return true; }
if (!eeprom_data) { return false; }
size_t flash_offset = SPI_FLASH_SEC_SIZE - eeprom_size;
uint8_t* flash_buffer;
flash_buffer = new uint8_t[SPI_FLASH_SEC_SIZE];
noInterrupts();
spi_flash_read(eeprom_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(flash_buffer), SPI_FLASH_SEC_SIZE);
memcpy(flash_buffer + flash_offset, eeprom_data, eeprom_size);
if (spi_flash_erase_sector(eeprom_sector) == SPI_FLASH_RESULT_OK) {
if (spi_flash_write(eeprom_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(flash_buffer), SPI_FLASH_SEC_SIZE) == SPI_FLASH_RESULT_OK) {
eeprom_dirty = false;
ret = true;
}
}
interrupts();
delete[] flash_buffer;
return ret;
}
uint8_t * EepromGetDataPtr()
{
eeprom_dirty = true;
return &eeprom_data[0];
}
void EepromEnd(void)
{
if (!eeprom_size) { return; }
EepromCommit();
if (eeprom_data) {
delete[] eeprom_data;
}
eeprom_data = 0;
eeprom_size = 0;
eeprom_dirty = false;
}
#endif // USE_EEPROM
/********************************************************************************************/
uint16_t settings_crc = 0; uint16_t settings_crc = 0;
uint32_t settings_location = SETTINGS_LOCATION; uint32_t settings_location = SETTINGS_LOCATION;
uint8_t *settings_buffer = nullptr; uint8_t *settings_buffer = nullptr;
@ -445,7 +311,9 @@ uint16_t GetSettingsCrc(void)
uint16_t crc = 0; uint16_t crc = 0;
uint8_t *bytes = (uint8_t*)&Settings; uint8_t *bytes = (uint8_t*)&Settings;
for (uint32_t i = 0; i < sizeof(SYSCFG); i++) { // Fix miscalculation if previous Settings was 3584 and current Settings is 4096 as of 0x06060007
uint32_t size = (Settings.version < 0x06060007) ? 3584 : sizeof(SYSCFG);
for (uint32_t i = 0; i < size; i++) {
if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); } // Skip crc if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); } // Skip crc
} }
return crc; return crc;
@ -827,6 +695,8 @@ void SettingsDefaultSet2(void)
// Settings.energy_max_energy_start = 0; // MaxEnergyStart // Settings.energy_max_energy_start = 0; // MaxEnergyStart
// Settings.energy_kWhtotal = 0; // Settings.energy_kWhtotal = 0;
RtcSettings.energy_kWhtotal = 0; RtcSettings.energy_kWhtotal = 0;
// memset((char*)&Settings.energy_usage, 0x00, sizeof(Settings.energy_usage));
memset((char*)&RtcSettings.energy_usage, 0x00, sizeof(RtcSettings.energy_usage));
Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP; Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
// IRRemote // IRRemote
@ -1193,6 +1063,9 @@ void SettingsDelta(void)
if (Settings.version < 0x06060001) { if (Settings.version < 0x06060001) {
Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP; Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
} }
if (Settings.version < 0x06060007) {
memset((char*)&Settings +0xE00, 0x00, sizeof(SYSCFG) -0xE00);
}
Settings.version = VERSION; Settings.version = VERSION;
SettingsSave(1); SettingsSave(1);

2
sonoff/sonoff_version.h
View File

@ -20,6 +20,6 @@
#ifndef _SONOFF_VERSION_H_ #ifndef _SONOFF_VERSION_H_
#define _SONOFF_VERSION_H_ #define _SONOFF_VERSION_H_
const uint32_t VERSION = 0x06060006; const uint32_t VERSION = 0x06060007;
#endif // _SONOFF_VERSION_H_ #endif // _SONOFF_VERSION_H_