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

split read_battery in status into its own function

This commit is contained in:
Daniel Pavel 2013-04-28 15:01:27 +02:00
parent 5eab013cf6
commit 674ee9ac9e
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,26 @@ class DeviceStatus(dict):
return bool(self._active) return bool(self._active)
__nonzero__ = __bool__ __nonzero__ = __bool__
def read_battery(self, timestamp=None):
d = self._device
if d and self._active:
battery = _hidpp10.get_battery(d)
if battery is None and d.protocol >= 2.0:
battery = _hidpp20.get_battery(d)
# really unnecessary, if the device has SOLAR_CHARGE it should be
# broadcasting it's battery status anyway, it will just take a little while
# if battery is None and _hidpp20.FEATURE.SOLAR_CHARGE in d.features:
# d.feature_request(_hidpp20.FEATURE.SOLAR_CHARGE, 0x00, 1, 1)
# return
if battery:
self[BATTERY_LEVEL], self[BATTERY_STATUS] = battery
self._changed(timestamp=timestamp)
elif BATTERY_STATUS in self:
self[BATTERY_STATUS] = None
self._changed(timestamp=timestamp)
def _changed(self, active=True, alert=ALERT.NONE, reason=None, timestamp=None): def _changed(self, active=True, alert=ALERT.NONE, reason=None, timestamp=None):
assert self._changed_callback assert self._changed_callback
self._active = active self._active = active
@ -150,23 +170,8 @@ class DeviceStatus(dict):
# read these from the device in case they haven't been read already # read these from the device in case they haven't been read already
d.protocol, d.serial, d.firmware d.protocol, d.serial, d.firmware
if BATTERY_LEVEL not in self: # if BATTERY_LEVEL not in self:
battery = _hidpp10.get_battery(d) self.read_battery(timestamp)
if battery is None and d.protocol >= 2.0:
battery = _hidpp20.get_battery(d)
# really unnecessary, if the device has SOLAR_CHARGE it should be
# broadcasting it's battery status anyway, it will just take a little while
# if battery is None and _hidpp20.FEATURE.SOLAR_CHARGE in d.features:
# d.feature_request(_hidpp20.FEATURE.SOLAR_CHARGE, 0x00, 1, 1)
# return
if battery:
self[BATTERY_LEVEL], self[BATTERY_STATUS] = battery
self._changed(timestamp=timestamp)
elif BATTERY_STATUS in self:
self[BATTERY_STATUS] = None
self._changed(timestamp=timestamp)
# make sure we know all the features of the device # make sure we know all the features of the device
if d.features: if d.features:
@ -245,6 +250,9 @@ class DeviceStatus(dict):
else: else:
_log.warn("%s: connection notification with unknown protocol %02X: %s", self._device.number, n.address, n) _log.warn("%s: connection notification with unknown protocol %02X: %s", self._device.number, n.address, n)
if self._active: # and BATTERY_LEVEL not in self:
self.read_battery()
return True return True
if n.sub_id == 0x49: if n.sub_id == 0x49: