Skip to content

[Bug][Core] Fix for Flow Tap: fix handling of distinct taps and timer updates. #25175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 22, 2025

Conversation

getreuer
Copy link
Contributor

This fixes Flow Tap bugs reported by @amarz45, @mwpardue, and @NikGovorov in the discussion on #25125.

Description

As reported by @amarz45 and @mwpardue, there is a bug where if two tap-hold keys are pressed in distinct taps back to back, then Flow Tap is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held followed by a tap of a tap-hold key, then Flow Tap updates its timer on the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed in #25125 that tapping_key is cleared to noevent once it is released, when actually tapping_key is still maintained for TAPPING_TERM ms after release (for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue, and @NikGovorov for reporting!

Details:

  • Logic for converting the current tap-hold event to a tap is extracted to flow_tap_key_if_within_term(), which is now invoked also in the post-release "interfered with other tap key" case. This fixes the distinct taps bug.

  • The Flow Tap timer is now updated at the beginning of each call to process_record(), provided that there is no unsettled tap-hold key at that time and that the record is not for a mod or layer switch key. By moving this update logic to process_record(), it is conceptually simpler and more robust.

  • Unit tests extended to cover the reported scenarios.

Debugging notes

In case it helps any further troubleshooting, here is how to enable verbose debug logging about the core tap-hold logic:

  • Enable console debug logging.

  • In your config.h, add: #define ACTION_DEBUG

  • Optionally, you may find it useful to add KEYCODE_STRING_ENABLE = yes to rules.mk and call my dlog_record() logging function from process_record_user(). This way, you also get logging of the events coming out of the core tap-hold logic.

An example log (rapidly pressing a regular key O followed by two tap-hold keys S, H):

---- action_exec: start -----
EVENT: 0703d(59572)
L0  ( 7, 3)      press   KC_O
ACTION: ACT_LMODS[0:12] layer_state: 00000000(0) default_layer_state: 00000001(0)
processed: 0703d(59572):0


---- action_exec: start -----
EVENT: 0202d(59599)
0202d(59599) within flow tap term (28 < 125) considered a tap
registered_taps = { 0202 }
L0  ( 2, 2) tap  press   LALT_T(KC_S)
layer_state: 00000000(0) to 00000000(0)
ACTION: ACT_LMODS_TAP[4:16] layer_state: 00000000(0) default_layer_state: 00000001(0)
MODS_TAP: Tap: register_code
processed: 0202d(59599):1


---- action_exec: start -----
EVENT: 0901d(59692)
0901d(59692) within flow tap term (92 < 100) considered a tap
registered_taps = { 0202 0901 }
L0  ( 9, 1) tap  press   RCTL_T(KC_H)
ACTION: ACT_RMODS_TAP[1:0B] layer_state: 00000000(0) default_layer_state: 00000001(0)
MODS_TAP: Tap: register_code
processed: 0901d(59692):1

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.
@zvecr zvecr added the bug label Apr 20, 2025
@NikGovorov
Copy link

Unfortunately, the issue I reported earlier is still reproducible after applying the changes. I've enabled logging, but since QMK Toolbox's HID Console doesn't allow copying the output, I've attached images of the logs instead 🙂

Screenshot 2025-04-20 194958

Screenshot 2025-04-20 195016

@NikGovorov
Copy link

NikGovorov commented Apr 20, 2025

Here is some extra logging I've added to https://github.com/getreuer/qmk_firmware/blob/2bd3f6cfde1ae6ea59960a3f208c9ceabb8e6ca5/quantum/action_tapping.c#L801 and https://github.com/getreuer/qmk_firmware/blob/2bd3f6cfde1ae6ea59960a3f208c9ceabb8e6ca5/quantum/action_tapping.c#L867

image

As you can see, we update the timer on the release of KC_RIGHT, but we set RALT_T(KC_I) as the prev_keycode, which makes it a valid flow tap previous key.

@tzarc
Copy link
Member

tzarc commented Apr 20, 2025

If you're building locally, qmk console should allow you to attach to the output without needing toolbox (and is faster too). You should be able to copy/paste from the terminal just fine.

@NikGovorov
Copy link

NikGovorov commented Apr 20, 2025

If you're building locally, qmk console should allow you to attach to the output without needing toolbox (and is faster too). You should be able to copy/paste from the terminal just fine.

Thanks! Unfortunately, the keyboard I'm currently testing is connected to a Windows machine(with no msys installed). I've submitted a pull request to fix the HID console functionality on Windows.

@getreuer
Copy link
Contributor Author

Thank you @NikGovorov for your continued testing and description! I successfully repro'd this bug now.

In this sequence:

  1. Q down;
  2. Q up;
  3. LT(NAV, KC_SPC) down;
  4. KC_RIGHT down;
  5. KC_RIGHT up;
  6. LT(NAV, KC_SPC) up;
  7. MT(MOD_LCTL, KC_T) down;
  8. U down;
  9. U up;
  10. MT(MOD_LCTL, KC_T) up;

