From 07523cf497203aab7afa98e033c6cbd735c505a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= <74135759+struckmb@users.noreply.github.com> Date: Wed, 11 Dec 2024 08:47:17 +0100 Subject: [PATCH] Trim pointer layer and edit readme --- README.md | 164 ++++++++++++------ .../v2/splinky_3/keymaps/struckmb/readme.md | 128 +++++++++++++- users/struckmb/README.md | 123 ------------- users/struckmb/struckmb.c | 42 ++--- users/struckmb/struckmb.h | 38 ++-- 5 files changed, 270 insertions(+), 225 deletions(-) delete mode 100644 users/struckmb/README.md diff --git a/README.md b/README.md index 25208997..4190b216 100644 --- a/README.md +++ b/README.md @@ -2,58 +2,124 @@ This is a template repository which allows for an external set of QMK keymaps to be defined and compiled. This is useful for users who want to maintain their own keymaps without having to fork the main QMK repository. -## Howto configure your build targets +These keymaps are using keymap_german_mac_iso. +Symbols are 'translated', if a linux/windows host is detected. -1. Run the normal `qmk setup` procedure if you haven't already done so -- see [QMK Docs](https://docs.qmk.fm/#/newbs) for details. -1. Fork this repository -1. Clone your fork to your local machine -1. Enable userspace in QMK config using `qmk config user.overlay_dir="$(realpath qmk_userspace)"` -1. Add a new keymap for your board using `qmk new-keymap` - * This will create a new keymap in the `keyboards` directory, in the same location that would normally be used in the main QMK repository. For example, if you wanted to add a keymap for the Planck, it will be created in `keyboards/planck/keymaps/` - * You can also create a new keymap using `qmk new-keymap -kb -km ` - * Alternatively, add your keymap manually by placing it in the location specified above. - * `layouts///keymap.*` is also supported if you prefer the layout system -1. Add your keymap(s) to the build by running `qmk userspace-add -kb -km ` - * This will automatically update your `qmk.json` file - * Corresponding `qmk userspace-remove -kb -km ` will delete it - * Listing the build targets can be done with `qmk userspace-list` -1. Commit your changes - -## Howto build with GitHub - -1. In the GitHub Actions tab, enable workflows -1. Push your changes above to your forked GitHub repository -1. Look at the GitHub Actions for a new actions run -1. Wait for the actions run to complete -1. Inspect the Releases tab on your repository for the latest firmware build - -## Howto build locally - -1. Run the normal `qmk setup` procedure if you haven't already done so -- see [QMK Docs](https://docs.qmk.fm/#/newbs) for details. -1. Fork this repository -1. Clone your fork to your local machine -1. `cd` into this repository's clone directory -1. Set global userspace path: `qmk config user.overlay_dir="$(realpath .)"` -- you MUST be located in the cloned userspace location for this to work correctly - * This will be automatically detected if you've `cd`ed into your userspace repository, but the above makes your userspace available regardless of your shell location. -1. Compile normally: `qmk compile -kb your_keyboard -km your_keymap` or `make your_keyboard:your_keymap` - -Alternatively, if you configured your build targets above, you can use `qmk userspace-compile` to build all of your userspace targets at once. - -## Extra info - -If you wish to point GitHub actions to a different repository, a different branch, or even a different keymap name, you can modify `.github/workflows/build_binaries.yml` to suit your needs. - -To override the `build` job, you can change the following parameters to use a different QMK repository or branch: +# Base Layers +First and last column keys on base layers for 6x3 keyboards, +(X) is the corresponding key from the currently active base layer: ``` - with: - qmk_repo: qmk/qmk_firmware - qmk_ref: master + ⌥/⌫│ │⌥/(X) + ───┼─ ─┼───── + ⌃/⎋│ (...other keys...) │⌃/(X) + ───┼─ ─┼───── + ⌘/▤│ │⌘/ ↵ ``` -If you wish to manually manage `qmk_firmware` using git within the userspace repository, you can add `qmk_firmware` as a submodule in the userspace directory instead. GitHub Actions will automatically use the submodule at the pinned revision if it exists, otherwise it will use the default latest revision of `qmk_firmware` from the main repository. +All base layers share the same thumb cluster: +(If the keyboard only has 2 keys on one side, the outermost key (marked with *) is missing) +``` + * * + ⎋ │ ↵ │ ⇥ │ │ ⌫ │Spc│ ⌦ + ───┴─⇧─┴LOW┘ └RSE┴─⇧─┴─── +``` -This can also be used to control which fork is used, though only upstream `qmk_firmware` will have support for external userspace until other manufacturers update their forks. +## QWERTY (german adaption) +``` + q │ w │ e │ r │ t z │ u │ i │ o │ p │(ü) + ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + a │ s │ d │ f │ g h │ j │ k │ l │ ö │(ä) + ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── + y │ x │ c │ v │ b n │ m │ , │ . │ ß │ + ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ +``` -1. (First time only) `git submodule add https://github.com/qmk/qmk_firmware.git` -1. (To update) `git submodule update --init --recursive` -1. Commit your changes to your userspace repository +## BONE +``` + j │ d │ u │ a │ x p │ h │ l │ m │ w │(ß) + ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + c │ t │ i │ e │ o b │ n │ r │ s │ g │(q) + ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── + f │ v │ ü │ ä │ ö y │ z │ , │ . │ k │ + ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ +``` + +## Colemak (Mod DH, german adaption) +``` + q │ w │ f │ p │ b j │ l │ u │ y │ ö │(ü) + ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + a │ r │ s │ t │ g m │ n │ e │ i │ o │(ä) + ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── + z │ x │ c │ d │ v k │ h │ , │ . │ ß │ + ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ +``` + +# Additional Layers + +## Symbols +``` + (⌥)│ @ │ _ │ [ │ ] │ ^ ! │ < │ > │ = │ & │(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│ \ │ / │ { │ } │ * ? │ ( │ ) │ - │ : │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│ # │ $ │ | │ ~ │ ´ + │ % │ " │ ' │ ; │(⌘) + ───┌───┬───┐ ┌───┬───┐─── + ° │ § │ ` │ │AGr│Spc│CWT + ───└───┴───┘ └───┴─⇧─┘─── +``` + (when dynamic tapping term is enabled, thumbs change to:) +``` + ───┌───┬───┐ ┌───┬───┐─── + PTT│ § │TT+│ │TT-│Spc│CWT + ───└───┴───┘ └───┴─⇧─┘─── +``` + +## Lower (Function keys and numbers) +``` + (⌥)│F1 │F2 │F3 │F4 │ £ / │ 7 │ 8 │ 9 │ - │(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│F5 │F6 │F7 │F8 │ € + │ 4 │ 5 │ 6 │ . │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│F9 │F10│F11│F12│ ¢ 0 │ 1 │ 2 │ 3 │ , │(⌘) + ───┌───┬───┐ ┌───┬───┐─── + $ │Sft│(v)│ │Bsp│Spc│App + ───└───┴───┘ └ATT┴─⇧─┘─── +``` + +## Raise (Navigation and control keys) +(the home row modifiers on the right are sticky) +``` + (⌥)│PUp│BSp│ ↑ │Del│Ins Prv│Stp│Ply│AGr│Nxt│(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│Hme│ ← │ ↓ │ → │End * Meh│Sft│ ⌃ │ ⌥ │ ⌘ │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│Esc│Cut│Cpy│Pst│PDn PSc│CWT│Pse│Ejt│SLk│(⌘) + ───┌───┬───┐ ┌───┬───┐─── + Prv│V -│V ×│ │(v)│V +│Nxt + ───└─⇧─┴ATT┘ └───┴─⇧─┘─── +``` + +## Pointer (Mouse, only if enabled) +* CSC: CTL(/GUI)+Shift+Click +``` + (⌥)│vMv│M>│ │ │CSC│AGr│ │(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│Bt4│Ms←│Ms↓│Ms→│Bt5 Meh│Sft│ ⌃ │ ⌥ │ ⌘ │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│Tb←│Cut│Cpy│Pst│^M^ │Slo│Med│Fst│Tb→│(⌘) + ───┌───┬───┐ ┌───┬───┐─── + CSC│Bt1│Bt2│ │Bt3│Bt1│CSC + ───└───┴───┘ └───┴─⇧─┘─── +``` + +## Attic (Adjustments and missing stuff) +``` + │QBt│ECl│LAs│LAr│APP ¡ │ ‹ │ « │ » │ › │(§) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + │LyG│Ly←│Ly→│BsL│MDX ¿ │ • │ ‚ │ ‘ │ ’ │(…) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + │RGB│R_S│R_H│R_V│R_M n-–│m-—│ „ │ “ │ ” │ + ───┌───┬───┐ ┌───┬───┐─── + LSf│Br-│(v)│ │(v)│Br+│RSf + ───└─⇧─┴───┘ └───┴─⇧─┘─── +``` diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md index 8b407f68..d60a5754 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md @@ -1,7 +1,127 @@ -# Charybdis Mini (3x6) default keymap +# Charybdis Mini (3x6) keymap -> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout. +The POINTER layer is altered to meet charybdis' needs and special keys: -The Charydbis Mini (3x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap. +## Pointer (Mouse, only if enabled) +* CSC: CTL(/GUI)+Shift+Click +``` + (⌥)│vMv│SD-│DD-│DD+│SD+ │ │CSC│AGr│ │(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│Bt4│DrT│Drg│Snp│Bt5 Meh│Sft│ ⌃ │ ⌥ │ ⌘ │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│Tb←│Cut│Cpy│Pst│^M^ │Snp│Drg│DrT│Tb→│(⌘) + ┌───┬───┬───┐ ┌───┬───┐ + │CSC│Bt1│Bt2│ │Bt3│Bt1│ + └───┴───┴───┘ └───┴─⇧─┘ +``` -This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect. +(all the rest is like my standard layout:) + +# Base Layers +First and last column keys on base layers for 6x3 keyboards, +(X) is the corresponding key from the currently active base layer: +``` + ⌥/⌫│ │⌥/(X) + ───┼─ ─┼───── + ⌃/⎋│ (...other keys...) │⌃/(X) + ───┼─ ─┼───── + ⌘/▤│ │⌘/ ↵ +``` + +All base layers share the same thumb cluster: +(If the keyboard only has 2 keys on one side, the outermost key (marked with *) is missing) +``` + * * + ⎋ │ ↵ │ ⇥ │ │ ⌫ │Spc│ ⌦ + ───┴─⇧─┴LOW┘ └RSE┴─⇧─┴─── +``` + +## QWERTY (german adaption) +``` + q │ w │ e │ r │ t z │ u │ i │ o │ p │(ü) + ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + a │ s │ d │ f │ g h │ j │ k │ l │ ö │(ä) + ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── + y │ x │ c │ v │ b n │ m │ , │ . │ ß │ + ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ +``` + +## BONE +``` + j │ d │ u │ a │ x p │ h │ l │ m │ w │(ß) + ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + c │ t │ i │ e │ o b │ n │ r │ s │ g │(q) + ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── + f │ v │ ü │ ä │ ö y │ z │ , │ . │ k │ + ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ +``` + +## Colemak (Mod DH, german adaption) +``` + q │ w │ f │ p │ b j │ l │ u │ y │ ö │(ü) + ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + a │ r │ s │ t │ g m │ n │ e │ i │ o │(ä) + ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── + z │ x │ c │ d │ v k │ h │ , │ . │ ß │ + ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ +``` + +# Additional Layers + +## Symbols +``` + (⌥)│ @ │ _ │ [ │ ] │ ^ ! │ < │ > │ = │ & │(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│ \ │ / │ { │ } │ * ? │ ( │ ) │ - │ : │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│ # │ $ │ | │ ~ │ ´ + │ % │ " │ ' │ ; │(⌘) + ───┌───┬───┐ ┌───┬───┐─── + ° │ § │ ` │ │AGr│Spc│CWT + ───└───┴───┘ └───┴─⇧─┘─── +``` + (when dynamic tapping term is enabled, thumbs change to:) +``` + ───┌───┬───┐ ┌───┬───┐─── + PTT│ § │TT+│ │TT-│Spc│CWT + ───└───┴───┘ └───┴─⇧─┘─── +``` + +## Lower (Function keys and numbers) +``` + (⌥)│F1 │F2 │F3 │F4 │ £ / │ 7 │ 8 │ 9 │ - │(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│F5 │F6 │F7 │F8 │ € + │ 4 │ 5 │ 6 │ . │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│F9 │F10│F11│F12│ ¢ 0 │ 1 │ 2 │ 3 │ , │(⌘) + ───┌───┬───┐ ┌───┬───┐─── + $ │Sft│(v)│ │Bsp│Spc│App + ───└───┴───┘ └ATT┴─⇧─┘─── +``` + +## Raise (Navigation and control keys) +(the home row modifiers on the right are sticky) +``` + (⌥)│PUp│BSp│ ↑ │Del│Ins Prv│Stp│Ply│AGr│Nxt│(⌥) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌃)│Hme│ ← │ ↓ │ → │End * Meh│Sft│ ⌃ │ ⌥ │ ⌘ │(⌃) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + (⌘)│Esc│Cut│Cpy│Pst│PDn PSc│CWT│Pse│Ejt│SLk│(⌘) + ───┌───┬───┐ ┌───┬───┐─── + Prv│V -│V ×│ │(v)│V +│Nxt + ───└─⇧─┴ATT┘ └───┴─⇧─┘─── +``` + +## Pointer (Mouse) +(see above) + +## Attic (Adjustments and missing stuff) +``` + │QBt│ECl│LAs│LAr│APP ¡ │ ‹ │ « │ » │ › │(§) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + │LyG│Ly←│Ly→│BsL│MDX ¿ │ • │ ‚ │ ‘ │ ’ │(…) + ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── + │RGB│R_S│R_H│R_V│R_M n-–│m-—│ „ │ “ │ ” │ + ───┌───┬───┐ ┌───┬───┐─── + LSf│Br-│(v)│ │(v)│Br+│RSf + ───└─⇧─┴───┘ └───┴─⇧─┘─── +``` diff --git a/users/struckmb/README.md b/users/struckmb/README.md deleted file mode 100644 index e20215c3..00000000 --- a/users/struckmb/README.md +++ /dev/null @@ -1,123 +0,0 @@ -These keymaps are using keymap_german_mac_iso. -Symbols are 'translated', if a linux/windows host is detected. - -# Base Layers -First and last column keys on base layers for 6x3 keyboards, -(X) is the corresponding key from the currently active base layer: -``` - ⌥/⌫│ │⌥/(X) - ───┼─ ─┼───── - ⌃/⎋│ (...other keys...) │⌃/(X) - ───┼─ ─┼───── - ⌘/▤│ │⌘/ ↵ -``` - -All base layers share the same thumb cluster: -(If the keyboard only has 2 keys on one side, the outermost key (marked with *) is missing) -``` - * * - ⎋ │ ↵ │ ⇥ │ │ ⌫ │Spc│ ⌦ - ───┴─⇧─┴LOW┘ └RSE┴─⇧─┴─── -``` - -## QWERTY (german adaption) -``` - q │ w │ e │ r │ t z │ u │ i │ o │ p │(ü) - ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - a │ s │ d │ f │ g h │ j │ k │ l │ ö │(ä) - ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── - y │ x │ c │ v │ b n │ m │ , │ . │ ß │ - ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ -``` - -## BONE -``` - j │ d │ u │ a │ x p │ h │ l │ m │ w │(ß) - ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - c │ t │ i │ e │ o b │ n │ r │ s │ g │(q) - ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── - f │ v │ ü │ ä │ ö y │ z │ , │ . │ k │ - ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ -``` - -## Colemak (Mod DH, german adaption) -``` - q │ w │ f │ p │ b j │ l │ u │ y │ ö │(ü) - ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - a │ r │ s │ t │ g m │ n │ e │ i │ o │(ä) - ─Σ─┼───┼───┼───┼─── ───┼───┼───┼───┼─Σ─ ─── - z │ x │ c │ d │ v k │ h │ , │ . │ ß │ - ─M─┴───┴───┴───┴─── ───┴───┴───┴───┴─M─ -``` - -# Additional Layers - -## Symbols -``` - (⌥)│ @ │ _ │ [ │ ] │ ^ ! │ < │ > │ = │ & │(⌥) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌃)│ \ │ / │ { │ } │ * ? │ ( │ ) │ - │ : │(⌃) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌘)│ # │ $ │ | │ ~ │ ´ + │ % │ " │ ' │ ; │(⌘) - ───┌───┬───┐ ┌───┬───┐─── - ° │ § │ ` │ │AGr│Spc│CWT - ───└───┴───┘ └───┴─⇧─┘─── -``` - (when dynamic tapping term is enabled, thumbs change to:) -``` - ───┌───┬───┐ ┌───┬───┐─── - PTT│ § │TT+│ │TT-│Spc│CWT - ───└───┴───┘ └───┴─⇧─┘─── -``` - -## Lower (Function keys and numbers) -``` - (⌥)│F1 │F2 │F3 │F4 │ £ / │ 7 │ 8 │ 9 │ - │(⌥) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌃)│F5 │F6 │F7 │F8 │ € + │ 4 │ 5 │ 6 │ . │(⌃) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌘)│F9 │F10│F11│F12│ ¢ 0 │ 1 │ 2 │ 3 │ , │(⌘) - ───┌───┬───┐ ┌───┬───┐─── - $ │Sft│(v)│ │Bsp│Spc│App - ───└───┴───┘ └ATT┴─⇧─┘─── -``` - -## Raise (Navigation and control keys) -(the home row modifiers on the right are sticky) -``` - (⌥)│PUp│BSp│ ↑ │Del│Ins Prv│Stp│Ply│Nxt│Ejt│(⌥) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌃)│Hme│ ← │ ↓ │ → │End * Meh│Sft│ ⌃ │ ⌥ │ ⌘ │(⌃) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌘)│Esc│Cut│Cpy│Pst│PDn PSc│CWT│Pse│AGr│SLk│(⌘) - ───┌───┬───┐ ┌───┬───┐─── - Prv│V -│V ×│ │(v)│V +│Nxt - ───└─⇧─┴ATT┘ └───┴─⇧─┘─── -``` - -## Pointer (Mouse) -(only if mouse keys are enabled) -* GSC: GUI+Shift+Click -* CSC: CTL+Shift+Click -``` - (⌥)│vMv│M>│ │GSC│CSC│ │ │(⌥) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌃)│Bt4│Ms←│Ms↓│Ms→│Bt5 Meh│Sft│ ⌃ │ ⌥ │ ⌘ │(⌃) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - (⌘)│Tb←│Cut│Cpy│Pst│^M^ Slo│Med│Fst│AGr│Tb→│(⌘) - ───┌───┬───┐ ┌───┬───┐─── - GSC│Bt1│Bt2│ │ ⌘ │Bt3│CSC - ───└───┴───┘ └───┴─⇧─┘─── -``` - -## Attic (Adjustments and missing stuff) -``` - │QBt│ECl│LAs│LAr│APP ¡ │ ‹ │ « │ » │ › │(§) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - │LyG│Ly←│Ly→│BsL│MDX ¿ │ • │ ‚ │ ‘ │ ’ │(…) - ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── - │RGB│R_S│R_H│R_V│R_M n-–│m-—│ „ │ “ │ ” │ - ───┌───┬───┐ ┌───┬───┐─── - LSf│Br-│(v)│ │(v)│Br+│RSf - ───└─⇧─┴───┘ └───┴─⇧─┘─── -``` diff --git a/users/struckmb/struckmb.c b/users/struckmb/struckmb.c index 231378bf..a42f0d48 100644 --- a/users/struckmb/struckmb.c +++ b/users/struckmb/struckmb.c @@ -31,30 +31,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case DE_RSQU: // ' if (record->event.pressed) { - register_code16(DE_QUOT); - } else { - unregister_code16(DE_QUOT); + tap_code16(S(DE_HASH)); } return false; case KC_CUT: if (record->event.pressed) { - register_code16(G(KC_X)); - } else { - unregister_code16(G(KC_X)); + tap_code16(G(KC_X)); } return false; case KC_COPY: if (record->event.pressed) { - register_code16(G(KC_C)); - } else { - unregister_code16(G(KC_C)); + tap_code16(G(KC_C)); } return false; case KC_PSTE: if (record->event.pressed) { - register_code16(G(KC_V)); - } else { - unregister_code16(G(KC_V)); + tap_code16(G(KC_V)); } return false; case KC_BRIU: @@ -71,6 +63,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code16(KC_BRMD); } return false; +#ifdef MOUSEKEY_ENABLE + case MS_CSB1: + if (record->event.pressed) { + tap_code16(S(G(KC_BTN1))); + } + return false; +#endif // MOUSEKEY_ENABLE } break; @@ -282,25 +281,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; case KC_CUT: if (record->event.pressed) { - register_code16(S(KC_DEL)); - } else { - unregister_code16(S(KC_DEL)); + tap_code16(S(KC_DEL)); } return false; case KC_COPY: if (record->event.pressed) { - register_code16(C(KC_INS)); - } else { - unregister_code16(C(KC_INS)); + tap_code16(C(KC_INS)); } return false; case KC_PSTE: if (record->event.pressed) { - register_code16(S(KC_INS)); - } else { - unregister_code16(S(KC_INS)); + tap_code16(S(KC_INS)); } return false; +#ifdef MOUSEKEY_ENABLE + case MS_CSB1: + if (record->event.pressed) { + tap_code16(S(C(KC_BTN1))); + } + return false; +#endif // MOUSEKEY_ENABLE } break; diff --git a/users/struckmb/struckmb.h b/users/struckmb/struckmb.h index 77c91b98..5f829b6f 100644 --- a/users/struckmb/struckmb.h +++ b/users/struckmb/struckmb.h @@ -65,6 +65,9 @@ enum userspace_custom_keycodes { /* AS_START, AS_END, // Dummy key codes for combo definitions */ #endif // ASETNIOP_ENABLE DE_RSQU, +#ifdef MOUSEKEY_ENABLE + MS_CSB1, +#endif // MOUSEKEY_ENABLE #ifdef ENCODER_ENABLE // Encoder button(s) BS_ENC0, @@ -312,24 +315,13 @@ void symR_reset(tap_dance_state_t *state, void *user_data); #define _SYMBL_3x6_ _SL1_6_, _SR1_6_, _SL2_6_, _SR2_6_, _SL3_6_, _SR3_6_ #ifdef MOUSEKEY_ENABLE -# define MS_GSB1 S(G(KC_BTN1)) -# define MS_CSB1 S(C(KC_BTN1)) -/* Pointer layer - (ALT)│vMv│M>│ │GSC│CSC│ │ │(ALT) - ───── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ───── - (C/E)│Bt4│Ms←│Ms↓│Ms→│Bt5 Meh│Sft│Ctl│Alt│Gui│(CTL) - ───── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ───── - (GUI)│Tb←│Cut│Cpy│Pst│^M^ Slo│Med│Fst│AGr│Tb→│(GUI) - ───┌───┬───┐ ┌───┬───┐─── - GSC│Bt1│Bt2│ │Gui│Bt3│CSC - ───└───┴───┘ └───┴───┘─── - * */ +/* Pointer layer */ # define _PL1_5_ KC_WH_D, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX # define _PL2_5_ KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5 # define _PL3_5_ S_C_TAB, KC_CUT, KC_COPY, KC_PSTE, KC_WH_U -# define _PR1_5_ XXXXXXX, MS_GSB1, MS_CSB1, XXXXXXX, XXXXXXX +# define _PR1_5_ XXXXXXX, XXXXXXX, MS_CSB1, OSM_AGR, XXXXXXX # define _PR2_5_ OSM_MEH, OSM_SFT, OSM_CTL, OSM_ALT, OSM_GUI -# define _PR3_5_ KC_ACL0, KC_ACL1, KC_ACL2, KC_RALT, C___TAB +# define _PR3_5_ XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, C___TAB // # define _PL1_6_ _ADD_L_1_, _PL1_5_ # define _PL2_6_ _ADD_L_2_, _PL2_5_ @@ -340,24 +332,14 @@ void symR_reset(tap_dance_state_t *state, void *user_data); // # define _PL4_2_ KC_BTN1, KC_BTN2 # define _PL4_3_ MS_GSB1, _PL4_2_ -# define _PR4_2_ KC_LGUI, KC_BTN3 +# define _PR4_2_ KC_BTN3, KC_BTN1 # define _PR4_3_ _PR4_2_, MS_CSB1 // # define _POINT_3x5_ _PL1_5_, _PR1_5_, _PL2_5_, _PR2_5_, _PL3_5_, _PR3_5_ # define _POINT_3x6_ _PL1_6_, _PR1_6_, _PL2_6_, _PR2_6_, _PL3_6_, _PR3_6_ #endif // MOUSEKEY_ENABLE -/* Lower: Numbers and function keys - * F1 │F2 │F3 │F4 │ £ / │ 7 │ 8 │ 9 │ - - * ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── - * F5 │F6 │F7 │F8 │ € + │ 4 │ 5 │ 6 │ . - * ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── - * F9 │F10│F11│F12│ ¢ 0 │ 1 │ 2 │ 3 │ , - * ┌───┬───┬───┐ ┌───┬───┬───┐ - * │ $ │Sft│(v)│ │Bsp│Spc│App│ - * └───┴───┴───┘ └ATT┴───┴───┘ - * * * - */ +/* Lower: Numbers and function keys */ #define _LL1_5_ KC_F1, KC_F2, KC_F3, KC_F4, DE_PND #define _LL2_5_ KC_F5, KC_F6, KC_F7, KC_F8, DE_EURO #define _LL3_5_ KC_F9, KC_F10, KC_F11, KC_F12, DE_CENT @@ -384,9 +366,9 @@ void symR_reset(tap_dance_state_t *state, void *user_data); #define _RL1_5_ KC_PGUP, KC_BSPC, KC_UP, KC_DEL, KC_INS #define _RL2_5_ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END #define _RL3_5_ KC_ESC, KC_CUT, KC_COPY, KC_PSTE, KC_PGDN -#define _RR1_5_ KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_EJCT +#define _RR1_5_ KC_MPRV, KC_MSTP, KC_MPLY, OSM_AGR, KC_MNXT #define _RR2_5_ OSM_MEH, OSM_SFT, OSM_CTL, OSM_ALT, OSM_GUI -#define _RR3_5_ KC_PSCR, CW_TOGG, KC_PAUS, OSM_AGR, KC_SCRL +#define _RR3_5_ KC_PSCR, CW_TOGG, KC_PAUS, KC_EJCT, KC_SCRL // #define _RL1_6_ _ADD_L_1_, _RL1_5_ #define _RL2_6_ _ADD_L_2_, _RL2_5_