fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-06 07:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Guess state for multiple batteries without AC

Browse source 
There is no reason to not guess the state if the device has no AC power
and there is more than one battery. Remove the corresponding constraint.

Related: #146
This commit is contained in:
Benjamin Berg 2022-06-14 17:48:22 +02:00
parent 2a1ab444e8
commit e6d4b8cd4a
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/up-daemon.c
View file

@ -260,26 +260,16 @@ out:
ac_online = up_daemon_get_on_ac_local (daemon, &has_ac);
if (has_ac) {
if (ac_online) {
if (percentage_total >= UP_FULLY_CHARGED_THRESHOLD)
state_total = UP_DEVICE_STATE_FULLY_CHARGED;
else
state_total = UP_DEVICE_STATE_CHARGING;
} else {
if (percentage_total < 1.0f)
state_total = UP_DEVICE_STATE_EMPTY;
else
state_total = UP_DEVICE_STATE_DISCHARGING;
}
if (has_ac && ac_online) {
if (percentage_total >= UP_FULLY_CHARGED_THRESHOLD)
state_total = UP_DEVICE_STATE_FULLY_CHARGED;
else
state_total = UP_DEVICE_STATE_CHARGING;
} else {
/* only guess when we have only one battery */
if (up_daemon_get_number_devices_of_type (daemon, UP_DEVICE_KIND_BATTERY) == 1) {
if (percentage_total < 1.0f)
state_total = UP_DEVICE_STATE_EMPTY;
else
state_total = UP_DEVICE_STATE_DISCHARGING;
}
if (percentage_total < 1.0f)
state_total = UP_DEVICE_STATE_EMPTY;
else
state_total = UP_DEVICE_STATE_DISCHARGING;
}
}