Skip to content

Commit

Permalink
Squash-merge of feature/improve_oneshot_modifiers
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 641ba5b8e03528f4df887e6ad73f015315256e6e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Jan 10 22:06:50 2022 +0100

    Set reminder about making OS_LCMD OS independent

commit 9b624c34d9dc61485d12a363182a0baea23ddab0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Jan 10 22:06:12 2022 +0100

    Add layer keys to one shot layer

commit a79e0fc37a98008afef1cd465731ba47a12bb1c6
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Jan 10 22:05:38 2022 +0100

    Create separate wrapper for qwerty w/o home row mods

commit 332bf27fc9bf163ba32e494f870d85201fc17844
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Jan 10 18:02:43 2022 +0100

    Set layers in correct order

commit 34c041285df03bc901d23e781755740dcb227391
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Jan 9 17:05:36 2022 +0100

    Use generic keymap wrappers to set up oneshot layer

commit 78a5d4b59ae29b1d3ba995f8323c3aad66ed5148
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Jan 9 17:05:08 2022 +0100

    Create generic keymap for my oneshot modifiers

commit 51b7c69ab5f518e95a14e776aa91d935105e1b62
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Jan 9 17:12:35 2022 +0100

    Add oneshot mod layer notifier to oled

commit cf8ea8f4398cf7e6f55d435422295e9ce7a4c2f1
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Jan 9 17:10:32 2022 +0100

    Tap to get to oneshot mod layer

commit ab4ef2aa11ab7a84faa511432e3cdc2e7d4748ae
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Jan 6 22:24:31 2022 +0100

    Add oneshot layer key to keymap

commit eb7d5cff15d0e8a21b5c24a493565ee26e310ac3
Merge: 0dabfd7e17 60a73d34b8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 18:20:35 2021 +0100

    Merge branch 'feature/callum_oneshot' into feature/keymaps_paullemmens

commit 60a73d34b874443671d0370677325c83a8d40be8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 18:15:50 2021 +0100

    Integrate oneshot into process_user_record()

commit 25e363c3854037788ea05f2f27e0c8930da0ea1d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 17:03:23 2021 +0100

    Remove old kyria location

commit 20ecbe0132de27d194bed51b379f97858f3c2402
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 16:57:57 2021 +0100

    Toggle between homerow and oneshot modifiers

commit 53ba1cfd738705b53098be01c0f88d3f13d9bbb1
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 16:11:52 2021 +0100

    Implement functions for cancelling and ignoring

commit 4bf4a6d5e69427fbb0ba885c9c85d8b416d70ec6
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 16:02:01 2021 +0100

    Add keys and layer dependent on config flag

commit c20b313652e31a2fa1fd5ef3c7da2d985d1f1958
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 14:25:25 2021 +0100

    Add define dependent definition of new key code

commit 6efb26311fe1e8295217c28629c071384f0af943
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 14:23:18 2021 +0100

    Include the oneshot header in the main code base

commit e3d081305a738c5bb58fa3c21337ea3e20aac5a0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Dec 31 14:20:15 2021 +0100

    Add C define to enable oneshot layer / modifiers

