Fixed a bug where battery would generate no output in occasions where it should.
This commit is contained in:
parent
3c284ad29c
commit
d6f1cbbd46
@ -5,15 +5,6 @@ from . import IntervalModule
|
|||||||
from .core.util import PrefixedKeyDict
|
from .core.util import PrefixedKeyDict
|
||||||
|
|
||||||
class Battery:
|
class Battery:
|
||||||
"""
|
|
||||||
Simple interface to /sys/class/power_supply/BATx/uevent
|
|
||||||
|
|
||||||
The data from uevent is transformed into attributes of this class, stripping
|
|
||||||
their prefix. (i.e. POWER_SUPPLY_NAME becomes the NAME attribute).
|
|
||||||
|
|
||||||
Numbers are automatically converted to floats. Strings are stripped.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def lchop(string, prefix="POWER_SUPPLY_"):
|
def lchop(string, prefix="POWER_SUPPLY_"):
|
||||||
if string.startswith(prefix):
|
if string.startswith(prefix):
|
||||||
@ -81,16 +72,12 @@ class BatteryChecker(IntervalModule):
|
|||||||
fdict["percentage_design"] = (energy_now / battery.ENERGY_FULL_DESIGN) * 100
|
fdict["percentage_design"] = (energy_now / battery.ENERGY_FULL_DESIGN) * 100
|
||||||
fdict["consumption"] = power_now / 1000000
|
fdict["consumption"] = power_now / 1000000
|
||||||
|
|
||||||
if not power_now:
|
|
||||||
return
|
|
||||||
|
|
||||||
if status == "Full":
|
if status == "Full":
|
||||||
fdict["status"] = "FULL"
|
fdict["status"] = "FULL"
|
||||||
else:
|
elif power_now:
|
||||||
if status == "Discharging":
|
if status == "Discharging":
|
||||||
fdict["status"] = "DIS"
|
fdict["status"] = "DIS"
|
||||||
remaining = RemainingCalculator(energy_now, power_now)
|
remaining = RemainingCalculator(energy_now, power_now)
|
||||||
|
|
||||||
if remaining.remaining_time < 15:
|
if remaining.remaining_time < 15:
|
||||||
urgent = True
|
urgent = True
|
||||||
color = "#ff0000"
|
color = "#ff0000"
|
||||||
@ -105,4 +92,3 @@ class BatteryChecker(IntervalModule):
|
|||||||
"urgent": urgent,
|
"urgent": urgent,
|
||||||
"color": color
|
"color": color
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user