morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed Total System Consumption and Average System Total calculation. Omit if the time diff is less than 0 (#1092)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-09-21 17:33:53 +02:00
parent 409640b261
commit 1e15d6590a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/Sensors/readers.swift
View File

@@ -168,16 +168,18 @@ internal class SensorsReader: Reader<[Sensor_p]> {
}
}
// Cumulative power is in watt-hours
if let PSTRSensor = self.list.first(where: { $0.key == "PSTR"}) {
if let totalIdx = self.list.firstIndex(where: {$0.key == "Total System Consumption"}) {
self.list[totalIdx].value += PSTRSensor.value * Date().timeIntervalSince(self.lastRead) / 3600
if let avgIdx = self.list.firstIndex(where: {$0.key == "Average System Total"}) {
// Avg power consumption is simply total consumption divided by time online
self.list[avgIdx].value = self.list[totalIdx].value * 3600 / Date().timeIntervalSince(self.firstRead)
if let PSTRSensor = self.list.first(where: { $0.key == "PSTR"}), PSTRSensor.value > 0 {
let sinceLastRead = Date().timeIntervalSince(self.lastRead)
let sinceFirstRead = Date().timeIntervalSince(self.firstRead)
if let totalIdx = self.list.firstIndex(where: {$0.key == "Total System Consumption"}), sinceLastRead > 0 {
self.list[totalIdx].value += PSTRSensor.value * sinceLastRead / 3600
if let avgIdx = self.list.firstIndex(where: {$0.key == "Average System Total"}), sinceFirstRead > 0 {
self.list[avgIdx].value = self.list[totalIdx].value * 3600 / sinceFirstRead
}
self.lastRead = Date()
}
self.lastRead = Date()
}
self.callback(self.list)