From afe04b9804648635ed64013cc3d90dc12a7ad3e1 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Tue, 26 Mar 2024 18:34:40 -0400 Subject: [PATCH] settings: remove unused code and fix but in EQUALIZER setting --- lib/logitech_receiver/settings.py | 2 +- lib/logitech_receiver/settings_templates.py | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py index 6fc9b7b1..26feaf77 100644 --- a/lib/logitech_receiver/settings.py +++ b/lib/logitech_receiver/settings.py @@ -1280,7 +1280,7 @@ class PackedRangeValidator(Validator): def prepare_write(self, new_values): if len(new_values) != self.count: raise ValueError(f"wrong number of values {new_values!r}") - for new_value in new_values: + for new_value in new_values.values(): if new_value < self.min_value or new_value > self.max_value: raise ValueError(f"invalid value {new_value!r}") bytes = self.write_prefix_bytes + b"".join(_int2bytes(new_values[n], self.bc, signed=True) for n in range(self.count)) diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py index 0752cf15..f09919b2 100644 --- a/lib/logitech_receiver/settings_templates.py +++ b/lib/logitech_receiver/settings_templates.py @@ -555,13 +555,6 @@ class ReportRate(_Setting): choices_universe[7] = "7ms" choices_universe[8] = "8ms" - class _rw_class(_FeatureRW): # no longer needed - set Onboard Profiles to disable - def write(self, device, data_bytes): - # Host mode is required for report rate to be adjustable - if _hidpp20.get_onboard_mode(device) != _hidpp20_constants.ONBOARD_MODES.MODE_HOST: - _hidpp20.set_onboard_mode(device, _hidpp20_constants.ONBOARD_MODES.MODE_HOST) - return super().write(device, data_bytes) - class validator_class(_ChoicesV): @classmethod def build(cls, setting_class, device): @@ -594,18 +587,6 @@ class ExtendedReportRate(_Setting): choices_universe[5] = "250us" choices_universe[6] = "125us" - class _rw_class(_FeatureRW): - def read(self, device, data_bytes=b""): - # need connection type from device to get actual report rate - self.read_prefix = b"\x00" if device.receiver else b"\x01" - super().read(device, data_bytes) - - def write(self, device, data_bytes): - # Host mode is required for report rate to be adjustable - if _hidpp20.get_onboard_mode(device) != _hidpp20_constants.ONBOARD_MODES.MODE_HOST: - _hidpp20.set_onboard_mode(device, _hidpp20_constants.ONBOARD_MODES.MODE_HOST) - return super().write(device, data_bytes) - class validator_class(_ChoicesV): @classmethod def build(cls, setting_class, device):