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

Fix ADE7953 apparent and reactive power calibration

This commit is contained in:
Theo Arends 2022-09-15 11:22:09 +02:00
parent d5e68ac683
commit 903d3174b2
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino
View File

@ -541,12 +541,14 @@ void CmndDspLine(void) {
}
if (9 == XdrvMailbox.index) {
// DspLine9 = Show sensor JSON
// Example 1: SCD30 I2C connected (GPIO25 = I2C SCL, GPIO26 = I2C SDA)
// {"SCD30":{"CarbonDioxide":746,"eCO2":727,"Temperature":30.6,"Humidity":43.6,"DewPoint":16.8}}
// index: 1 2 3 4 5 6
// unit: 0 0 (ppm) 0 (ppm) 1 (C or F) 2 (%RH) 1 (C or F)
// {"ENERGY":{"TotalStartTime":"2022-07-15T13:44:23","Total":0.086,"Yesterday":0.002,"Today":0.005,"Power":0.96,"ApparentPower":7.60,"ReactivePower":7.50,"Factor":0.13,"Voltage":227.9,"Current":0.033}}
// index: 1 2 3 4 5 6 7 8 9 10 11
// unit: 0 0 4 (kWh) 4 (kWh) 4 (kWh) 4 (W) 0 (VA) 0 (VAr) 0 3 (V) 3 (A)
// Example 2: PZEM016 serial connected (GPIO25 = PZEM0XX Tx, GPIO26 = PZEM016 Rx)
// {"ENERGY":{"TotalStartTime":"2022-07-05T16:01:39","Total":0.000,"Yesterday":0.000,"Today":0.000,"Power":0.00,"ApparentPower":0.00,"ReactivePower":0.00,"Factor":0.00,"Frequency":50,"Voltage":231.7,"Current":0.000}}
// index: 1 2 3 4 5 6 7 8 9 10 11 12
// unit: 0 0 4 (kWh) 4 (kWh) 4 (kWh) 4 (W) 0 (VA) 0 (VAr) 0 0 3 (V) 3 (A)
TM1621GetSensors(1);
}
}

8
tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
View File

@ -417,16 +417,16 @@ bool Ade7953SetDefaults(const char* json) {
}
JsonParserObject apparent = powers[PSTR("apparent")].getObject();
if (apparent) {
val = totactive[PSTR("a")];
val = apparent[PSTR("a")];
if (val) { Ade7953.calib_data[ADE7953_CAL_AVAGAIN] = val.getInt(); }
val = totactive[PSTR("b")];
val = apparent[PSTR("b")];
if (val) { Ade7953.calib_data[ADE7953_CAL_BVAGAIN] = val.getInt(); }
}
JsonParserObject reactive = powers[PSTR("reactive")].getObject();
if (reactive) {
val = totactive[PSTR("a")];
val = reactive[PSTR("a")];
if (val) { Ade7953.calib_data[ADE7953_CAL_AVARGAIN] = val.getInt(); }
val = totactive[PSTR("b")];
val = reactive[PSTR("b")];
if (val) { Ade7953.calib_data[ADE7953_CAL_BVARGAIN] = val.getInt(); }
}
}