3 files changed, 9 insertions(+), 6 deletions(-)

M harmony_changelog.md
M module-sys/SystemManager/PowerManager.cpp
M module-sys/SystemManager/include/SystemManager/PowerManager.hpp

@@ 5,6 5,7 @@
 ### Fixed
 * Fixed the backlight blink in pre-wake up
 * Fixed missing tooltip text in Onboarding in French
+* Fixed incorrect Power Management statistics in the logs
 
 ### Added
 * Added custom alarms functionality

@@ 219,12 219,7 @@ namespace sys
                              ? lowestLevelName
                              : (currentFreq == bsp::CpuFrequencyMHz::Level_6 ? highestLevelName : middleLevelName);
 
-        for (auto &level : cpuFrequencyMonitors) {
-            if (level.GetName() == levelName) {
-                level.IncreaseTicks(ticks - lastCpuFrequencyChangeTimestamp);
-            }
-        }
-
+        UpdateCpuFrequencyMonitor(levelName, ticks - lastCpuFrequencyChangeTimestamp);
         lastCpuFrequencyChangeTimestamp = ticks;
     }
 


@@ 237,6 232,11 @@ namespace sys
         }
     }
 
+    void PowerManager::UpdateCpuFrequencyMonitorTimestamp()
+    {
+        lastCpuFrequencyChangeTimestamp = xTaskGetTickCount();
+    }
+
     void PowerManager::EnterWfiIfReady()
     {
         if (cpuGovernor->IsWfiBlocked()) {


@@ 254,6 254,7 @@ namespace sys
             lowPowerControl->EnableSysTick();
             portEXIT_CRITICAL();
             UpdateCpuFrequencyMonitor(WfiName, timeSpentInWFI);
+            UpdateCpuFrequencyMonitorTimestamp();
         }
     }
 

@@ 76,6 76,7 @@ namespace sys
         void SetCpuFrequency(bsp::CpuFrequencyMHz freq);
         void UpdateCpuFrequencyMonitor(bsp::CpuFrequencyMHz currentFreq);
         void UpdateCpuFrequencyMonitor(const std::string &name, std::uint32_t tickIncrease);
+        void UpdateCpuFrequencyMonitorTimestamp();
         [[nodiscard]] auto GetMinimumCpuFrequencyRequested() const noexcept -> sentinel::View;
 
         TickType_t lastCpuFrequencyChangeTimestamp{0};