aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@LANDSRAAD.local>2017-08-16 20:23:47 -0700
committerJack Humbert <jack.humb@gmail.com>2017-08-17 12:38:09 -0400
commitcb76e711091f3de10761121a5372c500fc4bd869 (patch)
treeac667a0e80c628fdfb091dc45ec7d724cc6e5f69
parent8392667ac4a6ebf65bc4bab38abb512a4b5b7a06 (diff)
downloadqmk_firmware-cb76e711091f3de10761121a5372c500fc4bd869.tar.gz
qmk_firmware-cb76e711091f3de10761121a5372c500fc4bd869.zip
Add dvorak/colemak layers
-rw-r--r--keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c372
1 files changed, 285 insertions, 87 deletions
diff --git a/keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c b/keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c
index 07da654c9..1825447fb 100644
--- a/keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c
+++ b/keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c
@@ -10,16 +10,19 @@
10 10
11// Define layer names 11// Define layer names
12#define BASE 0 12#define BASE 0
13#define SYMB 1 13#define COLEMAK 1
14#define OVERWATCH 2 14#define DVORAK 2
15#define DIABLO 3 15#define SYMB 3
16#define MOUS 4 16#define OVERWATCH 4
17 17#define DIABLO 5
18#define MOUS 6
19
20//define modifiers
18#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 21#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
19#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL)) 22#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
20#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) 23#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
21 24
22 25//define macro keycodes
23#define M_VERSION M(0) 26#define M_VERSION M(0)
24#define M_SYMM M(1) 27#define M_SYMM M(1)
25#define M_SALT M(2) 28#define M_SALT M(2)
@@ -30,14 +33,15 @@
30#define M_DOOMFIST M(7) 33#define M_DOOMFIST M(7)
31 34
32 35
33 36//define layer change stuff for underglow indicator
34bool skip_leds = false; 37bool skip_leds = false;
35bool has_layer_changed = false; 38bool has_layer_changed = false;
36static uint8_t current_layer; 39static uint8_t current_layer;
37 40
38static uint16_t key_timer; 41static uint16_t key_timer;
42//define diablo macro timer variables
39static uint16_t diablo_timer[4]; 43static uint16_t diablo_timer[4];
40static uint8_t diablo_times[] = {0, 1, 3, 5, 10}; 44static uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30};
41static uint8_t diablo_key_time[4]; 45static uint8_t diablo_key_time[4];
42 46
43bool check_dtimer(uint8_t dtimer) { 47bool check_dtimer(uint8_t dtimer) {
@@ -65,8 +69,7 @@ enum custom_keycodes {
65 69
66#ifdef TAP_DANCE_ENABLE 70#ifdef TAP_DANCE_ENABLE
67enum { 71enum {
68 TD_ESC_CAPS = 0, 72 SFT_CAP = 0,
69 TD_SPACE,
70 TD_DIABLO_J, 73 TD_DIABLO_J,
71 TD_CLN, 74 TD_CLN,
72 TD_EGG, 75 TD_EGG,
@@ -148,7 +151,7 @@ void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
148} 151}
149 152
150void diablo_tapdance_master (qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) { 153void diablo_tapdance_master (qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
151 if (state->count >= 6) { 154 if (state->count >= 7) {
152 diablo_key_time[diablo_key] = diablo_times[0]; 155 diablo_key_time[diablo_key] = diablo_times[0];
153 reset_tap_dance(state); 156 reset_tap_dance(state);
154 } else { 157 } else {
@@ -187,10 +190,8 @@ void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
187 190
188//Tap Dance Definitions 191//Tap Dance Definitions
189qk_tap_dance_action_t tap_dance_actions[] = { 192qk_tap_dance_action_t tap_dance_actions[] = {
190 //Tap once for Esc, twice for Caps Lock
191 [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
192 //Tap one for Space, and twice for Enter 193 //Tap one for Space, and twice for Enter
193 [TD_SPACE] = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_ENTER), 194 [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSHIFT, KC_CAPS),
194 // Special Z 195 // Special Z
195 [TD_DIABLO_J] = ACTION_TAP_DANCE_DOUBLE(KC_J, S(KC_J)), 196 [TD_DIABLO_J] = ACTION_TAP_DANCE_DOUBLE(KC_J, S(KC_J)),
196 // Once for colin, twice for semi-colin 197 // Once for colin, twice for semi-colin
@@ -209,93 +210,286 @@ qk_tap_dance_action_t tap_dance_actions[] = {
209#endif 210#endif
210 211
211const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 212const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
213/* Keymap 0: Basic layer
214 *
215 *
216 * ,--------------------------------------------------. ,--------------------------------------------------.
217 * | = + | 1 ! | 2 @ | 3 # | 4 $ | 5 % | TG(4)| | TG(4)| 6 ^ | 7 & | 8 * | 9 ( | 0 ) | - _ |
218 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
219 * | TAB | Q | W | E | R | T | TG(3)| |TG(3) | Y | U | I | O | P | \ | |
220 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
221 * | Bksp | A | S | D | F | G |------| |------| H | J | K | L | ; | ' " |
222 * |--------+------+------+------+------+------| TG(2)| | TG(2)|------+------+------+------+------+--------|
223 * | Shift | Z | X | C | V | B | | | | N | M | , < | . > | UP | Shift |
224 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
225 * | `/SYM| ' " | LGUI | [ { | ] } | | SYMB | ? / | LEFT | DOWN |RIGHT |
226 * `----------------------------------' `----------------------------------'
227 * ,--------------. ,--------------.
228 * |Alt/Ap| Win | | Alt |Ctl/Esc|
229 * ,------|------|-------| |------+-------+------.
230 * | | | Home | | PgUp | | |
231 * | Space| Bksp |-------| |------| DEL |Enter |
232 * | | | End | | PgDn | | |
233 * `---------------------' `---------------------'
234 */
212 [BASE] = KEYMAP( 235 [BASE] = KEYMAP(
213 KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,TG(MOUS), 236 KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
214 KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(DIABLO), 237 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(DIABLO),
215 KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G, 238 KC_BSPACE, KC_A, KC_S, KC_D, KC_F, KC_G,
216 KC_LSHIFT,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,TG(OVERWATCH), 239 KC_LSHIFT, CTL_T(KC_Z),KC_X, KC_C, KC_V, KC_B, TG(OVERWATCH),
217 LT(SYMB,KC_GRAVE),KC_QUOTE,KC_LGUI,KC_LEFT,KC_RIGHT, 240 LT(SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
218 ALT_T(KC_APPLICATION),KC_LGUI, 241
219 KC_HOME, 242 ALT_T(KC_APPLICATION), KC_LGUI,
220 KC_SPACE,KC_BSPACE,KC_LBRACKET, 243 KC_HOME,
244 KC_SPACE, KC_BSPACE, KC_END,
221 245
222 TG(MOUS),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS, 246 TG(SYMB), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
223 TG(DIABLO),KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH, 247 TG(DVORAK), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
224 KC_H,KC_J,KC_K,KC_L,KC_SCOLON,GUI_T(KC_QUOTE), 248 KC_H, KC_J, KC_K, KC_L, KC_SCOLON, GUI_T(KC_QUOTE),
225 TG(OVERWATCH),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSHIFT, 249 TG(COLEMAK), KC_N, KC_M, KC_COMMA, KC_DOT, CTL_T(KC_SLASH),KC_RSHIFT,
226 KC_PGDOWN,KC_PGUP,KC_DOWN,KC_UP,MO(SYMB), 250 KC_FN1, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT,
227 KC_LALT,CTL_T(KC_ESCAPE), 251 KC_LALT, CTL_T(KC_ESCAPE),
228 KC_END, 252 KC_PGUP,
229 KC_RBRACKET,KC_DELETE,KC_ENTER 253 KC_PGDOWN, KC_DELETE, KC_ENTER
230 ), 254 ),
231 255/* Keymap 1: Basic layer
256 *
257 * ,--------------------------------------------------. ,--------------------------------------------------.
258 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
259 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
260 * | Del | Q | W | F | P | G | L1 | | L1 | J | L | U | Y | ; | \ |
261 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
262 * | BkSp | A | R | S | T | D |------| |------| H | N | E | I |O / L2| ' |
263 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
264 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
265 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
266 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
267 * `----------------------------------' `----------------------------------'
268 * ,-------------. ,-------------.
269 * | App | LGui | | Alt |Ctrl/Esc|
270 * ,------|------|------| |------+--------+------.
271 * | | | Home | | PgUp | | |
272 * | Space|Backsp|------| |------| Tab |Enter |
273 * | |ace | End | | PgDn | | |
274 * `--------------------' `----------------------'
275 */
276// If it accepts an argument (i.e, is a function), it doesn't need KC_.
277// Otherwise, it needs KC_*
278[COLEMAK] = KEYMAP(
279 // left hand
280 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
281 KC_DELT, KC_Q, KC_W, KC_F, KC_P, KC_G, TG(DIABLO),
282 KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D,
283 KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(OVERWATCH),
284 LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LBRACKET,KC_RBRACKET,
285 ALT_T(KC_APP), KC_LGUI,
286 KC_HOME,
287 KC_SPC,KC_BSPC,KC_END,
288 // right hand
289 KC_TRANSPARENT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
290 KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
291 KC_H, KC_N, KC_E, KC_I, LT(MOUS, KC_O), KC_QUOTE,
292 KC_TRANSPARENT,KC_K, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLASH),KC_RSHIFT,
293 KC_FN1, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT,
294 KC_LALT, CTL_T(KC_ESC),
295 KC_PGUP,
296 KC_PGDN,KC_TAB, KC_ENT
297 ),
298/* Keymap 2: Basic layer
299 *
300 * ,--------------------------------------------------. ,--------------------------------------------------.
301 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ |
302 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
303 * | Del | ' | , | . | P | Y | L1 | | L1 | F | G | C | R | L | / |
304 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
305 * | BkSp | A | O | E | U | I |------| |------| D | H | T | N |S / L2| - |
306 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
307 * | LShift |:/Ctrl| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift |
308 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
309 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
310 * `----------------------------------' `----------------------------------'
311 * ,-------------. ,-------------.
312 * | App | LGui | | Alt |Ctrl/Esc|
313 * ,------|------|------| |------+--------+------.
314 * | | | Home | | PgUp | | |
315 * | Space|Backsp|------| |------| Tab |Enter |
316 * | |ace | End | | PgDn | | |
317 * `--------------------' `----------------------'
318 */
319// If it accepts an argument (i.e, is a function), it doesn't need KC_.
320// Otherwise, it needs KC_*
321[DVORAK] = KEYMAP(
322 // left hand
323 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
324 KC_DELT, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, TG(DIABLO),
325 KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I,
326 KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, TG(OVERWATCH),
327 LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LBRACKET,KC_RBRACKET,
328 ALT_T(KC_APP), KC_LGUI,
329 KC_HOME,
330 KC_SPC,KC_BSPC,KC_END,
331 // right hand
332 KC_TRANSPARENT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
333 KC_TRANSPARENT, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
334 KC_D, KC_H, KC_T, KC_N, LT(MOUS, KC_S), KC_MINS,
335 KC_NO,KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_RSHIFT,
336 KC_FN1, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT,
337 KC_LALT, CTL_T(KC_ESC),
338 KC_PGUP,
339 KC_PGDN,KC_TAB, KC_ENT
340 ),
341
342 /* Keymap 3: Symbol Layer
343*
344* ,--------------------------------------------------. ,--------------------------------------------------.
345* | ESC | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
346* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
347* | VERSION| ! | @ | { | } | | | | | | + | 7 | 8 | 9 | * | F12 |
348* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
349* | MAKE | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | / | PrtSc |
350* |--------+------+------+------+------+------| COVE | | |------+------+------+------+------+--------|
351* | RESET | % | ^ | [ | ] | ~ | CUBE | | | NUM | 1 | 2 | 3 | = | PAUSE |
352* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
353* | LT0 | & | * | : | ; | | 0 | 0 | NUM. | ENT | ENT |
354* `----------------------------------' `----------------------------------'
355* ,-------------. ,-------------.
356* | RGBM | RED | | OFF | SOLID|
357* ,------|------|------| |------+------+------.
358* | | | GREEN| | | | |
359* | RGB | RGB |------| |------| NUM. | NUM0 |
360* | DARK |BRITE | BLUE | | | | |
361* `--------------------' `--------------------'
362*/
232 [SYMB] = KEYMAP( 363 [SYMB] = KEYMAP(
233 TD(TD_ESC_CAPS),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT, 364 KC_ESCAPE,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRANSPARENT,
234 M_VERSION,KC_EXLM,KC_AT,KC_LCBR,KC_RCBR,KC_PIPE,KC_TRANSPARENT, 365 M_VERSION, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRANSPARENT,
235 M_MAKE,KC_HASH,KC_DLR,KC_LPRN,KC_RPRN,KC_GRAVE, 366 M_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE,
236 TD(TD_FLSH),KC_PERC,KC_CIRC,KC_LBRACKET,KC_RBRACKET,KC_TILD,M_COVECUBE, 367 TD(TD_FLSH), KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, M_COVECUBE,
237 KC_NO,KC_AMPR,KC_ASTR,KC_COLN,KC_SCOLON, 368 KC_NO, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON,
238 RGB_MOD,RGB_0000FF, 369 RGB_MOD, RGB_0000FF,
239 RGB_008000, 370 RGB_008000,
240 RGB_VAD,RGB_VAI,RGB_FF0000, 371 RGB_VAD, RGB_VAI, RGB_FF0000,
241 372
242 KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11, 373 KC_TRANSPARENT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
243 KC_TRANSPARENT,KC_KP_PLUS,KC_KP_7,KC_KP_8,KC_KP_9,KC_KP_ASTERISK,KC_F12, 374 KC_TRANSPARENT, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12,
244 KC_KP_MINUS,KC_KP_4,KC_KP_5,KC_KP_6,KC_KP_SLASH,KC_PSCREEN, 375 KC_KP_MINUS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_SLASH,KC_PSCREEN,
245 KC_TRANSPARENT,KC_NUMLOCK,KC_KP_1,KC_KP_2,KC_KP_3,KC_EQUAL,KC_PAUSE, 376 KC_TRANSPARENT, KC_NUMLOCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_EQUAL, KC_PAUSE,
246 KC_KP_0,KC_KP_0,KC_KP_DOT,KC_KP_ENTER,KC_KP_ENTER, 377 KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, KC_KP_ENTER,
247 RGB_TOG,RGB_SLD, 378 RGB_TOG, RGB_SLD,
248 RGB_HUI, 379 RGB_HUI,
249 RGB_HUD,KC_KP_DOT,KC_KP_0 380 RGB_HUD, KC_KP_DOT, KC_KP_0
250 ), 381 ),
251 382
383/* Keymap 4: Customized Overwatch Layout
384 *
385 * ,--------------------------------------------------. ,--------------------------------------------------.
386 * | ESC | SALT | SYMM | MORE | DOOM | | | | | F9 | F10 | F11 | F12 | | |
387 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
388 * | F1 | K | Q | W | E | R | T | | | | | | | | |
389 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
390 * | TAB | G | A | S | D | F |------| |------| | | | | | |
391 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
392 * | LCTR | LSHFT| Z | X | C | M | | | | | | | | | |
393 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
394 * | J | U | I | Y | T | | | | | | |
395 * `----------------------------------' `----------------------------------'
396 * ,-------------. ,-------------.
397 * | O | P | | | |
398 * ,------|------|------| |------+------+------.
399 * | | | LGUI | | | | |
400 * | V | SPACE|------ |------| | Enter|
401 * | | | H | | | | |
402 * `--------------------' `--------------------'
403 */
252 [OVERWATCH] = KEYMAP( 404 [OVERWATCH] = KEYMAP(
253 KC_ESCAPE,KC_1,KC_2,KC_3,KC_4,M_MORESALT,M_SYMM, 405 KC_ESCAPE, M_SALT, M_SYMM, M_MORESALT, M_DOOMFIST, KC_NO, KC_NO,
254 KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_BSPACE, 406 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T,
255 KC_LCTL,KC_A,KC_S,KC_D,KC_F,KC_G, 407 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F,
256 KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_TRANSPARENT, 408 KC_LCTL, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_M, KC_TRANSPARENT,
257 KC_LCTL,M_SALT,KC_LGUI,KC_Y,KC_LALT, 409 KC_G, KC_U, KC_I, KC_Y, KC_T,
258 KC_ESCAPE,KC_LGUI, 410 KC_O, KC_P,
259 M_DOOMFIST, 411 KC_LGUI,
260 KC_SPACE,KC_V,KC_H, 412 KC_V, KC_SPACE, KC_H,
261 413
262 M_HARD,KC_F9,KC_F10,KC_F11,KC_F12,KC_NO,KC_NO, 414 KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
263 KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 415 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
264 KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 416 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
265 KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 417 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
266 KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 418 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
267 KC_NO,KC_NO, 419 KC_NO, KC_NO,
268 KC_NO, 420 KC_NO,
269 KC_NO,KC_NO,KC_NO 421 KC_NO, KC_NO, KC_ENTER
270 ), 422 ),
271 423
424/* Keymap 3:
425 *
426 * ,--------------------------------------------------. ,--------------------------------------------------.
427 * | ESC | V | D | ALT | | | | | | | | | | | |
428 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
429 * | TAB | S | I | F | M | T | | | | | | | | | |
430 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
431 * | Q | 1 | 2 | 3 | 4 | G |------| |------| | | | | | |
432 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
433 * | NUMLOCK| NUM1 | NUM2 | NUM3 | NUM4 | Z | | | | | | | | | |
434 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
435 * | LCTL | MAC1 | MAC2 | MAC3 | MAC4 | | | | | | |
436 * `----------------------------------' `----------------------------------'
437 * ,-------------. ,-------------.
438 * | L | J | | | |
439 * ,------|------|------| |------+------+------.
440 * | | | G | | | | |
441 * | SPACE| Q |------ |------| | |
442 * | SHIFT| ALT | 0MAC | | | | |
443 * `--------------------' `--------------------'
444 */
272 [DIABLO] = KEYMAP( 445 [DIABLO] = KEYMAP(
273 KC_ESCAPE,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_TRANSPARENT, 446 KC_ESCAPE, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO,
274 KC_TAB,KC_S,KC_I,KC_F,KC_M,KC_T,KC_TRANSPARENT, 447 KC_TAB, KC_S, KC_I, KC_F, KC_M, KC_T, KC_TRANSPARENT,
275 KC_Q,KC_1,KC_2,KC_3,KC_4,KC_G, 448 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G,
276 KC_NUMLOCK,KC_KP_1,KC_KP_2,KC_KP_3,KC_KP_4,KC_Z,TO(BASE), 449 KC_NUMLOCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_Z, KC_NO,
277 KC_LCTL,TD(TD_DIABLO_1),TD(TD_DIABLO_2),TD(TD_DIABLO_3),TD(TD_DIABLO_4), 450 KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4),
278 KC_L,LSFT(KC_J), 451 KC_L, KC_J,
279 KC_F, 452 KC_F,
280 SFT_T(KC_SPACE),ALT_T(KC_Q),KC_DIABLO_CLEAR, 453 SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DIABLO_CLEAR,
281 454
282 455
283 KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 456 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
284 KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 457 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
285 KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 458 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
286 KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 459 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
287 KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 460 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
288 KC_NO,KC_NO, 461 KC_NO, KC_NO,
289 KC_NO, 462 KC_NO,
290 KC_NO,KC_NO,KC_NO 463 KC_NO, KC_NO, KC_NO
291 ), 464 ),
292 465
466/* Keymap 4: Media and mouse keys
467 *
468 * ,--------------------------------------------------. ,--------------------------------------------------.
469 * | | | | | | | | | | | | | | | |
470 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
471 * | | | MsUp | | | | | | | | | | | | |
472 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
473 * | |MsLeft|MsDown|MsRght| | |------| |------| | | Acc0 | Acc1 | Acc2 | |
474 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
475 * | | Acc0 | Acc1 | Acc2 | | | | | | Play | Stop | Mute |VolDn |VolUp | |
476 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
477 * | | | | | | | | | | | |
478 * `----------------------------------' `----------------------------------'
479 * ,-------------. ,-------------.
480 * | | | | | |
481 * ,------|------|------| |------+------+------.
482 * | | | MWUp | | | | |
483 * | Lclk | Rclk |------| |------| MBn4 | MBn4 |
484 * | | | MWDn | | Mclk | | |
485 * `--------------------' `--------------------'
486 */
293 [MOUS] = KEYMAP( 487 [MOUS] = KEYMAP(
294 KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_TRANSPARENT, 488 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRANSPARENT,
295 KC_NO,KC_NO,KC_MS_UP,KC_NO,KC_NO,KC_NO,KC_TRANSPARENT, 489 KC_NO, KC_NO, KC_MS_UP, KC_NO, KC_NO, KC_NO, KC_TRANSPARENT,
296 KC_NO,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_NO,KC_NO, 490 KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT,KC_NO, KC_NO,
297 KC_NO,KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2,KC_NO,KC_NO,KC_TRANSPARENT, 491 KC_NO, KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2,KC_NO, KC_NO, KC_TRANSPARENT,
298 KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, 492 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
299 KC_NO,KC_NO, 493 KC_NO,KC_NO,
300 KC_MS_WH_UP, 494 KC_MS_WH_UP,
301 KC_MS_BTN1,KC_MS_BTN2,KC_MS_WH_DOWN, 495 KC_MS_BTN1,KC_MS_BTN2,KC_MS_WH_DOWN,
@@ -313,7 +507,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
313}; 507};
314 508
315const uint16_t PROGMEM fn_actions[] = { 509const uint16_t PROGMEM fn_actions[] = {
316 [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) 510 [1] = ACTION_LAYER_TAP_TOGGLE(SYMB),
511 // FN1 - Momentary Layer 1 (Symbols)
512 [2] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_UP),
513 [3] = ACTION_MODS_TAP_KEY(MOD_RGUI, KC_LEFT),
514 [4] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_DOWN),
515 [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_RIGHT),
317}; 516};
318 517
319void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) 518void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
@@ -546,7 +745,6 @@ void matrix_init_user(void) { // Runs boot tasks for keyboard
546#ifdef LAYER_UNDERGLOW_LIGHTING 745#ifdef LAYER_UNDERGLOW_LIGHTING
547 rgblight_enable(); 746 rgblight_enable();
548 rgblight_sethsv(195,255,255); 747 rgblight_sethsv(195,255,255);
549 rgblight_mode(5);
550#endif 748#endif
551 has_layer_changed = false; 749 has_layer_changed = false;
552 750
@@ -616,20 +814,20 @@ void matrix_scan_user(void) { // runs frequently to update info
616 ergodox_right_led_2_on(); 814 ergodox_right_led_2_on();
617 #endif 815 #endif
618 break; 816 break;
619 case 5: 817 case COLEMAK:
620 #ifdef LAYER_UNDERGLOW_LIGHTING 818 #ifdef LAYER_UNDERGLOW_LIGHTING
621 if (has_layer_changed) { 819 if (has_layer_changed) {
622 rgblight_sethsv (255,255,255); 820 rgblight_sethsv (300,255,255);
623 } 821 }
624 #else 822 #else
625 ergodox_right_led_1_on(); 823 ergodox_right_led_1_on();
626 ergodox_right_led_3_on(); 824 ergodox_right_led_3_on();
627 #endif 825 #endif
628 break; 826 break;
629 case 6: 827 case DVORAK:
630 #ifdef LAYER_UNDERGLOW_LIGHTING 828 #ifdef LAYER_UNDERGLOW_LIGHTING
631 if (has_layer_changed) { 829 if (has_layer_changed) {
632 rgblight_sethsv (255,255,255); 830 rgblight_sethsv (120,255,255);
633 } 831 }
634 #else 832 #else
635 ergodox_right_led_2_on(); 833 ergodox_right_led_2_on();