3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-23 05:46:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix reboot problem with deactivated power graph

Browse source
This commit is contained in:
you69man 2024-01-14 15:26:27 +01:00
parent 60111d0696
commit 28418998fc
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@
#endif #endif
#include "../../utils/helper.h" #include "../../utils/helper.h"
#include "Display_data.h" #include "Display_data.h"
#include "config/settings.h"
#include "../../utils/dbg.h" #include "../../utils/dbg.h"
#include "../../utils/timemonitor.h" #include "../../utils/timemonitor.h"
@ -184,7 +185,7 @@ class DisplayMono {
} }
void addPowerGraphEntry(float val) { void addPowerGraphEntry(float val) {
if (mDisplayData->utcTs > 0) { // precondition: utc time available if ((mPgData != nullptr) && (mDisplayData->utcTs > 0)) { // precondition: power graph initialized and utc time available
calcPowerGraphValues(); calcPowerGraphValues();
//mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], (uint8_t) (val * 255.0 / mPgMaxAvailPower)); // normalizing of data to 0-255 //mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], (uint8_t) (val * 255.0 / mPgMaxAvailPower)); // normalizing of data to 0-255
mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], val); mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], val);
@ -205,12 +206,15 @@ class DisplayMono {
} }
void plotPowerGraph(uint8_t xoff, uint8_t yoff) { void plotPowerGraph(uint8_t xoff, uint8_t yoff) {
if (mPgData == nullptr) // power graph not initialized
return;
// 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
// do not draw as long as time is not set correctly and no data was received // 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)) if ((mDisplayData->pGraphStartTime == 0) || (mDisplayData->pGraphEndTime == 0) || (mDisplayData->utcTs == 0) || (mPgMaxPwr < 1) || (mPgLastPos == 0))
return; return;
// draw X scale // draw X scale