Fix overflow and change time to minutes on MacOS #11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could you also attach output from the Same to #10, it would be nice to collect some real-life data and cover that case with test later. |
|
Also, There is also |
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>AdapterInfo</key>
<integer>0</integer>
<key>Amperage</key>
<integer>0</integer>
<key>AppleRawCurrentCapacity</key>
<integer>3637</integer>
<key>AppleRawMaxCapacity</key>
<integer>3688</integer>
<key>AvgTimeToEmpty</key>
<integer>65535</integer>
<key>AvgTimeToFull</key>
<integer>65535</integer>
<key>BatteryData</key>
<dict>
<key>CycleCount</key>
<integer>266</integer>
<key>DesignCapacity</key>
<integer>4315</integer>
<key>QmaxCell0</key>
<integer>43791</integer>
<key>QmaxCell1</key>
<integer>49935</integer>
<key>QmaxCell2</key>
<integer>12560</integer>
<key>ResScale</key>
<integer>32000</integer>
<key>StateOfCharge</key>
<integer>25344</integer>
<key>Voltage</key>
<integer>12804</integer>
</dict>
<key>BatteryFCCData</key>
<dict>
<key>DOD0</key>
<integer>0</integer>
<key>DOD1</key>
<integer>0</integer>
<key>DOD2</key>
<integer>0</integer>
<key>PassedCharge</key>
<integer>0</integer>
<key>ResScale</key>
<integer>32000</integer>
</dict>
<key>BatteryInstalled</key>
<true/>
<key>BatteryInvalidWakeSeconds</key>
<integer>30</integer>
<key>BatterySerialNumber</key>
<string>#####</string>
<key>BootPathUpdated</key>
<integer>#####</integer>
<key>CellVoltage</key>
<array>
<integer>4272</integer>
<integer>4271</integer>
<integer>4261</integer>
<integer>0</integer>
</array>
<key>ChargerData</key>
<dict>
<key>ChargingCurrent</key>
<integer>0</integer>
<key>ChargingVoltage</key>
<integer>64050</integer>
<key>NotChargingReason</key>
<integer>4</integer>
</dict>
<key>CurrentCapacity</key>
<integer>3637</integer>
<key>CycleCount</key>
<integer>266</integer>
<key>DesignCapacity</key>
<integer>4315</integer>
<key>DesignCycleCount70</key>
<integer>0</integer>
<key>DesignCycleCount9C</key>
<integer>1000</integer>
<key>DeviceName</key>
<string>bq20z451</string>
<key>ExternalChargeCapable</key>
<true/>
<key>ExternalConnected</key>
<true/>
<key>FirmwareSerialNumber</key>
<integer>1</integer>
<key>FullPathUpdated</key>
<integer>######</integer>
<key>FullyCharged</key>
<true/>
<key>IOGeneralInterest</key>
<string>IOCommand is not serializable</string>
<key>IOObjectClass</key>
<string>AppleSmartBattery</string>
<key>IOObjectRetainCount</key>
<integer>6</integer>
<key>IORegistryEntryID</key>
<integer>4294967992</integer>
<key>IORegistryEntryName</key>
<string>AppleSmartBattery</string>
<key>IOReportLegend</key>
<array>
<dict>
<key>IOReportChannelInfo</key>
<dict>
<key>IOReportChannelUnit</key>
<integer>0</integer>
</dict>
<key>IOReportChannels</key>
<array>
<array>
<integer>7167869599145487988</integer>
<integer>6460407809</integer>
<string>BatteryCycleCount</string>
</array>
</array>
<key>IOReportGroupName</key>
<string>Battery</string>
</dict>
</array>
<key>IOReportLegendPublic</key>
<true/>
<key>IOServiceBusyState</key>
<integer>0</integer>
<key>IOServiceBusyTime</key>
<integer>35339</integer>
<key>IOServiceState</key>
<integer>30</integer>
<key>InstantAmperage</key>
<integer>0</integer>
<key>InstantTimeToEmpty</key>
<integer>1307</integer>
<key>IsCharging</key>
<false/>
<key>LegacyBatteryInfo</key>
<dict>
<key>Amperage</key>
<integer>0</integer>
<key>Capacity</key>
<integer>3688</integer>
<key>Current</key>
<integer>3637</integer>
<key>Cycle Count</key>
<integer>266</integer>
<key>Flags</key>
<integer>5</integer>
<key>Voltage</key>
<integer>12804</integer>
</dict>
<key>Location</key>
<integer>0</integer>
<key>ManufactureDate</key>
<integer>19043</integer>
<key>Manufacturer</key>
<string>SMP</string>
<key>ManufacturerData</key>
<data>
#####
</data>
<key>MaxCapacity</key>
<integer>3688</integer>
<key>MaxErr</key>
<integer>1</integer>
<key>OperationStatus</key>
<integer>58435</integer>
<key>PackReserve</key>
<integer>125</integer>
<key>PermanentFailureStatus</key>
<integer>0</integer>
<key>PostChargeWaitSeconds</key>
<integer>120</integer>
<key>PostDischargeWaitSeconds</key>
<integer>120</integer>
<key>Temperature</key>
<integer>2993</integer>
<key>TimeRemaining</key>
<integer>0</integer>
<key>UserVisiblePathUpdated</key>
<integer>1551132291</integer>
<key>Voltage</key>
<integer>12804</integer>
</dict>
</array>
</plist> |
svartalf
added a commit
that referenced
this pull request
Feb 27, 2019
|
Hey, @martinrlilja! You were right, time values are definitely returned in minutes, not a seconds. Therefore, I'm closing this PR, many thanks for your help :) Edit: fixed versions are already published to the crates.io |
davidkna
pushed a commit
to davidkna/rust-battery
that referenced
this pull request
Dec 25, 2022
Removes unaligned reference access, which will become a hard error in the future. Also increases MSRV to 1.51, as required by the new code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Amperage was returning negative values, so I changed it to read as an isize and then getting the absolute value from it.
percentage() was also overflowing. I changed it to use the capacity values directly instead of going through the energy functions. The multiplication with voltage should cancel out either way.
InstantTimeToEmpty is returning the time in minutes, at least on my system. I haven't gotten InstantTimeToFull to report anything yet, instead it's reporting both values through TimeRemaining. (I haven't looked into this, just mentioning it)
I have only tested this on Mojave (10.14.3)