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

Fix energy maxpower retry count (#21695)

Browse Source
This commit is contained in:
Theo Arends 2024-07-03 13:52:01 +02:00
parent ac011132ee
commit 9b537d81e0
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -572,13 +572,18 @@ void EnergyMarginCheck(void) {
} }
Energy->mpl_hold_counter--; Energy->mpl_hold_counter--;
if (!Energy->mpl_hold_counter) { if (!Energy->mpl_hold_counter) {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "\":%d}"), energy_power_u);
MqttPublishPrefixTopicRulesProcess_P(STAT, S_RSLT_WARNING);
EnergyMqttShow();
SetAllPower(POWER_OFF_FORCE, SRC_MAXPOWER);
if (!Energy->mpl_retry_counter) { if (!Energy->mpl_retry_counter) {
Energy->mpl_retry_counter = Settings->param[P_MAX_POWER_RETRY] +1; // SetOption33 - Max Power Retry count Energy->mpl_retry_counter = Settings->param[P_MAX_POWER_RETRY] +1; // SetOption33 - Max Power Retry count
} }
Energy->mpl_retry_counter--;
if (Energy->mpl_retry_counter) {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "\":%d}"), energy_power_u);
} else {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
}
MqttPublishPrefixTopicRulesProcess_P(STAT, S_RSLT_WARNING);
EnergyMqttShow();
SetAllPower(POWER_OFF_FORCE, SRC_MAXPOWER);
Energy->mpl_window_counter = Settings->energy_max_power_limit_window; Energy->mpl_window_counter = Settings->energy_max_power_limit_window;
} }
} }
@ -592,17 +597,9 @@ void EnergyMarginCheck(void) {
Energy->mpl_window_counter--; Energy->mpl_window_counter--;
} else { } else {
if (Energy->mpl_retry_counter) { if (Energy->mpl_retry_counter) {
Energy->mpl_retry_counter--; ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "\":\"%s\"}"), GetStateText(1));
if (Energy->mpl_retry_counter) { MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "\":\"%s\"}"), GetStateText(1)); RestorePower(true, SRC_MAXPOWER);
MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
RestorePower(true, SRC_MAXPOWER);
} else {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
MqttPublishPrefixTopicRulesProcess_P(STAT, S_RSLT_WARNING);
EnergyMqttShow();
SetAllPower(POWER_OFF_FORCE, SRC_MAXPOWER);
}
} }
} }
} }

36
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -835,14 +835,21 @@ void EnergyMarginCheck(void) {
if (Energy->Settings.phase[phase].max_power_limit) { if (Energy->Settings.phase[phase].max_power_limit) {
energy_power_u = (uint16_t)(Energy->active_power[phase]); energy_power_u = (uint16_t)(Energy->active_power[phase]);
bool power_on = (TasmotaGlobal.power & (1 << phase)); bool power_on = (TasmotaGlobal.power & (1 << phase));
// if (Energy->active_power[phase] > Energy->Settings.phase[phase].max_power_limit) {
if (energy_power_u > Energy->Settings.phase[phase].max_power_limit) { if (energy_power_u > Energy->Settings.phase[phase].max_power_limit) {
if (!Energy->mpl_hold_counter[phase]) { if (!Energy->mpl_hold_counter[phase]) {
Energy->mpl_hold_counter[phase] = Energy->Settings.phase[phase].max_power_limit_hold +1; Energy->mpl_hold_counter[phase] = Energy->Settings.phase[phase].max_power_limit_hold +1;
} }
Energy->mpl_hold_counter[phase]--; Energy->mpl_hold_counter[phase]--;
if (!Energy->mpl_hold_counter[phase]) { if (!Energy->mpl_hold_counter[phase]) {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "%d\":%d}"), phase +1, energy_power_u); if (!Energy->mpl_retry_counter[phase]) {
Energy->mpl_retry_counter[phase] = Settings->param[P_MAX_POWER_RETRY] +1; // SetOption33 - Max Power Retry count
}
Energy->mpl_retry_counter[phase]--;
if (Energy->mpl_retry_counter[phase]) {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "%d\":%d}"), phase +1, energy_power_u);
} else {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "%d\":\"%s\"}"), phase +1, GetStateText(0));
}
MqttPublishPrefixTopicRulesProcess_P(STAT, S_RSLT_WARNING); MqttPublishPrefixTopicRulesProcess_P(STAT, S_RSLT_WARNING);
EnergyMqttShow(); EnergyMqttShow();
if (set_all_power) { if (set_all_power) {
@ -850,9 +857,6 @@ void EnergyMarginCheck(void) {
} else { } else {
ExecuteCommandPower(phase +1, POWER_OFF_FORCE, SRC_MAXPOWER); ExecuteCommandPower(phase +1, POWER_OFF_FORCE, SRC_MAXPOWER);
} }
if (!Energy->mpl_retry_counter[phase]) {
Energy->mpl_retry_counter[phase] = Settings->param[P_MAX_POWER_RETRY] +1; // SetOption33 - Max Power Retry count
}
Energy->mpl_window_counter[phase] = Energy->Settings.phase[phase].max_power_limit_window; Energy->mpl_window_counter[phase] = Energy->Settings.phase[phase].max_power_limit_window;
} }
} }
@ -866,24 +870,12 @@ void EnergyMarginCheck(void) {
Energy->mpl_window_counter[phase]--; Energy->mpl_window_counter[phase]--;
} else { } else {
if (Energy->mpl_retry_counter[phase]) { if (Energy->mpl_retry_counter[phase]) {
Energy->mpl_retry_counter[phase]--; ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "%d\":\"%s\"}"), phase +1, GetStateText(1));
if (Energy->mpl_retry_counter[phase]) { MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "%d\":\"%s\"}"), phase +1, GetStateText(1)); if (set_all_power) {
MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR)); RestorePower(true, SRC_MAXPOWER);
if (set_all_power) {
RestorePower(true, SRC_MAXPOWER);
} else {
ExecuteCommandPower(phase +1, POWER_ON, SRC_MAXPOWER);
}
} else { } else {
ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "%d\":\"%s\"}"), phase +1, GetStateText(0)); ExecuteCommandPower(phase +1, POWER_ON, SRC_MAXPOWER);
MqttPublishPrefixTopicRulesProcess_P(STAT, S_RSLT_WARNING);
EnergyMqttShow();
if (set_all_power) {
SetAllPower(POWER_OFF_FORCE, SRC_MAXPOWER);
} else {
ExecuteCommandPower(phase +1, POWER_OFF_FORCE, SRC_MAXPOWER);
}
} }
} }
} }