aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucW <luc.wastiaux@xsmail.com>2022-01-11 08:52:54 +0800
committerGitHub <noreply@github.com>2022-01-10 16:52:54 -0800
commitdd4e48b4a274810fc088dc43c1e9be6f0a248f1a (patch)
tree45da03803329486194eb19a237c1c73e5fbe7557
parentcb821b5f16c6b8aa79f1f6e1310b0654ae72079d (diff)
downloadqmk_firmware-dd4e48b4a274810fc088dc43c1e9be6f0a248f1a.tar.gz
qmk_firmware-dd4e48b4a274810fc088dc43c1e9be6f0a248f1a.zip
[Keymap] dvorak 42 key layouts (Ergodox EZ / Atreus) updates (#15656)
Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
-rw-r--r--keyboards/atreus/keymaps/dvorak_42_key/keymap.c6
-rw-r--r--keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c21
2 files changed, 17 insertions, 10 deletions
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 0c9ab59a9..dbe39a38b 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -122,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
122 ), 122 ),
123 123
124 [BROWSER_CONTROL] = LAYOUT( 124 [BROWSER_CONTROL] = LAYOUT(
125 MEH(KC_0), KC_BTN3, KC_MS_U, KC_BTN1, KC_BTN2, KC_UP, KC_PGUP, KC_PGDN, KC_MS_WH_UP, MEH(KC_9), 125 MEH(KC_C), KC_BTN3, KC_MS_U, KC_BTN1, KC_BTN2, KC_UP, KC_PGUP, KC_PGDN, KC_MS_WH_UP, MEH(KC_9),
126 MEH(KC_1), KC_MS_L, KC_MS_D, KC_MS_R, MEH(KC_6), KC_DOWN, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT), 126 MEH(KC_D), KC_MS_L, KC_MS_D, KC_MS_R, MEH(KC_6), KC_DOWN, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT),
127 MEH(KC_2), W10_TASKVIEW, W10_WORKSPACE_LEFT, W10_WORKSPACE_RIGHT, MEH(KC_7), MEH(KC_8), RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5, 127 MEH(KC_E), W10_TASKVIEW, W10_WORKSPACE_LEFT, W10_WORKSPACE_RIGHT, MEH(KC_7), MEH(KC_8), RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5,
128 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_W), RCTL(KC_T), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 128 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_W), RCTL(KC_T), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
129 ), 129 ),
130}; 130};
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 86aa1c2e6..67a09188a 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -111,6 +111,7 @@ enum custom_keycodes {
111#define AS_CLASS LCTL(KC_N) 111#define AS_CLASS LCTL(KC_N)
112#define AS_FINDUSAGE LALT(KC_F7) 112#define AS_FINDUSAGE LALT(KC_F7)
113#define AS_BACK LCTL(LALT(KC_LEFT)) 113#define AS_BACK LCTL(LALT(KC_LEFT))
114#define AS_BRACKET LCTL(LSFT(KC_M))
114#define AS_GO_DECLARATION LCTL(KC_B) 115#define AS_GO_DECLARATION LCTL(KC_B)
115#define AS_GO_IMPLEMENTATION LCTL(LALT(KC_B)) 116#define AS_GO_IMPLEMENTATION LCTL(LALT(KC_B))
116#define AS_CLOSETAB LCTL(KC_F4) 117#define AS_CLOSETAB LCTL(KC_F4)
@@ -118,6 +119,12 @@ enum custom_keycodes {
118#define AS_COPYLINEDOWN LCTL(KC_D) 119#define AS_COPYLINEDOWN LCTL(KC_D)
119#define AS_DEL_LINE LCTL(KC_Y) 120#define AS_DEL_LINE LCTL(KC_Y)
120#define AS_LINE LCTL(KC_G) 121#define AS_LINE LCTL(KC_G)
122#define AS_CMT_BLOCK LCTL(LSFT(KC_SLSH))
123#define AS_CMT_LINE LCTL(KC_SLSH)
124#define AS_BM_PREV LALT(KC_P)
125#define AS_BM_NEXT LALT(KC_N)
126#define AS_BM_TOGGLE KC_F11
127#define AS_BM_LIST LSFT(KC_F11)
121 128
122// visual studio code shortcuts 129// visual studio code shortcuts
123#define VS_FILE LCTL(KC_P) 130#define VS_FILE LCTL(KC_P)
@@ -148,7 +155,7 @@ enum custom_keycodes {
148#define VS_BM_PREV LCTL(LALT(KC_P)) 155#define VS_BM_PREV LCTL(LALT(KC_P))
149#define VS_BM_NEXT LCTL(LALT(KC_N)) 156#define VS_BM_NEXT LCTL(LALT(KC_N))
150#define VS_BM_TOGGLE LCTL(LALT(KC_K)) 157#define VS_BM_TOGGLE LCTL(LALT(KC_K))
151#define VS_BM_LABEL LCTL(LALT(KC_B)) 158#define VS_BM_CLEARALL LCTL(LALT(KC_C))
152 159
153 160
154#define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \ 161#define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \
@@ -362,12 +369,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
362 KC_TRNS, 369 KC_TRNS,
363 KC_TRNS,KC_TRNS,KC_TRNS, 370 KC_TRNS,KC_TRNS,KC_TRNS,
364 // right hand 371 // right hand
365 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 372 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
366 KC_TRNS, AS_COPYLINEDOWN, AS_FINDUSAGE, AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, AS_LINE, KC_TRNS, 373 AS_CMT_LINE, AS_COPYLINEDOWN, AS_FINDUSAGE, AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, AS_LINE, AS_BRACKET,
367 AS_CLOSETAB, AS_TABLEFT, AS_TABRIGHT, AS_SYMBOL, AS_CLASS, AS_BACK, 374 AS_CLOSETAB, AS_TABLEFT, AS_TABRIGHT, AS_SYMBOL, AS_CLASS, AS_BACK,
368 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, AS_CLOSETOOLWINDOW, KC_TRNS, 375 AS_CMT_BLOCK, KC_TRNS, AS_BM_PREV, AS_BM_NEXT, KC_TRNS, AS_CLOSETOOLWINDOW, AS_BM_TOGGLE,
369 // bottom row 376 // bottom row
370 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 377 KC_TRNS, AS_BM_LIST, KC_TRNS, KC_TRNS, KC_TRNS,
371 // thumb cluster 378 // thumb cluster
372 KC_TRNS, KC_TRNS, 379 KC_TRNS, KC_TRNS,
373 KC_TRNS, 380 KC_TRNS,
@@ -393,7 +400,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
393 VS_CLOSETAB, VS_TABLEFT, VS_TABRIGHT, VS_SYMBOLEDITOR, VS_FILE, VS_BACK, 400 VS_CLOSETAB, VS_TABLEFT, VS_TABRIGHT, VS_SYMBOLEDITOR, VS_FILE, VS_BACK,
394 VS_CMT_BLOCK, KC_TRNS, VS_BM_PREV, VS_BM_NEXT, VS_GROUP_1, VS_GROUP_2, VS_BM_TOGGLE, 401 VS_CMT_BLOCK, KC_TRNS, VS_BM_PREV, VS_BM_NEXT, VS_GROUP_1, VS_GROUP_2, VS_BM_TOGGLE,
395 // bottom row 402 // bottom row
396 VS_COMMANDS, VS_OPEN_FILE, VS_TERMINAL, VS_CLOSEPANEL, VS_BM_LABEL, 403 VS_COMMANDS, VS_BM_LIST, VS_BM_LISTALL, VS_CLOSEPANEL, VS_BM_CLEARALL,
397 // thumb cluster 404 // thumb cluster
398 KC_TRNS, KC_TRNS, 405 KC_TRNS, KC_TRNS,
399 KC_TRNS, 406 KC_TRNS,