The occurrence of the bug depends on that KC_RIGHT is tapped before LT(NAV, KC_SPC) is settled. Furthermore, on layer 0, the key RALT_T(KC_I) in the same position as KC_RIGHT is one where Flow Tap is enabled. It's a particular set of conditions, this is how I missed it before! I appreciate that you continued to explain until I got it.

What's happening is that in steps 4 and 5, LT(NAV, KC_SPC) hasn't been settled yet, so when conceptually KC_RIGHT is tapped, it is received in action_tapping as a tap on RALT_T(KC_I). The keycode stored in prev_keycode is RALT_T(KC_I). With Permissive Hold enabled, LT(NAV, KC_SPC) is settled as KC_RIGHT is released, and shortly after prev_keycode is set (d'oh!).

I'll see what can be done to fix this. Hopefully moving the prev_keycode to occur slightly later does it. The challenge with layer-taps is that when a key is pressed following a yet-undecided layer-tap key, we don't yet know which layer that key press is on since that depends on how the layer-tap is settled. It puts the "quantum" into "Quantum Mechanical Keyboard" :-P

@mwpardue
Copy link

mwpardue commented Apr 20, 2025

For my part the bug I reported appears to have been corrected. I see the flow_tap_term reported in debugging on back-to-back hold-tap keys, now, so I'm pretty sure it's going to work fine. I've been typing random text or running through typing tests on monkeytype.com for half an hour now and haven't seen the bug again.

I also can't seem to reproduce the issue that NikGovorov is having. I do have a default case in get_flow_tap_term() of 0 so only my home-row keys get any sort of FLOW_TAP_TERM at all; I'm not sure if that would make any difference.

Thank you, @getreuer, for tackling these bugs and for writing this feature to begin with. It's very much appreciated.

@NikGovorov
Copy link

@getreuer Thanks for continuing to look into the issue!

With Permissive Hold enabled, LT(NAV, KC_SPC) is settled as KC_RIGHT is released

I’m fairly certain the same behavior occurs when Permissive Hold is disabled, as long as this happens within the TAPPING_TERM.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
@getreuer
Copy link
Contributor Author

I've been typing random text or running through typing tests on monkeytype.com for half an hour now and haven't seen the bug again.

@mwpardue that sounds like progress! =) Thank you so much for your testing and feedback.

@getreuer
Copy link
Contributor Author

@NikGovorov, I just pushed commit 0e4c30a with a unit test repro'ing the scenario you describe, which would fail before, and revision to Flow Tap to fix this.

Summary of the revision:

  • The previous key and timer are both updated from process_record(). This is slightly later in the sequence of processing than before, and by this point, a just-settled layer-tap should have taken effect so that the keycode from the correct layer is remembered.

  • The Flow Tap previous key and timer are updated now also on key release events, except for releases of modifiers and held layer switches.

  • The Flow Tap previous key and timer are now updated together, for simplicity. This makes the logic easier to think about.

  • A few additional unit tests, including your scenario as "layer_tap_ignored_with_disabled_key_complex."

@NikGovorov
Copy link

@getreuer Just tested 0e4c30a, and it works perfectly on my end. Really appreciate your help—thanks a lot!

@getreuer
Copy link
Contributor Author

@NikGovorov fantastic, that's wonderful to hear! And thank you for that lightning-fast follow up!

@amarz45
Copy link

amarz45 commented Apr 21, 2025

I also tested this patch and I can confirm that the issue I reported is now fixed. Thanks @getreuer!

@getreuer
Copy link
Contributor Author

@amarz45 thank you!

@drashna, @KarlK90, this fix is good to go! @amarz45, @mwpardue, @NikGovorov have tested and confirmed that the problems reported previously are fixed.

@drashna drashna requested a review from a team April 21, 2025 23:48
Copy link
Member

@KarlK90 KarlK90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It puts the "quantum" into "Quantum Mechanical Keyboard" :-P

I had a good laugh. Thanks again for wading through the action_taping swamp and the swift fixes.

@KarlK90 KarlK90 merged commit 73e2ef4 into qmk:develop Apr 22, 2025
4 checks passed
@getreuer getreuer deleted the fix/flow_tap branch April 22, 2025 15:28
@getreuer
Copy link
Contributor Author

@KarlK90 this is definitely a "no, thank you" moment =) Let me tell you, with how delicate and complicated action_tapping is, unit tests are absolutely vital to making changes to this area of QMK successfully. Chordal Hold and Flow Tap could not have happened without your effort to develop QMK's testing framework. So thank you!

@amarz45
Copy link

amarz45 commented Apr 22, 2025

Hey @getreuer and others, thanks so much for your work on this. Shortly after this has been merged, I noticed that I’m oftentimes accidentally triggering keyboard shortcuts. I don’t know if it’s a bug or intentional behaviour, and it happens if I have PERMISSIVE_HOLD enabled as well as flow tap. Let’s say I have D and F as tap-hold keys. For the following key sequence:

  1. D down
  2. F down
  3. D up (resolved as tap)

I would have expected F to resolve as a tap key immediately after D is released, but instead it’s still a tap-hold key. I believe this is what has caused me to accidentally trigger a few keyboard shortcuts, even though I type consistently at around 150 WPM and I’ve set my FLOW_TAP_TERM to 200. One keyboard shortcut that I keep accidentally triggering is Control + H. I’ve set my Space key to Meta and my F key to Control, and on Colemak the F key is used to type T. So an example of a key sequence that would cause me to accidentally trigger Control + H is a space followed by “th”:

  1. Space down
  2. F down
  3. Space up
  4. H down
  5. H up
  6. F up

