From 801bdfa224bda2993b27886b3572db5fb07b4c84 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 11 Apr 2017 10:44:07 -0300 Subject: [PATCH] Remove the hid++ high-res wheel notification The best is to make the logitech-hidpp driver to switch to hid++ notification mode when it starts. As we don't want users to mangle with it, let's remove support from it. PS.: I opted to keep this as a separate patch. This way, if anyone needs to add support for it, in order to debug the driver, it is just a matter of reverting this patch. Signed-off-by: Mauro Carvalho Chehab --- lib/logitech_receiver/descriptors.py | 1 - lib/logitech_receiver/settings_templates.py | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/lib/logitech_receiver/descriptors.py b/lib/logitech_receiver/descriptors.py index c2a415f6..3d240551 100644 --- a/lib/logitech_receiver/descriptors.py +++ b/lib/logitech_receiver/descriptors.py @@ -285,7 +285,6 @@ _D('Anywhere Mouse MX 2', codename='Anywhere MX 2', protocol=4.5, wpid='404A', settings=[ _FS.hires_smooth_invert(), _FS.hires_smooth_resolution(), - _FS.hires_smooth_hid(), ], ) _D('Performance Mouse MX', codename='Performance MX', protocol=1.0, wpid='101A', diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py index e7d64f54..16ddb063 100644 --- a/lib/logitech_receiver/settings_templates.py +++ b/lib/logitech_receiver/settings_templates.py @@ -122,8 +122,6 @@ _HIRES_INV = ('hires-smooth-invert', _("High Resolution Wheel Invert"), _("High-sensitivity wheel invert mode for vertical scroll.")) _HIRES_RES = ('hires-smooth-resolution', _("Wheel Resolution"), _("High-sensitivity mode for vertical scroll with the wheel.")) -_HIRES_TGT = ('hires-smooth-hid', _("High Resolution HID++ notification"), - _("High-sensitivity HID++ notification for the wheel.")) _SIDE_SCROLL = ('side-scroll', _("Side Scrolling"), _("When disabled, pushing the wheel sideways sends custom button events\n" "instead of the standard side-scrolling events.")) @@ -206,14 +204,6 @@ def _feature_hires_smooth_resolution(): label=_HIRES_RES[1], description=_HIRES_RES[2], device_kind=_DK.mouse) -def _feature_hires_smooth_hid(): - return feature_toggle(_HIRES_TGT[0], _F.HIRES_WHEEL, - read_function_id=0x10, - write_function_id=0x20, - true_value=0x01, mask=0x01, - label=_HIRES_TGT[1], description=_HIRES_TGT[2], - device_kind=_DK.mouse) - def _feature_smart_shift(): _MIN_SMART_SHIFT_VALUE = 0 _MAX_SMART_SHIFT_VALUE = 50 @@ -306,7 +296,6 @@ _SETTINGS_LIST = namedtuple('_SETTINGS_LIST', [ 'lowres_smooth_scroll', 'hires_smooth_invert', 'hires_smooth_resolution', - 'hires_smooth_hid', 'side_scroll', 'dpi', 'pointer_speed', @@ -323,7 +312,6 @@ RegisterSettings = _SETTINGS_LIST( lowres_smooth_scroll=None, hires_smooth_invert=None, hires_smooth_resolution=None, - hires_smooth_hid=None, side_scroll=_register_side_scroll, dpi=_register_dpi, pointer_speed=None, @@ -338,7 +326,6 @@ FeatureSettings = _SETTINGS_LIST( lowres_smooth_scroll=_feature_lowres_smooth_scroll, hires_smooth_invert=_feature_hires_smooth_invert, hires_smooth_resolution=_feature_hires_smooth_resolution, - hires_smooth_hid=_feature_hires_smooth_hid, side_scroll=None, dpi=_feature_adjustable_dpi, pointer_speed=_feature_pointer_speed, @@ -382,7 +369,6 @@ def check_feature_settings(device, already_known): check_feature(_SMOOTH_SCROLL[0], _F.LOWRES_WHEEL) check_feature(_HIRES_INV[0], _F.HIRES_WHEEL, "hires_smooth_invert") check_feature(_HIRES_RES[0], _F.HIRES_WHEEL, "hires_smooth_resolution") - check_feature(_HIRES_TGT[0], _F.HIRES_WHEEL, "hires_smooth_hid") check_feature(_FN_SWAP[0], _F.FN_INVERSION) check_feature(_FN_SWAP[0], _F.NEW_FN_INVERSION, 'new_fn_swap') check_feature(_DPI[0], _F.ADJUSTABLE_DPI)