commit 0dabfd7e1734ec906c1db39f531c486d73e32e1c
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Dec 29 22:40:50 2021 +0100

    Implement oled task refactoring (qmk#14864)

    See qmk#14864

commit ec5d92d92707e6837aad59aefd865a77d06c8de7
Merge: f941077caf 906108f
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Dec 29 22:26:39 2021 +0100

    Merge branch 'master' into feature/keymaps_paullemmens

commit f941077caf10277c233d1c5ece9cdf7652e7c660
Merge: 0c9aded1dd b6417ea299
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Nov 19 18:07:11 2021 +0100

    Merge branch 'feature/keymaps_paullemmens' of https://github.com/paullemmens/qmk_firmware into feature/keymaps_paullemmens

commit 0c9aded1dd63f6a68e1129372141180b08984e71
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Nov 19 16:17:28 2021 +0100

    Tweaking to get home-row mods acting better

commit 92ef60541d8021df3e18714fd765550d7fa59df9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Oct 1 11:33:30 2021 +0200

    Disable modtap interrupt for U_ADJUST

    This was mostly there to get more reliable use of ! and @ when I was
    still using a shifted number row instead of aligning shifted number row
    with position on the numpad. Observed no negative impact on behavior.

commit 994d1b5f4032b4cc670b1725d7a43e54144e6e9d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Oct 1 11:32:08 2021 +0200

    Add new flag to enable WPM on split keyboards

    This is a new requirement since the recent update(s) of qmk and is one
    of the things that wreaked havoc on my firmware.

commit 3c8919020291916ddaf0b159149a25bf3ae24576
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 10:34:22 2021 +0200

    Return false in encoder_status to stop keyb. action

commit b8eec306ff272f965a33ad975be3bf62adc337a7
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:57:06 2021 +0200

    Add reminders for code to have a look at

commit a23a0cba14d44d83b1c2c934f68ae3d45e1b28de
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:52:24 2021 +0200

    Refactor code following hint from Drashna

commit 25a4880bfae14ac0bc3f208408a53239cb4ca128
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:34:15 2021 +0200

    Add debugging code to facilitate console logging

commit 0a219dda5e0226effdf38ba492e66bc0d25f15b3
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:32:10 2021 +0200

    Depend wpm graph #ifdef and variables on WPM_ENABLE

commit b071e86fd16c5c84c885d9f7f807f202a283c011
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Sep 19 21:52:22 2021 +0200

    Remove double code that is in userspace config.h

commit 85aef1bc526362f705889fbc2847e1ff91854de3
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Sep 19 21:51:18 2021 +0200

    Redo stdlib firmware size thing that got lost

commit b50532bfb04b39071e73322e69d8c0b3bf200c5f
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Sep 19 21:24:35 2021 +0200

    Relabel OLED config flag to follow qmk update

commit 868b1a7d949fa62085d8c2f780fda15a6163f84f
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sat Sep 18 23:10:14 2021 +0200

    Move config parameters from new location to userspace

commit 79172a3be42079745f8f31c5aa9404eb764274f9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Sep 17 10:52:21 2021 +0200

    Fix key codes to macOS native versions

commit de9d651eb6357fff7048488f31525057af14ca86
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Sep 17 10:50:56 2021 +0200

    Move home row timing settings to user space

commit cbbbeaf3452e09ca165ec2ab20f47fa677c784aa
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Sep 1 15:10:36 2021 +0200

    Remove underscore from upper right adjust layer key

commit e9160b4580d394b24d7ac596b07702ae792ad1d8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Sep 1 15:10:15 2021 +0200

    Update keymap visuals

commit 1a83a9dae54c17d06cca1a15ea6513525b79d8b8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Sep 1 15:09:45 2021 +0200

    Remove old wrappers

commit e0b7eaa30a956ba40ddd80d44dea07ecfb0db34e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Aug 26 16:39:02 2021 +0200

    Move number and shift-num row to numpad position

commit c545404ad0e7e62ca11825edb53354c5444f2143
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Aug 26 16:37:16 2021 +0200

    Move functions from keymap(s) to user space

commit 49765a68ffa728ff64ae9cd12e855c1168602b8c
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 13:12:23 2021 +0200

    Correct row numbers of left lower layer wrapper

commit f8a5a16112070534a692ba3d3cba0beb654c575e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 09:10:00 2021 +0200

    Add missing shift on K in qwerty user land wrapper

commit b20cae8b81d7d6f914048f2210deb88f3f06feb4
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 08:28:27 2021 +0200

    Add personal keycodes to qwerty wrapper

commit 8b3b2bf64b5898cf7fc578459fbfd788faf2137e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 14:15:08 2021 +0200

    Align with new requirements for encoder_update_user

    See qmk#12805, qmk#12985 in the main qmk issues.

commit c773580f347bf5a14041d840c822b9f7987e9429
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:20:52 2021 +0200

    Keep a few Redox specific defines for key codes

commit 0d76188509e5655adb1214b1f8eccffdbbf8d353
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:20:26 2021 +0200

    Add license to user land file(s)

commit 6cf373c18717104ef732d9a3534c43edd5c78273
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:19:51 2021 +0200

    Clean up keymap and wrapper layout

commit cc5e2c1f692441903e8800eec0b6264df9c4d814
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:18:48 2021 +0200

    Use layout wrapper macro instead of regular layout

commit 43f4a035f362c39b07c66a69c29c2faab60d89f6
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:18:09 2021 +0200

    Add extra location for mute button on Redox only

commit 4d7d0a98fdabc6765cc57d78f562cab002bf4d1a
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:17:35 2021 +0200

    Fix left-hand wrapper on right-hand keymap

commit a1f0337873d29fbe7646e02c136deb2074ed15f1
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:16:30 2021 +0200

    Fix NASTY bug in redox keymap with extra underscore

commit 24ccd0f2b89f146ae72ff81357d0441eecfb36c7
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 11:59:46 2021 +0200

    Update adjust layer to user land wrapper

commit 8468905c581a4f797b35c946ea9d4905a995ee8f
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 11:43:36 2021 +0200

    Personalize user land raise layer

commit bb3d2a28df855d251b0e4277a5ea8093c72e5d02
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 10:09:04 2021 +0200

    Implement lower layer using wrappers

commit dc069e159393378af884f76df24f11bf789d28e8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Aug 20 06:57:27 2021 +0200

    Expand layers with colemak specific macOS layer

commit c021566cb1a056352614f10b109ab7f30ffe0aef
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Aug 20 06:54:47 2021 +0200

    Move layers to user land configuration

commit 6c205d3171aa5f4c70774dcd065af3e53861930a
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:30:35 2021 +0200

    Convert redox qwerty keymap to user land setup

commit 7b7f46ecd61b19653ed83abb56b25a265cd87eef
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:30:12 2021 +0200

    Convert qwerty layer for kyria to user land setup

commit 5751fc85843c781c16e3ab5d0dcd2e120e3c524b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Aug 20 06:58:57 2021 +0200

    Create generic qwerty wrapper/keymap

commit 51c51378e722519ae828bbf285691975476937b2
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:29:03 2021 +0200

    Set up wrappers for creating keymaps

commit 0f9c885f49f9e9af4f2ff0fb3bf563dadb50fa16
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:27:56 2021 +0200

    Include user land header file in keymap

commit ea69b714fb5ea823d87449a50433e7981c953ad3
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:26:34 2021 +0200

    Move personal key definitions to user land .h file

commit 7dd54fc8d7a34784058a592ccaf3e35c0e70f2a0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:24:51 2021 +0200

    Remove incorrect pragma once from c file

commit 54bd5c3171ab5f052610fd7885e5c9264d122121
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 16 15:29:49 2021 +0200

    Set up file and dir structure for user land

commit 62999425cd731bc015b2af3339f1edc0e7fb32a0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue Aug 17 08:37:08 2021 +0200

    Transfer macOS specifics to redox keymap

commit 636fe724a3a1549551a840bb086f9d7f61f0178e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Jun 17 11:05:49 2021 +0200

    Use left encoder for macOS in-app window switching

commit a0c46c1bcd668969a31f44d2a02c3d4320d9c2ba
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:30:31 2021 +0200

    Add default layer toggles to redox

commit 9c8b13b13927cd79c3931eae4cefafc5ef3d9fd4
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:29:21 2021 +0200

    Add ctrl+arrow for right-hand encoder in lower layer

commit f1c4f4b1859474b7d2019da5e512752e75bcef8b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:28:48 2021 +0200

    Reduce tapping term to improve () and !@ response

commit ed08888f8ee3441ddd22d870f430a431e59b41a9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:28:13 2021 +0200

    Increase tapping term for macOS modifiers

commit 6f7b0c340a3e4ffb80fd59097f0a671929aeeb54
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:25:56 2021 +0200

    Set mod tap interrupt and permissive hold per key

    This reduces getting uq and uw instead of, respectively, ! and @ when
    using the U key for the adjust layer.

commit 09e4524991043dee49aa15ef7b7d966e1c574cd3
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 25 08:56:45 2021 +0200

    Reduce tapping term for easier parentheses

commit cc8dcdac48810aebe1e95d6919d13375762d04b0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 16:11:43 2021 +0200

    Fix accented characters

commit d20ca1b181d549f5c94a854ed1b590d0a2a9edd5
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 16:11:18 2021 +0200

    Try and optimize firmware size further

commit dda5cb06b5e271402348bab7f383f278694d5c90
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 16:08:51 2021 +0200

    Replace, for now, key lock with actual CAPS key

    I desperately needed firmware room, so instead of trying to find tiny
    improvements, for the moment, just disable the key lock feature. Only
    reason I had it under windows: remapping capslock to escape runs over
    the registry and captures all caps keypresses. In macOS this is done
    much better with a separate entry per registered keyboard.

commit 167d8ad754e7c3a1b4f26537d0854eb1aa671f46
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 11:06:52 2021 +0200

    Add o acute single keypress for kyria

commit 63e3f803dbcd5bd09ccb5da05b555682c1c26568
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 17 19:36:26 2021 +0200

    Set combination for e acute OSX

commit f3717681cbc2607c8081a2358cb5f42512e97465
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 08:09:06 2021 +0200

    Disable permissive hold; add permissive hold per key

    (also disabled for now)

commit f3f297c54c5dddbfc7cb0a036bbb186cd50664a8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 12:01:56 2021 +0200

    Document functionality of window moving in macOS

commit eb0ef9d95f150fc867d617c23ef142f97252cbdf
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:55:41 2021 +0200

    Remove superfluous return

commit 4c4e9fbc9b4d881c8e37484bd6deadb8cb8c2b2b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:45:51 2021 +0200

    Stop removing osx indicator when in other layer

    The old situation dropped the indicator from the oled whenever I
    selected a layer higher than the default osx layer because I checked
    both the default and current layer.

commit b56b1f70aa5fd373f502e293e1bbcca29fc3fc35
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:45:21 2021 +0200

    Simplify default layer check for alt-tab encoder

commit 9c835e83ade397e908925242c65f490308e3a49b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:44:09 2021 +0200

    Fix window movement using encoder

    It did not work because the check involved (also) checking for the
    current layer and that threw off the logic.

commit 51c1342ca72e60c9c0f36b94f9fe3c1e79f3de64
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 10 21:26:53 2021 +0200

    Fix check for which layer is default layer

commit c19be3112c0f77c6e3d3b112f233b106f1d56d2b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 5 20:10:52 2021 +0200

    Add firmware debloating stuff to redox

commit ceccaf9f596109384165e2d4def030fb7ee9bac4
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 5 20:09:37 2021 +0200

    Add MacOS layer to redox keyboard

commit cc161d7ae147478d9b91859fbfc3ae11d4758b1e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 4 08:19:24 2021 +0200

    Add dedicated key on OSX layer for moving windows

    I use Rectangle and/or Amethyst for managing windows. Rectangle had the
    default key combo of ctrl+opt+cmd+arrow for moving windows to the
    display left or right. This commit implements the modifiers into one key
    so that I only need to press left and right.

commit e15bc6c372b4a9922f2ec92c960d9bd0e38ed76d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 4 08:11:52 2021 +0200

    Reactivate wpm graph due to amount of free space

    The extra options for reducing bloat, reduced firmware to such an extent
    that the wpm graph fits in.

commit 1e00573112f6f847559865a1fa570b4c61a28111
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 4 08:11:02 2021 +0200

    Implement changes to reduce firmware size

    This is mostly needed due to recent changes in the qmk toolchain that
    cause firmware bloat. This is apparently known. See links mentioned in
    the code.

commit 0ee8dff35ee34988f6cf5f5d2adf20e2560c0540
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 3 17:41:16 2021 +0200

    Add latest copy of redox firmware to repository

commit 7fd8f899c201069d00c9594e0c41bee4a23dcb9b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 3 17:40:11 2021 +0200

    Update working copy with recent working copy

    Ok, so that was a big happy accident to have had "backup" on my private
    laptop because the code from github was waaaay old, in hindsight. Not
    sure what went wrong where and when but things were seriously foobar.

commit e19e1cf58064637bb53da1a24082e725fd5f6c2a
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 3 13:45:24 2021 +0200

    Redo initial commit of working keymap

    I got me qmk fork into serious problems that only surfaced when installing on my new
    work macbook. The original feature/paullemmens_keymap still exists but is foobar.

commit b6417ea29900e95287652f7112bdbac83496a9ec
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Oct 1 11:33:30 2021 +0200

    Disable modtap interrupt for U_ADJUST

    This was mostly there to get more reliable use of ! and @ when I was
    still using a shifted number row instead of aligning shifted number row
    with position on the numpad. Observed no negative impact on behavior.

commit 28b2bd6d5cb80d62e1ee873be16fe3896751907a
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Oct 1 11:32:08 2021 +0200

    Add new flag to enable WPM on split keyboards

    This is a new requirement since the recent update(s) of qmk and is one
    of the things that wreaked havoc on my firmware.

commit d1e8c2d8d3f8079d406c512639a7d87c1bad2bc7
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 10:34:22 2021 +0200

    Return false in encoder_status to stop keyb. action

commit 3077283fdd84324b9cdd3f9d62011d7628cf2996
Merge: 606edd5faa ef5c6ea
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 10:22:36 2021 +0200

    Merge branch 'master' into feature/keymaps_paullemmens

commit 606edd5faaaecde6cf0ced523a1e0490c510051c
Merge: 58d6b3e2b1 9ac51d9607
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 10:10:27 2021 +0200

    Merge branch 'fix/incorrect_compilation_kyria' into feature/keymaps_paullemmens

commit 9ac51d96071e513d8f8cef1af183a262ae80ac4f
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:57:06 2021 +0200

    Add reminders for code to have a look at

commit 5f4dc96e3806508c7c972159ac14a49082365bd2
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:52:24 2021 +0200

    Refactor code following hint from Drashna

commit cf04677903dd49697ee9473e73fd06c6b45d4fdc
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:34:15 2021 +0200

    Add debugging code to facilitate console logging

commit bf07404cbe53c81ccb074fbd611f338ed79b83cc
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Sep 20 09:32:10 2021 +0200

    Depend wpm graph #ifdef and variables on WPM_ENABLE

commit 9dc3781f24e5d18d80d6a61f40d6f6ebe2220625
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Sep 19 21:52:22 2021 +0200

    Remove double code that is in userspace config.h

commit 380926ac3244a64c232b574df8e3358175786a2a
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Sep 19 21:51:18 2021 +0200

    Redo stdlib firmware size thing that got lost

commit 63845d5a11e93afbbbd95f38afa1499319b53fc0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sun Sep 19 21:24:35 2021 +0200

    Relabel OLED config flag to follow qmk update

commit eec90297a745d51047e3f4f73b30ffbdbf912e1f
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Sat Sep 18 23:10:14 2021 +0200

    Move config parameters from new location to userspace

commit 58d6b3e2b173879fdee1f7d81ea262fccfdbfec4
Merge: b82634a1f8 3496513
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Sep 17 10:55:09 2021 +0200

    Merge branch 'master' into feature/keymaps_paullemmens

commit b82634a1f816f5c21777d75e939bed9c87cc126c
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Sep 17 10:52:21 2021 +0200

    Fix key codes to macOS native versions

commit 50f243fb0328f4e784c295d9f8a07759a1e46783
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Sep 17 10:50:56 2021 +0200

    Move home row timing settings to user space

commit 6bb22b8a853f9e42a020ccb84ca2710b446e66cd
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Sep 1 15:10:36 2021 +0200

    Remove underscore from upper right adjust layer key

commit d211b188c44a612e4cbf42644fba5ea585a13080
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Sep 1 15:10:15 2021 +0200

    Update keymap visuals

commit 336da852cdc7b01e0184b931c2090754c6b33d5d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Sep 1 15:09:45 2021 +0200

    Remove old wrappers

commit a1b44ef1a2a6e5254df75a2d75e8daebfc69dded
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Aug 26 16:39:02 2021 +0200

    Move number and shift-num row to numpad position

commit a67dcad6c0da26c3db65d5def04d053a8caa9607
Merge: cce5b085f6 658b25911b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Aug 26 16:38:17 2021 +0200

    Merge branch 'feature/move_custom_functions_userland' into feature/keymaps_paullemmens

commit 658b25911b9e204db12610dfbd57b3106e5c440d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Aug 26 16:37:16 2021 +0200

    Move functions from keymap(s) to user space

commit 2af524afeb7346d9a0e9819e9e43ae527430b8a5
Merge: 9bbd38f32d cce5b085f6
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 16:11:34 2021 +0200

    Merge branch 'feature/keymaps_paullemmens' into feature/move_custom_functions_userland

commit cce5b085f6863d81f1b3b53a611221a0b4501006
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 13:12:23 2021 +0200

    Correct row numbers of left lower layer wrapper

commit 773ed8ce12508d8467994710c571735d1cc99d53
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 09:10:00 2021 +0200

    Add missing shift on K in qwerty user land wrapper

commit 96e21b2da57624b5d61aec52ed50ae70626c7094
Merge: 9bbd38f32d 608f686559
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 08:29:51 2021 +0200

    Merge branch 'fix/omitted_personal_keycodes_in_userland_wrappers' into feature/keymaps_paullemmens

commit 608f686559009fc02bc9c15b4ac89731d28c5f14
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 25 08:28:27 2021 +0200

    Add personal keycodes to qwerty wrapper

commit 9bbd38f32d8f494d2750458d2a55eb7fce1b9553
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 14:15:08 2021 +0200

    Align with new requirements for encoder_update_user

    See qmk#12805, qmk#12985 in the main qmk issues.

commit c58b5268ca75f7dec2879f4caf3ce7d5ea0d7c47
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:20:52 2021 +0200

    Keep a few Redox specific defines for key codes

commit 192d9ada15e04e22e08819faf54d69d99637a63d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:20:26 2021 +0200

    Add license to user land file(s)

commit a0860d4916d0797aff47bac2c524081205a9a3d3
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:19:51 2021 +0200

    Clean up keymap and wrapper layout

commit 92c9a0ebad927abbf3f87c19cb5cfd1a0c852e6b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:18:48 2021 +0200

    Use layout wrapper macro instead of regular layout

commit 745ca7be6b319f2e932003527749131aaaff77e8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:18:09 2021 +0200

    Add extra location for mute button on Redox only

commit daba3ecbbc97dd6b3f54a877f34f742754878d91
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:17:35 2021 +0200

    Fix left-hand wrapper on right-hand keymap

commit 4d1a43199162cc80af03026e92ba5b30dd552e1e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 13:16:30 2021 +0200

    Fix NASTY bug in redox keymap with extra underscore

commit ad4f5f140ba3ce7eb24f5a0b54362b3eaecfec29
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 11:59:46 2021 +0200

    Update adjust layer to user land wrapper

commit 9508aa5e27144323c475b0f5817aef170c6e6738
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 11:43:36 2021 +0200

    Personalize user land raise layer

commit 04755d44ee118b642b9132569c8bf77fa93934f9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 23 10:09:04 2021 +0200

    Implement lower layer using wrappers

commit 8649ebb28dc81012e2321624c965249f72d73393
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Aug 20 06:57:27 2021 +0200

    Expand layers with colemak specific macOS layer

commit d17dae5d80ad80bf574cb42d9faf5f0b40c5957b
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Aug 20 06:54:47 2021 +0200

    Move layers to user land configuration

commit f6b29d28f4fc14583860421a1a965014b7a63523
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:30:35 2021 +0200

    Convert redox qwerty keymap to user land setup

commit 17a1482f45a11e3dbee60d25b9e548302252f201
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:30:12 2021 +0200

    Convert qwerty layer for kyria to user land setup

commit c2b76fa4915e02731d0f592b196e1682d50715e7
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Fri Aug 20 06:58:57 2021 +0200

    Create generic qwerty wrapper/keymap

commit 010110d42d519cd0c2b938c1d3b2129a79684fb9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:29:03 2021 +0200

    Set up wrappers for creating keymaps

commit 35ebcd786eabf8549eb212a443e8af34f25a8e31
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:27:56 2021 +0200

    Include user land header file in keymap

commit 9c01d1ba0fb2824df3e88c87f3779fd603441211
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:26:34 2021 +0200

    Move personal key definitions to user land .h file

commit 6cca447fd2dfda76c63b86135aacf6b3b319d225
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed Aug 18 16:24:51 2021 +0200

    Remove incorrect pragma once from c file

commit 94dce6601718c9af9d9e42084cde3a704b1a2080
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon Aug 16 15:29:49 2021 +0200

    Set up file and dir structure for user land

commit 9c68ce8a761cf7b97d2b889946e5252e56a46d20
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue Aug 17 08:37:08 2021 +0200

    Transfer macOS specifics to redox keymap

commit a17fbe1243c6106f72cc5c6d4403a7c7f9bb0dc8
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu Jun 17 11:05:49 2021 +0200

    Use left encoder for macOS in-app window switching

commit 4c91f9da8899e2d7a4977d2f2d625ba470512d54
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:30:31 2021 +0200

    Add default layer toggles to redox

commit 09d44cf78945e50f8c1aeb2c5e72d19795d91dc0
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:29:21 2021 +0200

    Add ctrl+arrow for right-hand encoder in lower layer

commit 8611ddbfe76a708aa8bb82171edea869a0763676
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:28:48 2021 +0200

    Reduce tapping term to improve () and !@ response

commit 5da5870b3081d09d35f6d5a4146c18712be5275a
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:28:13 2021 +0200

    Increase tapping term for macOS modifiers

commit 48da3ae5f5e037c8c30b0f08c52a35e873da11f9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Thu May 27 14:25:56 2021 +0200

    Set mod tap interrupt and permissive hold per key

    This reduces getting uq and uw instead of, respectively, ! and @ when
    using the U key for the adjust layer.

commit 483a1acf1d476587f7a0cd58d2fb374729e8d9fe
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 25 08:56:45 2021 +0200

    Reduce tapping term for easier parentheses

commit 5bf8e0c7e3b5e4a2c6e13cdb6f4ef0b255a5c92d
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 16:11:43 2021 +0200

    Fix accented characters

commit 00648a93602782d6ef6ac43baf03de4bda7095d6
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 16:11:18 2021 +0200

    Try and optimize firmware size further

commit 65215ece5cef01c51ae32ad6670e033071e31803
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 16:08:51 2021 +0200

    Replace, for now, key lock with actual CAPS key

    I desperately needed firmware room, so instead of trying to find tiny
    improvements, for the moment, just disable the key lock feature. Only
    reason I had it under windows: remapping capslock to escape runs over
    the registry and captures all caps keypresses. In macOS this is done
    much better with a separate entry per registered keyboard.

commit c7f0e4021683ae81c07974a92bf4413af6de10ea
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 11:06:52 2021 +0200

    Add o acute single keypress for kyria

commit d969e6b878a49282093efff0fca03ae28d6c9b86
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 17 19:36:26 2021 +0200

    Set combination for e acute OSX

commit 00fd2f500b394ebb9409a551ab1ca6fa0c6eb349
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 19 08:09:06 2021 +0200

    Disable permissive hold; add permissive hold per key

    (also disabled for now)

commit e60bc210ec64cf91c25b69c2b5ba9525937c2403
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 12:01:56 2021 +0200

    Document functionality of window moving in macOS

commit 7a1fc52759e784799c52bb46e5105258b49b29ab
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:55:41 2021 +0200

    Remove superfluous return

commit a9d4331aa59e75f09dbfdb026b73a05bd611af76
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:45:51 2021 +0200

    Stop removing osx indicator when in other layer

    The old situation dropped the indicator from the oled whenever I
    selected a layer higher than the default osx layer because I checked
    both the default and current layer.

commit f38a5cb7d1a640fed85249739b0117ccbf7f5b07
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:45:21 2021 +0200

    Simplify default layer check for alt-tab encoder

commit b2a4dcc8a657481e21b386cfce276c5edbac6aa4
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 11 11:44:09 2021 +0200

    Fix window movement using encoder

    It did not work because the check involved (also) checking for the
    current layer and that threw off the logic.

commit db9bd327850b73e522d9903e7b66cecb5cdda8ab
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 10 21:26:53 2021 +0200

    Fix check for which layer is default layer

commit 0d585984dc8ab0c4cd97501e73aefc4c7aba2da2
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 5 20:10:52 2021 +0200

    Add firmware debloating stuff to redox

commit aa8fb3436983447722a8ed49da30049a54d3de38
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Wed May 5 20:09:37 2021 +0200

    Add MacOS layer to redox keyboard

commit 2a96b52173e78e787045714dbefbcd0d860e3a8e
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 4 08:19:24 2021 +0200

    Add dedicated key on OSX layer for moving windows

    I use Rectangle and/or Amethyst for managing windows. Rectangle had the
    default key combo of ctrl+opt+cmd+arrow for moving windows to the
    display left or right. This commit implements the modifiers into one key
    so that I only need to press left and right.

commit 34251d739a387674055ec92bd56465ffa246af79
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 4 08:11:52 2021 +0200

    Reactivate wpm graph due to amount of free space

    The extra options for reducing bloat, reduced firmware to such an extent
    that the wpm graph fits in.

commit 8aaff4196fe21d07190eb65f075909dd1cf15f73
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Tue May 4 08:11:02 2021 +0200

    Implement changes to reduce firmware size

    This is mostly needed due to recent changes in the qmk toolchain that
    cause firmware bloat. This is apparently known. See links mentioned in
    the code.

commit e38bfff0b8909a81c7db6e383daad66b69e954d9
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 3 17:41:16 2021 +0200

    Add latest copy of redox firmware to repository

commit f2e16e846337509f5046fd318fdd73683636a887
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 3 17:40:11 2021 +0200

    Update working copy with recent working copy

    Ok, so that was a big happy accident to have had "backup" on my private
    laptop because the code from github was waaaay old, in hindsight. Not
    sure what went wrong where and when but things were seriously foobar.

commit 15602b8de2b752345f09e0a17c9ecbf7d8568eda
Author: Paul Lemmens <paul.lemmens@gmail.com>
Date:   Mon May 3 13:45:24 2021 +0200

    Redo initial commit of working keymap

    I got me qmk fork into serious problems that only surfaced when installing on my new
    work macbook. The original feature/paullemmens_keymap still exists but is foobar.
  • Loading branch information
@paullemmens
paullemmens committed Mar 31, 2023
1 parent f5d08cb commit d4e4d84
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 49 deletions.
13 changes: 8 additions & 5 deletions keyboards/splitkb/kyria/keymaps/paullemmens/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
KC_TAB, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \
KC_ESC, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \
KC_LSFT, K21, K22, K23, K24, K25, ESC_RAI, SGUI_LWR, DEL_RAI, BS_LALT, K26, K27, K28, K29, K2A, KC_RSFT, \
KC_LGUI, KC_LALT, SPC_LWR, KC_LCTRL, GUI_LWR, KC_RCTRL, ENT_RSF, KC_SPC, KC_RALT, KC_APP \
KC_LGUI, KC_LALT, SPC_LWR, OS_LCMD, GUI_LWR, KC_RCTRL, ENT_RSF, KC_SPC, KC_RALT, KC_APP \
)

