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

Fix Shelly 2.5 invalid energy measurement 

Fix Shelly 2.5 invalid energy measurement (#5968)
This commit is contained in:
Theo Arends 2019-07-04 10:36:38 +02:00
parent 006f4da90d
commit aa1af61bc8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sonoff/xnrg_07_ade7953.ino
View File

@ -107,20 +107,24 @@ void Ade7953Init(void)
void Ade7953GetData(void) void Ade7953GetData(void)
{ {
int32_t active_power;
ade7953_voltage_rms = Ade7953Read(0x31C); // Both relays ade7953_voltage_rms = Ade7953Read(0x31C); // Both relays
ade7953_current_rms1 = Ade7953Read(0x31B); // Relay 1 ade7953_current_rms1 = Ade7953Read(0x31B); // Relay 1
if (ade7953_current_rms1 < 2000) { // No load threshold (20mA) if (ade7953_current_rms1 < 2000) { // No load threshold (20mA)
ade7953_current_rms1 = 0; ade7953_current_rms1 = 0;
ade7953_active_power1 = 0; ade7953_active_power1 = 0;
} else { } else {
ade7953_active_power1 = (int32_t)Ade7953Read(0x313) * -1; // Relay 1 active_power = (int32_t)Ade7953Read(0x313) * -1; // Relay 1
ade7953_active_power1 = (active_power > 0) ? active_power : 0;
} }
ade7953_current_rms2 = Ade7953Read(0x31A); // Relay 2 ade7953_current_rms2 = Ade7953Read(0x31A); // Relay 2
if (ade7953_current_rms2 < 2000) { // No load threshold (20mA) if (ade7953_current_rms2 < 2000) { // No load threshold (20mA)
ade7953_current_rms2 = 0; ade7953_current_rms2 = 0;
ade7953_active_power2 = 0; ade7953_active_power2 = 0;
} else { } else {
ade7953_active_power2 = (int32_t)Ade7953Read(0x312); // Relay 2 active_power = (int32_t)Ade7953Read(0x312); // Relay 2
ade7953_active_power2 = (active_power > 0) ? active_power : 0;
} }
// First phase only supports accumulated Current and Power // First phase only supports accumulated Current and Power
ade7953_current_rms = ade7953_current_rms1 + ade7953_current_rms2; ade7953_current_rms = ade7953_current_rms1 + ade7953_current_rms2;