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

possibly fix power graph problems

Browse source
This commit is contained in:
you69man 2024-01-10 22:57:47 +01:00
parent e4cb948be4
commit 9a8d8560db
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/plugins/Display/Display_Mono.h
View file

@ -119,7 +119,7 @@ class DisplayMono {
case DispSwitchState::TEXT:
if (mDispSwitchTime.isTimeout()) {
mDispSwitchState = DispSwitchState::GRAPH;
mDispSwitchTime.startTimeMonitor(150 * mCfg->graph_ratio); // mGraphRatio: 0-100 Gesamtperiode 15000 ms
mDispSwitchTime.startTimeMonitor(150 * mCfg->graph_ratio); // graph_ratio: 0-100 Gesamtperiode 15000 ms
change = true;
}
break;
@ -135,6 +135,7 @@ class DisplayMono {
}
void initPowerGraph(uint8_t width, uint8_t height) {
DBGPRINTLN("---- Init Power Graph ----");
mPgWidth = width;
mPgHeight = height;
mPgData = new float[mPgWidth];
@ -205,6 +206,10 @@ class DisplayMono {
mDisplay->drawLine(xoff, yoff, xoff, yoff - mPgHeight); // vertical axis
mDisplay->drawLine(xoff, yoff, xoff + mPgWidth, yoff); // horizontal axis
// do not draw as long as time is not set correctly and no data was received
if ((mDisplayData->pGraphStartTime == 0) || (mDisplayData->pGraphEndTime == 0) || (mDisplayData->utcTs < 1) || (mPgMaxPwr < 1) || (mPgLastPos < 1))
return;
// draw X scale
tmElements_t tm;
breakTime(mDisplayData->pGraphEndTime, tm);

3
src/plugins/Display/Display_Mono_128X64.h
View file

@ -58,6 +58,7 @@ class DisplayMono128X64 : public DisplayMono {
widthShrink = (mCfg->screenSaver == 1) ? pixelShiftRange : 0; // shrink graphwidth for pixelshift screensaver
if (mCfg->graph_ratio > 0)
initPowerGraph(mDispWidth - 22 - widthShrink, mLineYOffsets[graph_last_line] - mLineYOffsets[graph_first_line - 1] - 2);
printText("Ahoy!", l_Ahoy, 0xff);
@ -172,7 +173,7 @@ class DisplayMono128X64 : public DisplayMono {
printText(mFmtText, l_YieldTotal, 0xff);
}
if (mDispSwitchState == DispSwitchState::GRAPH) {
if ((mCfg->graph_ratio > 0) && (mDispSwitchState == DispSwitchState::GRAPH)) {
// plot power graph
plotPowerGraph((mDispWidth - mPgWidth) / 2 + mPixelshift, mLineYOffsets[graph_last_line] - 1);
}

3
src/plugins/Display/Display_Mono_84X48.h
View file

@ -46,6 +46,7 @@ class DisplayMono84X48 : public DisplayMono {
break;
}
if (mCfg->graph_ratio > 0)
initPowerGraph(mDispWidth - 16, mLineYOffsets[graph_last_line] - mLineYOffsets[graph_first_line - 1] - 2);
printText("Ahoy!", l_Ahoy, 0xff);
@ -134,7 +135,7 @@ class DisplayMono84X48 : public DisplayMono {
printText(mFmtText, l_YieldTotal, 0xff);
}
if (mDispSwitchState == DispSwitchState::GRAPH) {
if ((mCfg->graph_ratio > 0) && (mDispSwitchState == DispSwitchState::GRAPH)) {
// plot power graph
plotPowerGraph(8, mLineYOffsets[graph_last_line] - 1);
}