topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

0.8.50 

* small changes
pull/1347/head
lumapu 2 years ago
parent
281da4f576
commit
ce6013d6a0
2 changed files with 44 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      src/plugins/Display/Display_Mono.h
  2. 4
      src/web/lang.json

83
src/plugins/Display/Display_Mono.h
View File

@ -155,16 +155,17 @@ class DisplayMono {
} }
void resetPowerGraph() { void resetPowerGraph() {
if (mPgData != nullptr) { if (mPgData != nullptr) {
mPgMaxPwr = 0.0; mPgMaxPwr = 0.0;
mPgLastPos = 0; mPgLastPos = 0;
for (uint8_t i = 0; i < mPgWidth; i++) for (uint8_t i = 0; i < mPgWidth; i++) {
mPgData[i] = 0.0; mPgData[i] = 0.0;
} }
}
} }
uint8_t sss2pgpos(uint seconds_since_start) { uint8_t sss2pgpos(uint seconds_since_start) {
return(seconds_since_start * (mPgWidth - 1) / (mDisplayData->pGraphEndTime - mDisplayData->pGraphStartTime)); return(seconds_since_start * (mPgWidth - 1) / (mDisplayData->pGraphEndTime - mDisplayData->pGraphStartTime));
} }
void calcPowerGraphValues() { void calcPowerGraphValues() {
@ -186,60 +187,60 @@ class DisplayMono {
} }
uint8_t getPowerGraphXpos(uint8_t p) { uint8_t getPowerGraphXpos(uint8_t p) {
if ((p <= mPgLastPos) && (mPgLastPos > 0)) if ((p <= mPgLastPos) && (mPgLastPos > 0))
return((p * (mPgWidth - 1)) / mPgLastPos); // scaling of x-axis return((p * (mPgWidth - 1)) / mPgLastPos); // scaling of x-axis
else else
return(0); return(0);
} }
uint8_t getPowerGraphYpos(uint8_t p) { uint8_t getPowerGraphYpos(uint8_t p) {
if (p < mPgWidth) if (p < mPgWidth)
//return(((uint32_t) mPgData[p] * (uint32_t) mPgMaxAvailPower) * (uint32_t) mPgHeight / mPgMaxPwr / 255); // scaling of normalized data (0-255) to graph height
return((mPgData[p] * (uint32_t) mPgHeight / mPgMaxPwr)); // scaling of data to graph height return((mPgData[p] * (uint32_t) mPgHeight / mPgMaxPwr)); // scaling of data to graph height
else else
return(0); return(0);
} }
void plotPowerGraph(uint8_t xoff, uint8_t yoff) { void plotPowerGraph(uint8_t xoff, uint8_t yoff) {
// draw axes // draw axes
mDisplay->drawLine(xoff, yoff, xoff, yoff - mPgHeight); // vertical axis mDisplay->drawLine(xoff, yoff, xoff, yoff - mPgHeight); // vertical axis
mDisplay->drawLine(xoff, yoff, xoff + mPgWidth, yoff); // horizontal axis mDisplay->drawLine(xoff, yoff, xoff + mPgWidth, yoff); // horizontal axis
// draw X scale // draw X scale
tmElements_t tm; tmElements_t tm;
breakTime(mDisplayData->pGraphEndTime, tm); breakTime(mDisplayData->pGraphEndTime, tm);
uint8_t endHourPg = tm.Hour; uint8_t endHourPg = tm.Hour;
breakTime(mDisplayData->utcTs, tm); breakTime(mDisplayData->utcTs, tm);
uint8_t endHour = std::min(endHourPg, tm.Hour); uint8_t endHour = std::min(endHourPg, tm.Hour);
breakTime(mDisplayData->pGraphStartTime, tm); breakTime(mDisplayData->pGraphStartTime, tm);
tm.Hour += 1; tm.Hour += 1;
tm.Minute = 0; tm.Minute = 0;
tm.Second = 0; tm.Second = 0;
for (; tm.Hour <= endHour; tm.Hour++) { for (; tm.Hour <= endHour; tm.Hour++) {
uint8_t x_pos_screen = getPowerGraphXpos(sss2pgpos((uint32_t) makeTime(tm) - mDisplayData->pGraphStartTime)); // scale horizontal axis uint8_t x_pos_screen = getPowerGraphXpos(sss2pgpos((uint32_t) makeTime(tm) - mDisplayData->pGraphStartTime)); // scale horizontal axis
mDisplay->drawPixel(xoff + x_pos_screen, yoff - 1); mDisplay->drawPixel(xoff + x_pos_screen, yoff - 1);
} }
// draw Y scale // draw Y scale
uint16_t scale_y = 10; uint16_t scale_y = 10;
uint32_t maxpwr_int = static_cast<uint8_t>(std::round(mPgMaxPwr)); uint32_t maxpwr_int = static_cast<uint8_t>(std::round(mPgMaxPwr));
if (maxpwr_int > 100) if (maxpwr_int > 100)
scale_y = 100; scale_y = 100;
for (uint32_t i = scale_y; i <= maxpwr_int; i += scale_y) {
for (uint32_t i = scale_y; i <= maxpwr_int; i += scale_y) {
uint8_t ypos = yoff - static_cast<uint8_t>(std::round(i * (float) mPgHeight / mPgMaxPwr)); // scale vertical axis uint8_t ypos = yoff - static_cast<uint8_t>(std::round(i * (float) mPgHeight / mPgMaxPwr)); // scale vertical axis
mDisplay->drawPixel(xoff + 1, ypos); mDisplay->drawPixel(xoff + 1, ypos);
} }
// draw curve // draw curve
for (uint8_t i = 1; i <= mPgLastPos; i++) { for (uint8_t i = 1; i <= mPgLastPos; i++) {
mDisplay->drawLine(xoff + getPowerGraphXpos(i - 1), yoff - getPowerGraphYpos(i - 1), mDisplay->drawLine(xoff + getPowerGraphXpos(i - 1), yoff - getPowerGraphYpos(i - 1),
xoff + getPowerGraphXpos(i), yoff - getPowerGraphYpos(i)); xoff + getPowerGraphXpos(i), yoff - getPowerGraphYpos(i));
} }
// print max power value // print max power value
mDisplay->setFont(u8g2_font_4x6_tr); mDisplay->setFont(u8g2_font_4x6_tr);
snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%dW", static_cast<uint16_t>(std::round(mPgMaxPwr))); snprintf(mFmtText, DISP_FMT_TEXT_LEN, "%dW", static_cast<uint16_t>(std::round(mPgMaxPwr)));
mDisplay->drawStr(xoff + 3, yoff - mPgHeight + 5, mFmtText); mDisplay->drawStr(xoff + 3, yoff - mPgHeight + 5, mFmtText);
} }
// pixelshift screensaver with wipe effect // pixelshift screensaver with wipe effect

4
src/web/lang.json
View File

@ -1261,12 +1261,12 @@
{ {
"token": "INV_LOSS_RATE", "token": "INV_LOSS_RATE",
"en": "Inverter loss rate", "en": "Inverter loss rate",
"de": "Wechselrichter Empfangsqualit&auml;t" "de": "Wechselrichter Verlustrate"
}, },
{ {
"token": "DTU_LOSS_RATE", "token": "DTU_LOSS_RATE",
"en": "DTU loss rate", "en": "DTU loss rate",
"de": "DTU Empfangsqualit&auml;t" "de": "DTU Verlustrate"
}, },
{ {
"token": "RADIO_STAT_MODAL", "token": "RADIO_STAT_MODAL",

Write Preview
Loading…
Cancel
Save