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: battery health on Apple Silicon (#246)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-12-30 14:43:18 +01:00
parent 2d6139b223
commit e33082f0ca
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Battery/main.swift
View File

@@ -16,7 +16,7 @@ import IOKit.ps
struct Battery_Usage: value_t {
var powerSource: String = ""
var state: String = ""
var state: String? = nil
var isCharged: Bool = false
var isCharging: Bool = false
var level: Double = 0

5
Modules/Battery/popup.swift
View File

@@ -246,7 +246,10 @@ internal class Popup: NSView, Popup_p {
self.timeField?.stringValue = LocalizedString("Fully charged")
}
self.healthField?.stringValue = "\(value.health) % (\(value.state))"
self.healthField?.stringValue = "\(value.health)%"
if let state = value.state {
self.healthField?.stringValue += " (\(state))"
}
self.cyclesField?.stringValue = "\(value.cycles)"
self.amperageField?.stringValue = "\(abs(value.amperage)) mA"

6
Modules/Battery/readers.swift
View File

@@ -63,7 +63,7 @@ internal class UsageReader: Reader<Battery_Usage> {
for ps in psList {
if let list = IOPSGetPowerSourceDescription(psInfo, ps).takeUnretainedValue() as? Dictionary<String, Any> {
self.usage.powerSource = list[kIOPSPowerSourceStateKey] as? String ?? "AC Power"
self.usage.state = list[kIOPSBatteryHealthKey] as? String ?? "0"
self.usage.state = list[kIOPSBatteryHealthKey] as? String
self.usage.isCharged = list[kIOPSIsChargedKey] as? Bool ?? false
self.usage.isCharging = self.getBoolValue("IsCharging" as CFString) ?? false
self.usage.level = Double(list[kIOPSCurrentCapacityKey] as? Int ?? 0) / 100
@@ -79,7 +79,11 @@ internal class UsageReader: Reader<Battery_Usage> {
let maxCapacity = self.getIntValue("MaxCapacity" as CFString) ?? 1
let designCapacity = self.getIntValue("DesignCapacity" as CFString) ?? 1
#if arch(x86_64)
self.usage.health = (100 * maxCapacity) / designCapacity
#else
self.usage.health = maxCapacity
#endif
self.usage.amperage = self.getIntValue("Amperage" as CFString) ?? 0
self.usage.voltage = self.getVoltage() ?? 0