The expected behaviour is to type th. The actual behaviour is Space gets typed, then Control + H is triggered. I’m not 100 % sure this is what’s causing me to accidentally trigger keyboard shortcuts, so I will investigate further.

@getreuer
Copy link
Contributor Author

@amarz45 thanks for the report, and good question.

Let’s say I have D and F as tap-hold keys. For the following key sequence:

  1. D down
  2. F down
  3. D up (resolved as tap)

I would have expected F to resolve as a tap key immediately after D is released, but instead it’s still a tap-hold key.

This is a "working as intended" case where Flow Tap does what logic I meant to implement. Though, it's totally fair to say an elaboration of that logic would better fulfill the intended idea.

As it is, Flow Tap potentially intervenes only on the key down event. In step 2, since D has not yet been settled at that moment, so Flow Tap does not act on F. The consideration is that the intention might be to hold both D and F for a Ctrl+Alt+key hotkey.

It's a great point that Flow Tap could act later than the key down event to address such a roll event. I'll take a shot at it.

Thinking about how to implement this, when the current tap-hold key is settled as tapped (on key up, or perhaps by Chordal Hold), it seems plausible to scan the waiting buffer for potentially a following yet-unsettled tap-hold key, then re-evaluate whether Flow Tap ought to act on it.

  1. Space down
  2. F down
  3. Space up
  4. H down
  5. H up
  6. F up

Space in this example is MT(MOD_LGUI, KC_SPC), correct? If so, the reason is the same as above: Space is not yet settled at the time that F is pressed, so Flow Tap does not act on it. Permissive Hold then settles it as held when the H key is released.

@amarz45
Copy link

amarz45 commented Apr 22, 2025

Space in this example is MT(MOD_LGUI, KC_SPC), correct? If so, the reason is the same as above: Space is not yet settled at the time that F is pressed, so Flow Tap does not act on it. Permissive Hold then settles it as held when the H key is released.

Correct. For me, it makes the most sense if the behaviour is to immediately resolve a tap-hold key as tapped whenever the previous key is tapped within the FLOW_TAP_TERM, even in the case of a roll. Perhaps this behaviour should be customizable though. Because in this situation, if a tap-hold key that wasn’t pressed for the TAPPING_TERM was released, instead of that modifier being cancelled it will result in all the keys being tapped instead. However, I find that to rarely be an issue because when I’m chaining modifiers I will have usually held them for longer than the TAPPING_TERM anyway.

@NikGovorov
Copy link

NikGovorov commented Apr 23, 2025

Correct. For me, it makes the most sense if the behaviour is to immediately resolve a tap-hold key as tapped whenever the previous key is tapped within the FLOW_TAP_TERM, even in the case of a roll. Perhaps this behaviour should be customizable though. Because in this situation, if a tap-hold key that wasn’t pressed for the TAPPING_TERM was released, instead of that modifier being cancelled it will result in all the keys being tapped instead. However, I find that to rarely be an issue because when I’m chaining modifiers I will have usually held them for longer than the TAPPING_TERM anyway.

In your case, you might find that the original implementation by @filterpaper suits your workflow better.

You might also consider adding an option to toggle a layer without HRM, ideally with a simple keybinding or a timer to switch between them, for example:
image

@amarz45
Copy link

amarz45 commented Apr 23, 2025

In your case, you might find that the original implementation by @filterpaper suits your workflow better.

I think it’s better as part of QMK’s core functionality rather than in user space.

You might also consider adding an option to toggle a layer without HRM, ideally with a simple keybinding to switch between them, for example [...]

I like the idea, but I still prefer home-row mods.

@filterpaper
Copy link
Contributor

I think it’s better as part of QMK’s core functionality rather than in user space.

The Flow Tap feature will typically require some customisation with callback functions in the keymap.c file (user space). The pre_process_record_user is also a callback function exposed for customisation in the keymap.c file. Is the preference of having the final "solution" that works in "core" over "user space" important because of specific reasons?

@KarlK90
Copy link
Member

KarlK90 commented Apr 23, 2025

@KarlK90 this is definitely a "no, thank you" moment =) Let me tell you, with how delicate and complicated action_tapping is, unit tests are absolutely vital to making changes to this area of QMK successfully. Chordal Hold and Flow Tap could not have happened without your effort to develop QMK's testing framework. So thank you!

Thanks and great to hear that :-). The effort to overhaul the unit tests initially came from my desire to untangle the spaghetti that action_tapping is and replace it with a better system - which never happened :D.

@amarz45
Copy link

amarz45 commented Apr 24, 2025

The Flow Tap feature will typically require some customisation with callback functions in the keymap.c file (user space). The pre_process_record_user is also a callback function exposed for customisation in the keymap.c file. Is the preference of having the final "solution" that works in "core" over "user space" important because of specific reasons?

