keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix processing of vial_keycode_down/etc

Browse Source
This commit is contained in:
Ilya Zhuravlev
2023-04-15 19:41:55 -06:00
parent b5da2c9db9
commit 091a2c8e0f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
quantum/dynamic_keymap.c
View File

@ -396,18 +396,7 @@ void dynamic_keymap_set_buffer(uint16_t offset, uint16_t size, uint8_t *data) {
} }
} }
extern uint16_t g_vial_magic_keycode_override;
uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) { uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) {
#ifdef VIAL_ENABLE
/* Disable any keycode processing while unlocking */
if (vial_unlock_in_progress)
return KC_NO;
if (row == VIAL_MATRIX_MAGIC && column == VIAL_MATRIX_MAGIC)
return g_vial_magic_keycode_override;
#endif
if (layer_num < DYNAMIC_KEYMAP_LAYER_COUNT && row < MATRIX_ROWS && column < MATRIX_COLS) { if (layer_num < DYNAMIC_KEYMAP_LAYER_COUNT && row < MATRIX_ROWS && column < MATRIX_COLS) {
return dynamic_keymap_get_keycode(layer_num, row, column); return dynamic_keymap_get_keycode(layer_num, row, column);
} }

11
quantum/keymap_common.c
View File

@ -186,8 +186,19 @@ action_t action_for_keycode(uint16_t keycode) {
return action; return action;
} }
extern uint16_t g_vial_magic_keycode_override;
// translates key to keycode // translates key to keycode
__attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { __attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
#ifdef VIAL_ENABLE
/* Disable any keycode processing while unlocking */
if (vial_unlock_in_progress) {
return KC_NO;
}
if (key.row == VIAL_MATRIX_MAGIC && key.col == VIAL_MATRIX_MAGIC) {
return g_vial_magic_keycode_override;
}
#endif
if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) { if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) {
return keycode_at_keymap_location(layer, key.row, key.col); return keycode_at_keymap_location(layer, key.row, key.col);
} }