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

Merge pull request #390 from Toshik1978/master 

Added Logitech K375s support
This commit is contained in:
Peter Wu 2018-08-11 16:36:13 +02:00 committed by GitHub
parent 8f95dd323d 47e7f997d5
commit dcd1a88250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/logitech_receiver/descriptors.py
View File

@ -167,6 +167,11 @@ _D('Wireless Keyboard K360', protocol=2.0, wpid='4004',
_FS.fn_swap() _FS.fn_swap()
], ],
) )
_D('Wireless Keyboard K375s', protocol=2.0, wpid='4061',
settings=[
_FS.k375s_fn_swap()
],
)
_D('Wireless Touch Keyboard K400', protocol=2.0, wpid=('400E', '4024'), _D('Wireless Touch Keyboard K400', protocol=2.0, wpid=('400E', '4024'),
settings=[ settings=[
_FS.fn_swap() _FS.fn_swap()

1
lib/logitech_receiver/hidpp20.py
View File

@ -81,6 +81,7 @@ FEATURE = _NamedInts(
HYBRID_TRACKING=0x2400, HYBRID_TRACKING=0x2400,
FN_INVERSION=0x40A0, FN_INVERSION=0x40A0,
NEW_FN_INVERSION=0x40A2, NEW_FN_INVERSION=0x40A2,
K375S_FN_INVERSION=0x40A3,
ENCRYPTION=0x4100, ENCRYPTION=0x4100,
LOCK_KEY_STATE=0x4220, LOCK_KEY_STATE=0x4220,
SOLAR_DASHBOARD=0x4301, SOLAR_DASHBOARD=0x4301,

9
lib/logitech_receiver/settings_templates.py
View File

@ -179,6 +179,11 @@ def _feature_new_fn_swap():
label=_FN_SWAP[1], description=_FN_SWAP[2], label=_FN_SWAP[1], description=_FN_SWAP[2],
device_kind=_DK.keyboard) device_kind=_DK.keyboard)
def _feature_k375s_fn_swap():
return feature_toggle(_FN_SWAP[0], _F.K375S_FN_INVERSION,
label=_FN_SWAP[1], description=_FN_SWAP[2],
device_kind=_DK.keyboard)
def _feature_smooth_scroll(): def _feature_smooth_scroll():
return feature_toggle(_SMOOTH_SCROLL[0], _F.HI_RES_SCROLLING, return feature_toggle(_SMOOTH_SCROLL[0], _F.HI_RES_SCROLLING,
label=_SMOOTH_SCROLL[1], description=_SMOOTH_SCROLL[2], label=_SMOOTH_SCROLL[1], description=_SMOOTH_SCROLL[2],
@ -292,6 +297,7 @@ from collections import namedtuple
_SETTINGS_LIST = namedtuple('_SETTINGS_LIST', [ _SETTINGS_LIST = namedtuple('_SETTINGS_LIST', [
'fn_swap', 'fn_swap',
'new_fn_swap', 'new_fn_swap',
'k375s_fn_swap',
'smooth_scroll', 'smooth_scroll',
'lowres_smooth_scroll', 'lowres_smooth_scroll',
'hires_smooth_invert', 'hires_smooth_invert',
@ -308,6 +314,7 @@ del namedtuple
RegisterSettings = _SETTINGS_LIST( RegisterSettings = _SETTINGS_LIST(
fn_swap=_register_fn_swap, fn_swap=_register_fn_swap,
new_fn_swap=None, new_fn_swap=None,
k375s_fn_swap=None,
smooth_scroll=_register_smooth_scroll, smooth_scroll=_register_smooth_scroll,
lowres_smooth_scroll=None, lowres_smooth_scroll=None,
hires_smooth_invert=None, hires_smooth_invert=None,
@ -322,6 +329,7 @@ RegisterSettings = _SETTINGS_LIST(
FeatureSettings = _SETTINGS_LIST( FeatureSettings = _SETTINGS_LIST(
fn_swap=_feature_fn_swap, fn_swap=_feature_fn_swap,
new_fn_swap=_feature_new_fn_swap, new_fn_swap=_feature_new_fn_swap,
k375s_fn_swap=_feature_k375s_fn_swap,
smooth_scroll=_feature_smooth_scroll, smooth_scroll=_feature_smooth_scroll,
lowres_smooth_scroll=_feature_lowres_smooth_scroll, lowres_smooth_scroll=_feature_lowres_smooth_scroll,
hires_smooth_invert=_feature_hires_smooth_invert, hires_smooth_invert=_feature_hires_smooth_invert,
@ -371,6 +379,7 @@ def check_feature_settings(device, already_known):
check_feature(_HIRES_RES[0], _F.HIRES_WHEEL, "hires_smooth_resolution") check_feature(_HIRES_RES[0], _F.HIRES_WHEEL, "hires_smooth_resolution")
check_feature(_FN_SWAP[0], _F.FN_INVERSION) check_feature(_FN_SWAP[0], _F.FN_INVERSION)
check_feature(_FN_SWAP[0], _F.NEW_FN_INVERSION, 'new_fn_swap') check_feature(_FN_SWAP[0], _F.NEW_FN_INVERSION, 'new_fn_swap')
check_feature(_FN_SWAP[0], _F.K375S_FN_INVERSION, 'k375s_fn_swap')
check_feature(_DPI[0], _F.ADJUSTABLE_DPI) check_feature(_DPI[0], _F.ADJUSTABLE_DPI)
check_feature(_POINTER_SPEED[0], _F.POINTER_SPEED) check_feature(_POINTER_SPEED[0], _F.POINTER_SPEED)
check_feature(_SMART_SHIFT[0], _F.SMART_SHIFT) check_feature(_SMART_SHIFT[0], _F.SMART_SHIFT)