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

Fix energy SO129

This commit is contained in:
Theo Arends 2022-03-15 17:36:25 +01:00
parent 9b0acd14f1
commit 1008205b2c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/xdrv_03_energy.ino
View File

@ -136,7 +136,7 @@ char* EnergyFormat(char* result, float* input, uint32_t resolution, uint32_t sin
char* EnergyFormat(char* result, float* input, uint32_t resolution, uint32_t single) {
// single = 0 - Energy.phase_count - xx or [xx,xx] or [xx,xx,xx]
// single = 1 - Energy.voltage_common or Energy.frequency_common - xx
// single = 2 - Sum of Energy.phase_count - xx
// single = 2 - Sum of Energy.phase_count if SO129 0 - xx or if SO129 1 - [xx,xx,xx]
// single = 5 - single &0x03 = 1 - xx
// single = 6 - single &0x03 = 2 - [xx,xx] - used by tarriff
// single = 7 - single &0x03 = 3 - [xx,xx,xx]
@ -149,6 +149,8 @@ char* EnergyFormat(char* result, float* input, uint32_t resolution, uint32_t sin
input_sum += input[i];
}
input = &input_sum;
} else {
index = Energy.phase_count;
}
}
result[0] = '\0';
@ -163,7 +165,7 @@ char* WebEnergyFormat(char* result, float* input, uint32_t resolution, uint32_t
char* WebEnergyFormat(char* result, float* input, uint32_t resolution, uint32_t single) {
// single = 0 - Energy.phase_count - xx / xx / xx or multi column
// single = 1 - Energy.voltage_common or Energy.frequency_common - xx or single column using colspan (if needed)
// single = 2 - Sum of Energy.phase_count - xx or single column using colspan (if needed)
// single = 2 - Sum of Energy.phase_count if SO129 0 - xx or single column using colspan (if needed) or if SO129 1 - xx / xx / xx or multi column
float input_sum = 0.0;
if (single > 1) { // Sum and/or Single column
if (!Settings->flag5.energy_phase) { // SetOption129 - (Energy) Show phase information