ETM-Schurig
/
powersync-experience-energy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sampleing of things totalConsumption/totalProduction

master
Michael Zanetti 2021-11-23 16:43:43 +01:00
parent 602347dba1
commit 10d323a3aa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/energylogger.cpp
View File

@ -658,17 +658,17 @@ bool EnergyLogger::sampleThingPower(const ThingId &thingId, SampleRate sampleRat
} }
double medianCurrentPower = 0; double medianCurrentPower = 0;
double totalConsumption = 0;
double totalProduction = 0;
while (query.next()) { while (query.next()) {
qCDebug(dcEnergyExperience()) << "Frame:" << query.value("currentPower").toDouble() << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString(); qCDebug(dcEnergyExperience()) << "Frame:" << query.value("currentPower").toDouble() << QDateTime::fromMSecsSinceEpoch(query.value("timestamp").toLongLong()).toString();
medianCurrentPower += query.value("currentPower").toDouble(); 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; medianCurrentPower = medianCurrentPower * baseSampleRate / sampleRate;
double totalConsumption = query.value("totalConsumption").toDouble(); qCDebug(dcEnergyExperience()) << "Sampled:" << thingId << sampleRate << "media currentpower:" << medianCurrentPower << "total consumption:" << totalConsumption << "total production:" << totalProduction;
double totalProduction = query.value("totalProduction").toDouble();
qCDebug(dcEnergyExperience()) << "Sampled:" << medianCurrentPower;
return insertThingPower(sampleEnd, sampleRate, thingId, medianCurrentPower, totalConsumption, totalProduction); return insertThingPower(sampleEnd, sampleRate, thingId, medianCurrentPower, totalConsumption, totalProduction);
} }