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

Change Energy `power_history` arrays to prepare for Berry mapping (#21876)

This commit is contained in:
s-hadinger 2024-07-31 14:27:34 +02:00 committed by GitHub
parent 67fcb71c6d
commit a3ed99e549
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -180,7 +180,7 @@ typedef struct {
float daily_sum_import_balanced; // 123.123 kWh float daily_sum_import_balanced; // 123.123 kWh
float daily_sum_export_balanced; // 123.123 kWh float daily_sum_export_balanced; // 123.123 kWh
uint16_t power_history[ENERGY_MAX_PHASES][3]; uint16_t power_history[3][ENERGY_MAX_PHASES];
uint16_t mpl_hold_counter[ENERGY_MAX_PHASES]; uint16_t mpl_hold_counter[ENERGY_MAX_PHASES];
uint16_t mpl_window_counter[ENERGY_MAX_PHASES]; uint16_t mpl_window_counter[ENERGY_MAX_PHASES];
@ -741,15 +741,15 @@ void EnergyMarginCheck(void) {
for (uint32_t phase = 0; phase < Energy->phase_count; phase++) { for (uint32_t phase = 0; phase < Energy->phase_count; phase++) {
uint16_t active_power = (uint16_t)(Energy->active_power[phase]); uint16_t active_power = (uint16_t)(Energy->active_power[phase]);
// AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: APower %d, HPower0 %d, HPower1 %d, HPower2 %d"), active_power, Energy->power_history[phase][0], Energy->power_history[phase][1], Energy->power_history[phase][2]); // AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: APower %d, HPower0 %d, HPower1 %d, HPower2 %d"), active_power, Energy->power_history[0][phase], Energy->power_history[1][phase], Energy->power_history[2][phase]);
if (Energy->Settings.power_delta[phase]) { if (Energy->Settings.power_delta[phase]) {
power_diff[phase] = active_power - Energy->power_history[phase][0]; power_diff[phase] = active_power - Energy->power_history[0][phase];
uint16_t delta = abs(power_diff[phase]); uint16_t delta = abs(power_diff[phase]);
bool threshold_met = false; bool threshold_met = false;
if (delta > 0) { if (delta > 0) {
if (Energy->Settings.power_delta[phase] < 101) { // 1..100 = Percentage if (Energy->Settings.power_delta[phase] < 101) { // 1..100 = Percentage
uint16_t min_power = (Energy->power_history[phase][0] > active_power) ? active_power : Energy->power_history[phase][0]; uint16_t min_power = (Energy->power_history[0][phase] > active_power) ? active_power : Energy->power_history[0][phase];
if (0 == min_power) { min_power++; } // Fix divide by 0 exception (#6741) if (0 == min_power) { min_power++; } // Fix divide by 0 exception (#6741)
delta = (delta * 100) / min_power; delta = (delta * 100) / min_power;
if (delta >= Energy->Settings.power_delta[phase]) { if (delta >= Energy->Settings.power_delta[phase]) {
@ -762,16 +762,16 @@ void EnergyMarginCheck(void) {
} }
} }
if (threshold_met) { if (threshold_met) {
Energy->power_history[phase][1] = active_power; // We only want one report so reset history Energy->power_history[1][phase] = active_power; // We only want one report so reset history
Energy->power_history[phase][2] = active_power; Energy->power_history[2][phase] = active_power;
jsonflg = true; jsonflg = true;
} else { } else {
power_diff[phase] = 0; power_diff[phase] = 0;
} }
} }
Energy->power_history[phase][0] = Energy->power_history[phase][1]; // Shift in history every second allowing power changes to settle for up to three seconds Energy->power_history[0][phase] = Energy->power_history[1][phase]; // Shift in history every second allowing power changes to settle for up to three seconds
Energy->power_history[phase][1] = Energy->power_history[phase][2]; Energy->power_history[1][phase] = Energy->power_history[2][phase];
Energy->power_history[phase][2] = active_power; Energy->power_history[2][phase] = active_power;
} }
if (jsonflg) { if (jsonflg) {
float power_diff_f[Energy->phase_count]; float power_diff_f[Energy->phase_count];