I used the user space solution before #25125 and this pull request was merged. Now that it is part of QMK’s core functionality, I think it makes sense to change the behaviour to the way I described for ease of use. However, if that’s too complex then I understand and am also willing to use the user space solution.

clownfish-og pushed a commit to clownfish-og/qmk_firmware that referenced this pull request Apr 24, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
@getreuer
Copy link
Contributor Author

Hi all, I have a draft PR for a Flow Tap enhancement in #25200. This addresses @amarz45's case, while yet preserving the ability to chord multiple mods without having to wait out the Flow Tap term.

If you have time over the next few days, please check out #25200 and share your feedback—good or bad. The window for new PRs in this breaking changes cycle closes soon, this Sunday on 2025-04-27. So quick feedback helps especially for a chance of inclusion in this cycle. All the feedback here has been immensely helpful. Thank you!

getreuer added a commit to getreuer/qmk_firmware that referenced this pull request Apr 28, 2025
Adds Tap Flow bug fix qmk#25175 and
enhancement qmk#25200.
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Apr 29, 2025
* Add Flow Tap to zsa/qmk_firmware.

* Flow Tap bug fixes and enhancements.

Adds Tap Flow bug fix qmk#25175 and
enhancement qmk#25200.
clownfish-og pushed a commit to clownfish-og/qmk_firmware that referenced this pull request Apr 29, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
ChrisGVE pushed a commit to ChrisGVE/qmk_firmware that referenced this pull request May 6, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
JoseCaliz pushed a commit to JoseCaliz/qmk_firmware that referenced this pull request Jun 3, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 4, 2025
* add 75_(ansi|iso) Community Layouts to mechlovin/olly/octagon (qmk#22459)

* expand mechlovin/olly/octagon

* Update info.json

* Rename info.json to keyboard.json

* correct matrix position for key

* remove VIA

* [Core] get_keycode_string(): function to format keycodes as strings, for more readable debug logging. (qmk#24787)

* keycode_string(): Format keycodes as strings.

This adds the `keycode_string()` function described in
https://getreuer.info/posts/keyboards/keycode-string/index.html
as a core feature.

* Fix formatting.

* keycode_string review revisions.

* Rename keycode_string() -> get_keycode_string() for consistency with
  existing string utils like get_u8_str().

* Revise custom keycode names with separate _user and _kb tables.

* Correct indent in builddefs/generic_features.mk.

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add KC_NUHS, KC_NUBS, and KC_CAPS.

* Fix linking error with custom names.

* Attempt at simplifying interface.

* Formatting fix.

* Several fixes and revisions.

* Don't use PSTR in KEYCODE_STRING_NAME, since this fails to build on
  AVR. Store custom names in RAM.
* Revise the internal table of common keycode names to use its own
  storage representation, still in PROGMEM, and now more efficiently
  stored flat in 8 bytes per entry.
* Support Swap Hands keycodes and a few other keycodes.

* Revert "Formatting fix."

This reverts commit 2a27710.

* Revert "Attempt at simplifying interface."

This reverts commit 8eaf67d.

* Simplify custom names API by sigprof's suggestion.

* Support more keycodes.

* Add QK_LOCK keycode.
* Add Secure keycodes.
* Add Joystick keycodes.
* Add Programmable Button keycodes.
* Add macro MC_ keycodes.
* For remaining keys in known code ranges, stringify them as
  "QK_<feature>+<number>". For instance, "QK_MIDI+7".

* Bug fix and a few improvements.

* Fix missing right-hand bit when displaying 5-bit mods numerically.
* Support KC_HYPR, KC_MEH, HYPR_T(kc), MEH_T(kc).
* Exclude one-shot keycodes when NO_ACTION_ONESHOT is defined.

---------

Co-authored-by: Ryan <fauxpark@gmail.com>

* Align to latest CLI dependencies (qmk#24553)

* Align to latest CLI dependencies

* Update docs

* Add Community Layout support to daskeyboard4 (qmk#23884)

add ansi CL

* Add the plywrks ply8x hotswap variant. (qmk#23558)

* Add hotswap variant

* Update RGB matrix

* Move files around to target develop

* Revert rules.mk for keyboards/jaykeeb/joker/rules.mk

* Update keyboards/plywrks/ply8x/hotswap/keyboard.json

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Apply suggestions from code review

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add missing community layouts

* Delete keyboards/plywrks/ply8x/rules.mk

* Update missing keys in RGB matrix

* Add missing key in RGB matrix for hotswap ver

* Remove via keymaps

* Add keyboard alias for plywrks/ply8x to plywrks/ply8x/solder

* Fix typo

* Fix another typo

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* [Core] use `keycode_string` in unit tests (qmk#25042)

* tests: use keycode_string feature

With a proper keycode to string implementation in qmk there is no need
to use the unit tests only implementation anymore.

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* tests: remove keycode_util feature

This feature is no longer used as we switched the tests to the
keycode string implementation.

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* Non-volatile memory data repository pattern (qmk#24356)

* First batch of eeconfig conversions.

* Offset and length for datablocks.

* `via`, `dynamic_keymap`.

* Fix filename.

* Commentary.

* wilba leds

* satisfaction75

* satisfaction75

* more keyboard whack-a-mole

* satisfaction75

* omnikeyish

* more whack-a-mole

* `generic_features.mk` to automatically pick up nvm repositories

* thievery

* deferred variable resolve

* whitespace

* convert api to structs/unions

* convert api to structs/unions

* convert api to structs/unions

* fixups

* code-side docs

* code size fix

* rollback

* nvm_xxxxx_erase

* Updated location of eeconfig magic numbers so non-EEPROM nvm drivers can use them too.

* Fixup build.

* Fixup compilation error with encoders.

* Build fixes.

* Add `via_ci` keymap to onekey to exercise VIA bindings (and thus dynamic keymap et.al.), fixup compilation errors based on preprocessor+sizeof.

* Build failure rectification.

* Migrate remaining `split.soft_serial_pin` to `split.serial.pin` (qmk#25046)

* Migrate keyboards/bastardkb

* Migrate keyboards/handwired

* Migrate keyboards/helix

* Fix duplicate serial key

* Fix outdated GPIO control function usage (qmk#25060)

* [Modules] Provide access to current path in `rules.mk`. (qmk#25061)

* Update keymap for keycult 1800 (qmk#25070)

Update keymap

Co-authored-by: yiancar <yiancar@gmail.com>

* Add handwired/erikpeyronson/erkbd (qmk#25030)


Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add support for Starry FRL (qmk#24626)


Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add "Large Lad" keyboard (qmk#24727)

Co-authored-by: jack <jack@pngu.org>

* Bump vite from 5.4.12 to 5.4.15 in /builddefs/docsgen (qmk#25065)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.12 to 5.4.15.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.15/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Allow AnnePro2 to reboot (qmk#24886)

Without this, the QK_REBOOT key did nothing.

* Fix path typo related RP2040 (qmk#25069)

Fix path typo

* Update onekey example for nucleo f446re (qmk#25067)

* use accessible pins for nucleo f446re onekey example

* remove pin collision with matrix in keyboard.json

* use accessible pins for LED

* remove pin collision with matrix

* Update readme.md to reflect pin changes

* Module documentation typo correction (qmk#25073)

* Fix lockups on AVR with `qmk/hello_world` module (qmk#25074)

Fix lockups on AVR.

* At101ish (qmk#25072)

* Dell AT101 replacement pcb support

* Update keyboards/at101ish/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* remove empty src clause in makefile

* feature: Update at101ish to qmk v0.28

* feature: Add osdetecting keymap variant.

* refactor: Move at101ish keyboard to handwired folder.

* fix: Adjust at101ish readme-

* fix: review changes.

* chore: Remove unneeded feature.

---------

Co-authored-by: fauxpark <fauxpark@gmail.com>

* Add "license" field to Community Module JSON schema. (qmk#25085)

Add "license" field to community module schema.

* Add kt60HS-T v2 PCB (qmk#25080)

* Add kt60HS-Tv2

* Update keyboards/keyten/kt60hs_t/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v1/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v2/keyboard.json

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v2/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/info.json

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Change of structure

* Moving the keyboard

* Update data/mappings/keyboard_aliases.hjson

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v1/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/keyten/kt60hs_t/v2/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

---------

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Make sure that unit tests run on all release versions

* [ErgoDox EZ] Fix complication issues due to updates

* [ErgoDox EZ] Fix compilication errors and warnings

We want all green!

* Fix 'qmk lint -kb' argument handling (qmk#25093)

* Refactor Deemen17 Works DE60 (qmk#25088)

* Add Coban Pad 12A (qmk#25039)



Co-authored-by: jack <jack@pngu.org>

* [Keyboard] Add PHDesign PH60/Multi Keyboard PCB (qmk#25086)

* Add PH60/Multi Support

* Add PCB PIcture for README

* Remove MO(_FN2)

* README Typo Fix

* Layout and README Adjustment

* Add README for PHDesign Main Folder

* Keymap Improvement

* Update README.md

* [Keyboard] Add Ortho Slayer (qmk#25099)

* Add Ortho Slayer

* Update keyboards/keyten/ortho_slayer/keymaps/default/keymap.c

Co-authored-by: jack <jack@pngu.org>

* Update keyboards/keyten/ortho_slayer/readme.md

Co-authored-by: jack <jack@pngu.org>

---------

Co-authored-by: jack <jack@pngu.org>

* Fix coban pad9a wrong layout in keyboard.json (qmk#25100)

* Remove `CTPC`/`CONVERT_TO_PROTON_C` options (qmk#25111)

* Remove direct docs.qmk.fm links from docs (qmk#25113)

* Add warning when deprecated 'promicro_rp2040' is used (qmk#25112)

* Add Vida to QMK (qmk#24225)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* More Windows->Unix style path fixes. (qmk#25119)

* Include `math.h` where necessary. (qmk#25122)

* Cater for use of `__errno_r()` in ChibiOS syscalls.c with newer picolibc revisions (qmk#25121)

* chore: Allow disabling underglow on Work Louder devices (qmk#25123) (qmk#25120)

* Allow disabling Underglow on Work Louder devices

Allows disabling Underglow on Work Louder devices by using `RGBLIGHT_ENABLE = no` on rules.mk

* Update keyboards/work_louder/rgb_functions.c

Suggested by @zvecr on review.

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Joel Challis <git@zvecr.com>

* Exclude external userspace from lint checking (qmk#24680)

* fix: Fix startup sound for Preonic (qmk#25132) (qmk#25133)

Add `AUDIO_INIT_DELAY ` to config.h to resolve

* New standard layout for Savage65 (65_ansi_blocker_tsangan_split_bs) (qmk#24690)

* Added a default firmware and layout for the WindStudio Wind X R1
keyboard.

* Wind X R1: cleaned-up the folders to make clear that this firmware is
for the release 1 of this keyboard.

* Delete keyboards/windstudio/wind_x/R1 directory

Removing the uppercase R1 folder

* feat(cannonkeys/savage65): Added layout to keyboard.json
- Added the layout LAYOUT_65_ansi_blocker_tsangan_split_bs to the
  community layouts.

* kradoindustries_promenade: add LAYOUT_1x2u (qmk#25090)

* Update shuguet/shu89 (qmk#24780)

* Update keyboard.json

Update mod keys location in RGB layout.

* Update keyboard.json

* Update keyboards/shuguet/shu89/keyboard.json

Co-authored-by: Ryan <fauxpark@gmail.com>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>

* [Keyboard] Add suika83opti (qmk#24991)

* [chore]: move and rename mouse/scroll min/max defines (qmk#25141)

* protocol: move {XY/HV}_REPORT_{MIN,MAX} into report.h

..to allow easier re-use in other code implementations.

* protocol: rename {XY/HV}_REPORT_{MIN/MAX} to MOUSE_REPORT_{XY/HV}_{MIN/MAX}

..to avoid naming collisions.

* [Core] Flow Tap tap-hold option to disable HRMs during fast typing (qmk#25125)

aka Global Quick Tap, Require Prior Idle

* Add Link keyboard (qmk#25058)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove Sofle `rgb_default` keymap & tidy readme's (qmk#25010)

* Added Keyboard LumPy27 (qmk#24967)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Kobold r1 (qmk#25161)

* Kobold r1

* Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>

* `board_init` => `early_hardware_init_post`.

---------

Co-authored-by: jack <jack@pngu.org>

* [Docs] Unify lighting step descriptions (qmk#25167)

unify lighting step descriptions and defaults across docs

* [Keyboard] Add voidhhkb-hotswap (qmk#25007)

* Added files for voidhhkb-hotswap

* Updated keyboard name to resolve build errors

* Implement suggestions from PR. Use 60_hhkb community layout.

* Update keyboards/void/voidhhkb_hotswap/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <jack@pngu.org>

* Remove duplication of RGB Matrix defaults (qmk#25146)

* Remove duplication of RGB Matrix defaults

* Remove more duplication of defaults

* fix

* Fix missing and extra commas in JSON schema (qmk#25057)

* Remove duplication of RGBLight defaults (qmk#25169)

* Ignore the Layer Lock key in Repeat Key and Caps Word. (qmk#25171)

* Allow for disabling EEPROM subsystem entirely. (qmk#25173)

* [keyboard] ymdk/id75/rp2040 (qmk#25157)

Co-authored-by: tao heihei <>

* Remove `bluefruit_le_read_battery_voltage` function (qmk#25129)

* Fix 'Would you like to clone the submodules?' prompt under msys (qmk#24958)

* Fixup eeconfig lighting reset. (qmk#25166)

* DOCS: `qmk-hid` missing in bootloaders list? (qmk#25177)

* Fix for `.clangd`. (qmk#25180)

* Update develop branch to Pico SDK 1.5.1 (qmk#25178)

* Add lint warning for empty url (qmk#25182)

* Implement connection keycode logic (qmk#25176)

* Add handwired/footy (qmk#25151)

Co-authored-by: jack <jack@pngu.org>

* Decrease firmware size for `anavi/macropad8`. (qmk#25185)

Preparation for bootstrapper.

* Align ChibiOS `USB_WAIT_FOR_ENUMERATION` implementation (qmk#25184)

* [Bug][Core] Fix for Flow Tap: fix handling of distinct taps and timer updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."

* Remove empty `url` fields (qmk#25181)

* Prompt for converter when creating new keymap (qmk#25116)

* High resolution scrolling (without feature report parsing) (qmk#24423)

* hires scrolling without feature report parsing

* fix valid range for exponent

* fix incorrect minimum exponent value documentation

* Avoid duplication in generated community modules `rules.mk` (qmk#25135)

* Bump rlespinasse/github-slug-action from 3 to 5 (qmk#25021)

* Remove `"console":false` from keyboards (qmk#25190)

* Update 'qmk generate-api' to only publish pure DD keymaps (qmk#24782)

* Remove more duplication of defaults (qmk#25189)

* Align `new-keyboard` template to current standards (qmk#25191)

* Bump vite from 5.4.15 to 5.4.18 in /builddefs/docsgen (qmk#25192)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix `boardsource/beiwagon` RGB Matrix coordinates (qmk#25018)

* Remove `"command":false` from keyboards (qmk#25193)

* Extend lint checks to reject duplication of defaults (qmk#25149)

* modelh: add prerequisites for via support (qmk#24932)

* First TypeK support (qmk#22876)

* Add Lemokey X0 keyboard (qmk#24994)

* keyboards/annepro2/ld: Add per-variant linker scripts (qmk#24999)

C18 has an MCU with 16K SRAM, up from C15's 8K.

Split the linker script into C15 and C18 variants to make use of the
larger RAM capacity of C18.

* Add new keyboard MirageiX (qmk#25054)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* [Keymap] Sofle RGB - fixed stuck on numpad layer and layout comments (qmk#24942)

* Add handwired 4x14 LuMaWing keyboard (qmk#24885)

* Add jcpm2 (JC Pro Macro 2) (qmk#24816)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* [Keyboard] Add splitkb.com's Halcyon Elora rev2 (qmk#24790)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] mzmkb/slimdash/rev1 (qmk#24804)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Added new keyboard epssp75 (qmk#24756)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Addition of OK-1 (qmk#24646)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add Umbra keyboard (qmk#24569)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Amptrics 0420 keyboard addition (qmk#24744)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Core] Enhance Flow Tap to work better for rolls over multiple tap-hold keys. (qmk#25200)

* Flow Tap revision for rolling press.

* Remove debugging cruft.

* Formatting fix.

* amptrics/0422 - Prevent OOB in `update_leds_for_layer` (qmk#25209)

* [Keyboard] Add Gravity-45(qmk#25206)

* add gravity-45

* readme.md

* fix readme

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: jack <0x6a73@protonmail.com>

* run qmk format-json -i keyboards/green_keys/gravity_45/keyboard.json

* add url

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboard.json

* Update keyboard.json

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: Drashna Jaelre <drashna@live.com>

---------

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove redundant keyboard headers (qmk#25208)

* Fix Spleeb compile when pointing device is enabled (qmk#25016)

* [Bug] Minimise force-included files (qmk#25194)

* Add additional hooks for Community modules (qmk#25050)

* Workaround for resolving keyboard alias for config file values (qmk#25228)

* Generate versions to keycode headers (qmk#25219)

* Resolve alias for `qmk new-keymap` keyboard prompts (qmk#25210)

* [Keyboard] Add Binepad KN01 (qmk#25224)

* Add Binepad NeoKnob KN01

* post @waffle87 recommendations

* Add battery changed callbacks (qmk#25207)

* Ensure `qmk_userspace_paths` maintains detected order (qmk#25204)

* Bind Bluetooth driver to `host_driver_t` (qmk#25199)

* Deprecate `qmk generate-compilation-database`. (qmk#25237)

* Remove force disable of NKRO when Bluetooth enabled (qmk#25201)

* Keycult 60 (qmk#25213)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <jack@pngu.org>

* [Keyboard] Add Binepad KnobX1 (qmk#25222)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Update Tractyl Manuform and add F405 (weact) variant (qmk#24764)

* Layout corrections: Zed60 (qmk#25003)

* Fixed print statement after enabling 32-bit layers (qmk#25027)

* Fix Aurora sweep default keymap configuration (qmk#25148)

* Docs update for installing qmk with uv (qmk#24995)

* CXT Studio 12E3: Fix encoder resolutions not applying (qmk#25242)

* add resolution to encoders so they apply

* Tweak default keymap

* replace KC_UNDO with C(KC_Z) as well

* Add debounce to duplicated defaults check (qmk#25246)

* [Docs] Fix typos introduced by PR qmk#25050 (qmk#25250)

It isn't a drashna PR if there aren't some typos in it somewhere.

* Allow LVGL onekey keymap to be able compile for other board (qmk#25005)

* [Keyboard] Add Jason Hazel’s Bad Wings v2 (qmk#25252)

Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>

* Add raw_hid support to host driver (qmk#25255)

* Fix Wear Leveling compilation (qmk#25254)

* [New Feature/Core] New RGB Matrix Animation "Starlight Smooth" (qmk#25203)

* Enable community modules to define LED matrix and RGB matrix effects. (qmk#25187)

Co-authored-by: Joel Challis <git@zvecr.com>

* Fix OS_DETECTION_KEYBOARD_RESET (qmk#25015)

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Fixes the numlock indicator for Magic Force MF17 numpad (qmk#25260)

* Add Harite v2 keyboard (qmk#24975)

* dlip/haritev2 - Post merge fixes (qmk#25264)

* Remove more USB only branches from NKRO handling (qmk#25263)

* Deprecate `usb.force_nkro`/`FORCE_NKRO` (qmk#25262)

* Add BDN9 Rev. 3 (qmk#25261)

* Remove duplicate of SPI default config from keyboards (qmk#25266)

* Resolve miscellaneous keyboard lint warnings (qmk#25268)

* Add Zeropad (qmk#24737)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Add Waveshare RP2040-Keyboard-3 support (qmk#25269)

* Update PR checklist notes on custom matrix (qmk#25240)

* Chew folders (qmk#24785)

* gcc15 AVR compilation fixes (qmk#25238)

* [Core] STM32G0x1 support (qmk#24301)

* Use relative paths for schemas, instead of $id. Enables VScode validation. (qmk#25251)

* add doio/kb03 (qmk#24815)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Move rookiebwoy to ivndbt (qmk#25142)

* [Chore] use {rgblight,rgb_matrix}_hsv_to_rgb overrides (qmk#25271)

* Remove outdated `nix` support due to bit-rot. (qmk#25280)

* Add `compiler_support.h` (qmk#25274)

* Configure boards to use development_board - 0-9 (qmk#25287)

* [Fix] lib8tion: enable fixed scale8 and blend functions (qmk#25272)

lib8tion: enable fixed scale8 and blend functions

These FastLED derived lib8tion functions have been fixed and enabled by
default in FastLED. QMK just never set these defines, there is no reason
to keep the buggy implementation. It is assumed that nobody relied on
the buggy behavior.

* Configure boards to use development_board - UVWXYZ (qmk#25288)

* [Docs] Fix tap_hold code blocks (qmk#25298)

* salicylic_acid3/getta25 - Fix oled keymap (qmk#25295)

* Configure boards to use development_board - S (qmk#25293)

* Configure boards to use development_board - T (qmk#25294)

* 2025 Q2 changelog (qmk#25297)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update Oryx module for newer code

* Soft reset matrix

* Use improved i2c reset for voyager and moonlander matrix

* Fix formatting

* Remove labeler action (unneeded)

* Fix module API version for Oryx module

* Use i2cStop instead of trying to work around

---------

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: yiancar <yiangosyiangou@cytanet.com.cy>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Erik Peyronson <erikpeyronson@gmail.com>
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
Co-authored-by: Hyphen-ated <Hyphen-ated@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Geoffrey Frogeye <s+github@frogeye.fr>
Co-authored-by: lsh4711 <120231876+lsh4711@users.noreply.github.com>
Co-authored-by: Ben Green <bengreen.uk@gmail.com>
Co-authored-by: フィルターペーパー <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: henrikosorensen <henrik.sorensen@gmail.com>
Co-authored-by: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com>
Co-authored-by: Dam Vu Duy <RyanDam@users.noreply.github.com>
Co-authored-by: nonameCCC <79012391+nonameCCC@users.noreply.github.com>
Co-authored-by: sudo pacman -Syu <hauvipapro@gmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
Co-authored-by: Luis Garcia <luis@bitjester.com>
Co-authored-by: Christian C. Berclaz <christian.berclaz@mac.com>
Co-authored-by: Olivier Mehani <shtrom-github@ssji.net>
Co-authored-by: Sylvain Huguet <sylvain@huguet.me>
Co-authored-by: suikagiken <115451678+suikagiken@users.noreply.github.com>
Co-authored-by: Daniel Reisch <danieljreisch@gmail.com>
Co-authored-by: ClownFish <177758267+clownfish-og@users.noreply.github.com>
Co-authored-by: JamesWilson1996 <47866504+JamesWilson1996@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Jan Bláha <blaha.j502@gmail.com>
Co-authored-by: Eric Molitor <534583+emolitor@users.noreply.github.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
Co-authored-by: eynsai <47629346+eynsai@users.noreply.github.com>
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-authored-by: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Aidan Gauland <aidalgol@users.noreply.github.com>
Co-authored-by: Michał Kopeć <michal@nozomi.space>
Co-authored-by: takashicompany <t@kashi.company>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Matheus Marques <matheusmbar@gmail.com>
Co-authored-by: LucasMateijsen <l.mateijsen@outlook.com>
Co-authored-by: Jeremy Cook <jscook55@gmail.com>
Co-authored-by: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
Co-authored-by: mizma <omoikane@path-works.net>
Co-authored-by: hen-des <141591967+hen-des@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: josephawilliamsiv <31166673+josephawilliamsiv@users.noreply.github.com>
Co-authored-by: vchowl <vchowl@outlook.com>
Co-authored-by: Christopher Hoage <iam@chrishoage.com>
Co-authored-by: Silvino R. <366673+silvinor@users.noreply.github.com>
Co-authored-by: dabstractor <dustindschultz@gmail.com>
Co-authored-by: Nathan Cain <13713501+nathanscain@users.noreply.github.com>
Co-authored-by: muge <221161+muge@users.noreply.github.com>
Co-authored-by: HorrorTroll <sonicvipduc@gmail.com>
Co-authored-by: cyxae <cyxae@amphitryon.nrst.fr>
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
Co-authored-by: art-was-here <mail@buckles.email>
Co-authored-by: Matti Hiljanen <170205+qvr@users.noreply.github.com>
Co-authored-by: Wasteland Fluttershy <ingvardm@gmail.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
Co-authored-by: Infos <136488157+diffrentGuesser@users.noreply.github.com>
Co-authored-by: Florent Linguenheld <f@linguenheld.fr>
Co-authored-by: ivan <81021475+ivndbt@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
faisyl pushed a commit to faisyl/qmk_firmware that referenced this pull request Jun 21, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
srphcr pushed a commit to srphcr/qmk_firmware that referenced this pull request Jun 27, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
Jari27 pushed a commit to Jari27/qmk_firmware that referenced this pull request Jul 3, 2025
… updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants