Fix OSM on a OSL activated layer #20410

NapOli1084 · 2023-04-11T11:36:11Z

Description

This change follows #19214 by @kosorin, which allowed mod-tap hold action on one shot layers. The purpose of this change is to do the same for one shot mods and allow them on one shot layers.

I attempted adding OSM(MOD_LSFT) on one of my OSL activated layers in order to use it along with accented letters I have on that layer. I realized it didn't work and after looking into the code I noticed the condition that prevents deactivating one shot layers with mods, which wasn't considering one shot mods, but was considering mod-tap. So it seemed like a simple oversight, doesn't seem intended that OSM wasn't considered. At least I can't think of a reason why it would be supported with other mods but not with OSM.

Types of Changes

Issues Fixed or Closed by This PR

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).

NapOli1084 · 2023-04-11T11:40:21Z

quantum/action.c

@@ -373,7 +373,8 @@ void process_action(keyrecord_t *record, action_t action) {
    if (is_oneshot_layer_active() && event.pressed &&
        (action.kind.id == ACT_USAGE || !(IS_MODIFIER_KEYCODE(action.key.code)
 #    ifndef NO_ACTION_TAPPING
-                                          || (tap_count == 0 && (action.kind.id == ACT_LMODS_TAP || action.kind.id == ACT_RMODS_TAP))
+                                          || ((action.kind.id == ACT_LMODS_TAP || action.kind.id == ACT_RMODS_TAP) &&
+                                                (action.layer_tap.code <= MODS_TAP_TOGGLE || tap_count == 0))


tap_count == 0 accounted for mod-tap, but not for OSM. action.layer_tap.code <= MODS_TAP_TOGGLE accounts for MODS_ONESHOT and MODS_TAP_TOGGLE. TBH I don't know how the latter can occur, can't figure a keycode leading to it. But considering it's for mods also I think it makes sense to consider them too.

NapOli1084 · 2023-04-11T11:43:45Z

I intended to look into adding a unit test for this, but I can't seem to build them. I'm getting "undefined reference" linker errors on many functions, seems to be the ones with weak linking. I'm on QMK MSYS, don't know if it's a setup issue. I'll try asking around on Discord.

NapOli1084 · 2023-04-11T14:45:29Z

I intended to look into adding a unit test for this, but I can't seem to build them. I'm getting "undefined reference" linker errors on many functions, seems to be the ones with weak linking. I'm on QMK MSYS, don't know if it's a setup issue. I'll try asking around on Discord.

I didn't figure out my linker issue, but gave it a try anyway, relying on the CI tests. Unfortunately means I failed on first attempt, but second succeeded.

sigprof · 2023-04-11T14:54:23Z

Currently the tests could be built either on Linux, or on MacOS if you compile them using GCC instead of Clang (which is apparently the default compiler there). The MSYS2 toolchain for Windows has some issues with weak symbols (LTO_ENABLE=yes might help, but it's not guaranteed to be a reliable fix).

NapOli1084 · 2023-04-11T16:29:28Z

Currently the tests could be built either on Linux, or on MacOS if you compile them using GCC instead of Clang (which is apparently the default compiler there). The MSYS2 toolchain for Windows has some issues with weak symbols (LTO_ENABLE=yes might help, but it's not guaranteed to be a reliable fix).

I see, thanks for the info. I guess I should use a container/WSL if I have another need to run them. I used vagrant in the past (have not tried running tests with it though), but since support was removed I went back to MSYS, and TBH was happy about it cause the container was extremely slow.

github-actions · 2023-07-16T02:17:16Z

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

github-actions · 2023-09-12T01:48:09Z

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

This reverts commit e0eb90a.

bencollerson · 2023-11-29T05:51:43Z

This change breaks the functionality of putting one shot mods on a layer and using them on the default (or other) layer.

I raised an issue related to this: #22566

Edit: Oops not sure why my revert commit was added here. I am sure some less heavy-handed solution is possible. haha ;)

elshize · 2023-12-02T00:18:27Z

Same here, I am relying on the old functionality, and had to revert these changes to make it work again.

fix OSM on a OSL activated layer

6e05024

github-actions bot added the core label Apr 11, 2023

NapOli1084 commented Apr 11, 2023

View reviewed changes

NapOli1084 added 3 commits April 11, 2023 07:48

format change

8c5721d

add test for OSL with OSM

8d1a74f

fix test for OSL with OSM

1e793be

github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Jul 16, 2023

drashna requested a review from a team July 27, 2023 03:16

github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Jul 28, 2023

github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Sep 12, 2023

drashna approved these changes Sep 14, 2023

View reviewed changes

drashna requested a review from a team September 14, 2023 08:25

github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Sep 15, 2023

tzarc approved these changes Sep 25, 2023

View reviewed changes

tzarc merged commit e0eb90a into qmk:develop Sep 25, 2023
1 check passed

mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Oct 25, 2023

Fix OSM on a OSL activated layer (qmk#20410)

a4a0c18

christrotter pushed a commit to christrotter/qmk_firmware that referenced this pull request Nov 28, 2023

Fix OSM on a OSL activated layer (qmk#20410)

e8a91df

bencollerson added a commit to bencollerson/qmk_firmware that referenced this pull request Nov 29, 2023

Revert "Fix OSM on a OSL activated layer (qmk#20410)"

529cde3

This reverts commit e0eb90a.

NapOli1084 deleted the osl-osm branch December 12, 2023 02:11

zgagnon pushed a commit to zgagnon/qmk_firmware_waterfowl that referenced this pull request Dec 15, 2023

Fix OSM on a OSL activated layer (qmk#20410)

55cba07

future-figs pushed a commit to future-figs/qmk_firmware that referenced this pull request Dec 27, 2023

Fix OSM on a OSL activated layer (qmk#20410)

8f79214

drashna pushed a commit to zsa/qmk_firmware that referenced this pull request Jan 12, 2024

Fix OSM on a OSL activated layer (qmk#20410)

99a0c79

alycklama pushed a commit to alycklama/qmk_firmware that referenced this pull request Apr 9, 2024

Fix OSM on a OSL activated layer (qmk#20410)

b4fa328

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix OSM on a OSL activated layer #20410

Fix OSM on a OSL activated layer #20410

NapOli1084 commented Apr 11, 2023 •

edited

Loading

NapOli1084 Apr 11, 2023

NapOli1084 commented Apr 11, 2023

NapOli1084 commented Apr 11, 2023

sigprof commented Apr 11, 2023

NapOli1084 commented Apr 11, 2023

github-actions bot commented Jul 16, 2023

github-actions bot commented Sep 12, 2023

bencollerson commented Nov 29, 2023 •

edited

Loading

elshize commented Dec 2, 2023

Fix OSM on a OSL activated layer #20410

Fix OSM on a OSL activated layer #20410

Conversation

NapOli1084 commented Apr 11, 2023 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

NapOli1084 Apr 11, 2023

Choose a reason for hiding this comment

NapOli1084 commented Apr 11, 2023

NapOli1084 commented Apr 11, 2023

sigprof commented Apr 11, 2023

NapOli1084 commented Apr 11, 2023

github-actions bot commented Jul 16, 2023

github-actions bot commented Sep 12, 2023

bencollerson commented Nov 29, 2023 • edited Loading

elshize commented Dec 2, 2023

NapOli1084 commented Apr 11, 2023 •

edited

Loading

bencollerson commented Nov 29, 2023 •

edited

Loading