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

hidpp20: be defensive about no device features

This commit is contained in:
Peter F. Patel-Schneider 2026-03-09 06:15:44 -04:00
parent 94e94c1254
commit 7520c9cc28
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/logitech_receiver/device.py
View File

@ -204,7 +204,7 @@ class Device:
self.registers = self.descriptor.registers if self.descriptor.registers else [] self.registers = self.descriptor.registers if self.descriptor.registers else []
if self._protocol is not None: if self._protocol is not None:
self.features = None if self._protocol < 2.0 else hidpp20.FeaturesArray(self) self.features = {} if self._protocol < 2.0 else hidpp20.FeaturesArray(self)
else: else:
self.features = hidpp20.FeaturesArray(self) # may be a 2.0 device; if not, it will fix itself later self.features = hidpp20.FeaturesArray(self) # may be a 2.0 device; if not, it will fix itself later

4
lib/logitech_receiver/hidpp20.py
View File

@ -1690,10 +1690,10 @@ class Hidpp20:
def get_keys(self, device: Device): def get_keys(self, device: Device):
# TODO: add here additional variants for other REPROG_CONTROLS # TODO: add here additional variants for other REPROG_CONTROLS
count = None count = None
if SupportedFeature.REPROG_CONTROLS_V2 in device.features: if device.features and SupportedFeature.REPROG_CONTROLS_V2 in device.features:
count = device.feature_request(SupportedFeature.REPROG_CONTROLS_V2) count = device.feature_request(SupportedFeature.REPROG_CONTROLS_V2)
return KeysArrayV2(device, ord(count[:1])) return KeysArrayV2(device, ord(count[:1]))
elif SupportedFeature.REPROG_CONTROLS_V4 in device.features: elif device.features and SupportedFeature.REPROG_CONTROLS_V4 in device.features:
count = device.feature_request(SupportedFeature.REPROG_CONTROLS_V4) count = device.feature_request(SupportedFeature.REPROG_CONTROLS_V4)
return KeysArrayV4(device, ord(count[:1])) return KeysArrayV4(device, ord(count[:1]))
return None return None