mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-10 21:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

add Yesterday to ENERGY

Browse Source
This commit is contained in:
Tester23
2024-02-07 09:07:33 +01:00
parent 729320258f
commit 23c4c4d408
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/httpserver/json_interface.c
View File

@ -196,13 +196,14 @@ static int http_tasmota_json_power(void* request, jsonCb_t printer) {
static int http_tasmota_json_ENERGY(void* request, jsonCb_t printer) {
float power, voltage, current, batterypercentage = 0;
float energy, energy_hour;
float energy, energy_hour, energy_yesterday;
voltage = DRV_GetReading(OBK_VOLTAGE);
current = DRV_GetReading(OBK_CURRENT);
power = DRV_GetReading(OBK_POWER);
energy = DRV_GetReading(OBK_CONSUMPTION_TOTAL);
energy_hour = DRV_GetReading(OBK_CONSUMPTION_LAST_HOUR);
energy_yesterday = DRV_GetReading(OBK_CONSUMPTION_YESTERDAY);
if (DRV_IsMeasuringBattery()) {
#ifdef ENABLE_DRIVER_BATTERY
@ -223,8 +224,11 @@ static int http_tasmota_json_ENERGY(void* request, jsonCb_t printer) {
if (OBK_IS_NAN(energy_hour)) {
energy_hour = 0;
}
if (OBK_IS_NAN(energy_yesterday)) {
energy_yesterday = 0;
}
printer(request, "{");
printer(request, "{");
printer(request, "\"Power\": %f,", power);
printer(request, "\"ApparentPower\": %f,", g_apparentPower);
printer(request, "\"ReactivePower\": %f,", g_reactivePower);
@ -232,6 +236,7 @@ static int http_tasmota_json_ENERGY(void* request, jsonCb_t printer) {
printer(request, "\"Voltage\":%f,", voltage);
printer(request, "\"Current\":%f,", current);
printer(request, "\"ConsumptionTotal\":%f,", energy);
printer(request, "\"Yesterday\": %f,", energy_yesterday);
printer(request, "\"ConsumptionLastHour\":%f", energy_hour);
// close ENERGY block
printer(request, "}");