Merge branch 'feature/PR_fix_vanishing_xscale' of https://github.com/You69Man/ahoy into development03

src/plugins/Display/Display_Mono.h

@@ -123,9 +123,9 @@ class DisplayMono {
                     if ((mDisplayData->pGraphStartTime > 0)
                         && (mDisplayData->pGraphEndTime > 0)                      // wait until period data is available ...
                         && (mDisplayData->utcTs >= mDisplayData->pGraphStartTime)
-                        && (mDisplayData->utcTs < mDisplayData->pGraphEndTime)) // and current time is in period
+                        && (mDisplayData->utcTs < mDisplayData->pGraphEndTime))   // and current time is in period
                     {
-                        storeStartEndTimes = true;                                     // period was received -> store
+                        storeStartEndTimes = true;                                // period was received -> store
                         store_entry = true;
                         mPgState = PowerGraphState::IN_PERIOD;
                     }
@@ -138,7 +138,7 @@ class DisplayMono {
                     break;
                 case PowerGraphState::WAIT_4_NEW_PERIOD:
                     if ((mPgStartTime != mDisplayData->pGraphStartTime) || (mPgEndTime != mDisplayData->pGraphEndTime)) { // wait until new time period was received ...
-                        storeStartEndTimes = true;                                                                             // and store it for next period
+                        storeStartEndTimes = true;                                                                        // and store it for next period
                         mPgState = PowerGraphState::WAIT_4_RESTART;
                     }
                     break;
@@ -158,10 +158,12 @@ class DisplayMono {
                 mPgPeriod = mDisplayData->pGraphEndTime - mDisplayData->pGraphStartTime;  // time period of power graph in sec for scaling of x-axis
             }
 
+            // store new value to mPgData
             if (store_entry) {
-                mPgLastPos = std::min((uint8_t) sss2PgPos(mDisplayData->utcTs - mPgStartTime), (uint8_t) (mPgWidth - 1));  // current datapoint based on seconds since start
-                mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], val); // update current datapoint to maximum of all seen values
-                mPgMaxPwr = std::max(mPgMaxPwr, val);  // update max value of stored data for scaling of y-axis
+                mPgLastTime = mDisplayData->utcTs;                                                                 // time of last datapoint
+                mPgLastPos = std::min((uint8_t) sss2PgPos(mPgLastTime - mPgStartTime), (uint8_t) (mPgWidth - 1));  // last datapoint based on seconds since start
+                mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], val); // update current datapoint to maximum of all seen values (= envelope curve)
+                mPgMaxPwr = std::max(mPgMaxPwr, val);                     // update max value of stored data for scaling of y-axis
             }
         }
 
@@ -175,27 +177,33 @@ class DisplayMono {
             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 ((0 == mDisplayData->pGraphStartTime) || (0 == mDisplayData->pGraphEndTime) || (0 == mDisplayData->utcTs) || (mPgMaxPwr < 1) || (0 == mPgLastPos))
+            if ((0 == mPgStartTime) || (0 == mPgEndTime) || (0 == mPgLastTime) || (0 == mPgLastPos) || (mPgMaxPwr < 1))
                 return;
 
             // draw X scale
             tmElements_t tm;
-            breakTime(mDisplayData->pGraphEndTime, tm);
-            uint8_t endHourPg = tm.Hour;
-            breakTime(mDisplayData->utcTs, tm);
-            uint8_t endHour = std::min(endHourPg, tm.Hour);
-            breakTime(mDisplayData->pGraphStartTime, tm);
+            breakTime(mPgEndTime, tm);
+            uint8_t endHourPg = tm.Hour;                    // absolute last hour in diagram
+            breakTime(mPgLastTime, tm);
+            uint8_t endHour = std::min(endHourPg, tm.Hour); // last hour of current data point in scaled diagram
+
+            breakTime(mPgStartTime, tm);
             tm.Hour += 1;
             tm.Minute = 0;
             tm.Second = 0;
             for (; tm.Hour <= endHour; tm.Hour++) {
-                uint8_t x_pos_screen = getPowerGraphXpos(sss2PgPos((uint32_t) makeTime(tm) - mDisplayData->pGraphStartTime)); // scale horizontal axis
-                mDisplay->drawPixel(xoff + x_pos_screen, yoff - 1);
+                uint8_t x_pos_screen = getPowerGraphXpos(sss2PgPos((uint32_t) makeTime(tm) - mPgStartTime)); // scale horizontal axis
+                if (12 == tm.Hour) {
+                    mDisplay->drawLine(xoff + x_pos_screen, yoff, xoff + x_pos_screen, yoff - 2);            // mark noon
+                    mDisplay->drawLine(xoff + x_pos_screen - 1, yoff - 1, xoff + x_pos_screen + 1, yoff - 1);
+                }
+                else
+                    mDisplay->drawPixel(xoff + x_pos_screen, yoff - 1);
             }
 
             // draw Y scale
             uint16_t scale_y = 10;
-            uint32_t maxpwr_int = static_cast<uint8_t>(std::round(mPgMaxPwr));
+            uint32_t maxpwr_int = static_cast<uint32_t>(std::round(mPgMaxPwr));
             if (maxpwr_int > 100)
                 scale_y = 100;
 
@@ -243,6 +251,7 @@ class DisplayMono {
             if (mPgData != nullptr) {
                 mPgMaxPwr = 0.0;
                 mPgLastPos = 0;
+                mPgLastTime = 0;
                 for (uint8_t i = 0; i < mPgWidth; i++) {
                     mPgData[i] = 0.0;
                 }
@@ -296,6 +305,7 @@ class DisplayMono {
         uint32_t mPgEndTime = 0;
         uint32_t mPgPeriod = 0;  // seconds
         uint8_t  mPgLastPos = 0;
+        uint32_t mPgLastTime = 0;
         PowerGraphState mPgState = PowerGraphState::NO_TIME_SYNC;
 
         uint16_t mDispHeight;