qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-02 06:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2025-04-19 18:57:20 +00:00
parent f9ef89890e ea85ace4a9
commit a88aa56a9e
59 changed files with 101 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/process_keycode/process_caps_word.c
+6 -1
View File
@@ -160,8 +160,13 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
#ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys.
case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER:
// Ignore AltGr.
#endif // TRI_LAYER_ENABLE
#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key.
case QK_LAYER_LOCK:
#endif // LAYER_LOCK_ENABLE
// Ignore AltGr.
case KC_RALT:
case OSM(MOD_RALT):
return true;
quantum/process_keycode/process_repeat_key.c
+4 -1
View File
@@ -41,7 +41,10 @@ static bool remember_last_key(uint16_t keycode, keyrecord_t* record, uint8_t* re
#ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys.
case QK_TRI_LAYER_LOWER:
case QK_TRI_LAYER_UPPER:
#endif // TRI_LAYER_ENABLE
#endif // TRI_LAYER_ENABLE
#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key.
case QK_LAYER_LOCK:
#endif // LAYER_LOCK_ENABLE
return false;
// Ignore hold events on tap-hold keys.