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

feat: added maximum and designed battery capacity to the Battery popup view (#806)

Browse Source 
fix: rounding battery health value to the nearest, not to the lowest value
This commit is contained in:
Serhiy Mytrovtsiy
2022-01-21 17:27:06 +01:00
parent 212881ec61
commit 587d00ce06
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Battery/main.swift
View File

@@ -22,6 +22,9 @@ struct Battery_Usage: value_t {
var cycles: Int = 0
var health: Int = 0
var designedCapacity: Int = 0
var maxCapacity: Int = 0
var amperage: Int = 0
var voltage: Double = 0
var temperature: Double = 0

15
Modules/Battery/popup.swift
View File

@@ -19,7 +19,7 @@ internal class Popup: NSView, Popup_p {
private let dashboardHeight: CGFloat = 90
private let detailsHeight: CGFloat = (22 * 6) + Constants.Popup.separatorHeight
private let detailsHeight: CGFloat = (22 * 7) + Constants.Popup.separatorHeight
private let batteryHeight: CGFloat = (22 * 4) + Constants.Popup.separatorHeight
private let adapterHeight: CGFloat = (22 * 2) + Constants.Popup.separatorHeight
private let processHeight: CGFloat = (22 * 1)
@@ -35,6 +35,7 @@ internal class Popup: NSView, Popup_p {
private var timeLabelField: NSTextField? = nil
private var timeField: NSTextField? = nil
private var healthField: NSTextField? = nil
private var capacityField: NSTextField? = nil
private var cyclesField: NSTextField? = nil
private var lastChargeField: NSTextField? = nil
@@ -146,12 +147,14 @@ internal class Popup: NSView, Popup_p {
let separator = separatorView(localizedString("Details"), origin: NSPoint(x: 0, y: self.detailsHeight-Constants.Popup.separatorHeight), width: self.frame.width)
let container: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: separator.frame.origin.y))
self.levelField = popupRow(container, n: 5, title: "\(localizedString("Level")):", value: "").1
self.sourceField = popupRow(container, n: 4, title: "\(localizedString("Source")):", value: "").1
let t = self.labelValue(container, n: 3, title: "\(localizedString("Time")):", value: "")
self.levelField = popupRow(container, n: 6, title: "\(localizedString("Level")):", value: "").1
self.sourceField = popupRow(container, n: 5, title: "\(localizedString("Source")):", value: "").1
let t = self.labelValue(container, n: 4, title: "\(localizedString("Time")):", value: "")
self.timeLabelField = t.0
self.timeField = t.1
self.healthField = popupRow(container, n: 2, title: "\(localizedString("Health")):", value: "").1
self.healthField = popupRow(container, n: 3, title: "\(localizedString("Health")):", value: "").1
self.capacityField = popupRow(container, n: 2, title: "\(localizedString("Capacity")):", value: "").1
self.capacityField?.toolTip = localizedString("maximum / designed")
self.cyclesField = popupRow(container, n: 1, title: "\(localizedString("Cycles")):", value: "").1
self.lastChargeField = popupRow(container, n: 0, title: "\(localizedString("Last charge")):", value: "").1
@@ -258,6 +261,8 @@ internal class Popup: NSView, Popup_p {
}
self.healthField?.stringValue = "\(value.health)%"
self.capacityField?.stringValue = "\(value.maxCapacity) / \(value.designedCapacity) mAh"
if let state = value.state {
self.healthField?.stringValue += " (\(state))"
}

15
Modules/Battery/readers.swift
View File

@@ -78,15 +78,12 @@ internal class UsageReader: Reader<Battery_Usage> {
self.usage.cycles = self.getIntValue("CycleCount" as CFString) ?? 0
var maxCapacity: Int = 1
let designCapacity: Int = self.getIntValue("DesignCapacity" as CFString) ?? 1
#if arch(x86_64)
maxCapacity = self.getIntValue("MaxCapacity" as CFString) ?? 1
#else
maxCapacity = self.getIntValue("AppleRawMaxCapacity" as CFString) ?? 1
#endif
self.usage.state = list[kIOPSBatteryHealthKey] as? String
self.usage.health = (100 * maxCapacity) / designCapacity
self.usage.designedCapacity = self.getIntValue("DesignCapacity" as CFString) ?? 1
self.usage.maxCapacity = self.getIntValue((isARM ? "AppleRawMaxCapacity" : "MaxCapacity") as CFString) ?? 1
if !isARM {
self.usage.state = list[kIOPSBatteryHealthKey] as? String
}
self.usage.health = Int((Double(100 * self.usage.maxCapacity) / Double(self.usage.designedCapacity)).rounded(.toNearestOrEven))
self.usage.amperage = self.getIntValue("Amperage" as CFString) ?? 0
self.usage.voltage = self.getVoltage() ?? 0