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

rules: track M keys and MR keys for use in rules

This commit is contained in:
Peter F. Patel-Schneider 2022-02-13 19:51:11 -05:00
parent 19b32f7856
commit cf0a71913e
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/logitech_receiver/diversion.py
View File

@ -811,13 +811,15 @@ if x11:
keys_down = [] keys_down = []
g_keys_down = [0, 0, 0, 0] g_keys_down = [0, 0, 0, 0]
m_keys_down = 0
mr_key_down = False
# process a notification # process a notification
def process_notification(device, status, notification, feature): def process_notification(device, status, notification, feature):
if not x11: if not x11:
return return
global keys_down, g_keys_down, key_down, key_up global keys_down, g_keys_down, m_keys_down, mr_key_down, key_down, key_up
key_down, key_up = None, None key_down, key_up = None, None
# need to keep track of keys that are down to find a new key down # need to keep track of keys that are down to find a new key down
if feature == _F.REPROG_CONTROLS_V4 and notification.address == 0x00: if feature == _F.REPROG_CONTROLS_V4 and notification.address == 0x00:
@ -841,6 +843,23 @@ def process_notification(device, status, notification, feature):
if old_byte & (0x01 << (i - 1)) and not new_byte & (0x01 << (i - 1)): if old_byte & (0x01 << (i - 1)) and not new_byte & (0x01 << (i - 1)):
key_up = _CONTROL['G' + str(i + 8 * byte_idx)] key_up = _CONTROL['G' + str(i + 8 * byte_idx)]
g_keys_down = new_g_keys_down g_keys_down = new_g_keys_down
# and also M keys down
elif feature == _F.MKEYS and notification.address == 0x00:
new_m_keys_down = _unpack('!1B', notification.data[:1])
for i in range(1, 9):
if new_m_keys_down & (0x01 << (i - 1)) and not m_keys_down & (0x01 << (i - 1)):
key_down = _CONTROL['M' + str(i + 8 * byte_idx)]
if m_keys_down & (0x01 << (i - 1)) and not new_m_keys_down & (0x01 << (i - 1)):
key_up = _CONTROL['M' + str(i + 8 * byte_idx)]
m_keys_down = new_m_keys_down
# and also MR key
elif feature == _F.MR and notification.address == 0x00:
new_mr_key_down = _unpack('!1B', notification.data[:1])
if not mr_key_down and new_mr_key_down:
key_down = _CONTROL['MR']
if mr_key_down and not new_mr_key_down:
key_up = _CONTROL['MR']
mr_key_down = new_mr_key_down
rules.evaluate(feature, notification, device, status, True) rules.evaluate(feature, notification, device, status, True)

3
lib/logitech_receiver/special_keys.py
View File

@ -276,6 +276,9 @@ CONTROL = _NamedInts(
for i in range(1, 33): # add in G keys - these are not really Logitech Controls for i in range(1, 33): # add in G keys - these are not really Logitech Controls
CONTROL[0x1000 + i] = 'G' + str(i) CONTROL[0x1000 + i] = 'G' + str(i)
for i in range(1, 9): # add in M keys - these are not really Logitech Controls
CONTROL[0x1100 + i] = 'M' + str(i)
CONTROL[0x1200] = 'MR' # add in MR key - this is not really a Logitech Control
CONTROL._fallback = lambda x: 'unknown:%04X' % x CONTROL._fallback = lambda x: 'unknown:%04X' % x