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

Merge branch 'development' into pre-release-9.4.0

Browse Source
This commit is contained in:
Theo Arends 2021-04-14 16:49:36 +02:00
commit 9f21938c2c
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasmota/xnrg_01_hlw8012.ino
View File

@ -47,9 +47,7 @@ struct HLW {
uint32_t debug[HLW_SAMPLE_COUNT];
#endif
volatile uint32_t cf_pulse_length = 0;
volatile uint32_t cf_summed_pulse_length = 0;
volatile uint32_t cf_pulse_last_time = 0;
volatile uint32_t cf_pulse_counter = 0;
uint32_t cf_power_pulse_length = 0;
volatile uint32_t cf1_pulse_length = 0;
@ -88,9 +86,7 @@ void HlwCfInterrupt(void) // Service Power
Hlw.load_off = false;
} else {
Hlw.cf_pulse_length = us - Hlw.cf_pulse_last_time;
Hlw.cf_summed_pulse_length += Hlw.cf_pulse_length;
Hlw.cf_pulse_last_time = us;
Hlw.cf_pulse_counter++;
Hlw.energy_period_counter++;
}
Energy.data_valid[0] = 0;
@ -128,14 +124,7 @@ void HlwEvery200ms(void)
Hlw.cf_pulse_length = 0; // No load for some time
Hlw.load_off = true;
}
if(Hlw.cf_pulse_counter){
Hlw.cf_power_pulse_length = Hlw.cf_summed_pulse_length/Hlw.cf_pulse_counter;
Hlw.cf_summed_pulse_length=0;
Hlw.cf_pulse_counter=0;
} else {
Hlw.cf_power_pulse_length=0;
}
Hlw.cf_power_pulse_length = Hlw.cf_pulse_length;
if (Hlw.cf_power_pulse_length && Energy.power_on && !Hlw.load_off) {
hlw_w = (Hlw.power_ratio * Settings.energy_power_calibration) / Hlw.cf_power_pulse_length ; // W *10