From 5c90a110ba3cd1aeb1ad1716828831796c24edfb Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 14 Apr 2024 09:57:45 -0500 Subject: [PATCH] Adjusting keymap to incorporate encoders - made swoop encoders the same as rollow - NAV key is momentary except for in number layer where it also taps 0 - NUM key now taps mouse button 1, but it won't tap that in NAV layer - removed visual studio code fold/unfold binds as I don't use them - cleaned up the keymap, went back to three keycode wrappers for base and layer - cleaned up the encoder taps - updated readme file --- README.md | 76 ++++++++++--------- .../rollow/keymaps/t4corun/keymap.c | 21 ++--- .../bluebell/swoop/keymaps/t4corun/keymap.c | 24 +++--- users/t4corun/t4corun.h | 69 ++++++++--------- 4 files changed, 99 insertions(+), 91 deletions(-) diff --git a/README.md b/README.md index 0d41959d..de458bb1 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ The custom layout optimizes for programming (SQL, Powershell, C) and minimizes h A single keymap layout can be shared with multiple keyboards by using C preprocessor macros. These macros are referenced in the keyboard JSON files, and the build process will expand them into a transient keymap.c file during compile time. -In this userspace, the base split 3x5_2 layout can be adapted for other split keyboards by expanding it with macros. For example, there is a wrapper that will add extra columns to the base layout for a Corne's 42-key 3x6_3 layout. +In this userspace, the base split 3x5_3 layout can be adapted for other split keyboards by expanding it with macros. For example, there is a wrapper that will add extra columns to the base layout for a Corne's 42-key 3x6_3 layout. ### Tri-Layer -Hold both thumb momentary layer keys `NAV` and `SYM` to access the `_NUMBER` layer +Hold both thumb momentary layer keys `NAV` and `SYM` to access the `_SYMBOL` layer ### One Shot Mods @@ -85,6 +85,7 @@ Enables simultaneous pressing of key combinations to get another. Handy when the This is the keymap designed for split 3x5 layout, two thumb keys on each side, and dual encoders. Emphasis on: - Releasing all keys always brings you back to base layer +- Outside thumb keys are encoder clicks - Keeping certain keys consistent on all layers for better muscle memory - Numbers and function keys are positioned similarly - Symbols important for powershell / writing are positioned under stronger fingers @@ -99,9 +100,9 @@ Additional keys may be mapped if present. Check each keyboard's `keymap.c` for m │ a mou│ s │ d │ f │ g │ qwerty │ h │ j │ k │ l │ ' " │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ z │ x │ c │ v │ b │ │ n │ m │ , ( │ . ) │ - _ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ sym │ mou │ │ spc │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc: mwheel │ │ num │ mou │ │ spc │ nav │ mute │ enc: volume + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ ╭──────┬──────┬──────┬──────┬──────╮ ╭──────┬──────┬──────┬──────┬──────╮ │ q │ w │ f │ p │ b │ │ j │ l │ u │ y │ o │ @@ -109,9 +110,10 @@ Additional keys may be mapped if present. Check each keyboard's `keymap.c` for m │ a mou│ r │ s │ t │ g │ colemak │ m │ n │ e │ i │ ' " │ ├──────┼──────┼──────┼──────┼──────┤ dh ├──────┼──────┼──────┼──────┼──────┤ │ z │ x │ c │ d │ v │ │ k │ h │ , ( │ . ) │ - _ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ sym │ mou │ │ spc │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc: mwheel │ │ num │ mou │ │ spc │ nav │ mute │ enc: volume + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ + Notes: - swapped o and repeat on this keymap to keep repeat key in the same position across layers @@ -121,9 +123,9 @@ Notes: │ gnum │ a │ s │ d │ f │ game │ │ │ │ │ │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ z │ x │ c │ v │ b │ │ │ │ │ │ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ shft │ spc │ │ spc │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc: mwheel │ │ shft │ spc │ │ spc │ nav │ mute │ enc: volume + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ ╭──────┬──────┬──────┬──────┬──────╮ ╭──────┬──────┬──────┬──────┬──────╮ │ esc │ home │ up │ end │ pgup │ │ ins │ │ app │ │ cfg │ @@ -131,9 +133,12 @@ Notes: │ │ left │ down │ rght │ pgdn │ nav │ bksp │ shft │ ctrl │ alt │ gui │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ undo │ cut │ copy │ pste │ redo │ │ del │ tab │ vol- │ vol+ │ mute │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ sym │ ent │ │ │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ + enc: zoom │ zrst │ num │ ent │ │ │ nav │ │ enc: none + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ + +Notes: +- zrst - Ctrl + 0 to Zoom Reset ╭──────┬──────┬──────┬──────┬──────╮ ╭──────┬──────┬──────┬──────┬──────╮ │ esc │ snip │ file │ func │ ` ~ │ │ ent │ 7 │ 8 │ 9 │ tab │ @@ -142,7 +147,7 @@ Notes: ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ undo │ cut │ copy │ pste │ redo │ │ del │ 1 │ 2 │ 3 │ - _ │ ╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ - │ │ sym │ │ │ spc │ 0 nav│ │ + enc: none │ │ sym │ │ │ spc │ 0 nav│ │ enc: ← → ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ ╭──────┬──────┬──────┬──────┬──────╮ ╭──────┬──────┬──────┬──────┬──────╮ @@ -151,9 +156,9 @@ Notes: │ & │ { {} │ } │ | │ ; : │ symbols │ bksp │ ? │ [ [] │ ] │ ' '' │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ % ^ │ < <> │ > │ \ │ ! │ │ del │ / │ , () │ . ) │ - _ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ sym │ │ │ │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc: none │ │ sym │ │ │ │ nav │ │ enc: none + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ Notes: - tri layer: Activate th the symbol layer by holding down symbol and navigation @@ -164,9 +169,9 @@ Notes: │ │ │ │ │ scrl │ func │ caps │ F4 │ F5 │ F6 │ F11 │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ │ │ │ │ │ │ paus │ F1 │ F2 │ F3 │ F12 │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ sym │ │ │ mply1│ mrec1│ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc: none │ │ sym │ │ │ mply1│ mrec1│ │ enc: ↑ ↓ + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ ╭──────┬──────┬──────┬──────┬──────╮ ╭──────┬──────┬──────┬──────┬──────╮ │ │ btn5 │ btn4 │ btn3 │ │ │ whup │ │ mouu │ │ │ @@ -174,9 +179,9 @@ Notes: │ mou │ alt │ ctrl │ shft │ │ mouse │ whdn │ moul │ moud │ mour │ │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ │ │ │ │ drgs │ snip │ │ sdpi │ pdpi │ │ │ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ btn1 │ btn2 │ │ │ │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc:mwheel │ │ btn1 │ btn2 │ │ │ │ │ enc: none + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ Notes: - drgs on non Charybdis Nano boards will trigger drag scrolling on Ploopy Nano @@ -189,20 +194,22 @@ Notes: │ gnum │ 1 │ 2 │ 3 │ 4 │ game │ │ │ │ │ │ ├──────┼──────┼──────┼──────┼──────┤ num ├──────┼──────┼──────┼──────┼──────┤ │ │ 5 │ 6 │ 7 │ 8 │ │ │ │ │ │ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │ alt │ ctr │ │ │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + end: mwheel │ │ alt │ ctr │ │ │ nav │ mute │ enc: volume + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ ╭──────┬──────┬──────┬──────┬──────╮ ╭──────┬──────┬──────┬──────┬──────╮ │ │ │ │ │ │ │ eeclr│ rboot│ boot │ │ cfg │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ -│rgbtog│rgbMod│ │ │ │ config │ │ shft │ ctrl │ alt │ gui │ +│rgbtog│rgbMod│ │ │ │ config │ blyr │ shft │ ctrl │ alt │ gui │ ├──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┤ -│ hue+ │ sat+ │ vib+ │ spd+ │ game │ │ │ │ │ │ │ -╰──────┴──────┴──────┼──────┼──────┤ ├──────┼──────┼──────┴──────┴──────╯ - │clmkdh│qwerty│ │ │ nav │ - ╰──────┴──────╯ ╰──────┴──────╯ -``` +│ hue+ │ sat+ │ vib+ │ spd+ │ │ │ │ │ │ │ │ +╰──────┴──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┴──────╯ + enc: none │ │ │ │ │ │ nav │ │ enc: none + ╰──────┴──────┴──────╯ ╰──────┴──────┴──────╯ + +notes: +- blyr - toggles between the three base layers: qwerty, colemakdh, game ## Target Keyboards @@ -212,8 +219,9 @@ All boards use my keymaps unless noted - Bastardkb Charybdis Nano 3x5 - Crkbd 3x6 - Planck Rev6 +- Ferris Swoop +- Barbell Rollow (non-tree) - DZRGB60v2 (coming) -- Ferris Swoop (coming) - Geist KLOR (coming) ## Links diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c index 455af8ac..d75794be 100644 --- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c +++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c @@ -37,15 +37,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* may have to swap the hands in this array since we do right side master*/ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, vol up and down - [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, vol up and down - [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, xx,xx - [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx - [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, //xx,xx left and right - [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx - [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, //xx,xx up and down - [_MOUSE] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,?? - [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, xx,xx - [_CONFIG] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality? + [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, + [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, + [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, + [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, + [_MOUSE] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, + [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, }; + #endif \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c index 423e7ec2..92efb33e 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -35,17 +35,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) -/* may have to swap the hands in this array since we do right side master*/ +/* The encoder presses are handled in the keymap */ + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down - [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down - [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx - [_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx - [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, //xx,xx left and right - [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx - [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, //xx,xx up and down - [_MOUSE] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,?? - [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx - [_CONFIG] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality? + [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, + [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, + [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, + [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, + [_MOUSE] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, + [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, }; + #endif \ No newline at end of file diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index dafc6aa7..75f06cc0 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -43,7 +43,8 @@ enum keycodes { #define ___x___ KC_NO // momentary layer -#define NAV LT(_NAVIGATION, KC_0) +#define NAV MO(_NAVIGATION) +#define NAV_0 LT(_NAVIGATION, KC_0) #define NUM MO(_NUMBER) #define CONFIG MO(_CONFIG) #define FUNC MO(_FUNCTION) @@ -58,10 +59,6 @@ enum keycodes { #define SC_SNIP LGUI(LSFT(KC_S)) #define SC_FILE LGUI(KC_E) -// Visual Studio Code -#define VS_FOLD LCTL(LSFT(KC_7)) -#define VS_UFLD LCTL(LSFT(KC_9)) - // Zoom #define ZOOMIN LCTL(LSFT(KC_EQL)) #define ZOOMOUT LCTL(KC_MINS) @@ -88,12 +85,12 @@ enum keycodes { #define TR_SQUO LT(_DEFAULT_LAYER_1, TH_SQUO) #define TR_DQUO LT(_DEFAULT_LAYER_1, TH_DQUO) -#define TR_LPRN LT(_DEFAULT_LAYER_1, TH_LPRN) // custom behavior0' +#define TR_LPRN LT(_DEFAULT_LAYER_1, TH_LPRN) // custom behavior #define TR_COMM LT(_DEFAULT_LAYER_1, TH_COMM) #define TR_DOT LT(_DEFAULT_LAYER_1, TH_DOT) #define TR_PERC LT(_DEFAULT_LAYER_1, TH_PERC) -#define TR_EQL LT(_DEFAULT_LAYER_1, TH_EQL) // auto shift +#define TR_EQL LT(_DEFAULT_LAYER_1, TH_EQL) // basically auto shift #define TR_MINS LT(_DEFAULT_LAYER_1, TH_MINS) #define TR_GRV LT(_DEFAULT_LAYER_1, TH_GRV) #define TR_SCLN LT(_DEFAULT_LAYER_1, TH_SCLN) @@ -101,7 +98,7 @@ enum keycodes { #if defined(MOUSEKEY_ENABLE) -# define TR_MOUA LT(_MOUSE, KC_A) +# define TR_MOUZ LT(_MOUSE, KC_Z) # define TR_MOUU KC_MS_U # define TR_MOUD KC_MS_D @@ -117,6 +114,8 @@ enum keycodes { # define TR_BTN4 KC_BTN4 # define TR_BTN5 KC_BTN5 +# define TR_NUM1 LT(_NUMBER, KC_BTN1) + # if defined(KEYBOARD_bastardkb_charybdis_3x5) //these codes are defined in charybdis.h # define TR_SNIP SNIPING @@ -131,7 +130,7 @@ enum keycodes { # endif //KEYBOARD_bastardkb_charybdis_3x5 #else -# define TR_MOUA KC_A +# define TR_MOUZ KC_A # define TR_MOUU ___x___ # define TR_MOUD ___x___ @@ -152,6 +151,8 @@ enum keycodes { # define TR_SDPI ___x___ # define TR_PDPI ___x___ +# define TR_NUM1 MO(_NUMBER) + #endif //MOUSEKEY_ENABLE @@ -185,9 +186,6 @@ enum keycodes { - - - #define _DEFAULT_LAYER_1 FIRST_DEFAULT_LAYER #define _DEFAULT_LAYER_2 (FIRST_DEFAULT_LAYER + 1) #define _DEFAULT_LAYER_3 (FIRST_DEFAULT_LAYER + 2) @@ -200,10 +198,9 @@ enum keycodes { #define _SCAG_MODS________________________ TR_LSFT, TR_LCTL, TR_LALT, TR_LGUI #define _UCCPR_L___________________________________ SC_UNDO, SC_CUT, SC_COPY, SC_PAST, SC_REDO -#define _BASE_L4________ NUM, TR_LSFT -#define _BASE_R4________ KC_SPC, NAV -#define _LAYER_TRANS_L__ _______, ___x___ -#define _LAYER_TRANS_R__ ___x___, _______ +#define _BASE_L4_________________ ___x___, TR_NUM1, TR_LSFT +#define _BASE_R4_________________ KC_SPC, NAV, KC_MUTE +#define _LAYER_TRANS_____________ ___x___, _______, ___x___ //___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, @@ -217,69 +214,69 @@ enum keycodes { #define LAYER_QWERTY \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - TR_MOUA, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TR_QUOT, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TR_COMM, TR_DOT, TR_MINS, \ - TR_BTN1, _BASE_L4________, _BASE_R4________, KC_MUTE + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TR_QUOT, \ + TR_MOUZ, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TR_COMM, TR_DOT, TR_MINS, \ + _BASE_L4_________________, _BASE_R4_________________ #define LAYER_COLEMAK_DH \ KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, TR_QUOT, \ - TR_MOUA, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ - KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, TR_COMM, TR_DOT, TR_MINS, \ - TR_BTN1, _BASE_L4________, _BASE_R4________, KC_MUTE + KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ + TR_MOUZ, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, TR_COMM, TR_DOT, TR_MINS, \ + _BASE_L4_________________, _BASE_R4_________________ #define LAYER_GAME \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, _NONE_5____________________________________, \ GAMENUM, KC_A, KC_S, KC_D, KC_F, _NONE_5____________________________________, \ KC_Z, KC_X, KC_C, KC_V, KC_B, _NONE_5____________________________________, \ - ___x___, KC_LSFT, KC_SPC, _BASE_R4________, KC_MUTE + ___x___, KC_LSFT, KC_SPC, _BASE_R4_________________ #define LAYER_NAVIGATION \ - KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, VS_FOLD, KC_APP, VS_UFLD, CONFIG, \ + KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, ___x___, KC_APP, ___x___, CONFIG, \ ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \ _UCCPR_L___________________________________, KC_DEL, KC_TAB, KC_VOLD, KC_VOLU, KC_MUTE, \ - ZOOMRST, _______, KC_ENT, _LAYER_TRANS_R__, ___x___ + ZOOMRST, NUM, KC_ENT, _LAYER_TRANS_____________ #define LAYER_NUMBER \ KC_ESC, SC_SNIP, SC_FILE, FUNC, TR_GRV, KC_ENT, KC_7, KC_8, KC_9, KC_TAB, \ _GACS_MODS________________________, TR_SCLN, KC_BSPC, KC_4, KC_5, KC_6, KC_DOT, \ _UCCPR_L___________________________________, KC_DEL, KC_1, KC_2, KC_3, TR_MINS, \ - ___x___, _LAYER_TRANS_L__, _BASE_R4________, ___x___ + _LAYER_TRANS_____________, KC_SPC, NAV_0, ___x___ #define LAYER_SYMBOL \ KC_ESC, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \ KC_AMPR, TR_LCBR, KC_RCBR, KC_PIPE, TR_SCLN, KC_BSPC, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \ TR_PERC, TR_LABK, KC_RABK, KC_BSLS, KC_EXLM, KC_DEL, KC_SLSH, TR_LPRN, TR_DOT, TR_MINS, \ - ___x___, _LAYER_TRANS_L__, _LAYER_TRANS_R__, ___x___ + _LAYER_TRANS_____________, _LAYER_TRANS_____________ #define LAYER_FUNCTION \ - TR_DMP2, TR_DMR2, ___x___, _______, ___x___, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, \ - ___x___, ___x___, ___x___, ___x___, KC_SCRL, KC_CAPS, KC_F4, KC_F5, KC_F6, KC_F11, \ + TR_DMP2, TR_DMR2, ___x___, _______, KC_SCRL, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, \ + _NONE_5____________________________________, KC_CAPS, KC_F4, KC_F5, KC_F6, KC_F11, \ _NONE_5____________________________________, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F12, \ - ___x___, _LAYER_TRANS_L__, TR_DMP1, TR_DMR1, ___x___ + _LAYER_TRANS_____________, TR_DMP1, TR_DMR1, ___x___ #define LAYER_MOUSE \ ___x___, TR_BTN5, TR_BTN4, TR_BTN3, ___x___, TR_MWHU, ___x___, TR_MOUU, ___x___, ___x___, \ _______, _GACS_MOUSE_MODS_________, ___x___, TR_MWHD, TR_MOUL, TR_MOUD, TR_MOUR, ___x___, \ - ___x___, ___x___, ___x___, TR_DRGS, TR_SNIP, TR_SDPI, TR_PDPI, ___x___, ___x___, ___x___, \ - TR_BTN1, TR_BTN1, TR_BTN2, ___x___, ___x___, ___x___ + _NONE_3__________________, TR_DRGS, TR_SNIP, TR_SDPI, TR_PDPI, ___x___, ___x___, ___x___, \ + ___x___, TR_BTN1, TR_BTN2, _NONE_3__________________ #define LAYER_GAME_NUM \ ___x___, KC_ESC, KC_TILD, KC_G, KC_T, _NONE_5____________________________________, \ _______, KC_1, KC_2, KC_3, KC_4, _NONE_5____________________________________, \ ___x___, KC_5, KC_6, KC_7, KC_8, _NONE_5____________________________________, \ - ___x___, KC_LALT, KC_LCTL, _LAYER_TRANS_R__, KC_MUTE + ___x___, KC_LALT, KC_LCTL, _LAYER_TRANS_____________ #define LAYER_CONFIG \ - ___x___, ___x___, ___x___, ___x___, ___x___, EE_CLR, QK_RBT, QK_BOOT, ___x___, _______, \ - TR_RTOG, TR_RMOD, ___x___, ___x___, ___x___, BASELYR, _SCAG_MODS________________________, \ + _NONE_5____________________________________, EE_CLR, QK_RBT, QK_BOOT, ___x___, _______, \ + TR_RTOG, TR_RMOD, _NONE_3__________________, BASELYR, _SCAG_MODS________________________, \ TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, _NONE_5____________________________________, \ - ___x___, ___x___, ___x___, _LAYER_TRANS_R__, ___x___ + _NONE_3__________________, _LAYER_TRANS_____________