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

receiver: use battery voltage in read_battery if available

This commit is contained in:
Peter F. Patel-Schneider 2020-06-03 15:23:19 -04:00
parent cb84d3b797
commit 7936d2dd48
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/logitech_receiver/hidpp20.py
View File

@ -195,9 +195,9 @@ CHARGE_STATUS = _NamedInts(
error=0x07) error=0x07)
CHARGE_LEVEL = _NamedInts( CHARGE_LEVEL = _NamedInts(
average=0x00, average=50,
full=0x01, full=90,
critical=0x02) critical=5)
CHARGE_TYPE = _NamedInts( CHARGE_TYPE = _NamedInts(
standard=0x00, standard=0x00,
@ -513,10 +513,7 @@ def get_name(device):
def get_battery(device): def get_battery(device):
"""Reads a device's battery level. """Reads a device's battery level."""
:raises FeatureNotSupported: if the device does not support this feature.
"""
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])

6
lib/logitech_receiver/status.py
View File

@ -229,6 +229,12 @@ class DeviceStatus(dict):
battery = _hidpp10.get_battery(d) battery = _hidpp10.get_battery(d)
else: else:
battery = _hidpp20.get_battery(d) battery = _hidpp20.get_battery(d)
if battery is None:
v = _hidpp20.get_voltage(d)
if v is not None:
_, charging, status, level, _ = v
status = _hidpp20.BATTERY_STATUS.recharging if status == _hidpp20.BATTERY_STATUS.recharging else _hidpp20.BATTERY_STATUS.discharging
battery = ( level, status, None )
# Really unnecessary, if the device has SOLAR_DASHBOARD it should be # Really unnecessary, if the device has SOLAR_DASHBOARD it should be
# broadcasting it's battery status anyway, it will just take a little while. # broadcasting it's battery status anyway, it will just take a little while.