sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #243 from honboubao/release-previously-pressed-key

Browse Source 
always release the same key as was pressed
This commit is contained in:
Josh Klar 2021-09-20 23:25:54 +00:00 committed by GitHub
commit 3bc038d0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kmk/handlers/stock.py
View File

@ -8,9 +8,6 @@ def passthrough(key, keyboard, *args, **kwargs):
def default_pressed(key, keyboard, KC, coord_int=None, coord_raw=None, *args, **kwargs): def default_pressed(key, keyboard, KC, coord_int=None, coord_raw=None, *args, **kwargs):
keyboard.hid_pending = True keyboard.hid_pending = True
if coord_int is not None:
keyboard._coordkeys_pressed[coord_int] = key
keyboard.keys_pressed.add(key) keyboard.keys_pressed.add(key)
return keyboard return keyboard
@ -22,10 +19,6 @@ def default_released(
keyboard.hid_pending = True keyboard.hid_pending = True
keyboard.keys_pressed.discard(key) keyboard.keys_pressed.discard(key)
if coord_int is not None:
keyboard.keys_pressed.discard(keyboard._coordkeys_pressed.get(coord_int, None))
keyboard._coordkeys_pressed[coord_int] = None
return keyboard return keyboard

29
kmk/kmk_keyboard.py
View File

@ -42,7 +42,7 @@ class KMKKeyboard:
secondary_hid_type = None secondary_hid_type = None
_hid_helper = None _hid_helper = None
hid_pending = False hid_pending = False
state_layer_key = None current_key = None
matrix_update = None matrix_update = None
secondary_matrix_update = None secondary_matrix_update = None
_matrix_modify = None _matrix_modify = None
@ -119,7 +119,6 @@ class KMKKeyboard:
self.state_changed = True self.state_changed = True
def _find_key_in_map(self, int_coord, row, col): def _find_key_in_map(self, int_coord, row, col):
self.state_layer_key = None
try: try:
idx = self.coord_mapping.index(int_coord) idx = self.coord_mapping.index(int_coord)
except ValueError: except ValueError:
@ -133,28 +132,39 @@ class KMKKeyboard:
return None return None
for layer in self.active_layers: for layer in self.active_layers:
self.state_layer_key = self.keymap[layer][idx] layer_key = self.keymap[layer][idx]
if not self.state_layer_key or self.state_layer_key == KC.TRNS: if not layer_key or layer_key == KC.TRNS:
continue continue
if self.debug_enabled: if self.debug_enabled:
print('KeyResolution(key={})'.format(self.state_layer_key)) print('KeyResolution(key={})'.format(layer_key))
return self.state_layer_key return layer_key
def _on_matrix_changed(self, row, col, is_pressed): def _on_matrix_changed(self, row, col, is_pressed):
if self.debug_enabled: if self.debug_enabled:
print('MatrixChange(col={} row={} pressed={})'.format(col, row, is_pressed)) print('MatrixChange(col={} row={} pressed={})'.format(col, row, is_pressed))
int_coord = intify_coordinate(row, col) int_coord = intify_coordinate(row, col)
kc_changed = self._find_key_in_map(int_coord, row, col) if not is_pressed:
self.current_key = self._coordkeys_pressed[int_coord]
if self.debug_enabled:
print('PressedKeyResolution(key={})'.format(self.current_key))
if kc_changed is None: if self.current_key is None:
self.current_key = self._find_key_in_map(int_coord, row, col)
if is_pressed:
self._coordkeys_pressed[int_coord] = self.current_key
else:
self._coordkeys_pressed[int_coord] = None
if self.current_key is None:
print('MatrixUndefinedCoordinate(col={} row={})'.format(col, row)) print('MatrixUndefinedCoordinate(col={} row={})'.format(col, row))
return self return self
return self.process_key(kc_changed, is_pressed, int_coord, (row, col)) return self.process_key(self.current_key, is_pressed, int_coord, (row, col))
def process_key(self, key, is_pressed, coord_int=None, coord_raw=None): def process_key(self, key, is_pressed, coord_int=None, coord_raw=None):
if self._tapping and not isinstance(key.meta, TapDanceKeyMeta): if self._tapping and not isinstance(key.meta, TapDanceKeyMeta):
@ -451,6 +461,7 @@ class KMKKeyboard:
self._print_debug_cycle(init=True) self._print_debug_cycle(init=True)
while True: while True:
self.current_key = None
self.state_changed = False self.state_changed = False
self.sandbox.active_layers = self.active_layers.copy() self.sandbox.active_layers = self.active_layers.copy()