RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

properly format battery status string for 0x07 devices

This commit is contained in:
Daniel Pavel 2013-07-01 11:51:20 +02:00
parent 4504045bc6
commit eaa38c858c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/logitech/unifying_receiver/status.py
View File

@ -144,9 +144,13 @@ class DeviceStatus(dict):
def _items(): def _items():
# TODO properly string approximative battery levels # TODO properly string approximative battery levels
battery_level = _item(KEYS.BATTERY_LEVEL, 'Battery: %d%%') battery_level = self.get(KEYS.BATTERY_LEVEL)
if battery_level: if battery_level is not None:
yield battery_level if isinstance(battery_level, _NamedInt):
yield 'Battery: %s' % str(battery_level)
else:
yield 'Battery: %d%%' % battery_level
battery_status = _item(KEYS.BATTERY_STATUS, ' (%s)') battery_status = _item(KEYS.BATTERY_STATUS, ' (%s)')
if battery_status: if battery_status:
yield battery_status yield battery_status
@ -244,6 +248,9 @@ class DeviceStatus(dict):
# make sure they're up-to-date. # make sure they're up-to-date.
for s in self._device.settings: for s in self._device.settings:
s.apply() s.apply()
if KEYS.BATTERY_LEVEL not in self:
self.read_battery(timestamp)
else: else:
if was_active: if was_active:
battery = self.get(KEYS.BATTERY_LEVEL) battery = self.get(KEYS.BATTERY_LEVEL)