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

receiver: improve feature notification processing code

This commit is contained in:
Peter F. Patel-Schneider 2021-12-02 10:36:04 -05:00
parent 253cfbacd5
commit 292461c168
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/logitech_receiver/notifications.py
View File

@ -305,6 +305,9 @@ def _process_hidpp10_notification(device, status, n):
def _process_feature_notification(device, status, n, feature): def _process_feature_notification(device, status, n, feature):
if _log.isEnabledFor(_DEBUG):
_log.debug('%s: notification for feature %s, report %s, data %s', device, feature, n.sub_id >> 4, _strhex(n.data))
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])
@ -317,31 +320,27 @@ def _process_feature_notification(device, status, n, feature):
_log.info('%s: spurious BATTERY status %s', device, n) _log.info('%s: spurious BATTERY status %s', device, n)
else: else:
_log.warn('%s: unknown BATTERY %s', device, n) _log.warn('%s: unknown BATTERY %s', device, n)
return True
if feature == _F.BATTERY_VOLTAGE: elif feature == _F.BATTERY_VOLTAGE:
if n.address == 0x00: if n.address == 0x00:
battery_level, battery_status, battery_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(battery_level, battery_status, None, battery_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
if feature == _F.UNIFIED_BATTERY: elif feature == _F.UNIFIED_BATTERY:
if n.address == 0x00: if n.address == 0x00:
battery_level, battery_status, battery_voltage = _hidpp20.decipher_unified_battery(n.data) battery_level, battery_status, battery_voltage = _hidpp20.decipher_unified_battery(n.data)
status.set_battery_info(battery_level, battery_status, None, battery_voltage) status.set_battery_info(battery_level, battery_status, None, battery_voltage)
else: else:
_log.warn('%s: unknown UNIFIED BATTERY %s', device, n) _log.warn('%s: unknown UNIFIED BATTERY %s', device, n)
return True
if feature == _F.SOLAR_DASHBOARD: elif feature == _F.SOLAR_DASHBOARD:
if n.data[5:9] == b'GOOD': if n.data[5:9] == b'GOOD':
charge, lux, adc = _unpack('!BHH', n.data[:5]) charge, lux, adc = _unpack('!BHH', n.data[:5])
# guesstimate the battery voltage, emphasis on 'guess' # guesstimate the battery voltage, emphasis on 'guess'
# status_text = '%1.2fV' % (adc * 2.67793237653 / 0x0672) # status_text = '%1.2fV' % (adc * 2.67793237653 / 0x0672)
status_text = _hidpp20.BATTERY_STATUS.discharging status_text = _hidpp20.BATTERY_STATUS.discharging
if n.address == 0x00: if n.address == 0x00:
status[_K.LIGHT_LEVEL] = None status[_K.LIGHT_LEVEL] = None
status.set_battery_info(charge, status_text, None) status.set_battery_info(charge, status_text, None)
@ -364,9 +363,8 @@ def _process_feature_notification(device, status, n, feature):
_log.warn('%s: unknown SOLAR CHARGE %s', device, n) _log.warn('%s: unknown SOLAR CHARGE %s', device, n)
else: else:
_log.warn('%s: SOLAR CHARGE not GOOD? %s', device, n) _log.warn('%s: SOLAR CHARGE not GOOD? %s', device, n)
return True
if feature == _F.WIRELESS_DEVICE_STATUS: elif feature == _F.WIRELESS_DEVICE_STATUS:
if n.address == 0x00: if n.address == 0x00:
if _log.isEnabledFor(_DEBUG): if _log.isEnabledFor(_DEBUG):
_log.debug('wireless status: %s', n) _log.debug('wireless status: %s', n)
@ -381,9 +379,8 @@ def _process_feature_notification(device, status, n, feature):
_log.warn('%s: unknown WIRELESS %s', device, n) _log.warn('%s: unknown WIRELESS %s', device, n)
else: else:
_log.warn('%s: unknown WIRELESS %s', device, n) _log.warn('%s: unknown WIRELESS %s', device, n)
return True
if feature == _F.TOUCHMOUSE_RAW_POINTS: elif feature == _F.TOUCHMOUSE_RAW_POINTS:
if n.address == 0x00: if n.address == 0x00:
if _log.isEnabledFor(_INFO): if _log.isEnabledFor(_INFO):
_log.info('%s: TOUCH MOUSE points %s', device, n) _log.info('%s: TOUCH MOUSE points %s', device, n)
@ -408,7 +405,7 @@ def _process_feature_notification(device, status, n, feature):
if n.address == 0x00: if n.address == 0x00:
if _log.isEnabledFor(_DEBUG): if _log.isEnabledFor(_DEBUG):
cid1, cid2, cid3, cid4 = _unpack('!HHHH', n.data[:8]) cid1, cid2, cid3, cid4 = _unpack('!HHHH', n.data[:8])
_log.debug('%s: diverted controls pressed: %i, %i, %i, %i', device, cid1, cid2, cid3, cid4) _log.debug('%s: diverted controls pressed: 0x%x, 0x%x, 0x%x, 0x%x', device, cid1, cid2, cid3, cid4)
elif n.address == 0x10: elif n.address == 0x10:
if _log.isEnabledFor(_DEBUG): if _log.isEnabledFor(_DEBUG):
dx, dy = _unpack('!hh', n.data[:4]) dx, dy = _unpack('!hh', n.data[:4])
@ -436,6 +433,4 @@ def _process_feature_notification(device, status, n, feature):
_log.info('%s: unknown WHEEL %s', device, n) _log.info('%s: unknown WHEEL %s', device, n)
_diversion.process_notification(device, status, n, feature) _diversion.process_notification(device, status, n, feature)
return True
if _log.isEnabledFor(_DEBUG):
_log.debug('%s: notification for feature %r, report %s, data %s', device, feature, n.sub_id >> 4, _strhex(n.data))