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

receiver: battery level 0 is unknown level

This commit is contained in:
Peter F. Patel-Schneider 2020-02-10 12:55:53 -05:00 committed by Filipe Laíns
parent 39791be440
commit 4f4e610635
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/logitech_receiver/hidpp20.py
View File

@ -520,6 +520,7 @@ def get_battery(device):
battery = feature_request(device, FEATURE.BATTERY_STATUS) battery = feature_request(device, FEATURE.BATTERY_STATUS)
if battery: if battery:
discharge, dischargeNext, status = _unpack('!BBB', battery[:3]) discharge, dischargeNext, status = _unpack('!BBB', battery[:3])
discharge = None if discharge == 0 else discharge
if _log.isEnabledFor(_DEBUG): if _log.isEnabledFor(_DEBUG):
_log.debug("device %d battery %d%% charged, next level %d%% charge, status %d = %s", _log.debug("device %d battery %d%% charged, next level %d%% charge, status %d = %s",
device.number, discharge, dischargeNext, status, BATTERY_STATUS[status]) device.number, discharge, dischargeNext, status, BATTERY_STATUS[status])

1
lib/logitech_receiver/notifications.py
View File

@ -211,6 +211,7 @@ def _process_feature_notification(device, status, n, feature):
if feature == _F.BATTERY_STATUS: if feature == _F.BATTERY_STATUS:
if n.address == 0x00: if n.address == 0x00:
discharge_level = ord(n.data[:1]) discharge_level = ord(n.data[:1])
discharge_level = None if discharge_level == 0 else discharge_level
discharge_next_level = ord(n.data[1:2]) discharge_next_level = ord(n.data[1:2])
battery_status = ord(n.data[2:3]) battery_status = ord(n.data[2:3])
status.set_battery_info(discharge_level, _hidpp20.BATTERY_STATUS[battery_status]) status.set_battery_info(discharge_level, _hidpp20.BATTERY_STATUS[battery_status])

2
lib/logitech_receiver/status.py
View File

@ -191,7 +191,7 @@ class DeviceStatus(dict):
changed = old_level != level or old_status != status or old_charging != charging changed = old_level != level or old_status != status or old_charging != charging
alert, reason = ALERT.NONE, None alert, reason = ALERT.NONE, None
if _hidpp20.BATTERY_OK(status) and level > _BATTERY_ATTENTION_LEVEL: if _hidpp20.BATTERY_OK(status) and ( level is None or level > _BATTERY_ATTENTION_LEVEL ):
self[KEYS.ERROR] = None self[KEYS.ERROR] = None
else: else:
_log.warn("%s: battery %d%%, ALERT %s", self._device, level, status) _log.warn("%s: battery %d%%, ALERT %s", self._device, level, status)