From 10d323a3aa17a8d7f8072156844228caac49abb5 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 23 Nov 2021 16:43:43 +0100 Subject: [PATCH] Fix sampleing of things totalConsumption/totalProduction --- plugin/energylogger.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin/energylogger.cpp b/plugin/energylogger.cpp index f77c84f..50fe593 100644 --- a/plugin/energylogger.cpp +++ b/plugin/energylogger.cpp @@ -658,17 +658,17 @@ bool EnergyLogger::sampleThingPower(const ThingId &thingId, SampleRate sampleRat } double medianCurrentPower = 0; + double totalConsumption = 0; + double totalProduction = 0; while (query.next()) { qCDebug(dcEnergyExperience()) << "Frame:" << query.value("currentPower").toDouble() << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString(); medianCurrentPower += query.value("currentPower").toDouble(); + totalConsumption = query.value("totalConsumption").toDouble(); + totalProduction = query.value("totalProduction").toDouble(); } - qCDebug(dcEnergyExperience()) << "Total:" << medianCurrentPower << "base samplerate" << baseSampleRate << "samplerate:" << sampleRate; medianCurrentPower = medianCurrentPower * baseSampleRate / sampleRate; - double totalConsumption = query.value("totalConsumption").toDouble(); - double totalProduction = query.value("totalProduction").toDouble(); - - qCDebug(dcEnergyExperience()) << "Sampled:" << medianCurrentPower; + qCDebug(dcEnergyExperience()) << "Sampled:" << thingId << sampleRate << "media currentpower:" << medianCurrentPower << "total consumption:" << totalConsumption << "total production:" << totalProduction; return insertThingPower(sampleEnd, sampleRate, thingId, medianCurrentPower, totalConsumption, totalProduction); }