aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucW <luc.wastiaux@xsmail.com>2020-06-22 16:45:47 +0800
committerGitHub <noreply@github.com>2020-06-22 09:45:47 +0100
commit4b13c4957844dfeca3c72c3c8782708081fc22ed (patch)
tree00ceed9c0b3753c24ecd69648509a98ed76bd17b
parent98642ca02878741531105bd879c0d61110198b62 (diff)
downloadqmk_firmware-4b13c4957844dfeca3c72c3c8782708081fc22ed.tar.gz
qmk_firmware-4b13c4957844dfeca3c72c3c8782708081fc22ed.zip
user keymaps for ergodox_ez/dvorak_42_key / atreus/dvorak_42_key (#9429)
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
-rw-r--r--keyboards/atreus/keymaps/dvorak_42_key/keymap.c30
-rw-r--r--keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c164
2 files changed, 104 insertions, 90 deletions
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 0fda245e2..3f7694944 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -23,6 +23,7 @@
23#define AS_GO_IMPLEMENTATION LCTL(LALT(KC_B)) 23#define AS_GO_IMPLEMENTATION LCTL(LALT(KC_B))
24#define AS_CLOSETAB LCTL(KC_F4) 24#define AS_CLOSETAB LCTL(KC_F4)
25#define AS_CLOSETOOLWINDOW LCTL(LSFT(KC_F4)) 25#define AS_CLOSETOOLWINDOW LCTL(LSFT(KC_F4))
26#define AS_ALTENTER LALT(KC_ENTER)
26 27
27enum custom_keycodes { 28enum custom_keycodes {
28 PLACEHOLDER = SAFE_RANGE, // can always be here 29 PLACEHOLDER = SAFE_RANGE, // can always be here
@@ -35,13 +36,16 @@ enum custom_keycodes {
35 CLOUD9_GOTO_LINE, 36 CLOUD9_GOTO_LINE,
36 CLOUD9_NAVIGATE, 37 CLOUD9_NAVIGATE,
37 38
39 // Windows 10 macros
40 W10_TASKVIEW,
41 W10_WORKSPACE_LEFT,
42 W10_WORKSPACE_RIGHT,
43
38}; 44};
39 45
40// building instructions: 46// building instructions:
41// make atreus:dvorak_42_key 47// make atreus:dvorak_42_key
42 48
43// flashing instructions:
44// avrdude -p atmega32u4 -c avr109 -U flash:w:atreus_dvorak_42_key.hex -P COM7
45 49
46const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 50const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
47 [BASE] = LAYOUT( 51 [BASE] = LAYOUT(
@@ -55,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
55 KC_ESC, AS_GO_IMPLEMENTATION, RCTL(KC_Z), RCTL(KC_S), MEH(KC_A), MEH(KC_B), KC_HOME, KC_UP, KC_END, KC_PGUP, 59 KC_ESC, AS_GO_IMPLEMENTATION, RCTL(KC_Z), RCTL(KC_S), MEH(KC_A), MEH(KC_B), KC_HOME, KC_UP, KC_END, KC_PGUP,
56 AS_BACK, AS_SYMBOL, RSFT(KC_TAB), KC_TAB, SHELL_DEL_WORD, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT), 60 AS_BACK, AS_SYMBOL, RSFT(KC_TAB), KC_TAB, SHELL_DEL_WORD, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT),
57 AS_FINDUSAGE, AS_CLASS, AS_TABLEFT, AS_TABRIGHT, AS_CLOSETAB, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDOWN, 61 AS_FINDUSAGE, AS_CLASS, AS_TABLEFT, AS_TABRIGHT, AS_CLOSETAB, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDOWN,
58 AS_CLOSETOOLWINDOW, AS_GO_DECLARATION, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE) 62 AS_CLOSETOOLWINDOW, AS_GO_DECLARATION, KC_TRNS, KC_TRNS, AS_ALTENTER, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE)
59 ), 63 ),
60 64
61 [KEYSEL] = LAYOUT( 65 [KEYSEL] = LAYOUT(
@@ -73,10 +77,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
73 ), 77 ),
74 78
75 [BROWSER_CONTROL] = LAYOUT( 79 [BROWSER_CONTROL] = LAYOUT(
76 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), 80 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),
77 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), 81 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),
78 MEH(KC_2), MEH(KC_3), MEH(KC_4), MEH(KC_5), MEH(KC_7), MEH(KC_8), RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5, 82 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,
79 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_W), RCTL(KC_T), RSFT(RCTL(KC_TAB)), KC_TRNS, KC_TRNS, KC_TRNS 83 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
80 ), 84 ),
81}; 85};
82 86
@@ -108,9 +112,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
108 SEND_STRING(SS_LCTRL("e")); 112 SEND_STRING(SS_LCTRL("e"));
109 return true; 113 return true;
110 break; 114 break;
115 case W10_TASKVIEW:
116 tap_code16(G(KC_TAB));
117 return true;
118 break;
119 case W10_WORKSPACE_LEFT:
120 tap_code16(G(C(KC_LEFT)));
121 return true;
122 break;
123 case W10_WORKSPACE_RIGHT:
124 tap_code16(G(C(KC_RIGHT)));
125 break;
111 } 126 }
112 } 127 }
113 128
114 return true; 129 return true;
115} 130}
116
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index dc18edac8..22b8a9b9e 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -50,30 +50,23 @@ enum custom_keycodes {
50 SHELL_EXPAND_OE_LOGPATTERN, 50 SHELL_EXPAND_OE_LOGPATTERN,
51 SHELL_EXPAND_OE_TRANPATTERN, 51 SHELL_EXPAND_OE_TRANPATTERN,
52 52
53 // Cloud9 macros
54 CLOUD9_TAB_LEFT,
55 CLOUD9_TAB_RIGHT,
56 CLOUD9_TAB_CLOSE,
57 CLOUD9_GOTO_SYMBOL,
58 CLOUD9_GOTO_LINE,
59 CLOUD9_NAVIGATE,
60
61 // Windows 10 macros, 53 // Windows 10 macros,
62 WINDOWS10_WORKSPACE_LEFT, 54 WINDOWS10_WORKSPACE_LEFT,
63 WINDOWS10_WORKSPACE_RIGHT, 55 WINDOWS10_WORKSPACE_RIGHT,
56 WINDOWS10_TASK_VIEW
64}; 57};
65 58
66 59
67#define BASE 0 // base dvorak layer 60#define BASE 0 // base dvorak layer
68#define BASE_ALTERNATE 1 // base dvorak layer, with different layer toggling 61#define KEYNAV 1 // arrow navigation (right hand)
69#define KEYNAV 2 // arrow navigation (right hand) 62#define KEYSEL 2 // arrow navigation + shift (allow text selection)
70#define KEYSEL 3 // arrow navigation + shift (allow text selection) 63#define SHELL_NAV 3 // bash shortcuts
71#define SHELL_NAV 4 // bash shortcuts 64#define SHELL_SCREEN 4 // linux screen shortcuts
72#define SHELL_SCREEN 5 // linux screen shortcuts 65#define SCREEN_NAV 5 // navigate between linux screen tabs
73#define SCREEN_NAV 6 // navigate between linux screen tabs 66#define BROWSER_CONTROL 6 // control browser and mouse
74#define BROWSER_CONTROL 7 // control browser and mouse 67#define COMBINED 7 // combined numbers and symbols layer
75#define COMBINED 8 // combined numbers and symbols layer 68#define ANDROID_STUDIO 8 // android studio specific layer
76#define ANDROID_STUDIO 9 69#define VSCODE 9 // visual studio code specific layer
77 70
78 71
79// macros 72// macros
@@ -117,6 +110,34 @@ enum custom_keycodes {
117#define AS_CLOSETAB LCTL(KC_F4) 110#define AS_CLOSETAB LCTL(KC_F4)
118#define AS_CLOSETOOLWINDOW LCTL(LSFT(KC_F4)) 111#define AS_CLOSETOOLWINDOW LCTL(LSFT(KC_F4))
119 112
113// visual studio code shortcuts
114#define VS_FILE LCTL(KC_P)
115#define VS_LINE LCTL(KC_G)
116#define VS_SYMBOLEDITOR LCTL(LSFT(KC_O))
117#define VS_DEFINITION KC_F12
118#define VS_IMPLEMENTATION LCTL(KC_F12)
119#define VS_REFERENCES LSFT(KC_F12)
120#define VS_BACK LALT(KC_LEFT)
121#define VS_BRACKET LCTL(LSFT(KC_BSLS))
122#define VS_TABLEFT LCTL(KC_PGUP)
123#define VS_TABRIGHT LCTL(KC_PGDN)
124#define VS_CLOSETAB LCTL(KC_W)
125#define VS_CLOSEPANEL LCTL(LSFT(KC_W))
126#define VS_TERMINAL LCTL(KC_GRAVE)
127#define VS_BUILD LCTL(LSFT(KC_B))
128#define VS_COMMANDS LCTL(LSFT(KC_P))
129#define VS_CMT_BLOCK LSFT(LALT(KC_A))
130#define VS_CMT_LINE LCTL(KC_SLSH)
131#define VS_DEL_LINE LCTL(LSFT(KC_K))
132#define VS_COPYLINEDOWN LSFT(LALT(KC_DOWN))
133// visual studio bookmark commands
134#define VS_BM_LIST LCTL(LALT(KC_L))
135#define VS_BM_LISTALL LCTL(LALT(KC_A))
136#define VS_BM_PREV LCTL(LALT(KC_P))
137#define VS_BM_NEXT LCTL(LALT(KC_N))
138#define VS_BM_TOGGLE LCTL(LALT(KC_K))
139#define VS_BM_LABEL LCTL(LALT(KC_B))
140
120 141
121#define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \ 142#define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \
122 case MACRO_NAME:\ 143 case MACRO_NAME:\
@@ -166,12 +187,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
166 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 187 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
167 OSL(SCREEN_NAV), KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, MEH(KC_2), 188 OSL(SCREEN_NAV), KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, MEH(KC_2),
168 OSL(SHELL_NAV), KC_A, KC_O, KC_E, KC_U, KC_I, 189 OSL(SHELL_NAV), KC_A, KC_O, KC_E, KC_U, KC_I,
169 OSL(SHELL_SCREEN), KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, MEH(KC_3), 190 OSL(SHELL_SCREEN), KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, MO(VSCODE),
170 MEH(KC_1), OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), 191 MEH(KC_1), OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL),
171 192
172 // left thumb cluster 193 // left thumb cluster
173 WINDOWS10_WORKSPACE_LEFT, WINDOWS10_WORKSPACE_RIGHT, 194 WINDOWS10_WORKSPACE_LEFT, WINDOWS10_WORKSPACE_RIGHT,
174 MEH(KC_6), 195 WINDOWS10_TASK_VIEW,
175 MO(COMBINED),MO(KEYNAV), OSM(MOD_LALT), 196 MO(COMBINED),MO(KEYNAV), OSM(MOD_LALT),
176 197
177 // right hand 198 // right hand
@@ -186,39 +207,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
186 207
187 ), 208 ),
188 209
189 // alternate base layout
190 [BASE_ALTERNATE] = LAYOUT_ergodox(
191 // left hand
192 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
193 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
194 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
195 OSL(ANDROID_STUDIO),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
196 // bottom row
197 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
198 // thumb cluster
199 KC_TRNS,KC_TRNS,
200 KC_TRNS,
201 KC_TRNS,KC_TRNS,KC_TRNS,
202 // right hand
203 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
204 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
205 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
206 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
207 // bottom row
208 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
209 // thumb cluster
210 KC_TRNS, KC_TRNS,
211 KC_TRNS,
212 KC_TRNS, KC_TRNS, KC_TRNS
213 ),
214
215 [KEYNAV] = LAYOUT_ergodox( 210 [KEYNAV] = LAYOUT_ergodox(
216 // left hand 211 // left hand
217 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 212 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
218 KC_TRNS,KC_ESC, CLOUD9_GOTO_LINE, RCTL(KC_Z), RCTL(KC_S), MEH(KC_F10), KC_TRNS, 213 KC_TRNS,KC_ESC, KC_TRNS, RCTL(KC_Z), RCTL(KC_S), KC_TRNS, KC_TRNS,
219 KC_TRNS,KC_LSFT, CLOUD9_GOTO_SYMBOL, RSFT(KC_TAB), KC_TAB, MEH(KC_A), 214 KC_TRNS,KC_LSFT, KC_TRNS, RSFT(KC_TAB), KC_TAB, KC_TRNS,
220 KC_TRNS,MEH(KC_B), CLOUD9_NAVIGATE, CLOUD9_TAB_LEFT, CLOUD9_TAB_RIGHT, CLOUD9_TAB_CLOSE, KC_TRNS, 215 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
221 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 216 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
222 // left thumb cluster 217 // left thumb cluster
223 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 218 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
224 219
@@ -242,7 +237,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
242 KC_TRNS,MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P), 237 KC_TRNS,MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P),
243 KC_TRNS,MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U), KC_TRNS, 238 KC_TRNS,MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U), KC_TRNS,
244 // bottom row 239 // bottom row
245 RESET,DF(BASE),DF(BASE_ALTERNATE),KC_TRNS,KC_TRNS, 240 RESET,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
246 // thumb cluster 241 // thumb cluster
247 KC_TRNS,KC_TRNS, 242 KC_TRNS,KC_TRNS,
248 KC_TRNS, 243 KC_TRNS,
@@ -355,10 +350,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
355 KC_TRNS, 350 KC_TRNS,
356 KC_TRNS,KC_TRNS,KC_TRNS, 351 KC_TRNS,KC_TRNS,KC_TRNS,
357 // right hand 352 // right hand
358 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 353 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
359 KC_TRNS, KC_TRNS, KC_TRNS, AS_FINDUSAGE, AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, KC_TRNS, 354 KC_TRNS, KC_TRNS, KC_TRNS, AS_FINDUSAGE, AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, KC_TRNS,
360 KC_TRNS, AS_TABLEFT, AS_TABRIGHT, AS_SYMBOL, AS_CLASS, AS_BACK, 355 AS_CLOSETAB, AS_TABLEFT, AS_TABRIGHT, AS_SYMBOL, AS_CLASS, AS_BACK,
361 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, AS_CLOSETAB, AS_CLOSETOOLWINDOW, KC_TRNS, 356 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, AS_CLOSETOOLWINDOW, KC_TRNS,
362 // bottom row 357 // bottom row
363 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 358 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
364 // thumb cluster 359 // thumb cluster
@@ -367,6 +362,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
367 KC_TRNS, KC_TRNS, KC_TRNS 362 KC_TRNS, KC_TRNS, KC_TRNS
368 ), 363 ),
369 364
365 // vscode shortcuts shortcuts
366 [VSCODE] = LAYOUT_ergodox(
367 // left hand
368 KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
369 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
370 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
371 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
372 // bottom row
373 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
374 // thumb cluster
375 KC_TRNS,KC_TRNS,
376 KC_TRNS,
377 KC_TRNS,KC_TRNS,KC_TRNS,
378 // right hand
379 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
380 VS_CMT_LINE, VS_COPYLINEDOWN, VS_REFERENCES, VS_DEFINITION, VS_IMPLEMENTATION, VS_LINE, VS_BRACKET,
381 VS_CLOSETAB, VS_TABLEFT, VS_TABRIGHT, VS_SYMBOLEDITOR, VS_FILE, VS_BACK,
382 VS_CMT_BLOCK, KC_TRNS, VS_BM_PREV, VS_BM_NEXT, VS_BM_LIST, VS_BM_LISTALL, VS_BM_TOGGLE,
383 // bottom row
384 VS_COMMANDS, VS_BUILD, VS_TERMINAL, VS_CLOSEPANEL, VS_BM_LABEL,
385 // thumb cluster
386 KC_TRNS, KC_TRNS,
387 KC_TRNS,
388 KC_TRNS, VS_DEL_LINE, KC_TRNS
389 ),
390
370 [COMBINED] = LAYOUT_ergodox( 391 [COMBINED] = LAYOUT_ergodox(
371 392
372 // left hand 393 // left hand
@@ -407,10 +428,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
407 // right hand 428 // right hand
408 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 429 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
409 KC_TRNS, KC_UP, KC_PGUP, KC_PGDN, KC_MS_WH_UP, KC_TRNS, KC_TRNS, 430 KC_TRNS, KC_UP, KC_PGUP, KC_PGDN, KC_MS_WH_UP, KC_TRNS, KC_TRNS,
410 KC_DOWN, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT), KC_TRNS, 431 KC_DOWN, RCTL(KC_PGUP), RCTL(KC_PGDN),KC_MS_WH_DOWN, LALT(KC_LEFT), KC_TRNS,
411 KC_TRNS, KC_TRNS, RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5, KC_TRNS, 432 KC_TRNS, KC_TRNS, RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5, KC_TRNS,
412 // bottom row 433 // bottom row
413 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 434 RCTL(LSFT(KC_TAB)), RCTL(KC_TAB), KC_TRNS, KC_TRNS, KC_TRNS,
414 KC_TRNS, KC_TRNS, 435 KC_TRNS, KC_TRNS,
415 KC_TRNS, 436 KC_TRNS,
416 KC_TRNS, RCTL(KC_W), RCTL(KC_T) 437 KC_TRNS, RCTL(KC_W), RCTL(KC_T)
@@ -623,31 +644,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
623 SEND_STRING(" | dumptlog - "); 644 SEND_STRING(" | dumptlog - ");
624 return true; 645 return true;
625 break; 646 break;
626 // Cloud9 macros
627 case CLOUD9_TAB_LEFT:
628 SEND_STRING(SS_LCTRL("["));
629 return true;
630 break;
631 case CLOUD9_TAB_RIGHT:
632 SEND_STRING(SS_LCTRL("]"));
633 return true;
634 break;
635 case CLOUD9_TAB_CLOSE:
636 SEND_STRING(SS_LALT("w"));
637 return true;
638 break;
639 case CLOUD9_GOTO_SYMBOL:
640 SEND_STRING(SS_LSFT(SS_LCTRL("e")));
641 return true;
642 break;
643 case CLOUD9_GOTO_LINE:
644 SEND_STRING(SS_LCTRL("g"));
645 return true;
646 break;
647 case CLOUD9_NAVIGATE:
648 SEND_STRING(SS_LCTRL("e"));
649 return true;
650 break;
651 case WINDOWS10_WORKSPACE_LEFT: 647 case WINDOWS10_WORKSPACE_LEFT:
652 SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_LEFT)))); 648 SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_LEFT))));
653 return true; 649 return true;
@@ -655,6 +651,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
655 case WINDOWS10_WORKSPACE_RIGHT: 651 case WINDOWS10_WORKSPACE_RIGHT:
656 SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_RIGHT)))); 652 SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_RIGHT))));
657 break; 653 break;
654 case WINDOWS10_TASK_VIEW:
655 SEND_STRING(SS_LGUI(SS_TAP(X_TAB)));
656 break;
658 657
659 } 658 }
660 } 659 }
@@ -686,6 +685,7 @@ void matrix_scan_user(void) {
686 case KEYNAV: 685 case KEYNAV:
687 case KEYSEL: 686 case KEYSEL:
688 case SCREEN_NAV: 687 case SCREEN_NAV:
688 case VSCODE:
689 ergodox_right_led_3_on(); 689 ergodox_right_led_3_on();
690 break; 690 break;
691 case BROWSER_CONTROL: 691 case BROWSER_CONTROL: