jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prep for new Hass Discovery

Browse Source
This commit is contained in:
Federico Leoni 2020-09-18 18:45:58 -03:00
parent f6705d6a1a
commit 4e84e33103
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/settings.h
View File

@ -557,7 +557,7 @@ struct {
uint16_t dimmer_hw_min; // E90 uint16_t dimmer_hw_min; // E90
uint16_t dimmer_hw_max; // E92 uint16_t dimmer_hw_max; // E92
uint32_t deepsleep; // E94 uint32_t deepsleep; // E94
uint16_t ex2_energy_power_delta; // E98 - Free since 8.4.0.3 uint16_t hass_new_discovery; // E98 - ex2_energy_power_delta on 8.4.0.3, replaced on 8.5.0.1
uint8_t shutter_motordelay[MAX_SHUTTERS]; // E9A uint8_t shutter_motordelay[MAX_SHUTTERS]; // E9A
int8_t temp_comp; // E9E int8_t temp_comp; // E9E
uint8_t weight_change; // E9F uint8_t weight_change; // E9F
@ -613,7 +613,8 @@ struct {
uint16_t energy_power_delta[3]; // F44 uint16_t energy_power_delta[3]; // F44
uint16_t shutter_pwmrange[2][MAX_SHUTTERS]; // F4A uint16_t shutter_pwmrange[2][MAX_SHUTTERS]; // F4A
uint8_t free_f5a[90]; // F5A - Decrement if adding new Setting variables just above and below
uint8_t free_f5a[89]; // F5A - Decrement if adding new Setting variables just above and below
// Only 32 bit boundary variables below // Only 32 bit boundary variables below
SysBitfield5 flag5; // FB4 SysBitfield5 flag5; // FB4

4
tasmota/settings.ino
View File

@ -1356,7 +1356,7 @@ void SettingsDelta(void)
Settings.ex_sbaudrate = 0; Settings.ex_sbaudrate = 0;
*/ */
Settings.flag3.fast_power_cycle_disable = 0; Settings.flag3.fast_power_cycle_disable = 0;
Settings.ex2_energy_power_delta = Settings.tuyamcu_topic; Settings.hass_new_discovery = Settings.tuyamcu_topic; // replaced ex2_energy_power_delta on 8.5.0.1
Settings.tuyamcu_topic = 0; // replaced ex_energy_power_delta on 8.5.0.1 Settings.tuyamcu_topic = 0; // replaced ex_energy_power_delta on 8.5.0.1
} }
if (Settings.version < 0x06060015) { if (Settings.version < 0x06060015) {
@ -1514,7 +1514,7 @@ void SettingsDelta(void)
Settings.fallback_module = FALLBACK_MODULE; Settings.fallback_module = FALLBACK_MODULE;
} }
if (Settings.version < 0x08040003) { if (Settings.version < 0x08040003) {
Settings.energy_power_delta[0] = Settings.ex2_energy_power_delta; Settings.energy_power_delta[0] = Settings.hass_new_discovery; // replaced ex2_energy_power_delta on 8.5.0.1
Settings.energy_power_delta[1] = 0; Settings.energy_power_delta[1] = 0;
Settings.energy_power_delta[2] = 0; Settings.energy_power_delta[2] = 0;
} }