3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-06 12:41:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

bug fixes

Browse source
This commit is contained in:
dAjaY85 2023-08-29 15:28:28 +02:00
parent e2f8fcab40
commit b12effd59e
1 changed files with 70 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

134
src/plugins/Display/Display_ePaper.cpp
View file

@ -165,75 +165,81 @@ void DisplayEPaper::actualPowerPaged(float totalPower, float totalYieldDay, floa
} else { } else {
snprintf(_fmtText, sizeof(_fmtText), "offline"); snprintf(_fmtText, sizeof(_fmtText), "offline");
} }
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
x = ((_display->width() - tbw) / 2) - tbx;
_display->setCursor(x, mHeadFootPadding + tbh + 10);
_display->print(_fmtText);
if ((totalYieldDay > 0) && (totalYieldTotal > 0)) { if ((totalPower == 0) && (mEnPowerSafe)) {
// Today Production _display->fillRect(0, mHeadFootPadding, 200, 200, GxEPD_BLACK);
_display->setFont(&FreeSans18pt7b); _display->drawBitmap(0, 0, logo, 200, 200, GxEPD_WHITE);
y = _display->height() / 2; } else {
_display->setCursor(5, y); _display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
x = ((_display->width() - tbw) / 2) - tbx;
_display->setCursor(x, mHeadFootPadding + tbh + 10);
_display->print(_fmtText);
if (totalYieldDay > 9999) { if ((totalYieldDay > 0) && (totalYieldTotal > 0)) {
snprintf(_fmtText, _display->width(), "%.1f", (totalYieldDay / 1000)); // Today Production
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh); _display->setFont(&FreeSans18pt7b);
_display->drawInvertedBitmap(5, y - ((tbh + 30) / 2), myToday, 30, 30, GxEPD_BLACK); y = _display->height() / 2;
x = ((_display->width() - tbw - 20) / 2) - tbx; _display->setCursor(5, y);
_display->setCursor(x, y);
_display->print(_fmtText); if (totalYieldDay > 9999) {
_display->setCursor(_display->width() - 50, y); snprintf(_fmtText, _display->width(), "%.1f", (totalYieldDay / 1000));
_display->setFont(&FreeSans12pt7b); _display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->println("kWh"); _display->drawInvertedBitmap(5, y - ((tbh + 30) / 2), myToday, 30, 30, GxEPD_BLACK);
} else if (totalYieldDay <= 9999) { x = ((_display->width() - tbw - 20) / 2) - tbx;
snprintf(_fmtText, _display->width(), "%.0f", (totalYieldDay)); _display->setCursor(x, y);
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh); _display->print(_fmtText);
_display->drawInvertedBitmap(5, y - tbh, myToday, 30, 30, GxEPD_BLACK); _display->setCursor(_display->width() - 50, y);
x = ((_display->width() - tbw - 20) / 2) - tbx; _display->setFont(&FreeSans12pt7b);
_display->setCursor(x, y); _display->println("kWh");
_display->print(_fmtText); } else if (totalYieldDay <= 9999) {
_display->setCursor(_display->width() - 38, y); snprintf(_fmtText, _display->width(), "%.0f", (totalYieldDay));
_display->setFont(&FreeSans12pt7b); _display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->println("Wh"); _display->drawInvertedBitmap(5, y - tbh, myToday, 30, 30, GxEPD_BLACK);
x = ((_display->width() - tbw - 20) / 2) - tbx;
_display->setCursor(x, y);
_display->print(_fmtText);
_display->setCursor(_display->width() - 38, y);
_display->setFont(&FreeSans12pt7b);
_display->println("Wh");
}
y = y + tbh + 15;
// Total Production
_display->setFont(&FreeSans18pt7b);
_display->setCursor(5, y);
if (totalYieldTotal > 9999) {
snprintf(_fmtText, _display->width(), "%.1f", (totalYieldTotal / 1000));
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->drawInvertedBitmap(5, y - tbh, mySigma, 30, 30, GxEPD_BLACK);
x = ((_display->width() - tbw - 20) / 2) - tbx;
_display->setCursor(x, y);
_display->print(_fmtText);
_display->setCursor(_display->width() - 59, y);
_display->setFont(&FreeSans12pt7b);
_display->println("MWh");
} else if (totalYieldTotal <= 9999) {
snprintf(_fmtText, _display->width(), "%.0f", (totalYieldTotal));
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->drawInvertedBitmap(5, y - tbh, mySigma, 30, 30, GxEPD_BLACK);
x = ((_display->width() - tbw - 20) / 2) - tbx;
_display->setCursor(x, y);
_display->print(_fmtText);
_display->setCursor(_display->width() - 50, y);
_display->setFont(&FreeSans12pt7b);
_display->println("kWh");
}
} }
y = y + tbh + 15;
// Total Production // Inverter online
_display->setFont(&FreeSans18pt7b); _display->setFont(&FreeSans12pt7b);
_display->setCursor(5, y); y = _display->height() - (mHeadFootPadding + 10);
if (totalYieldTotal > 9999) { snprintf(_fmtText, sizeof(_fmtText), " %d online", isprod);
snprintf(_fmtText, _display->width(), "%.1f", (totalYieldTotal / 1000)); _display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh); _display->drawInvertedBitmap(10, y - tbh, myWR, 20, 20, GxEPD_BLACK);
_display->drawInvertedBitmap(5, y - tbh, mySigma, 30, 30, GxEPD_BLACK); x = ((_display->width() - tbw - 20) / 2) - tbx;
x = ((_display->width() - tbw - 20) / 2) - tbx; _display->setCursor(x, y);
_display->setCursor(x, y); _display->println(_fmtText);
_display->print(_fmtText);
_display->setCursor(_display->width() - 59, y);
_display->setFont(&FreeSans12pt7b);
_display->println("MWh");
} else if (totalYieldTotal <= 9999) {
snprintf(_fmtText, _display->width(), "%.0f", (totalYieldTotal));
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->drawInvertedBitmap(5, y - tbh, mySigma, 30, 30, GxEPD_BLACK);
x = ((_display->width() - tbw - 20) / 2) - tbx;
_display->setCursor(x, y);
_display->print(_fmtText);
_display->setCursor(_display->width() - 50, y);
_display->setFont(&FreeSans12pt7b);
_display->println("kWh");
}
} }
// Inverter online
_display->setFont(&FreeSans12pt7b);
y = _display->height() - (mHeadFootPadding + 10);
snprintf(_fmtText, sizeof(_fmtText), " %d online", isprod);
_display->getTextBounds(_fmtText, 0, 0, &tbx, &tby, &tbw, &tbh);
_display->drawInvertedBitmap(10, y - tbh, myWR, 20, 20, GxEPD_BLACK);
x = ((_display->width() - tbw - 20) / 2) - tbx;
_display->setCursor(x, y);
_display->println(_fmtText);
} while (_display->nextPage()); } while (_display->nextPage());
} }
//*************************************************************************** //***************************************************************************