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

Patched BL09xx to measure positive and negative power 

Removed the abs() from the power so as to measure power flow from/to grid
This commit is contained in:
aoe1 2022-04-01 13:02:43 +02:00 committed by GitHub
parent 72e80b4058
commit 882ed16347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasmota/xnrg_14_bl09xx.ino
View File

@ -84,9 +84,9 @@ const uint8_t bl09xx_init[5][4] = {
};
struct BL09XX {
uint32_t voltage = 0;
uint32_t current[2] = { 0, };
uint32_t power[2] = { 0, };
int32_t voltage = 0;
int32_t current[2] = { 0, };
int32_t power[2] = { 0, };
float temperature;
uint16_t tps1 = 0;
uint8_t *rx_buffer = nullptr;
@ -129,12 +129,12 @@ bool Bl09XXDecode3940(void) {
Bl09XX.voltage = Bl09XX.rx_buffer[12] << 16 | Bl09XX.rx_buffer[11] << 8 | Bl09XX.rx_buffer[10]; // V_RMS unsigned
Bl09XX.current[0] = Bl09XX.rx_buffer[6] << 16 | Bl09XX.rx_buffer[5] << 8 | Bl09XX.rx_buffer[4]; // IA_RMS unsigned
int32_t tmp = Bl09XX.rx_buffer[18] << 24 | Bl09XX.rx_buffer[17] << 16 | Bl09XX.rx_buffer[16] << 8; // WATT_A signed
Bl09XX.power[0] = abs(tmp >> 8); // WATT_A unsigned
Bl09XX.power[0] = (tmp >> 8); // WATT_A unsigned
if (Energy.phase_count > 1) {
Bl09XX.current[1] = Bl09XX.rx_buffer[9] << 16 | Bl09XX.rx_buffer[8] << 8 | Bl09XX.rx_buffer[7]; // IB_RMS unsigned
tmp = Bl09XX.rx_buffer[21] << 24 | Bl09XX.rx_buffer[20] << 16 | Bl09XX.rx_buffer[19] << 8; // WATT_B signed
Bl09XX.power[1] = abs(tmp >> 8); // WATT_B unsigned
Bl09XX.power[1] = (tmp >> 8); // WATT_B unsigned
}
#ifdef DEBUG_BL09XX
@ -172,7 +172,7 @@ bool Bl09XXDecode42(void) {
Bl09XX.voltage = Bl09XX.rx_buffer[6] << 16 | Bl09XX.rx_buffer[5] << 8 | Bl09XX.rx_buffer[4]; // V_RMS unsigned
Bl09XX.current[0] = Bl09XX.rx_buffer[3] << 16 | Bl09XX.rx_buffer[2] << 8 | Bl09XX.rx_buffer[1]; // IA_RMS unsigned
int32_t tmp = Bl09XX.rx_buffer[12] << 24 | Bl09XX.rx_buffer[11] << 16 | Bl09XX.rx_buffer[10] << 8; // WATT_A signed
Bl09XX.power[0] = abs(tmp >> 8); // WATT_A unsigned
Bl09XX.power[0] = (tmp >> 8); // WATT_A unsigned
#ifdef DEBUG_BL09XX
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("BL9: U %d, I %d, P %d"),
@ -427,4 +427,4 @@ bool Xnrg14(uint8_t function) {
}
#endif // USE_BL09XX
#endif // USE_ENERGY_SENSOR
#endif // USE_ENERGY_SENSOR