diff --git a/plyer/facades.py b/plyer/facades.py index b5a11b9bd..735ff256b 100644 --- a/plyer/facades.py +++ b/plyer/facades.py @@ -403,7 +403,7 @@ class Battery(object): @property def status(self): '''Property that contains a dict with the following fields: - * **connected** *(bool)*: Whether to power supply + * **isCharging** *(bool)*: Battery is charging * **percentage** *(float)*: Battery charge remaining .. warning:: diff --git a/plyer/platforms/android/battery.py b/plyer/platforms/android/battery.py index b66e8b014..3f96f8a8f 100644 --- a/plyer/platforms/android/battery.py +++ b/plyer/platforms/android/battery.py @@ -9,7 +9,7 @@ class AndroidBattery(Battery): def _get_status(self): - status = {"connected": None, "percentage": None} + status = {"isCharging": None, "percentage": None} ifilter = IntentFilter(Intent.ACTION_BATTERY_CHANGED) @@ -24,7 +24,7 @@ def _get_status(self): scale = batteryStatus.getIntExtra(BatteryManager.EXTRA_SCALE, -1) percentage = level / float(scale) - status['connected'] = isCharging + status['isCharging'] = isCharging status['percentage'] = percentage return status diff --git a/plyer/platforms/linux/battery.py b/plyer/platforms/linux/battery.py index 3a4b343f6..e385b487d 100644 --- a/plyer/platforms/linux/battery.py +++ b/plyer/platforms/linux/battery.py @@ -4,7 +4,7 @@ class LinuxBattery(Battery): def _get_status(self): - status = {"connected": None, "percentage": None} + status = {"isCharging": None, "percentage": None} # We are supporting only one battery now dev = "/org/freedesktop/UPower/device/battery_BAT0" @@ -23,7 +23,7 @@ def _get_status(self): percentage = float(l.rpartition(':')[-1].strip()[:-1]) if(power_supply): - status['connected'] = power_supply == "yes" + status['isCharging'] = power_supply != "yes" status['percentage'] = percentage diff --git a/plyer/platforms/macosx/battery.py b/plyer/platforms/macosx/battery.py index b5db1e8f4..90fbb5faa 100644 --- a/plyer/platforms/macosx/battery.py +++ b/plyer/platforms/macosx/battery.py @@ -4,7 +4,7 @@ class OSXBattery(Battery): def _get_status(self): - status = {"connected": None, "percentage": None} + status = {"isCharging": None, "percentage": None} ioreg_process = Popen(["ioreg", "-rc", "AppleSmartBattery"], stdout=PIPE) @@ -13,17 +13,17 @@ def _get_status(self): if not output: return status - ExternalConnected = MaxCapacity = CurrentCapacity = None + IsCharging = MaxCapacity = CurrentCapacity = None for l in output.splitlines(): - if 'ExternalConnected' in l: - ExternalConnected = l.rpartition('=')[-1].strip() + if 'IsCharging' in l: + IsCharging = l.rpartition('=')[-1].strip() if 'MaxCapacity' in l: MaxCapacity = float(l.rpartition('=')[-1].strip()) if 'CurrentCapacity' in l: CurrentCapacity = float(l.rpartition('=')[-1].strip()) - if (ExternalConnected): - status['connected'] = ExternalConnected == "Yes" + if (IsCharging): + status['isCharging'] = IsCharging == "Yes" if (CurrentCapacity and MaxCapacity): status['percentage'] = 100. * CurrentCapacity / MaxCapacity diff --git a/plyer/platforms/win/battery.py b/plyer/platforms/win/battery.py index 479b5d46c..2fcaaebd6 100644 --- a/plyer/platforms/win/battery.py +++ b/plyer/platforms/win/battery.py @@ -4,14 +4,14 @@ class WinBattery(Battery): def _get_status(self): - status = {"connected": None, "percentage": None} + status = {"isCharging": None, "percentage": None} query = battery_status() if (not query): return status - status["connected"] = query["ACLineStatus"] == 1 + status["isCharging"] = query["BatteryFlag"] == 8 status["percentage"] = query["BatteryLifePercent"] return status