patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use the new data store in the graphic display class.

Browse Source 
With this patch, the display turns off if no inverter is reachable anymore. Previously it turned off if the production was zero.
This fixes #933
This commit is contained in:
Thomas Basler 2023-05-21 22:40:32 +02:00
parent cd98941c5d
commit 40820c07f2
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Display_Graphic.cpp
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "Display_Graphic.h" #include "Display_Graphic.h"
#include <Hoymiles.h> #include "Datastore.h"
#include <NetworkSettings.h> #include <NetworkSettings.h>
#include <map> #include <map>
#include <time.h> #include <time.h>
@ -113,38 +113,16 @@ void DisplayGraphicClass::loop()
} }
if ((millis() - _lastDisplayUpdate) > _period) { if ((millis() - _lastDisplayUpdate) > _period) {
float totalPower = 0;
float totalYieldDay = 0;
float totalYieldTotal = 0;
uint8_t isprod = 0;
for (uint8_t i = 0; i < Hoymiles.getNumInverters(); i++) {
auto inv = Hoymiles.getInverterByPos(i);
if (inv == nullptr) {
continue;
}
if (inv->isProducing()) {
isprod++;
}
for (auto& c : inv->Statistics()->getChannelsByType(TYPE_AC)) {
totalPower += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_PAC);
totalYieldDay += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_YD);
totalYieldTotal += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_YT);
}
}
_display->clearBuffer(); _display->clearBuffer();
//=====> Actual Production ========== //=====> Actual Production ==========
if ((totalPower > 0) && (isprod > 0)) { if (Datastore.isAtLeastOneReachable) {
_display->setPowerSave(false); _display->setPowerSave(false);
if (totalPower > 999) { if (Datastore.totalAcPowerEnabled > 999) {
snprintf(_fmtText, sizeof(_fmtText), "%2.1f kW", (totalPower / 1000)); snprintf(_fmtText, sizeof(_fmtText), "%2.1f kW", (Datastore.totalAcPowerEnabled / 1000));
} else { } else {
snprintf(_fmtText, sizeof(_fmtText), "%3.0f W", totalPower); snprintf(_fmtText, sizeof(_fmtText), "%3.0f W", Datastore.totalAcPowerEnabled);
} }
printText(_fmtText, 0); printText(_fmtText, 0);
_previousMillis = millis(); _previousMillis = millis();
@ -162,10 +140,10 @@ void DisplayGraphicClass::loop()
//<======================= //<=======================
//=====> Today & Total Production ======= //=====> Today & Total Production =======
snprintf(_fmtText, sizeof(_fmtText), "today: %4.0f Wh", totalYieldDay); snprintf(_fmtText, sizeof(_fmtText), "today: %4.0f Wh", Datastore.totalAcYieldDayEnabled);
printText(_fmtText, 1); printText(_fmtText, 1);
snprintf(_fmtText, sizeof(_fmtText), "total: %.1f kWh", totalYieldTotal); snprintf(_fmtText, sizeof(_fmtText), "total: %.1f kWh", Datastore.totalAcYieldTotalEnabled);
printText(_fmtText, 2); printText(_fmtText, 2);
//<======================= //<=======================