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

This commit is contained in:
QMK Bot 2023-04-16 05:34:31 +00:00
commit 285c0bce8a
2 changed files with 13 additions and 0 deletions

View File

@ -25,6 +25,7 @@
#define MUSIC_MASK (keycode != KC_NO) #define MUSIC_MASK (keycode != KC_NO)
#define PERMISSVE_HOLD #define PERMISSVE_HOLD
#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
#define LEADER_PER_KEY_TIMING #define LEADER_PER_KEY_TIMING

View File

@ -279,6 +279,18 @@ static inline bool toggle_layer(enum preonic_layers layer, keyrecord_t *record)
return false; return false;
} }
bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case MOD_TAP_LSFT_ENT:
case MOD_TAP_LSFT_ESC:
/* Immediately select the hold action when another key is pressed. */
return true;
default:
/* Do not select the hold action when another key is pressed. */
return false;
}
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case QWERTY: case QWERTY: