jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 04:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

v5.12.0e - Fix S31 power on wrong power report

Browse Source 
Fix S31 power on wrong power report
This commit is contained in:
Theo Arends 2018-03-16 17:33:14 +01:00
parent 5677a9c854
commit 3e7142f2a4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sonoff/xdrv_03_energy.ino
View File

@ -265,11 +265,11 @@ void HlwInit()
#define CSE_UREF 100 #define CSE_UREF 100
uint8_t cse_receive_flag = 0; uint8_t cse_receive_flag = 0;
uint8_t cse_power_valid = 0;
long voltage_cycle = 0; long voltage_cycle = 0;
long current_cycle = 0; long current_cycle = 0;
long power_cycle = 0; long power_cycle = 0;
unsigned long power_cycle_first = 0;
long cf_pulses = 0; long cf_pulses = 0;
long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED; long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
@ -320,9 +320,6 @@ void CseReceived()
power_cycle = serial_in_buffer[17] << 16 | serial_in_buffer[18] << 8 | serial_in_buffer[19]; power_cycle = serial_in_buffer[17] << 16 | serial_in_buffer[18] << 8 | serial_in_buffer[19];
cf_pulses = serial_in_buffer[21] << 8 | serial_in_buffer[22]; cf_pulses = serial_in_buffer[21] << 8 | serial_in_buffer[22];
// if (adjustement & 0x80) { // CF overflow
// cf_pulses += 0x10000;
// }
if (energy_power_on) { // Powered on if (energy_power_on) { // Powered on
if (adjustement & 0x40) { // Voltage valid if (adjustement & 0x40) { // Voltage valid
energy_voltage = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)voltage_cycle; energy_voltage = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)voltage_cycle;
@ -331,15 +328,16 @@ void CseReceived()
if ((header & 0xF2) == 0xF2) { // Power cycle exceeds range if ((header & 0xF2) == 0xF2) { // Power cycle exceeds range
energy_power = 0; energy_power = 0;
} else { } else {
if (cse_power_valid < 16) { // Skip first incomplete power_cycle if (0 == power_cycle_first) power_cycle_first = power_cycle; // Skip first incomplete power_cycle
cse_power_valid++; if (power_cycle_first != power_cycle) {
energy_power = 0; power_cycle_first = -1;
} else {
energy_power = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)power_cycle; energy_power = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)power_cycle;
} else {
energy_power = 0;
} }
} }
} else { } else {
cse_power_valid = 0; power_cycle_first = 0;
energy_power = 0; // Powered on but no load energy_power = 0; // Powered on but no load
} }
if (adjustement & 0x20) { // Current valid if (adjustement & 0x20) { // Current valid
@ -350,6 +348,7 @@ void CseReceived()
} }
} }
} else { // Powered off } else { // Powered off
power_cycle_first = 0;
energy_voltage = 0; energy_voltage = 0;
energy_power = 0; energy_power = 0;
energy_current = 0; energy_current = 0;