mirror of https://github.com/arendst/Tasmota.git
Alternative method of calculating energy usage
Alternative method of calculating energy usage (#8175)
This commit is contained in:
parent
2b327c96c9
commit
57ffd27153
|
@ -33,6 +33,8 @@
|
|||
#define BL0940_UREF 33000
|
||||
#define BL0940_IREF 2750
|
||||
|
||||
#define BL0940_PULSES_NOT_INITIALIZED -1
|
||||
|
||||
#define BL0940_BUFFER_SIZE 36
|
||||
|
||||
#define BL0940_WRITE_COMMAND 0xA0 // 0xA8 according to documentation
|
||||
|
@ -55,8 +57,11 @@ struct BL0940 {
|
|||
long voltage = 0;
|
||||
long current = 0;
|
||||
long power = 0;
|
||||
// long power_cycle_first = 0;
|
||||
// long cf_pulses = 0;
|
||||
|
||||
long power_cycle_first = 0;
|
||||
long cf_pulses = 0;
|
||||
long cf_pulses_last_time = BL0940_PULSES_NOT_INITIALIZED;
|
||||
|
||||
float temperature;
|
||||
|
||||
int byte_counter = 0;
|
||||
|
@ -95,9 +100,11 @@ void Bl0940Received(void) {
|
|||
Bl0940.current = Bl0940.rx_buffer[6] << 16 | Bl0940.rx_buffer[5] << 8 | Bl0940.rx_buffer[4]; // I_RMS unsigned
|
||||
int32_t power = Bl0940.rx_buffer[18] << 24 | Bl0940.rx_buffer[17] << 16 | Bl0940.rx_buffer[16] << 8; // WATT signed
|
||||
Bl0940.power = abs(power) >> 8; // WATT unsigned
|
||||
// Bl0940.cf_pulses = Bl0940.rx_buffer[24] << 16 | Bl0940.rx_buffer[23] << 8 | Bl0940.rx_buffer[22]; // CF_CNT unsigned
|
||||
int32_t cf_cnt = Bl0940.rx_buffer[24] << 24 | Bl0940.rx_buffer[23] << 16 | Bl0940.rx_buffer[22] << 8; // CF_CNT signed
|
||||
Bl0940.cf_pulses = abs(cf_cnt) >> 8;
|
||||
|
||||
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BL9: U %d, I %d, P %d, T %d"), Bl0940.voltage, Bl0940.current, Bl0940.power, Bl0940.tps1);
|
||||
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BL9: U %d, I %d, P %d, C %d, T %d"),
|
||||
Bl0940.voltage, Bl0940.current, Bl0940.power, Bl0940.cf_pulses, Bl0940.tps1);
|
||||
|
||||
if (Energy.power_on) { // Powered on
|
||||
Energy.voltage[0] = (float)Bl0940.voltage / Settings.energy_voltage_calibration;
|
||||
|
@ -163,10 +170,37 @@ void Bl0940EverySecond(void) {
|
|||
Bl0940.current = 0;
|
||||
Bl0940.power = 0;
|
||||
} else {
|
||||
/*
|
||||
// Calculate energy by using active power
|
||||
if (Energy.active_power[0]) {
|
||||
Energy.kWhtoday_delta += (Energy.active_power[0] * 1000) / 36;
|
||||
EnergyUpdateToday();
|
||||
}
|
||||
*/
|
||||
// Calculate energy by using active energy pulse count
|
||||
if (BL0940_PULSES_NOT_INITIALIZED == Bl0940.cf_pulses_last_time) {
|
||||
Bl0940.cf_pulses_last_time = Bl0940.cf_pulses; // Init after restart
|
||||
} else {
|
||||
uint32_t cf_pulses = 0;
|
||||
if (Bl0940.cf_pulses < Bl0940.cf_pulses_last_time) { // Rolled over after 0xFFFFFF (16777215) pulses
|
||||
cf_pulses = (0x1000000 - Bl0940.cf_pulses_last_time) + Bl0940.cf_pulses;
|
||||
} else {
|
||||
cf_pulses = Bl0940.cf_pulses - Bl0940.cf_pulses_last_time;
|
||||
}
|
||||
if (cf_pulses && Energy.active_power[0]) {
|
||||
if (cf_pulses < 16) { // max load for SHP10: 4.00kW (3.68kW)
|
||||
uint32_t watt256 = (1638400 * 256) / Settings.energy_power_calibration;
|
||||
uint32_t delta = (cf_pulses * watt256) / 36;
|
||||
Bl0940.cf_pulses_last_time = Bl0940.cf_pulses;
|
||||
Energy.kWhtoday_delta += delta;
|
||||
} else {
|
||||
AddLog_P(LOG_LEVEL_DEBUG, PSTR("BL9: Overload"));
|
||||
Bl0940.cf_pulses_last_time = BL0940_PULSES_NOT_INITIALIZED;
|
||||
}
|
||||
EnergyUpdateToday();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Bl0940Serial->flush();
|
||||
|
|
Loading…
Reference in New Issue