diff options
| author | QMK Bot | 2025-11-30 20:25:52 +0100 |
|---|---|---|
| committer | QMK Bot | 2025-11-30 20:25:52 +0100 |
| commit | ee60542bd6aa8d96714516f7f42b02fbd8105fcb (patch) | |
| tree | facebc35a70d8890375388f963f05ec4c89a9369 /quantum/action_tapping.c | |
| parent | b5dfb2bd1ea38a37c58227eb17bde583f0c0e4d6 (diff) | |
| parent | 6ed61c65dd66cdbb450a4920a69bae193ec73f15 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/action_tapping.c')
| -rw-r--r-- | quantum/action_tapping.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c index ccc99bfd8e..6baf7721ad 100644 --- a/quantum/action_tapping.c +++ b/quantum/action_tapping.c @@ -474,28 +474,28 @@ bool process_tapping(keyrecord_t *keyp) { && !(MAYBE_RETRO_SHIFTING(event, keyp) && get_auto_shifted_key(get_record_keycode(keyp, false), keyp)) # endif ) { - // Settle the tapping key as *held*, since - // HOLD_ON_OTHER_KEY_PRESS is enabled for this key. - ac_dprintf("Tapping: End. No tap. Interfered by pressed key\n"); - process_record(&tapping_key); + // Settle the tapping key as *held*, since + // HOLD_ON_OTHER_KEY_PRESS is enabled for this key. + ac_dprintf("Tapping: End. No tap. Interfered by pressed key\n"); + process_record(&tapping_key); # if defined(CHORDAL_HOLD) - if (waiting_buffer_tail != waiting_buffer_head && is_tap_record(&waiting_buffer[waiting_buffer_tail])) { - tapping_key = waiting_buffer[waiting_buffer_tail]; - // Pop tail from the queue. - waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE; - debug_waiting_buffer(); - } else + if (waiting_buffer_tail != waiting_buffer_head && is_tap_record(&waiting_buffer[waiting_buffer_tail])) { + tapping_key = waiting_buffer[waiting_buffer_tail]; + // Pop tail from the queue. + waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE; + debug_waiting_buffer(); + } else # endif // CHORDAL_HOLD - { - tapping_key = (keyrecord_t){0}; - } - debug_tapping_key(); + { + tapping_key = (keyrecord_t){0}; + } + debug_tapping_key(); # if defined(CHORDAL_HOLD) - waiting_buffer_process_regular(); + waiting_buffer_process_regular(); # endif // CHORDAL_HOLD - } + } } // enqueue return false; @@ -946,7 +946,7 @@ static uint8_t waiting_buffer_find_chordal_hold_tap(void) { uint16_t prev_keycode = get_record_keycode(&tapping_key, false); uint8_t first_tap = WAITING_BUFFER_SIZE; for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { - keyrecord_t * cur = &waiting_buffer[i]; + keyrecord_t *cur = &waiting_buffer[i]; const uint16_t cur_keycode = get_record_keycode(cur, false); if (!cur->event.pressed || !is_mt_or_lt(prev_keycode)) { break; |