diff options
author | QMK Bot <hello@qmk.fm> | 2022-09-18 23:11:22 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-09-18 23:11:22 +0000 |
commit | 07936d37b68352747b4da4b15d345987f438263a (patch) | |
tree | 713cc1aaa8f279275bb659913bb876ff7e446cba | |
parent | b7358825d7245b3921b4414a6df2a2a7995da1a2 (diff) | |
parent | d8ef2ea7dd59e018a816a519f74c1813d198498c (diff) |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/keyboardio/atreus/keymaps/dshields/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keyboardio/model01/keymaps/dshields/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/planck/keymaps/dshields/keymap.c | 2 | ||||
-rw-r--r-- | users/dshields/dshields.h | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c index b10d80664c..0077c4d836 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 , - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + MT_A, MT_S, MT_D, MT_F, KC_G, KC_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 97ccd975cc..2d257fe371 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, KC_A , KC_S , KC_D , KC_F , KC_G , KC_TAB , KC_ENT , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, + 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_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 948f978330..538c41922a 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 , - KC_A, KC_S, KC_D, KC_F, KC_G, KC_TAB, KC_ENT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + 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_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/dshields.h b/users/dshields/dshields.h index 54268210c9..34544b0260 100644 --- a/users/dshields/dshields.h +++ b/users/dshields/dshields.h @@ -17,6 +17,14 @@ #define MT_SPC SFT_T(KC_SPC) #define MT_BSPC SFT_T(KC_BSPC) #define MT_ESC LGUI_T(KC_ESC) +#define MT_A LGUI_T(KC_A) +#define MT_S LALT_T(KC_S) +#define MT_D LSFT_T(KC_D) +#define MT_F LCTL_T(KC_F) +#define MT_J RCTL_T(KC_J) +#define MT_K RSFT_T(KC_K) +#define MT_L RALT_T(KC_L) +#define MT_SCLN RGUI_T(KC_SCLN) // LED/RGB controls #ifdef KEYBOARD_planck_light |