/* Re-pass though to allow templates to be used */
Expand Down Expand Up @@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
*/
[_OS_MODS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, OS__CMD, OS_SHFT, OS_CTRL, OS__ALT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
[_OS_MODS] = LAYOUT_wrapper(
_______, _________________OS_MODS_L1________________, _________________OS_MODS_R1________________, _______,
_______, _________________OS_MODS_L2________________, _________________OS_MODS_R2________________, _______,
_______, _________________OS_MODS_L3________________, _______, _______, _______, _______, _________________OS_MODS_R3________________, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
#endif //CALLUM_ONESHOT
Expand Down Expand Up @@ -291,6 +291,9 @@ static void render_status(void) {
case _ADJUST:
oled_write_P(PSTR("Adjust\n"), false);
break;
case _OS_MODS:
oled_write_P(PSTR("Mods\n"), false);
break;
default:
oled_write_P(PSTR("Undefined\n"), false);
}
Expand Down
89 changes: 45 additions & 44 deletions users/paullemmens/paullemmens.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,61 +33,45 @@
#define _GRAVE_ ALGR(KC_GRAVE)
#define _UMLAU_ ALGR(S(KC_QUOTE))
#define _CIRCFL ALGR(KC_CIRC)
// old home row mods
// Home row mods
#define LGUI__Z LGUI_T(KC_Z)
#define Z_LCTRL LCTL_T(KC_Z)
#define G_LSHFT LSFT_T(KC_G)
#define V_LSHFT LSFT_T(KC_V)
#define V_LCTRL LCTL_T(KC_V)
#define B_LCTRL LCTL_T(KC_B)
#define V__LCMD LCMD_T(KC_V)
#define N_RSHFT RSFT_T(KC_N)
#define N_RCTRL RCTL_T(KC_N)
#define M_RSHFT RSFT_T(KC_M)
#define M_RCTRL RCTL_T(KC_M)
#define M__RCMD RCMD_T(KC_M)
#define D_LCTRL LCTL_T(KC_D)
#define D_LSHFT LSFT_T(KC_D)
#define K_RCTRL RCTL_T(KC_K)
#define K_RSHFT RSFT_T(KC_K)
#define S__LALT LALT_T(KC_S)
#define L__LALT LALT_T(KC_L)
#define BS_LALT LALT_T(KC_BSPC)
#define ENT_RSF RSFT_T(KC_ENT)
// Layer toggles
#define R_ADJST LT(_ADJUST, KC_R)
#define F_RAISE LT(_RAISE, KC_F)
#define SPC_LWR LT(_LOWER, KC_SPC)
#ifdef CALLUM_ONESHOT
// TODO: change to something fancy some how to keep keep layer switch in there for key movement.
// FIXME: figure out smart way for adjusting to macos vs windows so I don't need the extra layer no more
#define OS_LCMD MO(_OS_MODS)
#define B_LCTRL KC_B
#define D_LSHFT KC_D
#define G_LOWER KC_G
#define F_RAISE KC_F
#define H_LOWER KC_H
#define J_RAISE KC_J
#define K_RSHFT KC_K
#define K_RCTRL KC_K
#define L__LALT KC_L
#define M_RCTRL KC_M
#define M__RCMD KC_M
#define N_RCTRL KC_N
#define R_ADJST KC_R
#define S__LALT KC_S
#define U_ADJST KC_U
#define V_LCTRL KC_V
#define V__LCMD KC_V
// Callum defines as MO(_OS_MODS) but I want to tap instead of hold the key.
#define OS_LCMD OSL(_OS_MODS)
#else
// FIXME: figure out smart way for adjusting to macos vs windows so I don't need the extra layer no more
#define OS_LCMD KC_LCMD
#define B_LCTRL LCTL_T(KC_B)
#define D_LSHFT LSFT_T(KC_D)
#define F_RAISE LT(_RAISE, KC_F)
#define H_LOWER LT(_LOWER, KC_H)
#define G_LOWER LT(_LOWER, KC_G)
#define J_RAISE LT(_RAISE, KC_J)
#define K_RSHFT RSFT_T(KC_K)
#define K_RCTRL RCTL_T(KC_K)
#define L__LALT LALT_T(KC_L)
#define M_RCTRL RCTL_T(KC_M)
#define M__RCMD RCMD_T(KC_M)
#define N_RCTRL RCTL_T(KC_N)
#define R_ADJST LT(_ADJUST, KC_R)
#define S__LALT LALT_T(KC_S)
#define U_ADJST LT(_ADJUST, KC_U)
#define V_LCTRL LCTL_T(KC_V)
#define V__LCMD LCMD_T(KC_V)
#endif
#define DEL_RAI LT(_RAISE, KC_DEL)
#define ESC_RAI LT(_RAISE, KC_ESC)
#define H_LOWER LT(_LOWER, KC_H)
#define G_LOWER LT(_LOWER, KC_G)
#define J_RAISE LT(_RAISE, KC_J)
#define U_ADJST LT(_ADJUST, KC_U)
#define MACOS_L DF(_MACOS)
#define DEFAU_L DF(_QWERTY)

Expand All @@ -113,10 +97,10 @@ enum custom_keycodes {
/* My layers are: */
enum userspace_layers {
_QWERTY = 0,
_MACOS,
#ifdef CALLUM_ONESHOT
_OS_MODS,
#endif
_MACOS,
/* _COLEMAK, */ // Not activated because trouble with defaulting to macos layer these days.
/* _MACOS2, */ // This will probably work because I can now use the same scheme for colemak on macOS.
_LOWER,
Expand All @@ -132,14 +116,31 @@ enum userspace_layers {
underscores to keep the lengths consistent. */

// clang-format off
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, R_ADJST, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, D_LSHFT, F_RAISE, G_LOWER
#define _________________QWERTY_L3_________________ LGUI__Z, KC_X, KC_C, V_LCTRL, KC_B
#ifdef CALLUM_ONESHOT
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G
#define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B

#define _________________QWERTY_R1_________________ KC_Y, KC_U, KC_I, KC_O, KC_P
#define _________________QWERTY_R2_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT
#define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
#else
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, R_ADJST, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, D_LSHFT, F_RAISE, G_LOWER
#define _________________QWERTY_L3_________________ LGUI__Z, KC_X, KC_C, V_LCTRL, KC_B

#define _________________QWERTY_R1_________________ KC_Y, U_ADJST, KC_I, KC_O, KC_P
#define _________________QWERTY_R2_________________ H_LOWER, J_RAISE, K_RSHFT, KC_L, KC_SCLN, KC_QUOT
#define _________________QWERTY_R3_________________ KC_N, M_RCTRL, KC_COMM, KC_DOT, KC_SLSH
#endif

#define _________________QWERTY_R1_________________ KC_Y, U_ADJST, KC_I, KC_O, KC_P
#define _________________QWERTY_R2_________________ H_LOWER, J_RAISE, K_RSHFT, KC_L, KC_SCLN, KC_QUOT
#define _________________QWERTY_R3_________________ KC_N, M_RCTRL, KC_COMM, KC_DOT, KC_SLSH
#define _________________OS_MODS_L1________________ _______, _______, _______, MO(_ADJUST), _______
#define _________________OS_MODS_L2________________ _______, OS__ALT, OS_SHFT, MO(_RAISE), MO(_LOWER)
#define _________________OS_MODS_L3________________ _______, _______, _______, OS__CMD, OS_CTRL

#define _________________OS_MODS_R1________________ _______, MO(_ADJUST), _______, _______, _______
#define _________________OS_MODS_R2________________ MO(_LOWER), MO(_RAISE), OS_SHFT, OS__ALT, _______
#define _________________OS_MODS_R3________________ OS_CTRL, OS__CMD, _______, _______, _______

#define _________________COLEMAK_L1________________ KC_Q, KC_W, KC_F, KC_P, KC_G
#define _________________COLEMAK_L2________________ KC_A, KC_R, KC_S, KC_T, KC_D
Expand Down

0 comments on commit d4e4d84

Please sign in to comment.