From 6de4870ee0dbd14eb592195334eb70423ae88136 Mon Sep 17 00:00:00 2001 From: Daniel Shields <1530706+shieldsd@users.noreply.github.com> Date: Sun, 20 Nov 2022 08:27:45 +0000 Subject: [PATCH] [Keyboard] Add layer tap keys to dshields keymaps. (#18953) --- .../atreus/keymaps/dshields/keymap.c | 2 +- .../model01/keymaps/dshields/keymap.c | 2 +- keyboards/planck/keymaps/dshields/keymap.c | 2 +- users/dshields/config.h | 4 ++++ users/dshields/dshields.h | 23 +++++++++++++++---- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c index 0077c4d836..eb8312387f 100644 --- a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DEF] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P , - MT_A, MT_S, MT_D, MT_F, KC_G, KC_H, MT_J, MT_K, MT_L, MT_SCLN, + MT_A, MT_S, MT_D, MT_F, LT_G, LT_H, MT_J, MT_K, MT_L, MT_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSMLCTL, MT_ESC, OSMLALT, OSL_FUN, MT_BSPC, OSL_LWR, OSL_RSE, MT_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), diff --git a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c index 2d257fe371..3bd739e513 100644 --- a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c +++ b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c @@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DEF] = LAYOUT( QK_BOOT, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______, KC_GRV , KC_Q , KC_W , KC_E , KC_R , KC_T , RGB_TOG, DM_REC1, KC_Y , KC_U , KC_I , KC_O , KC_P , KC_EQL , - KC_PGUP, MT_A , MT_S , MT_D , MT_F , KC_G , KC_TAB , KC_ENT , KC_H , MT_J , MT_K , MT_L , MT_SCLN, KC_QUOT, + KC_PGUP, MT_A , MT_S , MT_D , MT_F , LT_G , KC_TAB , KC_ENT , LT_H , MT_J , MT_K , MT_L , MT_SCLN, KC_QUOT, KC_PGDN, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_ESC , DM_PLY1, KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_MINS, OSMLCTL, OSMRCTL, KC_BSPC, KC_SPC , diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c index 538c41922a..cc23e73977 100644 --- a/keyboards/planck/keymaps/dshields/keymap.c +++ b/keyboards/planck/keymaps/dshields/keymap.c @@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DEF] = LAYOUT_planck_grid( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_BSPC, KC_Y, KC_U, KC_I, KC_O, KC_P , - MT_A, MT_S, MT_D, MT_F, KC_G, KC_TAB, KC_ENT, KC_H, MT_J, MT_K, MT_L, MT_SCLN, + MT_A, MT_S, MT_D, MT_F, LT_G, KC_TAB, KC_ENT, LT_H, MT_J, MT_K, MT_L, MT_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, OSMLSFT, DM_PLY1, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSMLCTL, KC_LGUI, OSMLALT, OSL_FUN, OSL_LWR, MT_SPC, MT_SPC, OSL_RSE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), diff --git a/users/dshields/config.h b/users/dshields/config.h index 21a5c3500d..1420a9178f 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h @@ -13,9 +13,13 @@ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 +#ifndef MOUSEKEY_TIME_TO_MAX #define MOUSEKEY_TIME_TO_MAX 40 +#endif #define MOUSEKEY_MAX_SPEED 7 +#ifndef MOUSEKEY_WHEEL_DELAY #define MOUSEKEY_WHEEL_DELAY 0 +#endif #undef ENABLE_RGB_MATRIX_ALPHAS_MODS #undef ENABLE_RGB_MATRIX_BREATHING diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h index 34544b0260..9ed0310645 100644 --- a/users/dshields/dshields.h +++ b/users/dshields/dshields.h @@ -26,22 +26,35 @@ #define MT_L RALT_T(KC_L) #define MT_SCLN RGUI_T(KC_SCLN) +// layer-tap keys +#if defined KEYBOARD_planck_light \ + || defined KEYBOARD_planck_rev3 \ + || defined KEYBOARD_planck_rev6 \ + || defined KEYBOARD_keyboardio_atreus + #define LT_G LT(LWR, KC_G) + #define LT_H LT(RSE, KC_H) +#elif defined KEYBOARD_keyboardio_model01 + #define LT_G LT(FUN, KC_G) + #define LT_H LT(FUN, KC_H) +#else + #define LT_G KC_G + #define LT_H KC_H +#endif + // LED/RGB controls -#ifdef KEYBOARD_planck_light +#if defined KEYBOARD_planck_light #define LGT_TOG RGB_TOG #define LGT_MOD RGB_MOD #define LGT_BRT _______ #define LGT_INC RGB_HUI #define LGT_DEC RGB_HUD -#endif -#ifdef KEYBOARD_planck_rev3 +#elif defined KEYBOARD_planck_rev3 #define LGT_TOG BL_TOGG #define LGT_MOD BL_STEP #define LGT_BRT BL_BRTG #define LGT_INC BL_INC #define LGT_DEC BL_DEC -#endif -#ifdef KEYBOARD_planck_rev6 +#else #define LGT_TOG _______ #define LGT_MOD _______ #define LGT_BRT _______