masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CURRENT_NOW isn't always present

Browse Source
This commit is contained in:
Stéphane Brunner 2014-04-16 17:27:48 +02:00
parent 1f80fb4e19
commit 5aef5f529a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
i3pystatus/battery.py
View File

@ -57,15 +57,21 @@ class Battery:
class BatteryCharge(Battery): class BatteryCharge(Battery):
def consumption(self): def consumption(self):
return self.battery_info["VOLTAGE_NOW"] * self.battery_info["CURRENT_NOW"] # V * A = W if "VOLTAGE_NOW" in self.battery_info and "CURRENT_NOW" in self.battery_info:
return self.battery_info["VOLTAGE_NOW"] * self.battery_info["CURRENT_NOW"] # V * A = W
else:
return -1
def _percentage(self, design): def _percentage(self, design):
return self.battery_info["CHARGE_NOW"] / self.battery_info["CHARGE_FULL" + design] return self.battery_info["CHARGE_NOW"] / self.battery_info["CHARGE_FULL" + design]
def remaining(self): def remaining(self):
if self.status() == "Discharging": if self.status() == "Discharging":
# Ah / A = h * 60 min = min if "CHARGE_NOW" in self.battery_info and "CURRENT_NOW" in self.battery_info:
return self.battery_info["CHARGE_NOW"] / self.battery_info["CURRENT_NOW"] * 60 # Ah / A = h * 60 min = min
return self.battery_info["CHARGE_NOW"] / self.battery_info["CURRENT_NOW"] * 60
else:
return -1
else: else:
return (self.battery_info["CHARGE_FULL"] - self.battery_info["CHARGE_NOW"]) / self.battery_info["CURRENT_NOW"] * 60 return (self.battery_info["CHARGE_FULL"] - self.battery_info["CHARGE_NOW"]) / self.battery_info["CURRENT_NOW"] * 60