From 1868ba09f20b4c78f9e5d4c1799f84eb69eef1c0 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 16 Jul 2020 21:33:35 -0400 Subject: [PATCH 01/17] [Keymap] add crkbd/keymaps/markstos --- keyboards/crkbd/keymaps/markstos/README.md | 15 +++ keyboards/crkbd/keymaps/markstos/config.h | 96 ++++++++++++++++++ keyboards/crkbd/keymaps/markstos/keymap.c | 111 +++++++++++++++++++++ keyboards/crkbd/keymaps/markstos/rules.mk | 21 ++++ 4 files changed, 243 insertions(+) create mode 100644 keyboards/crkbd/keymaps/markstos/README.md create mode 100644 keyboards/crkbd/keymaps/markstos/config.h create mode 100644 keyboards/crkbd/keymaps/markstos/keymap.c create mode 100644 keyboards/crkbd/keymaps/markstos/rules.mk diff --git a/keyboards/crkbd/keymaps/markstos/README.md b/keyboards/crkbd/keymaps/markstos/README.md new file mode 100644 index 000000000000..cce8b06da559 --- /dev/null +++ b/keyboards/crkbd/keymaps/markstos/README.md @@ -0,0 +1,15 @@ +# Markstos Corne keyboard layout + +![markstos 3x5+1 Corne layout](https://mark.stosberg.com/content/images/2022/11/markstos-3x5-plus-1-layout-v2.2.png) + +A primarily 3x5 layout for split ergonomic keywords with a extra column on each hand for rare and optional keys. + +For a detailed description see [markstos Corne layout](https://mark.stosberg.com/markstos-corne-3x5-1-keyboard-layout). + +# Disclaimer + +This is my personal layout and is subject to evolve further with my tastes. Fork your own copy if you need stability. Suggestions welcome. + +# Author + +* [Mark Stosberg](mailto:mark@stosberg.com) diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h new file mode 100644 index 000000000000..bf2a99eb9883 --- /dev/null +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -0,0 +1,96 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +//#define USE_MATRIX_I2C + +/* Select hand configuration */ + +// #define MASTER_LEFT +#define MASTER_RIGHT +// #define EE_HANDS + +//#define SSD1306OLED + +#define USE_SERIAL_PD2 + +// By default, when holding a dual-function key shortly after tapping it, the +// tapped key will begin repeating. This is handy for fast typists when typing +// words with double letters, such as "happy". If you turn this setting ON, it +// will be counted as a held modifier instead. +//#define TAPPING_FORCE_HOLD + +// Customized by markstos +#define TAPPING_TERM 200 +#define TAPPING_TERM_PER_KEY +// used for Tapping Term on thumb keys +#define TAPPING_TERM_THUMB 125 + +// If you press a dual-role key, press another key, and then release the +// dual-role key, all within the tapping term, by default the dual-role key +// will perform its tap action. If the HOLD_ON_OTHER_KEY_PRESS option is +// enabled, the dual-role key will perform its hold action instead. +#define HOLD_ON_OTHER_KEY_PRESS + +// markstos: prevent keydown and keyup from firing on different layers +#define PREVENT_STUCK_MODIFERS + +#ifdef RGBLIGHT_ENABLE + #undef RGBLED_NUM + #define RGBLIGHT_ANIMATIONS + #define RGBLED_NUM 27 + #define RGBLIGHT_LIMIT_VAL 120 + #define RGBLIGHT_HUE_STEP 10 + #define RGBLIGHT_SAT_STEP 17 + #define RGBLIGHT_VAL_STEP 17 +#endif + +// markstos: not sure if these are correct +// They are intended to beep and flash during flashing +#define QMK_LED D5 +#define QMK_SPEAKER C6 + +// Prevent normal rollover on alphas from accidentally triggering mods. +#define IGNORE_MOD_TAP_INTERRUPT + +// When enabled, typing a mod-tap plus second within term will register as the mod-combo +// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold +#define PERMISSIVE_HOLD + +//#define RGBLIGHT_SLEEP +//#define RGBLIGHT_EFFECT_BREATHING +//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//#define RGBLIGHT_EFFECT_KNIGHT +//#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define COMBO_COUNT 3 + +// Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing. +// They would have be held together intentionally to trigger this. +#define COMBO_TERM 40 + +// markstos +//#define BACKLIGHT_PIN B7 + +// These mostly affect my one-shot Shift key, providing a CapsLock alternative. +// I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on. +#define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */ +#define ONESHOT_TIMEOUT 2000 /* Time (in ms) before the one shot key is released */ + diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c new file mode 100644 index 000000000000..a927e410115e --- /dev/null +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -0,0 +1,111 @@ +#include QMK_KEYBOARD_H + +extern uint8_t is_master; + +// markstos defines + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + FUNC, + BACKLIT +}; + +enum combos { + JK_ESC +}; + +const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + // For Vim, put Escape on the home row + [JK_ESC] = COMBO(jk_combo, KC_ESC), + +}; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, + _FUNC, +}; + +// For _QWERTY layer +#define OSM_LCTL OSM(MOD_LCTL) +#define OSM_AGR OSM(MOD_RALT) +#define OSL_FUN OSL(_FUNC) +#define GUI_ENT GUI_T(KC_ENT) +#define LOW_TAB LT(_LOWER, KC_TAB) +#define RSE_BSP LT(_RAISE, KC_BSPC) +#define OSM_SFT OSM(MOD_LSFT) + + +// For _RAISE layer +#define CTL_ESC LCTL_T(KC_ESC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_DEL , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + OSM(MOD_LALT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H ,KC_J ,KC_K ,KC_L ,KC_QUOT ,OSM_AGR , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,OSL_FUN , + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + OSM_LCTL, GUI_ENT, LOW_TAB, RSE_BSP ,KC_SPC ,OSM_SFT \ + //`--------------------------' `--------------------------' + ), + + [_LOWER] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______ , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______ , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, XXXXXXX , KC_TILD,KC_GRV, KC_LBRC, KC_LCBR, KC_RCBR, KC_RBRC, KC_COMM,KC_DOT, KC_SLSH, _______ , + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, LOWER, KC_TRNS, KC_TRNS, KC_COLON \ + //`--------------------------' `--------------------------' + ), + + + [_RAISE] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + _______, KC_DEL , XXXXXXX, KC_UNDS, KC_PLUS, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,_______ , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_HOME, KC_END , KC_MINS, KC_EQL , KC_PGDN, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_APP ,_______ , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_LT , KC_GT , KC_COPY, KC_PSTE, KC_SCLN, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU,_______ , + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + CTL_ESC, KC_TRNS, XXXXXXX, RAISE , KC_TRNS, KC_TRNS\ + //`--------------------------' `--------------------------' + ), + + [_FUNC] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 ,_______ , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_F11 , KC_F12 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______ , + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, RESET ,XXXXXXX , + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, FUNC , XXXXXXX\ + //`--------------------------' `--------------------------' + ) +}; + +uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LT(_RAISE, KC_BSPC): + return TAPPING_TERM_THUMB; + case LT(_LOWER, KC_TAB): + return TAPPING_TERM_THUMB; + default: + return TAPPING_TERM; + } +} diff --git a/keyboards/crkbd/keymaps/markstos/rules.mk b/keyboards/crkbd/keymaps/markstos/rules.mk new file mode 100644 index 000000000000..919aa5007479 --- /dev/null +++ b/keyboards/crkbd/keymaps/markstos/rules.mk @@ -0,0 +1,21 @@ +# markstos: Attempt to enable Bootmagic +#BOOTMAGIC_ENABLE = lite + +# markstos: enable media keys +EXTRAKEY_ENABLE = yes + +# markstos: smaller file size, little down-side +LINK_TIME_OPTIMIZATION_ENABLE = yes + +# markstos: for combos! +COMBO_ENABLE = yes + +# markstos +# Backlighting is not RGB underglow or RGB matrix +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + +# This is for RGB *underglow* +# https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgblight.md +RGBLIGHT_ENABLE = no + +TAP_DANCE_ENABLE = no From 2c7c59d7d6b7144a3b2a6e45ca620afad4bcd00e Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Fri, 11 Nov 2022 13:20:17 -0500 Subject: [PATCH 02/17] Update keyboards/crkbd/keymaps/markstos/config.h Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/markstos/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h index bf2a99eb9883..1712e50782a8 100644 --- a/keyboards/crkbd/keymaps/markstos/config.h +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -50,8 +50,6 @@ along with this program. If not, see . // enabled, the dual-role key will perform its hold action instead. #define HOLD_ON_OTHER_KEY_PRESS -// markstos: prevent keydown and keyup from firing on different layers -#define PREVENT_STUCK_MODIFERS #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM From b1e1efbc7bcb483bbd0ac95628a2b1cbb4b1a58c Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Fri, 11 Nov 2022 13:20:35 -0500 Subject: [PATCH 03/17] Update keyboards/crkbd/keymaps/markstos/config.h Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/markstos/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h index 1712e50782a8..9b9f8ae48744 100644 --- a/keyboards/crkbd/keymaps/markstos/config.h +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . //#define SSD1306OLED -#define USE_SERIAL_PD2 // By default, when holding a dual-function key shortly after tapping it, the // tapped key will begin repeating. This is handy for fast typists when typing From 43e39a53ecb7a7c4cb42a38156f02e2502f0c627 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Fri, 11 Nov 2022 13:20:51 -0500 Subject: [PATCH 04/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index a927e410115e..9f9ac9998759 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -1,7 +1,5 @@ #include QMK_KEYBOARD_H -extern uint8_t is_master; - // markstos defines enum custom_keycodes { From 9fb4f1291944f593f936d90cb14fbea4e932bc38 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Fri, 11 Nov 2022 13:21:12 -0500 Subject: [PATCH 05/17] Update keyboards/crkbd/keymaps/markstos/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/markstos/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/rules.mk b/keyboards/crkbd/keymaps/markstos/rules.mk index 919aa5007479..2a0f31b3f874 100644 --- a/keyboards/crkbd/keymaps/markstos/rules.mk +++ b/keyboards/crkbd/keymaps/markstos/rules.mk @@ -5,7 +5,7 @@ EXTRAKEY_ENABLE = yes # markstos: smaller file size, little down-side -LINK_TIME_OPTIMIZATION_ENABLE = yes +LTO_ENABLE = yes # markstos: for combos! COMBO_ENABLE = yes From 41805e0772540ed2801801da5421a46c578b35e8 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Sun, 13 Nov 2022 08:25:57 -0500 Subject: [PATCH 06/17] fixup: address peer review: - Add GPL / copyright headers - rename README to lowercase - Remove unused RGB features - Remove Tap Dance & Backlight code --- keyboards/crkbd/keymaps/markstos/config.h | 37 ++----------------- keyboards/crkbd/keymaps/markstos/keymap.c | 4 +- .../keymaps/markstos/{README.md => readme.md} | 0 keyboards/crkbd/keymaps/markstos/rules.mk | 7 ---- 4 files changed, 5 insertions(+), 43 deletions(-) rename keyboards/crkbd/keymaps/markstos/{README.md => readme.md} (100%) diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h index 9b9f8ae48744..42cfd6d90f03 100644 --- a/keyboards/crkbd/keymaps/markstos/config.h +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -1,21 +1,9 @@ /* -This is the c configuration file for the keymap +This is the C configuration file for the keymap -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert + Copyright 2022 Mark Stosberg (@markstos) + SPDX-License-Identifier: GPL-2.0-or-later -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . */ #pragma once @@ -49,17 +37,6 @@ along with this program. If not, see . // enabled, the dual-role key will perform its hold action instead. #define HOLD_ON_OTHER_KEY_PRESS - -#ifdef RGBLIGHT_ENABLE - #undef RGBLED_NUM - #define RGBLIGHT_ANIMATIONS - #define RGBLED_NUM 27 - #define RGBLIGHT_LIMIT_VAL 120 - #define RGBLIGHT_HUE_STEP 10 - #define RGBLIGHT_SAT_STEP 17 - #define RGBLIGHT_VAL_STEP 17 -#endif - // markstos: not sure if these are correct // They are intended to beep and flash during flashing #define QMK_LED D5 @@ -72,20 +49,12 @@ along with this program. If not, see . // Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold #define PERMISSIVE_HOLD -//#define RGBLIGHT_SLEEP -//#define RGBLIGHT_EFFECT_BREATHING -//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//#define RGBLIGHT_EFFECT_KNIGHT -//#define RGBLIGHT_EFFECT_STATIC_GRADIENT #define COMBO_COUNT 3 // Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing. // They would have be held together intentionally to trigger this. #define COMBO_TERM 40 -// markstos -//#define BACKLIGHT_PIN B7 - // These mostly affect my one-shot Shift key, providing a CapsLock alternative. // I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on. #define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */ diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 9f9ac9998759..4720207598cd 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -1,7 +1,7 @@ +// Copyright 2022 Mark Stosberg (@markstos) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -// markstos defines - enum custom_keycodes { QWERTY = SAFE_RANGE, LOWER, diff --git a/keyboards/crkbd/keymaps/markstos/README.md b/keyboards/crkbd/keymaps/markstos/readme.md similarity index 100% rename from keyboards/crkbd/keymaps/markstos/README.md rename to keyboards/crkbd/keymaps/markstos/readme.md diff --git a/keyboards/crkbd/keymaps/markstos/rules.mk b/keyboards/crkbd/keymaps/markstos/rules.mk index 2a0f31b3f874..67da71408a51 100644 --- a/keyboards/crkbd/keymaps/markstos/rules.mk +++ b/keyboards/crkbd/keymaps/markstos/rules.mk @@ -7,15 +7,8 @@ EXTRAKEY_ENABLE = yes # markstos: smaller file size, little down-side LTO_ENABLE = yes -# markstos: for combos! COMBO_ENABLE = yes -# markstos -# Backlighting is not RGB underglow or RGB matrix -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - # This is for RGB *underglow* # https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgblight.md RGBLIGHT_ENABLE = no - -TAP_DANCE_ENABLE = no From 0f073d80e74f0650ad54b8336d798b77267558c3 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Sun, 20 Nov 2022 11:03:22 -0500 Subject: [PATCH 07/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 4720207598cd..bd784a9124aa 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------------------------' `--------------------------' ), - [_FUNC] = LAYOUT( \ + [_FUNC] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 ,_______ , //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From a42a13f13a8b2101cb5087706111d9c67edf1171 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Sun, 20 Nov 2022 11:03:30 -0500 Subject: [PATCH 08/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index bd784a9124aa..853c403c017e 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), - [_RAISE] = LAYOUT( \ + [_RAISE] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. _______, KC_DEL , XXXXXXX, KC_UNDS, KC_PLUS, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,_______ , //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From f221aa684b428294934a0af2cad1c1c55d16acdd Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Sun, 20 Nov 2022 11:03:38 -0500 Subject: [PATCH 09/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 853c403c017e..0dd3a69b25f3 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------------------------' `--------------------------' ), - [_LOWER] = LAYOUT( \ + [_LOWER] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______ , //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From f58ba8686d37da94c2f0dec5daa2a68a74986806 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Sun, 20 Nov 2022 11:03:50 -0500 Subject: [PATCH 10/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 0dd3a69b25f3..5997cf88ecaf 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, KC_F11 , KC_F12 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______ , //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, RESET ,XXXXXXX , + _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,XXXXXXX , //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, FUNC , XXXXXXX\ //`--------------------------' `--------------------------' From 487bdf2cc76ce26bf2431fc1bc0ad606fc315003 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Sun, 20 Nov 2022 11:04:25 -0500 Subject: [PATCH 11/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 5997cf88ecaf..4ec6c745d754 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -47,7 +47,7 @@ enum custom_layers { #define CTL_ESC LCTL_T(KC_ESC) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_DEL , //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From 508bea579ebb073b2747c7d8559ebbaae92aa0ec Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 15 Dec 2022 10:01:55 -0500 Subject: [PATCH 12/17] Update keyboards/crkbd/keymaps/markstos/rules.mk Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/rules.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/crkbd/keymaps/markstos/rules.mk b/keyboards/crkbd/keymaps/markstos/rules.mk index 67da71408a51..9bca23db9517 100644 --- a/keyboards/crkbd/keymaps/markstos/rules.mk +++ b/keyboards/crkbd/keymaps/markstos/rules.mk @@ -1,6 +1,3 @@ -# markstos: Attempt to enable Bootmagic -#BOOTMAGIC_ENABLE = lite - # markstos: enable media keys EXTRAKEY_ENABLE = yes From 3df515e9135f4fe8efcc885e69181644b31c4069 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 15 Dec 2022 10:02:24 -0500 Subject: [PATCH 13/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 4ec6c745d754..16ac9f1efccb 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,XXXXXXX , //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, FUNC , XXXXXXX\ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, FUNC , XXXXXXX //`--------------------------' `--------------------------' ) }; From 6452c5efbd866728fc1c67fb860a84240722c8ff Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 15 Dec 2022 10:02:35 -0500 Subject: [PATCH 14/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 16ac9f1efccb..92aeabf3d389 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, XXXXXXX , KC_TILD,KC_GRV, KC_LBRC, KC_LCBR, KC_RCBR, KC_RBRC, KC_COMM,KC_DOT, KC_SLSH, _______ , //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, LOWER, KC_TRNS, KC_TRNS, KC_COLON \ + KC_TRNS, KC_TRNS, LOWER, KC_TRNS, KC_TRNS, KC_COLON //`--------------------------' `--------------------------' ), From eb13dfeaafb3d4f922e0b05b1aeb631d27db42e3 Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 15 Dec 2022 10:02:50 -0500 Subject: [PATCH 15/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 92aeabf3d389..7be8f8c71f09 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,OSL_FUN , //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - OSM_LCTL, GUI_ENT, LOW_TAB, RSE_BSP ,KC_SPC ,OSM_SFT \ + OSM_LCTL, GUI_ENT, LOW_TAB, RSE_BSP ,KC_SPC ,OSM_SFT //`--------------------------' `--------------------------' ), From 34517371d2ff56df446685f3b68ced7d2453e32a Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 15 Dec 2022 10:23:06 -0500 Subject: [PATCH 16/17] cleanup, add dash combo --- keyboards/crkbd/keymaps/markstos/config.h | 2 +- keyboards/crkbd/keymaps/markstos/keymap.c | 5 ++++- keyboards/crkbd/keymaps/markstos/readme.md | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h index 42cfd6d90f03..ff00a04a8d14 100644 --- a/keyboards/crkbd/keymaps/markstos/config.h +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -49,7 +49,7 @@ This is the C configuration file for the keymap // Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold #define PERMISSIVE_HOLD -#define COMBO_COUNT 3 +#define COMBO_COUNT 2 // Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing. // They would have be held together intentionally to trigger this. diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 7be8f8c71f09..44cbec888430 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -11,15 +11,18 @@ enum custom_keycodes { }; enum combos { + DF_DASH, JK_ESC }; +const uint16_t PROGMEM df_combo[] = {KC_D, KC_F, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; combo_t key_combos[COMBO_COUNT] = { + // Add commonly used dash to home row + [DF_DASH] = COMBO(df_combo, KC_MINS), // For Vim, put Escape on the home row [JK_ESC] = COMBO(jk_combo, KC_ESC), - }; // Each layer gets a name for readability, which is then used in the keymap matrix below. diff --git a/keyboards/crkbd/keymaps/markstos/readme.md b/keyboards/crkbd/keymaps/markstos/readme.md index cce8b06da559..6789c9da30e1 100644 --- a/keyboards/crkbd/keymaps/markstos/readme.md +++ b/keyboards/crkbd/keymaps/markstos/readme.md @@ -2,7 +2,7 @@ ![markstos 3x5+1 Corne layout](https://mark.stosberg.com/content/images/2022/11/markstos-3x5-plus-1-layout-v2.2.png) -A primarily 3x5 layout for split ergonomic keywords with a extra column on each hand for rare and optional keys. +A primarily 3x5 layout for split ergonomic keywords with an extra column on each hand for rare and optional keys. For a detailed description see [markstos Corne layout](https://mark.stosberg.com/markstos-corne-3x5-1-keyboard-layout). From 833d0a3c0fe7b7547840ef6308f9a6951068085e Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Thu, 15 Dec 2022 10:24:41 -0500 Subject: [PATCH 17/17] Update keyboards/crkbd/keymaps/markstos/keymap.c Co-authored-by: Ryan --- keyboards/crkbd/keymaps/markstos/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index 44cbec888430..ca5be183b17e 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, KC_LT , KC_GT , KC_COPY, KC_PSTE, KC_SCLN, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU,_______ , //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - CTL_ESC, KC_TRNS, XXXXXXX, RAISE , KC_TRNS, KC_TRNS\ + CTL_ESC, KC_TRNS, XXXXXXX, RAISE , KC_TRNS, KC_TRNS //`--------------------------' `--------------------------' ),