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

don't force a battery read on link active, will happen anyway

This commit is contained in:
Daniel Pavel 2013-06-21 22:24:28 +02:00
parent ae4c921300
commit df8df2bffa
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,9 +207,9 @@ class DeviceStatus(dict):
d.feature_request(_hidpp20.FEATURE.SOLAR_DASHBOARD, 0x00, 1, 1) d.feature_request(_hidpp20.FEATURE.SOLAR_DASHBOARD, 0x00, 1, 1)
return return
if battery: if battery is not None:
level, status = battery level, status = battery
self.set_battery_info(level, status, timestamp=timestamp) self.set_battery_info(level, status)
elif KEYS.BATTERY_STATUS in self: elif KEYS.BATTERY_STATUS in self:
self[KEYS.BATTERY_STATUS] = None self[KEYS.BATTERY_STATUS] = None
self[KEYS.BATTERY_CHARGING] = None self[KEYS.BATTERY_CHARGING] = None
@ -272,7 +272,7 @@ class DeviceStatus(dict):
# may go to sleep and wake up without the devices available # may go to sleep and wake up without the devices available
if timestamp - self.updated > _STATUS_TIMEOUT: if timestamp - self.updated > _STATUS_TIMEOUT:
if d.ping(): if d.ping():
self.updated = _timestamp() timestamp = self.updated = _timestamp()
else: else:
self._changed(active=False, reason='out of range') self._changed(active=False, reason='out of range')
@ -363,17 +363,6 @@ class DeviceStatus(dict):
self._device, protocol_name, sw_present, link_encrypyed, link_established, has_payload) self._device, protocol_name, sw_present, link_encrypyed, link_established, has_payload)
self[KEYS.LINK_ENCRYPTED] = link_encrypyed self[KEYS.LINK_ENCRYPTED] = link_encrypyed
self._changed(active=link_established) self._changed(active=link_established)
# if protocol_name == 'eQuad':
# # some Nano devices might not have been initialized fully
# if self._device._kind is None:
# kind = ord(n.data[:1]) & 0x0F
# self._device._kind = _hidpp10.DEVICE_KIND[kind]
# assert self._device.wpid == _strhex(n.data[2:3] + n.data[1:2])
# if the device just came online, read the battery charge
if self._active and KEYS.BATTERY_LEVEL not in self:
self.read_battery()
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)