Merge pull request #150 from fredj/battery_remaining
[module/battery] Simplify remaining time computation
This commit is contained in:
commit
be4f4cb68f
1 changed files with 4 additions and 7 deletions
|
@ -53,14 +53,11 @@ class Module(bumblebee.engine.Module):
|
||||||
def remaining(self):
|
def remaining(self):
|
||||||
estimate = 0.0
|
estimate = 0.0
|
||||||
try:
|
try:
|
||||||
power_type = power.PowerManagement().get_providing_power_source_type()
|
|
||||||
|
|
||||||
# do not show remaining if on AC
|
|
||||||
if power.PowerManagement().get_providing_power_source_type() == power.POWER_TYPE_AC:
|
|
||||||
return None
|
|
||||||
|
|
||||||
estimate = power.PowerManagement().get_time_remaining_estimate()
|
estimate = power.PowerManagement().get_time_remaining_estimate()
|
||||||
if estimate == -1.0:
|
# do not show remaining if on AC
|
||||||
|
if estimate == power.common.TIME_REMAINING_UNLIMITED:
|
||||||
|
return None
|
||||||
|
if estimate == power.common.TIME_REMAINING_UNKNOWN:
|
||||||
return "n/a"
|
return "n/a"
|
||||||
except Exception:
|
except Exception:
|
||||||
return "n/a"
|
return "n/a"
|
||||||
|
|
Loading…
Reference in a new issue