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

settings: use KeysArray for key reprogramming

This commit is contained in:
Wojciech Nawrocki 2020-07-18 18:25:39 +02:00 committed by Peter F. Patel-Schneider
parent 95dc973748
commit 6e5d36e59f
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/logitech_receiver/settings_templates.py
View File

@ -26,7 +26,6 @@ from logging import getLogger
from . import hidpp10 as _hidpp10 from . import hidpp10 as _hidpp10
from . import hidpp20 as _hidpp20 from . import hidpp20 as _hidpp20
from . import special_keys as _special_keys from . import special_keys as _special_keys
from .common import NamedInt as _NamedInt
from .common import NamedInts as _NamedInts from .common import NamedInts as _NamedInts
from .common import bytes2int as _bytes2int from .common import bytes2int as _bytes2int
from .common import int2bytes as _int2bytes from .common import int2bytes as _int2bytes
@ -528,29 +527,12 @@ def _feature_pointer_speed():
# and the integer being the control number for that task (to be written to the device) # and the integer being the control number for that task (to be written to the device)
# Solaar only remaps keys (controlled by key gmask and group), not other key reprogramming # Solaar only remaps keys (controlled by key gmask and group), not other key reprogramming
def _feature_reprogrammable_keys_choices(device): def _feature_reprogrammable_keys_choices(device):
count = device.feature_request(_F.REPROG_CONTROLS_V4)
assert count, 'Oops, reprogrammable key count cannot be retrieved!'
count = ord(count[:1]) # the number of key records
keys = [None] * count
groups = [[] for i in range(0, 9)]
choices = {} choices = {}
for i in range(0, count): # get the data for each key record on device for k in device.keys:
keydata = device.feature_request(_F.REPROG_CONTROLS_V4, 0x10, i) tgts = k.remappable_to
key, key_task, flags, pos, group, gmask = _unpack('!HHBBBB', keydata[:8]) if len(tgts) > 1:
action = _NamedInt(key, str(_special_keys.TASK[key_task])) choices[k.key] = tgts
keys[i] = (_special_keys.CONTROL[key], action, flags, gmask)
groups[group].append(action)
for k in keys:
# if k[2] & _special_keys.KEY_FLAG.reprogrammable: # this flag is only to show in UI, ignore in Solaar
if k[3]: # only keys with a non-zero gmask are remappable
key_choices = [k[1]] # it should always be possible to map the key to itself
for g in range(1, 9): # group 0 and gmask 0 (k[3]) does not indicate remappability so don't consider group 0
if (k[3] == 0 if g == 0 else k[3] & 2**(g - 1)):
for gm in groups[g]:
if int(gm) != int(k[0]): # don't put itself in twice
key_choices.append(gm)
if len(key_choices) > 1:
choices[k[0]] = key_choices
return choices return choices