Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battery: move percentage calculation to linux code

Browse Source 
Only Linux provides detailed energy statistics. The BSDs directly
provide percentage values. This change makes it easier to split
out the BSD code and reduces code overhead on BSD systems.
This commit is contained in:
Sebastian Reichel
2015-08-07 02:53:52 +02:00
parent 441c420773
commit d1c22762c4
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/battery/battery.c
View File

@@ -258,8 +258,6 @@ void init_battery_panel(void *p)
int update_battery() {
int64_t energy_now = 0,
energy_full = 0;
int seconds = 0;
int8_t new_percentage = 0;
int errors = 0;
@@ -337,7 +335,7 @@ int update_battery() {
else
new_percentage = sysctl_out;
#else
update_linux_batteries(&battery_state.state, &energy_now, &energy_full, &seconds);
update_linux_batteries(&battery_state.state, &new_percentage, &seconds);
#endif
battery_state.time.hours = seconds / 3600;
@@ -346,9 +344,6 @@ int update_battery() {
seconds -= 60 * battery_state.time.minutes;
battery_state.time.seconds = seconds;
if (energy_full > 0)
new_percentage = 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
battery_state.percentage = new_percentage;
// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max