ETM-Schurig
/
nymea-experience-plugin-energy
mirror of https://github.com/nymea/nymea-experience-plugin-energy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sampling of things totalEnergy states

initial-experience
Michael Zanetti 2021-11-27 01:15:24 +01:00
parent fd1fd490df
commit 5f4534b6dc
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugin/energylogger.cpp
View File

@ -287,10 +287,6 @@ void EnergyLogger::sample()
qCDebug(dcEnergyExperience()) << "Sampled:" << "🔥:" << medianConsumption << "🌞:" << medianProduction << "💵:" << medianAcquisition << "🔋:" << medianStorage << "Totals:" << "🔥:" << totalConsumption << "🌞:" << totalProduction << "💵↓:" << totalAcquisition << "💵↑:" << totalReturn; qCDebug(dcEnergyExperience()) << "Sampled:" << "🔥:" << medianConsumption << "🌞:" << medianProduction << "💵:" << medianAcquisition << "🔋:" << medianStorage << "Totals:" << "🔥:" << totalConsumption << "🌞:" << totalProduction << "💵↓:" << totalAcquisition << "💵↑:" << totalReturn;
insertPowerBalance(sampleEnd, SampleRate1Min, medianConsumption, medianProduction, medianAcquisition, medianStorage, totalConsumption, totalProduction, totalAcquisition, totalReturn); insertPowerBalance(sampleEnd, SampleRate1Min, medianConsumption, medianProduction, medianAcquisition, medianStorage, totalConsumption, totalProduction, totalAcquisition, totalReturn);
m_lastSampleTotalConsumption = totalConsumption;
m_lastSampleTotalProducation = totalProduction;
m_lastSampleTotalAcquisition = totalAcquisition;
m_lastSampleTotalReturn = totalReturn;
foreach (const ThingId &thingId, m_thingsPowerLiveLogs.keys()) { foreach (const ThingId &thingId, m_thingsPowerLiveLogs.keys()) {
medianConsumption = 0; medianConsumption = 0;
@ -308,12 +304,11 @@ void EnergyLogger::sample()
} }
} }
medianConsumption /= sampleStart.msecsTo(sampleEnd); medianConsumption /= sampleStart.msecsTo(sampleEnd);
double totalConsumption = 0;
double totalProduction = 0; ThingPowerLogEntry newest = entries.count() > 0 ? entries.first() : ThingPowerLogEntry();
if (entries.count() > 0) { double totalConsumption = newest.totalConsumption();
totalConsumption = entries.last().totalConsumption(); double totalProduction = newest.totalProduction();
totalProduction = entries.last().totalProduction();
}
qCDebug(dcEnergyExperience()) << "Sampled:" << "🔥:" << medianConsumption << "🌞:" << medianProduction << "Totals:" << "🔥:" << totalConsumption << "🌞:" << totalProduction; qCDebug(dcEnergyExperience()) << "Sampled:" << "🔥:" << medianConsumption << "🌞:" << medianProduction << "Totals:" << "🔥:" << totalConsumption << "🌞:" << totalProduction;
insertThingPower(sampleEnd, SampleRate1Min, thingId, medianConsumption, totalConsumption, totalProduction); insertThingPower(sampleEnd, SampleRate1Min, thingId, medianConsumption, totalConsumption, totalProduction);
} }

5
plugin/energylogger.h
View File

@ -69,11 +69,6 @@ private:
QTimer m_sampleTimer; QTimer m_sampleTimer;
QHash<SampleRate, QDateTime> m_nextSamples; QHash<SampleRate, QDateTime> m_nextSamples;
double m_lastSampleTotalConsumption = 0;
double m_lastSampleTotalProducation = 0;
double m_lastSampleTotalAcquisition = 0;
double m_lastSampleTotalReturn = 0;
QSqlDatabase m_db; QSqlDatabase m_db;
int m_maxMinuteSamples = 0; int m_maxMinuteSamples = 0;