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

receiver: keep better track of battery voltage status for GUI

This commit is contained in:
Peter F. Patel-Schneider 2020-08-06 11:41:09 -04:00
parent 4c31adb907
commit 78a6ae9208
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/logitech_receiver/notifications.py
View File

@ -259,8 +259,8 @@ def _process_feature_notification(device, status, n, feature):
if feature == _F.BATTERY_VOLTAGE: if feature == _F.BATTERY_VOLTAGE:
if n.address == 0x00: if n.address == 0x00:
level, status, voltage, _ignore, _ignore = _hidpp20.decipher_voltage(n.data) battery_level, battery_status, battery_voltage, _ignore, _ignore = _hidpp20.decipher_voltage(n.data)
status.set_battery_info(level, status, None, voltage) status.set_battery_info(battery_level, battery_status, None, battery_voltage)
else: else:
_log.warn('%s: unknown VOLTAGE %s', device, n) _log.warn('%s: unknown VOLTAGE %s', device, n)
return True return True

13
lib/logitech_receiver/status.py
View File

@ -208,8 +208,7 @@ class DeviceStatus(dict):
old_level, self[KEYS.BATTERY_LEVEL] = self.get(KEYS.BATTERY_LEVEL), level old_level, self[KEYS.BATTERY_LEVEL] = self.get(KEYS.BATTERY_LEVEL), level
old_status, self[KEYS.BATTERY_STATUS] = self.get(KEYS.BATTERY_STATUS), status old_status, self[KEYS.BATTERY_STATUS] = self.get(KEYS.BATTERY_STATUS), status
self[KEYS.BATTERY_NEXT_LEVEL] = nextLevel self[KEYS.BATTERY_NEXT_LEVEL] = nextLevel
if voltage is not None: old_voltage, self[KEYS.BATTERY_VOLTAGE] = self.get(KEYS.BATTERY_VOLTAGE), voltage
self[KEYS.BATTERY_VOLTAGE] = voltage
charging = status in ( charging = status in (
_hidpp20.BATTERY_STATUS.recharging, _hidpp20.BATTERY_STATUS.almost_full, _hidpp20.BATTERY_STATUS.full, _hidpp20.BATTERY_STATUS.recharging, _hidpp20.BATTERY_STATUS.almost_full, _hidpp20.BATTERY_STATUS.full,
@ -217,7 +216,7 @@ class DeviceStatus(dict):
) )
old_charging, self[KEYS.BATTERY_CHARGING] = self.get(KEYS.BATTERY_CHARGING), charging old_charging, self[KEYS.BATTERY_CHARGING] = self.get(KEYS.BATTERY_CHARGING), charging
changed = old_level != level or old_status != status or old_charging != charging changed = old_level != level or old_status != status or old_charging != charging or old_voltage != voltage
alert, reason = ALERT.NONE, None alert, reason = ALERT.NONE, None
if _hidpp20.BATTERY_OK(status) and (level is None or level > _BATTERY_ATTENTION_LEVEL): if _hidpp20.BATTERY_OK(status) and (level is None or level > _BATTERY_ATTENTION_LEVEL):
@ -273,6 +272,7 @@ class DeviceStatus(dict):
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
self[KEYS.BATTERY_VOLTAGE] = None
self.changed() self.changed()
def changed(self, active=None, alert=ALERT.NONE, reason=None, timestamp=None): def changed(self, active=None, alert=ALERT.NONE, reason=None, timestamp=None):
@ -293,11 +293,12 @@ class DeviceStatus(dict):
self[KEYS.NOTIFICATION_FLAGS] = d.enable_notifications() self[KEYS.NOTIFICATION_FLAGS] = d.enable_notifications()
# If we've been inactive for a long time, forget anything # If we've been inactive for a long time, forget anything
# about the battery. # about the battery. (This is probably unnecessary.)
if self.updated > 0 and timestamp - self.updated > _LONG_SLEEP: if self.updated > 0 and timestamp - self.updated > _LONG_SLEEP:
self[KEYS.BATTERY_LEVEL] = None self[KEYS.BATTERY_LEVEL] = None
self[KEYS.BATTERY_STATUS] = None self[KEYS.BATTERY_STATUS] = None
self[KEYS.BATTERY_CHARGING] = None self[KEYS.BATTERY_CHARGING] = None
self[KEYS.BATTERY_VOLTAGE] = None
# Devices lose configuration when they are turned off, # Devices lose configuration when they are turned off,
# make sure they're up-to-date. # make sure they're up-to-date.
@ -306,8 +307,8 @@ class DeviceStatus(dict):
for s in d.settings: for s in d.settings:
s.apply() s.apply()
if self.get(KEYS.BATTERY_LEVEL) is None: # battery information may have changed so try to read it now
self.read_battery(timestamp) self.read_battery(timestamp)
else: else:
if was_active: if was_active:
battery = self.get(KEYS.BATTERY_LEVEL) battery = self.get(KEYS.BATTERY_LEVEL)