aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna-custom/config.h16
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c832
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna-custom/rules.mk13
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/config.h20
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/keymap.c884
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/readme.md9
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/rules.mk10
-rw-r--r--keyboards/handwired/woodpad/keymaps/drashna/keymap.c483
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c310
-rw-r--r--keyboards/orthodox/keymaps/drashna/rules.mk2
-rw-r--r--keyboards/viterbi/keymaps/drashna/keymap.c467
11 files changed, 1429 insertions, 1617 deletions
diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/config.h b/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
deleted file mode 100644
index c1ebf174a..000000000
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3#include "../../config.h"
4
5
6#define TAPPING_TERM 200
7
8#ifdef RGBLIGHT_ENABLE
9#undef RGBLIGHT_SAT_STEP
10#define RGBLIGHT_SAT_STEP 12
11#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
12#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
13#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
14#endif // RGBLIGHT_ENABLE
15
16#endif \ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
deleted file mode 100644
index bdc4eed48..000000000
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
+++ /dev/null
@@ -1,832 +0,0 @@
1/*
2This is the keymap for the keyboard
3Copyright 2012 Jun Wako <wakojun@gmail.com>
4Copyright 2015 Jack Humbert
5Copyright 2017 Art Ortenburger
6This program is free software: you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by
8the Free Software Foundation, either version 2 of the License, or
9(at your option) any later version.
10This program is distributed in the hope that it will be useful,
11but WITHOUT ANY WARRANTY; without even the implied warranty of
12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13GNU General Public License for more details.
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#include QMK_KEYBOARD_H
18#include "debug.h"
19#include "action_layer.h"
20#include "version.h"
21
22
23#include "keymap_german.h"
24
25#include "keymap_nordic.h"
26
27// Define layer names
28#define QWERTY 0
29#define COLEMAK 1
30#define DVORAK 2
31#define WORKMAN 3
32#define SYMB 8
33#define OVERWATCH 9
34#define DIABLO 10
35#define MOUS 12
36
37//Leader Key stuff
38#ifdef LEADER_TIMEOUT
39#undef LEADER_TIMEOUT
40#endif
41#define LEADER_TIMEOUT 1500
42
43//define modifiers
44#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
45#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
46#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
47
48//define layer change stuff for underglow indicator
49bool skip_leds = false;
50
51#ifdef RGBLIGHT_ENABLE
52#define rgblight_set_blue rgblight_sethsv (0xFF, 0xFF, 0xFF);
53#define rgblight_set_red rgblight_sethsv (0x00, 0xFF, 0xFF);
54#define rgblight_set_green rgblight_sethsv (0x78, 0xFF, 0xFF);
55#define rgblight_set_orange rgblight_sethsv (0x1E, 0xFF, 0xFF);
56#define rgblight_set_teal rgblight_sethsv (0xC3, 0xFF, 0xFF);
57#define rgblight_set_magenta rgblight_sethsv (0x12C, 0xFF, 0xFF);
58#define rgblight_set_yellow rgblight_sethsv (0x3C, 0xFF, 0xFF);
59#define rgblight_set_purple rgblight_sethsv (0x10E, 0xFF, 0xFF);
60#endif
61
62//define diablo macro timer variables
63static uint16_t diablo_timer[4];
64static uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30};
65static uint8_t diablo_key_time[4];
66
67bool check_dtimer(uint8_t dtimer) {
68 // has the correct number of seconds elapsed (as defined by diablo_times)
69 return (timer_elapsed(diablo_timer[dtimer]) < ( diablo_key_time[dtimer] * 1000 ) ) ? false : true;
70};
71
72
73enum custom_keycodes {
74 PLACEHOLDER = SAFE_RANGE, // can always be here
75 EPRM,
76 VRSN,
77 RGB_SLD,
78 RGB_0000FF,
79 RGB_008000,
80 RGB_FF0000,
81 RGB_800080,
82 RGB_00FF90,
83 KC_DIABLO_CLEAR,
84 KC_QWERTY,
85 KC_COLEMAK,
86 KC_DVORAK,
87 KC_WORKMAN,
88 KC_MAKEQMK
89};
90
91#ifdef TAP_DANCE_ENABLE
92enum {
93 TD_FLSH = 0,
94 TD_DIABLO_1,
95 TD_DIABLO_2,
96 TD_DIABLO_3,
97 TD_DIABLO_4
98};
99
100
101
102
103// on each tap, light up one led, from right to left
104// on the forth tap, turn them off from right to left
105
106void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
107 if (!skip_leds) {
108 ergodox_board_led_off();
109 ergodox_right_led_1_off();
110 ergodox_right_led_2_off();
111 ergodox_right_led_3_off();
112 skip_leds = true;
113 }
114 switch (state->count) {
115 case 1:
116 ergodox_right_led_1_on();
117 break;
118 case 2:
119 ergodox_right_led_2_on();
120 break;
121 case 3:
122 ergodox_right_led_3_on();
123 break;
124 case 4:
125 ergodox_right_led_1_off();
126 _delay_ms(50);
127 ergodox_right_led_2_off();
128 _delay_ms(50);
129 ergodox_right_led_3_off();
130
131 }
132}
133
134// on the fourth tap, set the keyboard on flash state
135// and set the underglow to red, because red == bad
136void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
137 if (state->count >= 4) {
138#ifdef RGBLIGHT_ENABLE
139 rgblight_enable();
140 rgblight_mode(1);
141 rgblight_setrgb(0xff,0x00,0x00);
142#endif
143 reset_tap_dance(state);
144 reset_keyboard();
145 }
146}
147
148// Cycle through the times for the macro, starting at 0, for disabled.
149// Max of six values, so don't exceed
150void diablo_tapdance_master (qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
151 if (state->count >= 7) {
152 diablo_key_time[diablo_key] = diablo_times[0];
153 reset_tap_dance(state);
154 } else {
155 diablo_key_time[diablo_key] = diablo_times[state->count - 1];
156 }
157}
158
159
160// Would rather have one function for all of this, but no idea how to do that...
161void diablo_tapdance1 (qk_tap_dance_state_t *state, void *user_data) {
162 diablo_tapdance_master (state, user_data, 0);
163}
164
165void diablo_tapdance2 (qk_tap_dance_state_t *state, void *user_data) {
166 diablo_tapdance_master (state, user_data, 1);
167}
168
169void diablo_tapdance3 (qk_tap_dance_state_t *state, void *user_data) {
170 diablo_tapdance_master (state, user_data, 2);
171}
172
173void diablo_tapdance4 (qk_tap_dance_state_t *state, void *user_data) {
174 diablo_tapdance_master (state, user_data, 3);
175}
176
177
178// if the flash state didnt happen, then turn off leds, left to right
179void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
180 _delay_ms(200);
181 ergodox_right_led_3_off();
182 _delay_ms(200);
183 ergodox_right_led_2_off();
184 _delay_ms(200);
185 ergodox_right_led_1_off();
186 _delay_ms(500);
187 skip_leds = false;
188}
189
190//Tap Dance Definitions
191qk_tap_dance_action_t tap_dance_actions[] = {
192 //Once for Blue, Twice for Green, Thrice for Red, and four to flash
193 [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED (dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
194 // tap once to disable, and more to enable timed micros
195 [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
196 [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
197 [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
198 [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
199
200};
201#endif
202
203const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
204/* Keymap 0: Basic layer
205 *
206 *
207 * ,--------------------------------------------------. ,--------------------------------------------------.
208 * | = + | 1 ! | 2 @ | 3 # | 4 $ | 5 % | TG(4)| | TG(4)| 6 ^ | 7 & | 8 * | 9 ( | 0 ) | - _ |
209 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
210 * | TAB | Q | W | E | R | T | TG(3)| |TG(3) | Y | U | I | O | P | \ | |
211 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
212 * | Bksp | A | S | D | F | G |------| |------| H | J | K | L | ; | ' " |
213 * |--------+------+------+------+------+------| TG(2)| | TG(2)|------+------+------+------+------+--------|
214 * | Shift | Z | X | C | V | B | | | | N | M | , < | . > | ? / | Shift |
215 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
216 * | `/SYM| ' " | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
217 * `----------------------------------' `----------------------------------'
218 * ,--------------. ,--------------.
219 * |Alt/Ap| Win | | Alt |Ctl/Esc|
220 * ,------|------|-------| |------+-------+------.
221 * | | | Home | | PgUp | | |
222 * | Space| Bksp |-------| |------| DEL |Enter |
223 * | | | End | | PgDn | | |
224 * `---------------------' `---------------------'
225 */
226 [QWERTY] = KEYMAP(
227 KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
228 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(DIABLO),
229 KC_BSPACE, KC_A, KC_S, KC_D, KC_F, KC_G,
230 KC_LSHIFT, LCTL_T(KC_Z),KC_X, KC_C, KC_V, KC_B, TG(OVERWATCH),
231 LT(SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
232
233 ALT_T(KC_APPLICATION), KC_LGUI,
234 KC_HOME,
235 KC_SPACE, KC_BSPACE, KC_END,
236
237 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
238 TG(DIABLO), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
239 KC_H, KC_J, KC_K, KC_L, KC_SCOLON, GUI_T(KC_QUOTE),
240 TG(OVERWATCH), KC_N, KC_M, KC_COMMA, KC_DOT, RCTL_T(KC_SLASH),KC_RSHIFT,
241 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TT(SYMB),
242 KC_LEAD, CTL_T(KC_ESCAPE),
243 KC_PGUP,
244 KC_PGDOWN, KC_DELETE, KC_ENTER
245 ),
246/* Keymap 0: Basic layer
247 *
248 * ,--------------------------------------------------. ,--------------------------------------------------.
249 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
250 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
251 * | Del | Q | W | F | P | G | L1 | | L1 | J | L | U | Y | ; | \ |
252 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
253 * | BkSp | A | R | S | T | D |------| |------| H | N | E | I |O / L2| ' |
254 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
255 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
256 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
257 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
258 * `----------------------------------' `----------------------------------'
259 * ,-------------. ,-------------.
260 * | App | LGui | | Alt |Ctrl/Esc|
261 * ,------|------|------| |------+--------+------.
262 * | | | Home | | PgUp | | |
263 * | Space|Backsp|------| |------| Tab |Enter |
264 * | |ace | End | | PgDn | | |
265 * `--------------------' `----------------------'
266 */
267// If it accepts an argument (i.e, is a function), it doesn't need KC_.
268// Otherwise, it needs KC_*
269[COLEMAK] = KEYMAP(
270 // left hand
271 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
272 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, TG(DIABLO),
273 KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D,
274 KC_LSFT, LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(OVERWATCH),
275 LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
276 ALT_T(KC_APP), KC_LEAD,
277 KC_HOME,
278 KC_SPC,KC_BSPC,KC_END,
279 // right hand
280 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
281 TG(DIABLO), KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
282 KC_H, KC_N, KC_E, KC_I, KC_O, GUI_T(KC_QUOTE),
283 TG(OVERWATCH),KC_K, KC_M, KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
284 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TT(SYMB),
285 KC_LALT, CTL_T(KC_ESC),
286 KC_PGUP,
287 KC_PGDN,KC_DELETE, KC_ENT
288 ),
289/* Keymap 0: Basic layer
290 *
291 * ,--------------------------------------------------. ,--------------------------------------------------.
292 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ |
293 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
294 * | Del | ' | , | . | P | Y | L1 | | L1 | F | G | C | R | L | / |
295 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
296 * | BkSp | A | O | E | U | I |------| |------| D | H | T | N |S / L2| - |
297 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
298 * | LShift |:/Ctrl| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift |
299 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
300 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
301 * `----------------------------------' `----------------------------------'
302 * ,-------------. ,-------------.
303 * | App | LGui | | Alt |Ctrl/Esc|
304 * ,------|------|------| |------+--------+------.
305 * | | | Home | | PgUp | | |
306 * | Space|Backsp|------| |------| Tab |Enter |
307 * | |ace | End | | PgDn | | |
308 * `--------------------' `----------------------'
309 */
310// If it accepts an argument (i.e, is a function), it doesn't need KC_.
311// Otherwise, it needs KC_*
312[DVORAK] = KEYMAP(
313 // left hand
314 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
315 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, TG(DIABLO),
316 KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I,
317 KC_LSFT, LCTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, TG(OVERWATCH),
318 LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
319 ALT_T(KC_APP), KC_LEAD,
320 KC_HOME,
321 KC_SPC,KC_BSPC,KC_END,
322 // right hand
323 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
324 TG(DIABLO), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
325 KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
326 TG(OVERWATCH),KC_B, KC_M, KC_W, KC_V, RCTL_T(KC_Z), KC_RSHIFT,
327 KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, TT(SYMB),
328 KC_LALT, CTL_T(KC_ESC),
329 KC_PGUP,
330 KC_PGDN,KC_DELETE, KC_ENT
331 ),
332/* Keymap 0: Basic layer
333 *
334 * ,--------------------------------------------------. ,--------------------------------------------------.
335 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
336 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
337 * | Del | Q | W | F | P | G | L1 | | L1 | J | L | U | Y | ; | \ |
338 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
339 * | BkSp | A | R | S | T | D |------| |------| H | N | E | I |O / L2| ' |
340 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
341 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
342 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
343 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
344 * `----------------------------------' `----------------------------------'
345 * ,-------------. ,-------------.
346 * | App | LGui | | Alt |Ctrl/Esc|
347 * ,------|------|------| |------+--------+------.
348 * | | | Home | | PgUp | | |
349 * | Space|Backsp|------| |------| Tab |Enter |
350 * | |ace | End | | PgDn | | |
351 * `--------------------' `----------------------'
352 */
353// If it accepts an argument (i.e, is a function), it doesn't need KC_.
354// Otherwise, it needs KC_*
355[WORKMAN] = KEYMAP(
356 // left hand
357 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
358 KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, TG(DIABLO),
359 KC_BSPC, KC_A, KC_S, KC_H, KC_T, KC_G,
360 KC_LSFT, LCTL_T(KC_Z), KC_X, KC_M, KC_C, KC_V, TG(OVERWATCH),
361 LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
362 ALT_T(KC_APP), KC_LEAD,
363 KC_HOME,
364 KC_SPC,KC_BSPC,KC_END,
365 // right hand
366 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
367 TG(DIABLO), KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSLS,
368 KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOTE,
369 TG(OVERWATCH),KC_K, KC_L, KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
370 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TT(SYMB),
371 KC_LALT, CTL_T(KC_ESC),
372 KC_PGUP,
373 KC_PGDN,KC_DELETE, KC_ENT
374 ),
375
376 /* Keymap 3: Symbol Layer
377*
378* ,--------------------------------------------------. ,--------------------------------------------------.
379* | ESC | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
380* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
381* | VERSION| ! | @ | { | } | | | | | | + | 7 | 8 | 9 | * | F12 |
382* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
383* | MAKE | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | / | PrtSc |
384* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
385* | RESET | % | ^ | [ | ] | ~ | | | | NUM | 1 | 2 | 3 | = | PAUSE |
386* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
387* | LT0 | & | * | : | ; | | | 0 | NUM. | ENT | ENT |
388* `----------------------------------' `----------------------------------'
389* ,-------------. ,-------------.
390* | RGBM | RED | | OFF | SOLID|
391* ,------|------|------| |------+------+------.
392* | | | GREEN| | | | |
393* | RGB | RGB |------| |------| NUM0 | NUME |
394* | DARK |BRITE | BLUE | | | | |
395* `--------------------' `--------------------'
396*/
397 [SYMB] = KEYMAP(
398 KC_ESCAPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_WORKMAN,
399 VRSN, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_DVORAK,
400 KC_MAKEQMK, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE,
401 TD(TD_FLSH), KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK,
402 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON,
403 KC_TRNS, KC_TRNS,
404 KC_TRNS,
405 KC_TRNS, KC_TRNS, KC_TRNS,
406
407 KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
408 KC_DVORAK, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12,
409 KC_KP_MINUS,KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_SLASH, KC_PSCREEN,
410 KC_COLEMAK, KC_NUMLOCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_EQUAL, KC_PAUSE,
411 KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, KC_TRNS,
412 RGB_TOG, RGB_SLD,
413 KC_NO,
414 KC_KP_DOT, KC_KP_0, KC_KP_ENTER
415 ),
416
417/* Keymap 4: Customized Overwatch Layout
418 *
419 * ,--------------------------------------------------. ,--------------------------------------------------.
420 * | ESC | | | | | | | | | F9 | F10 | F11 | F12 | | |
421 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
422 * | F1 | K | Q | W | E | R | T | | | | | | | | |
423 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
424 * | TAB | G | A | S | D | F |------| |------| | | | | | |
425 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
426 * | LCTR | LSHFT| Z | X | C | V | | | | N | M | | | | |
427 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
428 * | J | U | I | Y | T | | | | | | |
429 * `----------------------------------' `----------------------------------'
430 * ,-------------. ,-------------.
431 * | O | P | | | |
432 * ,------|------|------| |------+------+------.
433 * | | | LGUI | | | | |
434 * | V | SPACE|------ |------| | Enter|
435 * | | | H | | | | |
436 * `--------------------' `--------------------'
437 */
438 [OVERWATCH] = KEYMAP(
439 KC_ESCAPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
440 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T,
441 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F,
442 KC_LCTL, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS,
443 KC_G, KC_U, KC_I, KC_Y, KC_T,
444 KC_O, KC_P,
445 KC_LGUI,
446 KC_V, KC_SPACE, KC_H,
447
448 KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
449 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
450 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
451 TG(OVERWATCH), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
452 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
453 KC_NO, KC_NO,
454 KC_NO,
455 KC_PGDOWN, KC_DELETE, KC_ENTER
456 ),
457
458/* Keymap 3:
459 *
460 * ,--------------------------------------------------. ,--------------------------------------------------.
461 * | ESC | V | D | ALT | | | | | | | | | | | |
462 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
463 * | TAB | S | I | F | M | T | | | | | | | | | |
464 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
465 * | Q | 1 | 2 | 3 | 4 | G |------| |------| | | | | | |
466 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
467 * | NUMLOCK| NUM1 | NUM2 | NUM3 | NUM4 | Z | | | | | | | | | |
468 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
469 * | LCTL | MAC1 | MAC2 | MAC3 | MAC4 | | | | | | |
470 * `----------------------------------' `----------------------------------'
471 * ,-------------. ,-------------.
472 * | L | J | | | |
473 * ,------|------|------| |------+------+------.
474 * | | | G | | | | |
475 * | SPACE| Q |------ |------| | |
476 * | SHIFT| ALT | 0MAC | | | | |
477 * `--------------------' `--------------------'
478 */
479 [DIABLO] = KEYMAP(
480 KC_ESCAPE, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO,
481 KC_TAB, KC_S, KC_F, KC_I, KC_M, KC_T, KC_TRNS,
482 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G,
483 KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_NO,
484 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
485 KC_L, KC_J,
486 KC_F,
487 SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DIABLO_CLEAR,
488
489
490
491 KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
492 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
493 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
494 KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
495 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
496 KC_NO, KC_NO,
497 KC_NO,
498 KC_PGDOWN, KC_DELETE, KC_ENTER
499 ),
500
501/* Keymap 4: Media and mouse keys
502 *
503 * ,--------------------------------------------------. ,--------------------------------------------------.
504 * | | | | | | | | | | | | | | | |
505 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
506 * | | | MsUp | | | | | | | | | | | | |
507 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
508 * | |MsLeft|MsDown|MsRght| | |------| |------| | | Acc0 | Acc1 | Acc2 | |
509 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
510 * | | Acc0 | Acc1 | Acc2 | | | | | | | Mute |VolDn |VolUp | | |
511 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
512 * | | | | | | | Play | Stop | | | |
513 * `----------------------------------' `----------------------------------'
514 * ,-------------. ,-------------.
515 * | | | | | |
516 * ,------|------|------| |------+------+------.
517 * | | | MWUp | | | | |
518 * | Lclk | Rclk |------| |------| MBn4 | MBn5 |
519 * | | | MWDn | | Mclk | | |
520 * `--------------------' `--------------------'
521 */
522 [MOUS] = KEYMAP(
523 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
524 KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, KC_NO, KC_TRNS,
525 KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
526 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, KC_TRNS,
527 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
528 KC_NO, KC_NO,
529 KC_WH_U,
530 KC_BTN1, KC_BTN2, KC_WH_D,
531
532 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
533 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
534 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO,
535 KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,
536 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
537 KC_NO,KC_NO,
538 KC_NO,
539 KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
540 ),
541
542};
543
544
545void persistent_default_layer_set(uint16_t default_layer) {
546 eeconfig_update_default_layer(default_layer);
547 default_layer_set(default_layer);
548}
549
550
551bool process_record_user(uint16_t keycode, keyrecord_t *record) {
552#ifdef CONSOLE_ENABLE
553 xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
554#endif
555 switch (keycode) {
556 // dynamically generate these.
557 case EPRM:
558 if (record->event.pressed) {
559 eeconfig_init();
560 }
561 return false;
562 break;
563 case VRSN:
564 if (record->event.pressed) {
565 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
566 }
567 return false;
568 break;
569 case RGB_SLD:
570 if (record->event.pressed) {
571#ifdef RGBLIGHT_ENABLE
572 rgblight_mode(1);
573#endif
574 }
575 return false;
576 break;
577
578 case RGB_0000FF:
579 if (record->event.pressed) {
580 #ifdef RGBLIGHT_ENABLE
581 rgblight_enable();
582 rgblight_mode(1);
583 rgblight_setrgb(0x00,0x00,0xff);
584 #endif
585 }
586 return false;
587 break;
588
589 case RGB_008000:
590 if (record->event.pressed) {
591 #ifdef RGBLIGHT_ENABLE
592 rgblight_enable();
593 rgblight_mode(1);
594 rgblight_setrgb(0x00,0x80,0x00);
595 #endif
596 }
597 return false;
598 break;
599
600 case RGB_FF0000:
601 if (record->event.pressed) {
602 #ifdef RGBLIGHT_ENABLE
603 rgblight_enable();
604 rgblight_mode(1);
605 rgblight_setrgb(0xff,0x00,0x00);
606 #endif
607 }
608 return false;
609 break;
610
611 case RGB_800080:
612 if (record->event.pressed) {
613 #ifdef RGBLIGHT_ENABLE
614 rgblight_enable();
615 rgblight_mode(1);
616 rgblight_setrgb(0x80,0x00,0x80);
617 #endif
618 }
619 return false;
620 break;
621
622 case RGB_00FF90:
623 if (record->event.pressed) {
624 #ifdef RGBLIGHT_ENABLE
625 rgblight_enable();
626 rgblight_mode(1);
627 rgblight_setrgb(0x00,0xff,0x90);
628 #endif
629 }
630 return false;
631 break;
632 case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them
633 if (record->event.pressed) {
634 uint8_t dtime;
635
636 for (dtime = 0; dtime < 4; dtime++) {
637 diablo_key_time[dtime] = diablo_times[0];
638 }
639 }
640 return false;
641 break;
642 case KC_QWERTY:
643 if (record->event.pressed) {
644 persistent_default_layer_set(1UL << QWERTY);
645 }
646 return false;
647 break;
648 case KC_COLEMAK:
649 if (record->event.pressed) {
650 persistent_default_layer_set(1UL << COLEMAK);
651 }
652 return false;
653 break;
654 case KC_DVORAK:
655 if (record->event.pressed) {
656 persistent_default_layer_set(1UL << DVORAK);
657 }
658 return false;
659 break;
660 case KC_WORKMAN:
661 if (record->event.pressed) {
662 persistent_default_layer_set(1UL << WORKMAN);
663 }
664 return false;
665 break;
666 case KC_MAKEQMK:
667 if (!record->event.pressed) {
668 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":teensy"SS_TAP(X_ENTER));
669 }
670 return false;
671 break;
672
673 }
674 return true;
675}
676
677#ifdef TAP_DANCE_ENABLE
678
679// Sends the key press to system, but only if on the Diablo layer
680void send_diablo_keystroke (uint8_t diablo_key) {
681 if (biton32(layer_state) == DIABLO) {
682 switch (diablo_key) {
683 case 0:
684 SEND_STRING("1");
685 break;
686 case 1:
687 SEND_STRING("2");
688 break;
689 case 2:
690 SEND_STRING("3");
691 break;
692 case 3:
693 SEND_STRING("4");
694 break;
695 }
696 }
697}
698
699// Checks each of the 4 timers/keys to see if enough time has elapsed
700// Runs the "send string" command if enough time has passed, and resets the timer.
701void run_diablo_macro_check(void) {
702 uint8_t dtime;
703
704 for (dtime = 0; dtime < 4; dtime++) {
705 if (check_dtimer(dtime) && diablo_key_time[dtime]) {
706 diablo_timer[dtime] = timer_read();
707 send_diablo_keystroke(dtime);
708 }
709 }
710
711}
712
713#endif
714
715
716void matrix_init_user(void) { // Runs boot tasks for keyboard
717#ifdef RGBLIGHT_ENABLE
718 uint8_t default_layer = eeconfig_read_default_layer();
719
720 rgblight_enable();
721 if (default_layer & (1UL << COLEMAK)) {
722 rgblight_set_magenta;
723 }
724 else if (default_layer & (1UL << DVORAK)) {
725 rgblight_set_green;
726 }
727 else if (default_layer & (1UL << WORKMAN)) {
728 rgblight_set_purple;
729 }
730 else {
731 rgblight_set_teal;
732 }
733#endif
734};
735
736LEADER_EXTERNS();
737
738void matrix_scan_user(void) { // runs frequently to update info
739 uint8_t modifiders = get_mods();
740
741 if (!skip_leds) {
742 ergodox_board_led_off();
743 ergodox_right_led_1_off();
744 ergodox_right_led_2_off();
745 ergodox_right_led_3_off();
746
747 // Since we're not using the LEDs here for layer indication anymore,
748 // then lets use them for modifier indicators. Shame we don't have 4...
749 // Also, no "else", since we want to know each, independantly.
750 if ( modifiders & MODS_SHIFT_MASK) {
751 ergodox_right_led_2_on();
752 }
753 if ( modifiders & MODS_CTRL_MASK) {
754 ergodox_right_led_1_on();
755 }
756 if ( modifiders & MODS_ALT_MASK) {
757 ergodox_right_led_3_on();
758 }
759
760 }
761
762 // Run Diablo 3 macro checking code.
763#ifdef TAP_DANCE_ENABLE
764 run_diablo_macro_check();
765#endif
766 LEADER_DICTIONARY() {
767 leading = false;
768 leader_end();
769 SEQ_ONE_KEY(KC_C) {
770 SEND_STRING("Covecube");
771 }
772 SEQ_ONE_KEY(KC_D) {
773 SEND_STRING("StableBit CloudDrive");
774 }
775 SEQ_ONE_KEY(KC_L) {
776 register_code(KC_LGUI);
777 register_code(KC_L);
778 unregister_code(KC_L);
779 unregister_code(KC_LGUI);
780 }
781 SEQ_TWO_KEYS(KC_S, KC_D) {
782 SEND_STRING("StableBit DrivePool");
783 }
784 SEQ_TWO_KEYS(KC_S, KC_C) {
785 SEND_STRING("StableBit Scanner");
786 }
787 SEQ_TWO_KEYS(KC_S, KC_T) {
788 SEND_STRING("StableBit Troubleshooter");
789 }
790 }
791};
792
793uint32_t layer_state_set_kb(uint32_t state) {
794#ifdef RGBLIGHT_ENABLE
795 uint8_t default_layer = eeconfig_read_default_layer();
796
797 switch (biton32(state)) {
798 case SYMB:
799 rgblight_set_blue;
800 rgblight_mode(2);
801 break;
802 case OVERWATCH:
803 rgblight_set_orange;
804 rgblight_mode(17);
805 break;
806 case DIABLO:
807 rgblight_set_red;
808 rgblight_mode(5);
809 break;
810 case MOUS:
811 rgblight_set_yellow;
812 rgblight_mode(1);
813 break;
814 default:
815 if (default_layer & (1UL << COLEMAK)) {
816 rgblight_set_green;
817 }
818 else if (default_layer & (1UL << DVORAK)) {
819 rgblight_set_magenta;
820 }
821 else if (default_layer & (1UL << WORKMAN)) {
822 rgblight_set_purple;
823 }
824 else {
825 rgblight_set_teal;
826 }
827 rgblight_mode(1);
828 break;
829 }
830#endif
831 return state;
832}
diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/rules.mk b/keyboards/ergodox_ez/keymaps/drashna-custom/rules.mk
deleted file mode 100644
index 0fa7cd227..000000000
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
1TAP_DANCE_ENABLE = yes
2SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
3COMMAND_ENABLE = yes # Commands for debug and configuration
4RGBLIGHT_ENABLE = yes
5MIDI_ENABLE = no
6CONSOLE_ENABLE = no
7LEADER_KEYS = no
8
9EXTRAFLAGS = -flto
10
11ifndef QUANTUM_DIR
12 include ../../../../Makefile
13endif
diff --git a/keyboards/ergodox_ez/keymaps/drashna/config.h b/keyboards/ergodox_ez/keymaps/drashna/config.h
index 258dc391f..8f3924e5a 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna/config.h
@@ -1,11 +1,19 @@
1 1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
2#include "../../config.h" 3#include "../../config.h"
3 4
4 5
6#define TAPPING_TERM 200
7
8#ifdef RGBLIGHT_ENABLE
9#undef RGBLIGHT_SAT_STEP
10#define RGBLIGHT_SAT_STEP 12
11#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
12#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
13#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
14#endif // RGBLIGHT_ENABLE
5 15
6// make this easy to toggle behavior, so that it can be more easily toggled 16#undef DEBOUNCE
7#define LAYER_UNDERGLOW_LIGHTING 17#define DEBOUNCE 5
8 18
9#ifdef LAYER_UNDERGLOW_LIGHTING 19#endif
10#undef RGBLIGHT_ANIMATIONS
11#endif \ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
index 97ede9431..f37b54bf2 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -1,3 +1,19 @@
1/*
2This is the keymap for the keyboard
3Copyright 2012 Jun Wako <wakojun@gmail.com>
4Copyright 2015 Jack Humbert
5Copyright 2017 Art Ortenburger
6This program is free software: you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by
8the Free Software Foundation, either version 2 of the License, or
9(at your option) any later version.
10This program is distributed in the hope that it will be useful,
11but WITHOUT ANY WARRANTY; without even the implied warranty of
12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13GNU General Public License for more details.
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
1#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
2#include "debug.h" 18#include "debug.h"
3#include "action_layer.h" 19#include "action_layer.h"
@@ -8,187 +24,791 @@
8 24
9#include "keymap_nordic.h" 25#include "keymap_nordic.h"
10 26
11#define VERSION M(0)
12
13
14// Define layer names 27// Define layer names
15#define BASE 0 28#define QWERTY 0
16#define SYMB 1 29#define COLEMAK 1
17#define MOUS 2 30#define DVORAK 2
18 31#define WORKMAN 3
19#ifdef LAYER_UNDERGLOW_LIGHTING 32#define SYMB 8
20#define rgblight_set_teal rgblight_setrgb(0x00, 0xFF, 0xFF) 33#define OVERWATCH 9
21#define rgblight_set_red rgblight_setrgb(0xFF, 0x00, 0x00) 34#define DIABLO 10
22#define rgblight_set_blue rgblight_setrgb(0x00, 0xFF, 0x00); 35#define MOUS 12
23#define rgblight_set_green rgblight_setrgb(0x00, 0x00, 0xFF);
24#define rgblight_set_yellow rgblight_setrgb(0xFF, 0xFF, 0x00);
25 36
26 37
38//define modifiers
27#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 39#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
28#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL)) 40#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
29#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) 41#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
30#endif 42
43//define layer change stuff for underglow indicator
44bool skip_leds = false;
45
46#ifdef RGBLIGHT_ENABLE
47#define rgblight_set_blue rgblight_sethsv (0xFF, 0xFF, 0xFF);
48#define rgblight_set_red rgblight_sethsv (0x00, 0xFF, 0xFF);
49#define rgblight_set_green rgblight_sethsv (0x78, 0xFF, 0xFF);
50#define rgblight_set_orange rgblight_sethsv (0x1E, 0xFF, 0xFF);
51#define rgblight_set_teal rgblight_sethsv (0xC3, 0xFF, 0xFF);
52#define rgblight_set_magenta rgblight_sethsv (0x12C, 0xFF, 0xFF);
53#define rgblight_set_yellow rgblight_sethsv (0x3C, 0xFF, 0xFF);
54#define rgblight_set_purple rgblight_sethsv (0x10E, 0xFF, 0xFF);
55#endif
56
57//define diablo macro timer variables
58static uint16_t diablo_timer[4];
59static uint8_t diablo_times[] = { 0, 1, 3, 5, 10, 30 };
60static uint8_t diablo_key_time[4];
61
62bool check_dtimer(uint8_t dtimer) {
63 // has the correct number of seconds elapsed (as defined by diablo_times)
64 return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
65};
31 66
32 67
33enum custom_keycodes { 68enum custom_keycodes {
34 PLACEHOLDER = SAFE_RANGE, // can always be here 69 PLACEHOLDER = SAFE_RANGE, // can always be here
35 EPRM, 70 EPRM,
36 VRSN, 71 VRSN,
37#ifndef LAYER_UNDERGLOW_LIGHTING
38 RGB_SLD, 72 RGB_SLD,
39#endif 73 RGB_0000FF,
74 RGB_008000,
75 RGB_FF0000,
76 RGB_800080,
77 RGB_00FF90,
78 KC_DIABLO_CLEAR,
79 KC_QWERTY,
80 KC_COLEMAK,
81 KC_DVORAK,
82 KC_WORKMAN,
83 KC_MAKEQMK,
84 KC_RESET
40}; 85};
41 86
42const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 87#ifdef TAP_DANCE_ENABLE
88enum {
89 TD_FLSH = 0,
90 TD_DIABLO_1,
91 TD_DIABLO_2,
92 TD_DIABLO_3,
93 TD_DIABLO_4
94};
95
96
97
43 98
44 [0] = KEYMAP(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,KC_LEFT,KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_BSPACE,KC_END,KC_RIGHT,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,KC_J,KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSHIFT,KC_UP,KC_DOWN,KC_LBRACKET,KC_RBRACKET,MO(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,KC_TAB,KC_ENTER), 99// on each tap, light up one led, from right to left
100// on the forth tap, turn them off from right to left
45 101
46#ifdef LAYER_UNDERGLOW_LIGHTING 102void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
47 [1] = KEYMAP(KC_ESCAPE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,VERSION,KC_EXLM,KC_AT,KC_LCBR,KC_RCBR,KC_PIPE,KC_TRANSPARENT,VRSN,KC_HASH,KC_DLR,KC_LPRN,KC_RPRN,KC_GRAVE,RESET,KC_PERC,KC_CIRC,KC_LBRACKET,KC_RBRACKET,KC_TILD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,RGB_VAI,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_UP,KC_7,KC_8,KC_9,KC_ASTR,KC_F12,KC_DOWN,KC_4,KC_5,KC_6,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_AMPR,KC_1,KC_2,KC_3,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_DOT,KC_0,KC_EQUAL,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT), 103 if (!skip_leds) {
48#else 104 ergodox_board_led_off();
49 [1] = KEYMAP(KC_ESCAPE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,VERSION,KC_EXLM,KC_AT,KC_LCBR,KC_RCBR,KC_PIPE,KC_TRANSPARENT,VRSN,KC_HASH,KC_DLR,KC_LPRN,KC_RPRN,KC_GRAVE,RESET,KC_PERC,KC_CIRC,KC_LBRACKET,KC_RBRACKET,KC_TILD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,RGB_VAI,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_UP,KC_7,KC_8,KC_9,KC_ASTR,KC_F12,KC_DOWN,KC_4,KC_5,KC_6,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_AMPR,KC_1,KC_2,KC_3,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_DOT,KC_0,KC_EQUAL,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUD,RGB_HUI), 105 ergodox_right_led_1_off();
106 ergodox_right_led_2_off();
107 ergodox_right_led_3_off();
108 skip_leds = true;
109 }
110 switch (state->count) {
111 case 1:
112 ergodox_right_led_1_on();
113 break;
114 case 2:
115 ergodox_right_led_2_on();
116 break;
117 case 3:
118 ergodox_right_led_3_on();
119 break;
120 case 4:
121 ergodox_right_led_1_off();
122 _delay_ms(50);
123 ergodox_right_led_2_off();
124 _delay_ms(50);
125 ergodox_right_led_3_off();
126
127 }
128}
129
130// on the fourth tap, set the keyboard on flash state
131// and set the underglow to red, because red == bad
132void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
133 if (state->count >= 4) {
134#ifdef RGBLIGHT_ENABLE
135 rgblight_enable();
136 rgblight_mode(1);
137 rgblight_setrgb(0xff, 0x00, 0x00);
50#endif 138#endif
139 reset_tap_dance(state);
140 reset_keyboard();
141 }
142}
143
144// Cycle through the times for the macro, starting at 0, for disabled.
145// Max of six values, so don't exceed
146void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
147 if (state->count >= 7) {
148 diablo_key_time[diablo_key] = diablo_times[0];
149 reset_tap_dance(state);
150 }
151 else {
152 diablo_key_time[diablo_key] = diablo_times[state->count - 1];
153 }
154}
51 155
52 [2] = KEYMAP(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK),
53 156
54}; 157// Would rather have one function for all of this, but no idea how to do that...
158void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) {
159 diablo_tapdance_master(state, user_data, 0);
160}
161
162void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) {
163 diablo_tapdance_master(state, user_data, 1);
164}
165
166void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) {
167 diablo_tapdance_master(state, user_data, 2);
168}
169
170void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
171 diablo_tapdance_master(state, user_data, 3);
172}
173
174
175// if the flash state didnt happen, then turn off leds, left to right
176void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
177 _delay_ms(200);
178 ergodox_right_led_3_off();
179 _delay_ms(200);
180 ergodox_right_led_2_off();
181 _delay_ms(200);
182 ergodox_right_led_1_off();
183 _delay_ms(500);
184 skip_leds = false;
185}
186
187//Tap Dance Definitions
188qk_tap_dance_action_t tap_dance_actions[] = {
189 //Once for Blue, Twice for Green, Thrice for Red, and four to flash
190 [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
191 // tap once to disable, and more to enable timed micros
192 [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
193 [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
194 [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
195 [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
55 196
56const uint16_t PROGMEM fn_actions[] = {
57 [1] = ACTION_LAYER_TAP_TOGGLE(1)
58}; 197};
198#endif
199
200const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
201/* Keymap 0: Basic layer
202 *
203 *
204 * ,--------------------------------------------------. ,--------------------------------------------------.
205 * | = + | 1 ! | 2 @ | 3 # | 4 $ | 5 % | TG(4)| | TG(4)| 6 ^ | 7 & | 8 * | 9 ( | 0 ) | - _ |
206 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
207 * | TAB | Q | W | E | R | T | TG(3)| |TG(3) | Y | U | I | O | P | \ | |
208 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
209 * | Bksp | A | S | D | F | G |------| |------| H | J | K | L | ; | ' " |
210 * |--------+------+------+------+------+------| TG(2)| | TG(2)|------+------+------+------+------+--------|
211 * | Shift | Z | X | C | V | B | | | | N | M | , < | . > | ? / | Shift |
212 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
213 * | `/SYM| ' " | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
214 * `----------------------------------' `----------------------------------'
215 * ,--------------. ,--------------.
216 * |Alt/Ap| Win | | Alt |Ctl/Esc|
217 * ,------|------|-------| |------+-------+------.
218 * | | | Home | | PgUp | | |
219 * | Space| Bksp |-------| |------| DEL |Enter |
220 * | | | End | | PgDn | | |
221 * `---------------------' `---------------------'
222 */
223 [QWERTY] = LAYOUT_ergodox(
224 KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
225 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(DIABLO),
226 KC_BSPACE, KC_A, KC_S, KC_D, KC_F, KC_G,
227 KC_LSHIFT, LCTL_T(KC_Z),KC_X, KC_C, KC_V, KC_B, TG(OVERWATCH),
228 LT(SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
229
230 ALT_T(KC_APPLICATION), KC_LGUI,
231 KC_HOME,
232 KC_SPACE, KC_BSPACE, KC_END,
233
234 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
235 TG(DIABLO), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
236 KC_H, KC_J, KC_K, KC_L, KC_SCOLON, GUI_T(KC_QUOTE),
237 TG(OVERWATCH), KC_N, KC_M, KC_COMMA, KC_DOT, RCTL_T(KC_SLASH),KC_RSHIFT,
238 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TT(SYMB),
239 KC_RGUI, CTL_T(KC_ESCAPE),
240 KC_PGUP,
241 KC_PGDOWN, KC_DELETE, KC_ENTER
242 ),
243/* Keymap 0: Basic layer
244 *
245 * ,--------------------------------------------------. ,--------------------------------------------------.
246 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
247 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
248 * | Del | Q | W | F | P | G | L1 | | L1 | J | L | U | Y | ; | \ |
249 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
250 * | BkSp | A | R | S | T | D |------| |------| H | N | E | I |O / L2| ' |
251 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
252 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
253 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
254 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
255 * `----------------------------------' `----------------------------------'
256 * ,-------------. ,-------------.
257 * | App | LGui | | Alt |Ctrl/Esc|
258 * ,------|------|------| |------+--------+------.
259 * | | | Home | | PgUp | | |
260 * | Space|Backsp|------| |------| Tab |Enter |
261 * | |ace | End | | PgDn | | |
262 * `--------------------' `----------------------'
263 */
264// If it accepts an argument (i.e, is a function), it doesn't need KC_.
265// Otherwise, it needs KC_*
266[COLEMAK] = LAYOUT_ergodox(
267 // left hand
268 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
269 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, TG(DIABLO),
270 KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D,
271 KC_LSFT, LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(OVERWATCH),
272 LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
273 ALT_T(KC_APP), KC_LEAD,
274 KC_HOME,
275 KC_SPC,KC_BSPC,KC_END,
276 // right hand
277 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
278 TG(DIABLO), KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
279 KC_H, KC_N, KC_E, KC_I, KC_O, GUI_T(KC_QUOTE),
280 TG(OVERWATCH),KC_K, KC_M, KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
281 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TT(SYMB),
282 KC_LALT, CTL_T(KC_ESC),
283 KC_PGUP,
284 KC_PGDN,KC_DELETE, KC_ENT
285 ),
286/* Keymap 0: Basic layer
287 *
288 * ,--------------------------------------------------. ,--------------------------------------------------.
289 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ |
290 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
291 * | Del | ' | , | . | P | Y | L1 | | L1 | F | G | C | R | L | / |
292 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
293 * | BkSp | A | O | E | U | I |------| |------| D | H | T | N |S / L2| - |
294 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
295 * | LShift |:/Ctrl| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift |
296 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
297 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
298 * `----------------------------------' `----------------------------------'
299 * ,-------------. ,-------------.
300 * | App | LGui | | Alt |Ctrl/Esc|
301 * ,------|------|------| |------+--------+------.
302 * | | | Home | | PgUp | | |
303 * | Space|Backsp|------| |------| Tab |Enter |
304 * | |ace | End | | PgDn | | |
305 * `--------------------' `----------------------'
306 */
307// If it accepts an argument (i.e, is a function), it doesn't need KC_.
308// Otherwise, it needs KC_*
309[DVORAK] = LAYOUT_ergodox(
310 // left hand
311 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
312 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, TG(DIABLO),
313 KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I,
314 KC_LSFT, LCTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, TG(OVERWATCH),
315 LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
316 ALT_T(KC_APP), KC_LEAD,
317 KC_HOME,
318 KC_SPC,KC_BSPC,KC_END,
319 // right hand
320 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
321 TG(DIABLO), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
322 KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
323 TG(OVERWATCH),KC_B, KC_M, KC_W, KC_V, RCTL_T(KC_Z), KC_RSHIFT,
324 KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, TT(SYMB),
325 KC_LALT, CTL_T(KC_ESC),
326 KC_PGUP,
327 KC_PGDN,KC_DELETE, KC_ENT
328 ),
329/* Keymap 0: Basic layer
330 *
331 * ,--------------------------------------------------. ,--------------------------------------------------.
332 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
333 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
334 * | Del | Q | W | F | P | G | L1 | | L1 | J | L | U | Y | ; | \ |
335 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
336 * | BkSp | A | R | S | T | D |------| |------| H | N | E | I |O / L2| ' |
337 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
338 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
339 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
340 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
341 * `----------------------------------' `----------------------------------'
342 * ,-------------. ,-------------.
343 * | App | LGui | | Alt |Ctrl/Esc|
344 * ,------|------|------| |------+--------+------.
345 * | | | Home | | PgUp | | |
346 * | Space|Backsp|------| |------| Tab |Enter |
347 * | |ace | End | | PgDn | | |
348 * `--------------------' `----------------------'
349 */
350// If it accepts an argument (i.e, is a function), it doesn't need KC_.
351// Otherwise, it needs KC_*
352[WORKMAN] = LAYOUT_ergodox(
353 // left hand
354 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(MOUS),
355 KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, TG(DIABLO),
356 KC_BSPC, KC_A, KC_S, KC_H, KC_T, KC_G,
357 KC_LSFT, LCTL_T(KC_Z), KC_X, KC_M, KC_C, KC_V, TG(OVERWATCH),
358 LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET,KC_RBRACKET,
359 ALT_T(KC_APP), KC_LEAD,
360 KC_HOME,
361 KC_SPC,KC_BSPC,KC_END,
362 // right hand
363 TG(MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
364 TG(DIABLO), KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSLS,
365 KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOTE,
366 TG(OVERWATCH),KC_K, KC_L, KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
367 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TT(SYMB),
368 KC_LALT, CTL_T(KC_ESC),
369 KC_PGUP,
370 KC_PGDN,KC_DELETE, KC_ENT
371 ),
372
373 /* Keymap 3: Symbol Layer
374*
375* ,--------------------------------------------------. ,--------------------------------------------------.
376* | ESC | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
377* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
378* | VERSION| ! | @ | { | } | | | | | | + | 7 | 8 | 9 | * | F12 |
379* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
380* | MAKE | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | / | PrtSc |
381* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
382* | RESET | % | ^ | [ | ] | ~ | | | | NUM | 1 | 2 | 3 | = | PAUSE |
383* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
384* | LT0 | & | * | : | ; | | | 0 | NUM. | ENT | ENT |
385* `----------------------------------' `----------------------------------'
386* ,-------------. ,-------------.
387* | RGBM | RED | | OFF | SOLID|
388* ,------|------|------| |------+------+------.
389* | | | GREEN| | | | |
390* | RGB | RGB |------| |------| NUM0 | NUME |
391* | DARK |BRITE | BLUE | | | | |
392* `--------------------' `--------------------'
393*/
394 [SYMB] = LAYOUT_ergodox(
395 KC_ESCAPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_WORKMAN,
396 VRSN, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_DVORAK,
397 KC_MAKEQMK, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE,
398 KC_RESET, KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK,
399 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON,
400 KC_TRNS, KC_TRNS,
401 KC_TRNS,
402 KC_TRNS, KC_TRNS, KC_TRNS,
403
404 KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
405 KC_DVORAK, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12,
406 KC_KP_MINUS,KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_SLASH, KC_PSCREEN,
407 KC_COLEMAK, KC_NUMLOCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_EQUAL, KC_PAUSE,
408 KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, KC_TRNS,
409 RGB_TOG, RGB_SLD,
410 KC_NO,
411 KC_KP_DOT, KC_KP_0, KC_KP_ENTER
412 ),
413
414/* Keymap 4: Customized Overwatch Layout
415 *
416 * ,--------------------------------------------------. ,--------------------------------------------------.
417 * | ESC | | | | | | | | | F9 | F10 | F11 | F12 | | |
418 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
419 * | F1 | K | Q | W | E | R | T | | | | | | | | |
420 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
421 * | TAB | G | A | S | D | F |------| |------| | | | | | |
422 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
423 * | LCTR | LSHFT| Z | X | C | V | | | | N | M | | | | |
424 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
425 * | J | U | I | Y | T | | | | | | |
426 * `----------------------------------' `----------------------------------'
427 * ,-------------. ,-------------.
428 * | O | P | | | |
429 * ,------|------|------| |------+------+------.
430 * | | | LGUI | | | | |
431 * | V | SPACE|------ |------| | Enter|
432 * | | | H | | | | |
433 * `--------------------' `--------------------'
434 */
435 [OVERWATCH] = LAYOUT_ergodox(
436 KC_ESCAPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
437 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T,
438 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F,
439 KC_LCTL, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS,
440 KC_G, KC_U, KC_I, KC_Y, KC_T,
441 KC_O, KC_P,
442 KC_LGUI,
443 KC_V, KC_SPACE, KC_H,
444
445 KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
446 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
447 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
448 TG(OVERWATCH), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
449 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
450 KC_NO, KC_NO,
451 KC_NO,
452 KC_PGDOWN, KC_DELETE, KC_ENTER
453 ),
454
455/* Keymap 3:
456 *
457 * ,--------------------------------------------------. ,--------------------------------------------------.
458 * | ESC | V | D | ALT | | | | | | | | | | | |
459 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
460 * | TAB | S | I | F | M | T | | | | | | | | | |
461 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
462 * | Q | 1 | 2 | 3 | 4 | G |------| |------| | | | | | |
463 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
464 * | NUMLOCK| NUM1 | NUM2 | NUM3 | NUM4 | Z | | | | | | | | | |
465 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
466 * | LCTL | MAC1 | MAC2 | MAC3 | MAC4 | | | | | | |
467 * `----------------------------------' `----------------------------------'
468 * ,-------------. ,-------------.
469 * | L | J | | | |
470 * ,------|------|------| |------+------+------.
471 * | | | G | | | | |
472 * | SPACE| Q |------ |------| | |
473 * | SHIFT| ALT | 0MAC | | | | |
474 * `--------------------' `--------------------'
475 */
476 [DIABLO] = LAYOUT_ergodox(
477 KC_ESCAPE, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO,
478 KC_TAB, KC_S, KC_F, KC_I, KC_M, KC_T, KC_TRNS,
479 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G,
480 KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_NO,
481 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
482 KC_L, KC_J,
483 KC_F,
484 SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DIABLO_CLEAR,
485
486
487
488 KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
489 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
490 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
491 KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
492 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
493 KC_NO, KC_NO,
494 KC_NO,
495 KC_PGDOWN, KC_DELETE, KC_ENTER
496 ),
497
498/* Keymap 4: Media and mouse keys
499 *
500 * ,--------------------------------------------------. ,--------------------------------------------------.
501 * | | | | | | | | | | | | | | | |
502 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
503 * | | | MsUp | | | | | | | | | | | | |
504 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
505 * | |MsLeft|MsDown|MsRght| | |------| |------| | | Acc0 | Acc1 | Acc2 | |
506 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
507 * | | Acc0 | Acc1 | Acc2 | | | | | | | Mute |VolDn |VolUp | | |
508 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
509 * | | | | | | | Play | Stop | | | |
510 * `----------------------------------' `----------------------------------'
511 * ,-------------. ,-------------.
512 * | | | | | |
513 * ,------|------|------| |------+------+------.
514 * | | | MWUp | | | | |
515 * | Lclk | Rclk |------| |------| MBn4 | MBn5 |
516 * | | | MWDn | | Mclk | | |
517 * `--------------------' `--------------------'
518 */
519 [MOUS] = LAYOUT_ergodox(
520 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
521 KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, KC_NO, KC_TRNS,
522 KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
523 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, KC_TRNS,
524 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
525 KC_NO, KC_NO,
526 KC_WH_U,
527 KC_BTN1, KC_BTN2, KC_WH_D,
528
529 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
530 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
531 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO,
532 KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,
533 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
534 KC_NO,KC_NO,
535 KC_NO,
536 KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
537 ),
59 538
60// leaving this in place for compatibilty with old keymaps cloned and re-compiled.
61const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
62{
63 switch(id) {
64 case 0:
65 if (record->event.pressed) {
66 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
67 }
68 break;
69 }
70 return MACRO_NONE;
71}; 539};
72 540
541
542void persistent_default_layer_set(uint16_t default_layer) {
543 eeconfig_update_default_layer(default_layer);
544 default_layer_set(default_layer);
545}
546
547
73bool process_record_user(uint16_t keycode, keyrecord_t *record) { 548bool process_record_user(uint16_t keycode, keyrecord_t *record) {
549#ifdef CONSOLE_ENABLE
550 xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
551#endif
74 switch (keycode) { 552 switch (keycode) {
75 // dynamically generate these. 553 // dynamically generate these.
76 case EPRM: 554 case EPRM:
77 if (record->event.pressed) { 555 if (record->event.pressed) {
78 eeconfig_init(); 556 eeconfig_init();
557 }
558 return false;
559 break;
560 case VRSN:
561 if (record->event.pressed) {
562 SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
563 }
564 return false;
565 break;
566 case RGB_SLD:
567 if (record->event.pressed) {
568#ifdef RGBLIGHT_ENABLE
569 rgblight_mode(1);
570#endif
571 }
572 return false;
573 break;
574
575 case RGB_0000FF:
576 if (record->event.pressed) {
577#ifdef RGBLIGHT_ENABLE
578 rgblight_enable();
579 rgblight_mode(1);
580 rgblight_setrgb(0x00, 0x00, 0xff);
581#endif
582 }
583 return false;
584 break;
585
586 case RGB_008000:
587 if (record->event.pressed) {
588#ifdef RGBLIGHT_ENABLE
589 rgblight_enable();
590 rgblight_mode(1);
591 rgblight_setrgb(0x00, 0x80, 0x00);
592#endif
593 }
594 return false;
595 break;
596
597 case RGB_FF0000:
598 if (record->event.pressed) {
599#ifdef RGBLIGHT_ENABLE
600 rgblight_enable();
601 rgblight_mode(1);
602 rgblight_setrgb(0xff, 0x00, 0x00);
603#endif
604 }
605 return false;
606 break;
607
608 case RGB_800080:
609 if (record->event.pressed) {
610#ifdef RGBLIGHT_ENABLE
611 rgblight_enable();
612 rgblight_mode(1);
613 rgblight_setrgb(0x80, 0x00, 0x80);
614#endif
615 }
616 return false;
617 break;
618
619 case RGB_00FF90:
620 if (record->event.pressed) {
621#ifdef RGBLIGHT_ENABLE
622 rgblight_enable();
623 rgblight_mode(1);
624 rgblight_setrgb(0x00, 0xff, 0x90);
625#endif
626 }
627 return false;
628 break;
629 case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them
630 if (record->event.pressed) {
631 uint8_t dtime;
632
633 for (dtime = 0; dtime < 4; dtime++) {
634 diablo_key_time[dtime] = diablo_times[0];
79 } 635 }
80 return false; 636 }
637 return false;
638 break;
639 case KC_QWERTY:
640 if (record->event.pressed) {
641 persistent_default_layer_set(1UL << QWERTY);
642 }
643 return false;
644 break;
645 case KC_COLEMAK:
646 if (record->event.pressed) {
647 persistent_default_layer_set(1UL << COLEMAK);
648 }
649 return false;
650 break;
651 case KC_DVORAK:
652 if (record->event.pressed) {
653 persistent_default_layer_set(1UL << DVORAK);
654 }
655 return false;
656 break;
657 case KC_WORKMAN:
658 if (record->event.pressed) {
659 persistent_default_layer_set(1UL << WORKMAN);
660 }
661 return false;
662 break;
663 case KC_MAKEQMK:
664 if (!record->event.pressed) {
665 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":teensy"SS_TAP(X_ENTER));
666 }
667 return false;
668 break;
669 case KC_RESET:
670 if (!record->event.pressed) {
671#ifdef RGBLIGHT_ENABLE
672 rgblight_enable();
673 rgblight_mode(1);
674 rgblight_setrgb(0xff, 0x00, 0x00);
675#endif
676 reset_keyboard();
677 }
678 return false;
679 break;
680
681 }
682 return true;
683}
684
685#ifdef TAP_DANCE_ENABLE
686
687// Sends the key press to system, but only if on the Diablo layer
688void send_diablo_keystroke(uint8_t diablo_key) {
689 if (biton32(layer_state) == DIABLO) {
690 switch (diablo_key) {
691 case 0:
692 SEND_STRING("1");
81 break; 693 break;
82 case VRSN: 694 case 1:
83 if (record->event.pressed) { 695 SEND_STRING("2");
84 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
85 }
86 return false;
87 break; 696 break;
88#ifndef LAYER_UNDERGLOW_LIGHTING 697 case 2:
89 case RGB_SLD: 698 SEND_STRING("3");
90 if (record->event.pressed) {
91 rgblight_mode(1);
92 }
93 return false;
94 break; 699 break;
95#endif 700 case 3:
96 701 SEND_STRING("4");
702 break;
703 }
97 } 704 }
98 return true;
99} 705}
100 706
101void matrix_init_user(void) { 707// Checks each of the 4 timers/keys to see if enough time has elapsed
102#ifdef LAYER_UNDERGLOW_LIGHTING 708// Runs the "send string" command if enough time has passed, and resets the timer.
709void run_diablo_macro_check(void) {
710 uint8_t dtime;
711
712 for (dtime = 0; dtime < 4; dtime++) {
713 if (check_dtimer(dtime) && diablo_key_time[dtime]) {
714 diablo_timer[dtime] = timer_read();
715 send_diablo_keystroke(dtime);
716 }
717 }
718
719}
720
721#endif
722
723
724void matrix_init_user(void) { // Runs boot tasks for keyboard
725#ifdef RGBLIGHT_ENABLE
726 uint8_t default_layer = eeconfig_read_default_layer();
727
103 rgblight_enable(); 728 rgblight_enable();
104 rgblight_set_teal; 729 if (default_layer & (1UL << COLEMAK)) {
105 rgblight_mode(1); 730 rgblight_set_magenta;
731 }
732 else if (default_layer & (1UL << DVORAK)) {
733 rgblight_set_green;
734 }
735 else if (default_layer & (1UL << WORKMAN)) {
736 rgblight_set_purple;
737 }
738 else {
739 rgblight_set_teal;
740 }
106#endif 741#endif
742};
107 743
108}
109 744
110void matrix_scan_user(void) { 745void matrix_scan_user(void) { // runs frequently to update info
746 uint8_t modifiders = get_mods();
111 747
748 if (!skip_leds) {
112 ergodox_board_led_off(); 749 ergodox_board_led_off();
113 ergodox_right_led_1_off(); 750 ergodox_right_led_1_off();
114 ergodox_right_led_2_off(); 751 ergodox_right_led_2_off();
115 ergodox_right_led_3_off(); 752 ergodox_right_led_3_off();
116 753
117#ifdef LAYER_UNDERGLOW_LIGHTING 754 // Since we're not using the LEDs here for layer indication anymore,
118 uint8_t modifiders = get_mods(); 755 // then lets use them for modifier indicators. Shame we don't have 4...
119 756 // Also, no "else", since we want to know each, independantly.
120 if ( modifiders & MODS_SHIFT_MASK) { 757 if (modifiders & MODS_SHIFT_MASK) {
121 ergodox_right_led_1_on(); 758 ergodox_right_led_2_on();
122 } 759 }
123 if ( modifiders & MODS_CTRL_MASK) { 760 if (modifiders & MODS_CTRL_MASK) {
124 ergodox_right_led_2_on(); 761 ergodox_right_led_1_on();
125 } 762 }
126 if ( modifiders & MODS_ALT_MASK) { 763 if (modifiders & MODS_ALT_MASK) {
127 ergodox_right_led_3_on(); 764 ergodox_right_led_3_on();
128 } 765 }
129#else 766
130 uint8_t layer = biton32(layer_state); 767 }
131 switch (layer) { 768
132 case 1: 769 // Run Diablo 3 macro checking code.
133 ergodox_right_led_1_on(); 770#ifdef TAP_DANCE_ENABLE
134 break; 771 run_diablo_macro_check();
135 case 2: 772#endif
136 ergodox_right_led_2_on();
137 break;
138 case 3:
139 ergodox_right_led_3_on();
140 break;
141 case 4:
142 ergodox_right_led_1_on();
143 ergodox_right_led_2_on();
144 break;
145 case 5:
146 ergodox_right_led_1_on();
147 ergodox_right_led_3_on();
148 break;
149 case 6:
150 ergodox_right_led_2_on();
151 ergodox_right_led_3_on();
152 break;
153 case 7:
154 ergodox_right_led_1_on();
155 ergodox_right_led_2_on();
156 ergodox_right_led_3_on();
157 break;
158 default:
159 break;
160 }
161#endif
162}; 773};
163 774
164uint32_t layer_state_set_kb(uint32_t state) { 775uint32_t layer_state_set_kb(uint32_t state) {
165#ifdef LAYER_UNDERGLOW_LIGHTING 776#ifdef RGBLIGHT_ENABLE
166 switch (biton32(state)) { 777 uint8_t default_layer = eeconfig_read_default_layer();
167 case 1: 778
168 rgblight_set_red; 779 switch (biton32(state)) {
169 break; 780 case SYMB:
170 case 2: 781 rgblight_set_blue;
171 rgblight_set_blue; 782 rgblight_mode(2);
172 break; 783 break;
173 case 3: 784 case OVERWATCH:
785 rgblight_set_orange;
786 rgblight_mode(17);
787 break;
788 case DIABLO:
789 rgblight_set_red;
790 rgblight_mode(5);
791 break;
792 case MOUS:
793 rgblight_set_yellow;
794 rgblight_mode(1);
795 break;
796 default:
797 if (default_layer & (1UL << COLEMAK)) {
798 rgblight_set_magenta;
799 }
800 else if (default_layer & (1UL << DVORAK)) {
174 rgblight_set_green; 801 rgblight_set_green;
175 break; 802 }
176 case 4: 803 else if (default_layer & (1UL << WORKMAN)) {
177 rgblight_set_yellow; 804 rgblight_set_purple;
178 break; 805 }
179 case 5: 806 else {
180 rgblight_setrgb(0xFF, 0xFF, 0x00);
181 break;
182 case 6:
183 rgblight_setrgb(0xFF, 0xFF, 0x00);
184 break;
185 case 7:
186 rgblight_setrgb(0xFF, 0xFF, 0xFF);
187 break;
188 default:
189 rgblight_set_teal; 807 rgblight_set_teal;
190 break;
191 } 808 }
809 rgblight_mode(1);
810 break;
811 }
192#endif 812#endif
193 return state; 813 return state;
194} 814}
diff --git a/keyboards/ergodox_ez/keymaps/drashna/readme.md b/keyboards/ergodox_ez/keymaps/drashna/readme.md
deleted file mode 100644
index 90fe44861..000000000
--- a/keyboards/ergodox_ez/keymaps/drashna/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
1# Drashna's ErgoDox EZ Underglow Mod
2
3This is based on the default Ergodox EZ keymap.
4
5This modifieds the keymay so that it uses the underglow to indicate which layer you're on, rather than the top LEDs.
6
7Default colors are "teal" for base layer, "red" for Symbols, and "green" for mouse/media. Blue would be the next layer, if you had more.
8
9Additionally, the top LEDs are Shift/Control/Alt indicators instead (in that order). \ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/drashna/rules.mk b/keyboards/ergodox_ez/keymaps/drashna/rules.mk
index 9dfddf01e..b6c5ed3bd 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/drashna/rules.mk
@@ -1,5 +1,11 @@
1RGBLIGHT_ENABLE = yes 1TAP_DANCE_ENABLE = yes
2RGBLIGHT_ANIMATION = no 2SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
3COMMAND_ENABLE = yes # Commands for debug and configuration
4RGBLIGHT_ENABLE = yes
5MIDI_ENABLE = no
6CONSOLE_ENABLE = no
7
8EXTRAFLAGS = -flto
3 9
4ifndef QUANTUM_DIR 10ifndef QUANTUM_DIR
5 include ../../../../Makefile 11 include ../../../../Makefile
diff --git a/keyboards/handwired/woodpad/keymaps/drashna/keymap.c b/keyboards/handwired/woodpad/keymaps/drashna/keymap.c
index 4a2893e4a..725d1f724 100644
--- a/keyboards/handwired/woodpad/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/woodpad/keymaps/drashna/keymap.c
@@ -15,10 +15,10 @@
15 */ 15 */
16#include "woodpad.h" 16#include "woodpad.h"
17 17
18// Each layer gets a name for readability, which is then used in the keymap matrix below. 18 // Each layer gets a name for readability, which is then used in the keymap matrix below.
19// The underscores don't mean anything - you can have a layer called STUFF or any other name. 19 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
20// Layer names don't all need to be of the same length, obviously, and you can also skip them 20 // Layer names don't all need to be of the same length, obviously, and you can also skip them
21// entirely and just use numbers. 21 // entirely and just use numbers.
22#define _NUMLOCK 0 22#define _NUMLOCK 0
23#define _NAV 1 23#define _NAV 1
24#define _DIABLO 2 24#define _DIABLO 2
@@ -54,76 +54,77 @@ static uint8_t diablo_key_time[4];
54 54
55 55
56bool check_dtimer(uint8_t dtimer) { 56bool check_dtimer(uint8_t dtimer) {
57 // has the correct number of seconds elapsed (as defined by diablo_times) 57 // has the correct number of seconds elapsed (as defined by diablo_times)
58 return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true; 58 return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
59}; 59};
60#endif 60#endif
61 61
62 62
63enum custom_keycodes { 63enum custom_keycodes {
64 PLACEHOLDER = SAFE_RANGE, // can always be here 64 PLACEHOLDER = SAFE_RANGE, // can always be here
65 KC_DIABLO_CLEAR, 65 KC_DIABLO_CLEAR,
66 KC_OVERWATCH, 66 KC_OVERWATCH,
67 KC_SALT, 67 KC_SALT,
68 KC_MORESALT, 68 KC_MORESALT,
69 KC_SALTHARD, 69 KC_SALTHARD,
70 KC_GOODGAME, 70 KC_GOODGAME,
71 KC_SYMM, 71 KC_SYMM,
72 KC_DOOMFIST, 72 KC_DOOMFIST,
73 KC_JUSTGAME, 73 KC_JUSTGAME,
74 KC_GLHF, 74 KC_GLHF,
75 KC_TORB, 75 KC_TORB,
76 KC_MAKE 76 KC_MAKE,
77 KC_RESET
77}; 78};
78 79
79#ifdef TAP_DANCE_ENABLE 80#ifdef TAP_DANCE_ENABLE
80enum { 81enum {
81 TD_DIABLO_1 = 0, 82 TD_DIABLO_1 = 0,
82 TD_DIABLO_2, 83 TD_DIABLO_2,
83 TD_DIABLO_3, 84 TD_DIABLO_3,
84 TD_DIABLO_4 85 TD_DIABLO_4
85}; 86};
86 87
87 88
88// Cycle through the times for the macro, starting at 0, for disabled. 89// Cycle through the times for the macro, starting at 0, for disabled.
89// Max of six values, so don't exceed 90// Max of six values, so don't exceed
90void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) { 91void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
91 if (state->count >= 7) { 92 if (state->count >= 7) {
92 diablo_key_time[diablo_key] = diablo_times[0]; 93 diablo_key_time[diablo_key] = diablo_times[0];
93 reset_tap_dance(state); 94 reset_tap_dance(state);
94 } 95 }
95 else { 96 else {
96 diablo_key_time[diablo_key] = diablo_times[state->count - 1]; 97 diablo_key_time[diablo_key] = diablo_times[state->count - 1];
97 } 98 }
98} 99}
99 100
100 101
101// Would rather have one function for all of this, but no idea how to do that... 102// Would rather have one function for all of this, but no idea how to do that...
102void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) { 103void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) {
103 diablo_tapdance_master(state, user_data, 0); 104 diablo_tapdance_master(state, user_data, 0);
104} 105}
105 106
106void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) { 107void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) {
107 diablo_tapdance_master(state, user_data, 1); 108 diablo_tapdance_master(state, user_data, 1);
108} 109}
109 110
110void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) { 111void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) {
111 diablo_tapdance_master(state, user_data, 2); 112 diablo_tapdance_master(state, user_data, 2);
112} 113}
113 114
114void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) { 115void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
115 diablo_tapdance_master(state, user_data, 3); 116 diablo_tapdance_master(state, user_data, 3);
116} 117}
117 118
118 119
119 120
120//Tap Dance Definitions 121//Tap Dance Definitions
121qk_tap_dance_action_t tap_dance_actions[] = { 122qk_tap_dance_action_t tap_dance_actions[] = {
122 // tap once to disable, and more to enable timed micros 123 // tap once to disable, and more to enable timed micros
123 [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1), 124 [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
124 [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2), 125 [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
125 [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3), 126 [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
126 [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4), 127 [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
127 128
128}; 129};
129#endif 130#endif
@@ -170,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
170 KC_SALT, KC_MORESALT, KC_SALTHARD, KC_GLHF \ 171 KC_SALT, KC_MORESALT, KC_SALTHARD, KC_GLHF \
171), 172),
172[_MEDIA] = KEYMAP( /* Base */ 173[_MEDIA] = KEYMAP( /* Base */
173 RESET, KC_MUTE, KC_VOLD, KC_VOLU,\ 174 KC_RESET, KC_MUTE, KC_VOLD, KC_VOLU,\
174 KC_MAKE, _______, RGB_HUI, RGB_HUD, \ 175 KC_MAKE, _______, RGB_HUI, RGB_HUD, \
175 KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, \ 176 KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, \
176 RGB_TOG, RGB_MOD, RGB_SAI, RGB_VAI, \ 177 RGB_TOG, RGB_MOD, RGB_SAI, RGB_VAI, \
@@ -181,150 +182,162 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
181 182
182 183
183void numlock_led_on(void) { 184void numlock_led_on(void) {
184 PORTF |= (1<<7); 185 PORTF |= (1 << 7);
185} 186}
186 187
187void numlock_led_off(void) { 188void numlock_led_off(void) {
188 PORTF &= ~(1<<7); 189 PORTF &= ~(1 << 7);
189} 190}
190 191
191 192
192bool process_record_user(uint16_t keycode, keyrecord_t *record) { 193bool process_record_user(uint16_t keycode, keyrecord_t *record) {
193 uint16_t kc; 194 uint16_t kc;
194 if (is_overwatch) { 195 if (is_overwatch) {
195 kc = KC_BSPC; 196 kc = KC_BSPC;
196 } else { 197 }
197 kc = KC_ENTER; 198 else {
198 } 199 kc = KC_ENTER;
199 switch (keycode) { 200 }
201 switch (keycode) {
200#ifdef TAP_DANCE_ENABLE 202#ifdef TAP_DANCE_ENABLE
201 case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them 203 case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them
202 if (record->event.pressed) { 204 if (record->event.pressed) {
203 uint8_t dtime; 205 uint8_t dtime;
204 206
205 for (dtime = 0; dtime < 4; dtime++) { 207 for (dtime = 0; dtime < 4; dtime++) {
206 diablo_key_time[dtime] = diablo_times[0]; 208 diablo_key_time[dtime] = diablo_times[0];
207 } 209 }
208 } 210 }
209 return false; 211 return false;
210 break; 212 break;
211#endif 213#endif
212 case KC_OVERWATCH: 214 case KC_OVERWATCH:
213 if (record->event.pressed) { 215 if (record->event.pressed) {
214 is_overwatch = !is_overwatch; 216 is_overwatch = !is_overwatch;
215 } 217 }
216#ifdef RGBLIGHT_ENABLE 218#ifdef RGBLIGHT_ENABLE
217 is_overwatch ? rgblight_mode(17) : rgblight_mode(18); 219 is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
218#endif 220#endif
219 return false; 221 return false;
220 break; 222 break;
221 case KC_SALT: 223 case KC_SALT:
222 if (!record->event.pressed) { 224 if (!record->event.pressed) {
223 register_code(kc); 225 register_code(kc);
224 unregister_code(kc); 226 unregister_code(kc);
225 _delay_ms(50); 227 _delay_ms(50);
226 SEND_STRING("Salt, salt, salt..."); 228 SEND_STRING("Salt, salt, salt...");
227 register_code(KC_ENTER); 229 register_code(KC_ENTER);
228 unregister_code(KC_ENTER); 230 unregister_code(KC_ENTER);
229 } 231 }
230 return false; 232 return false;
231 break; 233 break;
232 case KC_MORESALT: 234 case KC_MORESALT:
233 if (!record->event.pressed) { 235 if (!record->event.pressed) {
234 register_code(kc); 236 register_code(kc);
235 unregister_code(kc); 237 unregister_code(kc);
236 _delay_ms(50); 238 _delay_ms(50);
237 SEND_STRING("Please sir, can I have some more salt?!"); 239 SEND_STRING("Please sir, can I have some more salt?!");
238 register_code(KC_ENTER); 240 register_code(KC_ENTER);
239 unregister_code(KC_ENTER); 241 unregister_code(KC_ENTER);
240 } 242 }
241 return false; 243 return false;
242 break; 244 break;
243 case KC_SALTHARD: 245 case KC_SALTHARD:
244 if (!record->event.pressed) { 246 if (!record->event.pressed) {
245 register_code(kc); 247 register_code(kc);
246 unregister_code(kc); 248 unregister_code(kc);
247 _delay_ms(50); 249 _delay_ms(50);
248 SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!"); 250 SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!");
249 register_code(KC_ENTER); 251 register_code(KC_ENTER);
250 unregister_code(KC_ENTER); 252 unregister_code(KC_ENTER);
251 } 253 }
252 return false; 254 return false;
253 break; 255 break;
254 case KC_GOODGAME: 256 case KC_GOODGAME:
255 if (!record->event.pressed) { 257 if (!record->event.pressed) {
256 register_code(kc); 258 register_code(kc);
257 unregister_code(kc); 259 unregister_code(kc);
258 _delay_ms(50); 260 _delay_ms(50);
259 SEND_STRING("Good game, everyone!"); 261 SEND_STRING("Good game, everyone!");
260 register_code(KC_ENTER); 262 register_code(KC_ENTER);
261 unregister_code(KC_ENTER); 263 unregister_code(KC_ENTER);
262 } 264 }
263 return false; 265 return false;
264 break; 266 break;
265 case KC_GLHF: 267 case KC_GLHF:
266 if (!record->event.pressed) { 268 if (!record->event.pressed) {
267 register_code(kc); 269 register_code(kc);
268 unregister_code(kc); 270 unregister_code(kc);
269 _delay_ms(50); 271 _delay_ms(50);
270 SEND_STRING("Good luck, have fun!!!"); 272 SEND_STRING("Good luck, have fun!!!");
271 register_code(KC_ENTER); 273 register_code(KC_ENTER);
272 unregister_code(KC_ENTER); 274 unregister_code(KC_ENTER);
273 } 275 }
274 return false; 276 return false;
275 break; 277 break;
276 case KC_SYMM: 278 case KC_SYMM:
277 if (!record->event.pressed) { 279 if (!record->event.pressed) {
278 register_code(kc); 280 register_code(kc);
279 unregister_code(kc); 281 unregister_code(kc);
280 _delay_ms(50); 282 _delay_ms(50);
281 SEND_STRING("Left click to win!"); 283 SEND_STRING("Left click to win!");
282 register_code(KC_ENTER); 284 register_code(KC_ENTER);
283 unregister_code(KC_ENTER); 285 unregister_code(KC_ENTER);
284 } 286 }
285 return false; 287 return false;
286 break; 288 break;
287 case KC_DOOMFIST: 289 case KC_DOOMFIST:
288 if (!record->event.pressed) { 290 if (!record->event.pressed) {
289 register_code(kc); 291 register_code(kc);
290 unregister_code(kc); 292 unregister_code(kc);
291 _delay_ms(50); 293 _delay_ms(50);
292 SEND_STRING("Hey, look at me. I'm Doomfist, and I'm overpowered! All I do is spam punches all day! I'm DPS, tank and defense, rolled into one! All I need is team healing to be complete!"); 294 SEND_STRING("Hey, look at me. I'm Doomfist, and I'm overpowered! All I do is spam punches all day! I'm DPS, tank and defense, rolled into one! All I need is team healing to be complete!");
293 register_code(KC_ENTER); 295 register_code(KC_ENTER);
294 unregister_code(KC_ENTER); 296 unregister_code(KC_ENTER);
295 } 297 }
296 return false; 298 return false;
297 break; 299 break;
298 case KC_JUSTGAME: 300 case KC_JUSTGAME:
299 301
300 if (!record->event.pressed) { 302 if (!record->event.pressed) {
301 register_code(kc); 303 register_code(kc);
302 unregister_code(kc); 304 unregister_code(kc);
303 _delay_ms(50); 305 _delay_ms(50);
304 SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games."); 306 SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games.");
305 register_code(KC_ENTER); 307 register_code(KC_ENTER);
306 unregister_code(KC_ENTER); 308 unregister_code(KC_ENTER);
307 } 309 }
308 return false; 310 return false;
309 break; 311 break;
310 case KC_TORB: 312 case KC_TORB:
311 313
312 if (!record->event.pressed) { 314 if (!record->event.pressed) {
313 register_code(kc); 315 register_code(kc);
314 unregister_code(kc); 316 unregister_code(kc);
315 _delay_ms(50); 317 _delay_ms(50);
316 SEND_STRING("That was positively riveting!"); 318 SEND_STRING("That was positively riveting!");
317 register_code(KC_ENTER); 319 register_code(KC_ENTER);
318 unregister_code(KC_ENTER); 320 unregister_code(KC_ENTER);
319 } 321 }
320 return false; 322 return false;
321 break; 323 break;
322 case KC_MAKE: 324 case KC_MAKE:
323 if (!record->event.pressed) { 325 if (!record->event.pressed) {
324 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER)); 326 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
325 } 327 }
326 return false; 328 return false;
327 break; 329 break;
330 case KC_RESET:
331 if (!record->event.pressed) {
332#ifdef RGBLIGHT_ENABLE
333 rgblight_enable();
334 rgblight_mode(1);
335 rgblight_setrgb(0xff, 0x00, 0x00);
336#endif
337 reset_keyboard();
338 }
339 return false;
340 break;
328 341
329 342
330 } 343 }
@@ -334,96 +347,96 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
334 347
335// Sends the key press to system, but only if on the Diablo layer 348// Sends the key press to system, but only if on the Diablo layer
336void send_diablo_keystroke(uint8_t diablo_key) { 349void send_diablo_keystroke(uint8_t diablo_key) {
337 if (biton32(layer_state) == _DIABLO) { 350 if (biton32(layer_state) == _DIABLO) {
338 switch (diablo_key) { 351 switch (diablo_key) {
339 case 0: 352 case 0:
340 SEND_STRING("1"); 353 SEND_STRING("1");
341 break; 354 break;
342 case 1: 355 case 1:
343 SEND_STRING("2"); 356 SEND_STRING("2");
344 break; 357 break;
345 case 2: 358 case 2:
346 SEND_STRING("3"); 359 SEND_STRING("3");
347 break; 360 break;
348 case 3: 361 case 3:
349 SEND_STRING("4"); 362 SEND_STRING("4");
350 break; 363 break;
351 }
352 } 364 }
365 }
353} 366}
354 367
355// Checks each of the 4 timers/keys to see if enough time has elapsed 368// Checks each of the 4 timers/keys to see if enough time has elapsed
356// Runs the "send string" command if enough time has passed, and resets the timer. 369// Runs the "send string" command if enough time has passed, and resets the timer.
357void run_diablo_macro_check(void) { 370void run_diablo_macro_check(void) {
358 uint8_t dtime; 371 uint8_t dtime;
359 372
360 for (dtime = 0; dtime < 4; dtime++) { 373 for (dtime = 0; dtime < 4; dtime++) {
361 if (check_dtimer(dtime) && diablo_key_time[dtime]) { 374 if (check_dtimer(dtime) && diablo_key_time[dtime]) {
362 diablo_timer[dtime] = timer_read(); 375 diablo_timer[dtime] = timer_read();
363 send_diablo_keystroke(dtime); 376 send_diablo_keystroke(dtime);
364 }
365 } 377 }
378 }
366 379
367} 380}
368#endif 381#endif
369void matrix_init_user(void) { 382void matrix_init_user(void) {
370 // set Numlock LED to output and low 383 // set Numlock LED to output and low
371 DDRF |= (1<<7); 384 DDRF |= (1 << 7);
372 PORTF &= ~(1<<7); 385 PORTF &= ~(1 << 7);
373 386
374#ifdef RGBLIGHT_ENABLE 387#ifdef RGBLIGHT_ENABLE
375 rgblight_enable(); 388 rgblight_enable();
376 rgblight_set_teal; 389 rgblight_set_teal;
377 rgblight_mode(1); 390 rgblight_mode(1);
378#endif 391#endif
379 392
380 if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)) ){ 393 if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK))) {
381 register_code(KC_NUMLOCK); 394 register_code(KC_NUMLOCK);
382 unregister_code(KC_NUMLOCK); 395 unregister_code(KC_NUMLOCK);
383 } 396 }
384} 397}
385 398
386void matrix_scan_user(void) { 399void matrix_scan_user(void) {
387 numlock_led_off(); 400 numlock_led_off();
388 if (is_overwatch && biton32(layer_state) == _MACROS) { 401 if (is_overwatch && biton32(layer_state) == _MACROS) {
389 numlock_led_on(); 402 numlock_led_on();
390 } 403 }
391 404
392 // Run Diablo 3 macro checking code. 405 // Run Diablo 3 macro checking code.
393#ifdef TAP_DANCE_ENABLE 406#ifdef TAP_DANCE_ENABLE
394 run_diablo_macro_check(); 407 run_diablo_macro_check();
395#endif 408#endif
396} 409}
397 410
398uint32_t layer_state_set_kb(uint32_t state) { 411uint32_t layer_state_set_kb(uint32_t state) {
399#ifdef RGBLIGHT_ENABLE 412#ifdef RGBLIGHT_ENABLE
400// Check layer, and apply color if its changed since last check 413 // Check layer, and apply color if its changed since last check
401 switch (biton32(state)) { 414 switch (biton32(state)) {
402 case _NAV: 415 case _NAV:
403 rgblight_set_blue; 416 rgblight_set_blue;
404 rgblight_mode(1); 417 rgblight_mode(1);
405 break; 418 break;
406 case _MACROS: 419 case _MACROS:
407 rgblight_set_orange; 420 rgblight_set_orange;
408 is_overwatch ? rgblight_mode(17) : rgblight_mode(18); 421 is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
409 break; 422 break;
410 case _DIABLO: 423 case _DIABLO:
411 rgblight_set_red; 424 rgblight_set_red;
412 rgblight_mode(5); 425 rgblight_mode(5);
413 break; 426 break;
414 case _MEDIA: 427 case _MEDIA:
415 rgblight_set_green; 428 rgblight_set_green;
416 rgblight_mode(22); 429 rgblight_mode(22);
417 break; 430 break;
418 default: 431 default:
419 rgblight_set_teal; 432 rgblight_set_teal;
420 rgblight_mode(1); 433 rgblight_mode(1);
421 break; 434 break;
422 } 435 }
423 436
424#endif 437#endif
425 return state; 438 return state;
426} 439}
427void led_set_user(uint8_t usb_led) { 440void led_set_user(uint8_t usb_led) {
428 441
429} 442}
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index de7d4e108..3ad0af71b 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -45,7 +45,8 @@ enum custom_keycodes {
45 LOWER, 45 LOWER,
46 RAISE, 46 RAISE,
47 ADJUST, 47 ADJUST,
48 KC_MAKE 48 KC_MAKE,
49 KC_RESET
49}; 50};
50 51
51// Fillers to make layering more clear 52// Fillers to make layering more clear
@@ -66,7 +67,7 @@ enum custom_keycodes {
66 67
67#ifdef TAP_DANCE_ENABLE 68#ifdef TAP_DANCE_ENABLE
68enum { 69enum {
69 TD_FLSH = 0, 70 TD_FLSH = 0,
70}; 71};
71 72
72 73
@@ -76,38 +77,38 @@ enum {
76// on the fourth tap, set the keyboard on flash state 77// on the fourth tap, set the keyboard on flash state
77// and set the underglow to red, because red == bad 78// and set the underglow to red, because red == bad
78void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) { 79void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
79 if (state->count >= 4) { 80 if (state->count >= 4) {
80#ifdef RGBLIGHT_ENABLE 81#ifdef RGBLIGHT_ENABLE
81 rgblight_mode(1); 82 rgblight_mode(1);
82 rgblight_setrgb(0xff, 0x00, 0x00); 83 rgblight_setrgb(0xff, 0x00, 0x00);
83#endif 84#endif
84 reset_tap_dance(state); 85 reset_tap_dance(state);
85 reset_keyboard(); 86 reset_keyboard();
86 } 87 }
87} 88}
88 89
89 90
90 91
91//Tap Dance Definitions 92//Tap Dance Definitions
92qk_tap_dance_action_t tap_dance_actions[] = { 93qk_tap_dance_action_t tap_dance_actions[] = {
93 //Once for Blue, Twice for Green, Thrice for Red, and four to flash 94 //Once for Blue, Twice for Green, Thrice for Red, and four to flash
94 [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_flsh_finished, NULL), 95 [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_flsh_finished, NULL),
95 96
96}; 97};
97#endif 98#endif
98 99
99const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 100const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
100 101
101[_QWERTY] = KEYMAP( \ 102[_QWERTY] = KEYMAP(\
102 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ 103 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
103 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 104 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
104 KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \ 105 KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \
105), 106),
106 107
107[_COLEMAK] = KEYMAP(\ 108[_COLEMAK] = KEYMAP(\
108 KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ 109 KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
109 KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ 110 KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
110 KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_K, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \ 111 KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_K, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \
111), 112),
112 113
113[_DVORAK] = KEYMAP(\ 114[_DVORAK] = KEYMAP(\
@@ -121,20 +122,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
121 KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ 122 KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \
122), 123),
123 124
124[_LOWER] = KEYMAP( \ 125[_LOWER] = KEYMAP(\
125 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ 126 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
126 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, XXXXXXX, KC_F12, _______, XXXXXXX, KC_RCTL, KC_F11, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ 127 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, XXXXXXX, KC_F12, _______, XXXXXXX, KC_RCTL, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
127 TD(TD_FLSH),KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, KC_F12, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \ 128 TD(TD_FLSH),KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \
128), 129),
129 130
130[_RAISE] = KEYMAP( \ 131[_RAISE] = KEYMAP(\
131 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ 132 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
132 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, XXXXXXX, KC_F12, _______, XXXXXXX, _______, KC_F11, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 133 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, XXXXXXX, KC_F12, _______, XXXXXXX, _______, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
133 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, KC_F12, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ \ 134 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ \
134), 135),
135 136
136[_ADJUST] = KEYMAP( \ 137[_ADJUST] = KEYMAP(\
137 KC_MAKE, RESET, TD(TD_FLSH), _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 138 KC_MAKE, KC_RESET, TD(TD_FLSH), _______, _______, _______, _______, _______, _______, _______, _______, _______, \
138 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN, _______, \ 139 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN, _______, \
139 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MAGIC_TOGGLE_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY \ 140 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MAGIC_TOGGLE_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY \
140) 141)
@@ -146,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
146float tone_qwerty[][2] = SONG(QWERTY_SOUND); 147float tone_qwerty[][2] = SONG(QWERTY_SOUND);
147float tone_dvorak[][2] = SONG(DVORAK_SOUND); 148float tone_dvorak[][2] = SONG(DVORAK_SOUND);
148float tone_colemak[][2] = SONG(COLEMAK_SOUND); 149float tone_colemak[][2] = SONG(COLEMAK_SOUND);
149float tone_workman[][2] = SONG(PLOVER_SONG); 150float tone_workman[][2] = SONG(PLOVER_SOUND);
150#endif 151#endif
151 152
152void persistent_default_layer_set(uint16_t default_layer) { 153void persistent_default_layer_set(uint16_t default_layer) {
@@ -156,102 +157,123 @@ void persistent_default_layer_set(uint16_t default_layer) {
156 157
157bool process_record_user(uint16_t keycode, keyrecord_t *record) { 158bool process_record_user(uint16_t keycode, keyrecord_t *record) {
158 switch (keycode) { 159 switch (keycode) {
159 case QWERTY: 160 case QWERTY:
160 if (record->event.pressed) { 161 if (record->event.pressed) {
161 #ifdef AUDIO_ENABLE 162#ifdef AUDIO_ENABLE
162 PLAY_SONG(tone_qwerty); 163 PLAY_SONG(tone_qwerty);
163 #endif 164#endif
164 persistent_default_layer_set(1UL<<_QWERTY); 165 persistent_default_layer_set(1UL << _QWERTY);
165 } 166 }
166 return false; 167 return false;
167 break; 168 break;
168 case COLEMAK: 169 case COLEMAK:
169 if (record->event.pressed) { 170 if (record->event.pressed) {
170 #ifdef AUDIO_ENABLE 171#ifdef AUDIO_ENABLE
171 PLAY_SONG(tone_colemak); 172 PLAY_SONG(tone_colemak);
172 #endif 173#endif
173 persistent_default_layer_set(1UL<<_COLEMAK); 174 persistent_default_layer_set(1UL << _COLEMAK);
174 } 175 }
175 return false; 176 return false;
176 break; 177 break;
177 case DVORAK: 178 case DVORAK:
178 if (record->event.pressed) { 179 if (record->event.pressed) {
179 #ifdef AUDIO_ENABLE 180#ifdef AUDIO_ENABLE
180 PLAY_SONG(tone_dvorak); 181 PLAY_SONG(tone_dvorak);
181 #endif 182#endif
182 persistent_default_layer_set(1UL << _DVORAK); 183 persistent_default_layer_set(1UL << _DVORAK);
183 } 184 }
184 return false; 185 return false;
185 break; 186 break;
186 case WORKMAN: 187 case WORKMAN:
187 if (record->event.pressed) { 188 if (record->event.pressed) {
188 #ifdef AUDIO_ENABLE 189#ifdef AUDIO_ENABLE
189 PLAY_SONG(tone_workman); 190 PLAY_SONG(tone_workman);
190 #endif 191#endif
191 persistent_default_layer_set(1UL << _WORKMAN); 192 persistent_default_layer_set(1UL << _WORKMAN);
192 } 193 }
193 return false; 194 return false;
194 break; 195 break;
195 case LOWER: 196 case LOWER:
196 if (record->event.pressed) { 197 if (record->event.pressed) {
197 layer_on(_LOWER); 198 layer_on(_LOWER);
198 update_tri_layer(_LOWER, _RAISE, _ADJUST); 199 update_tri_layer(_LOWER, _RAISE, _ADJUST);
199 } else { 200 }
200 layer_off(_LOWER); 201 else {
201 update_tri_layer(_LOWER, _RAISE, _ADJUST); 202 layer_off(_LOWER);
202 } 203 update_tri_layer(_LOWER, _RAISE, _ADJUST);
203 return false; 204 }
204 break; 205 return false;
205 case RAISE: 206 break;
206 if (record->event.pressed) { 207 case RAISE:
207 layer_on(_RAISE); 208 if (record->event.pressed) {
208 update_tri_layer(_LOWER, _RAISE, _ADJUST); 209 layer_on(_RAISE);
209 } else { 210 update_tri_layer(_LOWER, _RAISE, _ADJUST);
210 layer_off(_RAISE); 211 }
211 update_tri_layer(_LOWER, _RAISE, _ADJUST); 212 else {
212 } 213 layer_off(_RAISE);
213 return false; 214 update_tri_layer(_LOWER, _RAISE, _ADJUST);
214 break; 215 }
215 case ADJUST: 216 return false;
216 if (record->event.pressed) { 217 break;
217 layer_on(_ADJUST); 218 case ADJUST:
218 } else { 219 if (record->event.pressed) {
219 layer_off(_ADJUST); 220 layer_on(_ADJUST);
220 } 221 }
221 return false; 222 else {
222 break; 223 layer_off(_ADJUST);
223 case KC_MAKE: 224 }
224 if (!record->event.pressed) { 225 return false;
226 break;
227 case KC_MAKE:
228 if (!record->event.pressed) {
225#ifdef RGBLIGHT_ENABLE 229#ifdef RGBLIGHT_ENABLE
226 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER)); 230 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP " RGBLIGHT_ENABLE=yes AUDIO_ENABLE=yes" SS_TAP(X_ENTER));
227#else 231#else
228 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP " RGBLIGHT_ENABLE=no"SS_TAP(X_ENTER)); 232 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP " RGBLIGHT_ENABLE=no AUDIO_ENABLE=yes"SS_TAP(X_ENTER));
229#endif 233#endif
230 } 234 }
231 return false; 235 return false;
232 break; 236 break;
233 237 case KC_RESET:
238 if (!record->event.pressed) {
239#ifdef RGBLIGHT_ENABLE
240 rgblight_enable();
241 rgblight_mode(1);
242 rgblight_setrgb(0xff, 0x00, 0x00);
243#endif
244 reset_keyboard();
245 }
246 return false;
247 break;
234 } 248 }
235 return true; 249 return true;
236} 250}
237 251
238void matrix_init_user(void) { // Runs boot tasks for keyboard 252void matrix_init_user(void) { // Runs boot tasks for keyboard
239#ifdef RGBLIGHT_ENABLE 253#ifdef RGBLIGHT_ENABLE
240 uint8_t default_layer = eeconfig_read_default_layer(); 254 uint8_t default_layer = eeconfig_read_default_layer();
255
256 rgblight_enable();
241 257
242 rgblight_enable(); 258 if (true) {
243 if (default_layer & (1UL << _COLEMAK)) { 259 if (default_layer & (1UL << _COLEMAK)) {
244 rgblight_set_magenta; 260 rgblight_set_magenta;
245} 261 }
246 else if (default_layer & (1UL << _DVORAK)) { 262 else if (default_layer & (1UL << _DVORAK)) {
247 rgblight_set_green; 263 rgblight_set_green;
248 } 264 }
249 else if (default_layer & (1UL << _WORKMAN)) { 265 else if (default_layer & (1UL << _WORKMAN)) {
250 rgblight_set_purple; 266 rgblight_set_purple;
251 } 267 }
252 else { 268 else {
253 rgblight_set_teal; 269 rgblight_set_teal;
254 } 270 }
271 }
272 else
273 {
274 rgblight_set_red;
275 rgblight_mode(5);
276 }
255#endif 277#endif
256 278
257}; 279};
@@ -262,48 +284,48 @@ void matrix_scan_user(void) { // runs frequently to update info
262 284
263uint32_t layer_state_set_kb(uint32_t state) { // runs on layer switch 285uint32_t layer_state_set_kb(uint32_t state) { // runs on layer switch
264#ifdef RGBLIGHT_ENABLE 286#ifdef RGBLIGHT_ENABLE
265 uint8_t default_layer = eeconfig_read_default_layer(); 287 uint8_t default_layer = eeconfig_read_default_layer();
266 288
267 switch (biton32(state)) { 289 switch (biton32(state)) {
268 case _COLEMAK: 290 case _COLEMAK:
269 rgblight_set_magenta; 291 rgblight_set_magenta;
270 rgblight_mode(1); 292 rgblight_mode(1);
271 break; 293 break;
272 case _DVORAK: 294 case _DVORAK:
273 rgblight_set_green; 295 rgblight_set_green;
274 rgblight_mode(1); 296 rgblight_mode(1);
275 break; 297 break;
276 case _RAISE: 298 case _RAISE:
277 rgblight_set_yellow; 299 rgblight_set_yellow;
278 rgblight_mode(5); 300 rgblight_mode(5);
279 break; 301 break;
280 case _LOWER: 302 case _LOWER:
281 rgblight_set_orange; 303 rgblight_set_orange;
282 rgblight_mode(5); 304 rgblight_mode(5);
283 break; 305 break;
284 case _ADJUST: 306 case _ADJUST:
285 rgblight_set_red; 307 rgblight_set_red;
286 rgblight_mode(23); 308 rgblight_mode(23);
287 break; 309 break;
288 case 6: 310 case 6:
289 rgblight_set_blue; 311 rgblight_set_blue;
290 break; 312 break;
291 case _QWERTY: 313 case _QWERTY:
292 if (default_layer & (1UL << _COLEMAK)) { 314 if (default_layer & (1UL << _COLEMAK)) {
293 rgblight_set_magenta; 315 rgblight_set_magenta;
294 } 316 }
295 else if (default_layer & (1UL << _DVORAK)) { 317 else if (default_layer & (1UL << _DVORAK)) {
296 rgblight_set_green; 318 rgblight_set_green;
297 }
298 else if (default_layer & (1UL << _WORKMAN)) {
299 rgblight_set_purple;
300 }
301 else {
302 rgblight_set_teal;
303 }
304 rgblight_mode(1);
305 break;
306 } 319 }
320 else if (default_layer & (1UL << _WORKMAN)) {
321 rgblight_set_purple;
322 }
323 else {
324 rgblight_set_teal;
325 }
326 rgblight_mode(1);
327 break;
328 }
307#endif 329#endif
308 return state; 330 return state;
309} 331}
diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk
index bb4aad689..e6eb954bc 100644
--- a/keyboards/orthodox/keymaps/drashna/rules.mk
+++ b/keyboards/orthodox/keymaps/drashna/rules.mk
@@ -1,5 +1,5 @@
1CONSOLE_ENABLE = no 1CONSOLE_ENABLE = no
2TAP_DANCE_ENABLE = no 2TAP_DANCE_ENABLE = yes
3RGBLIGHT_ENABLE = yes 3RGBLIGHT_ENABLE = yes
4AUDIO_ENABLE = no 4AUDIO_ENABLE = no
5MOUSEKEY_ENABLE = no 5MOUSEKEY_ENABLE = no
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/viterbi/keymaps/drashna/keymap.c
index acddcb741..0722746ff 100644
--- a/keyboards/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/viterbi/keymaps/drashna/keymap.c
@@ -11,32 +11,33 @@ extern keymap_config_t keymap_config;
11#define _NUMNAV 0 11#define _NUMNAV 0
12#define _DIABLO 1 12#define _DIABLO 1
13#define _GAMEPAD 2 13#define _GAMEPAD 2
14#define _MACROS 3 14#define _GMACRO 3
15#define _MEDIA 4 15#define _MEDIA 4
16#define _COVECUBE 5 16#define _COVECUBE 5
17 17
18 18
19enum custom_keycodes { 19enum custom_keycodes {
20 KC_DIABLO_CLEAR = SAFE_RANGE, 20 KC_DIABLO_CLEAR = SAFE_RANGE,
21 KC_P00, 21 KC_P00,
22 KC_MAKE, 22 KC_MAKE,
23 KC_OVERWATCH, 23 KC_RESET,
24 KC_SALT, 24 KC_OVERWATCH,
25 KC_MORESALT, 25 KC_SALT,
26 KC_SALTHARD, 26 KC_MORESALT,
27 KC_GOODGAME, 27 KC_SALTHARD,
28 KC_SYMM, 28 KC_GOODGAME,
29 KC_DOOMFIST, 29 KC_SYMM,
30 KC_JUSTGAME, 30 KC_DOOMFIST,
31 KC_GLHF, 31 KC_JUSTGAME,
32 KC_TORB, 32 KC_GLHF,
33 KC_AIM 33 KC_TORB,
34 KC_AIM
34}; 35};
35 36
36// Fillers to make layering more clear 37// Fillers to make layering more clear
37#define _______ KC_TRNS 38#define _______ KC_TRNS
38#define XXXXXXX KC_NO 39#define XXXXXXX KC_NO
39#define MACROS TG(_MACROS) 40#define GMACRO TG(_GMACRO)
40#define DIABLO TG(_DIABLO) 41#define DIABLO TG(_DIABLO)
41#define GAMEPAD TG(_GAMEPAD) 42#define GAMEPAD TG(_GAMEPAD)
42#define MEDIA TG(_MEDIA) 43#define MEDIA TG(_MEDIA)
@@ -65,58 +66,58 @@ static uint8_t diablo_key_time[4];
65 66
66 67
67bool check_dtimer(uint8_t dtimer) { 68bool check_dtimer(uint8_t dtimer) {
68 // has the correct number of seconds elapsed (as defined by diablo_times) 69 // has the correct number of seconds elapsed (as defined by diablo_times)
69 return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true; 70 return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
70}; 71};
71 72
72 73
73enum { 74enum {
74 TD_DIABLO_1 = 0, 75 TD_DIABLO_1 = 0,
75 TD_DIABLO_2, 76 TD_DIABLO_2,
76 TD_DIABLO_3, 77 TD_DIABLO_3,
77 TD_DIABLO_4 78 TD_DIABLO_4
78}; 79};
79 80
80 81
81// Cycle through the times for the macro, starting at 0, for disabled. 82// Cycle through the times for the macro, starting at 0, for disabled.
82// Max of six values, so don't exceed 83// Max of six values, so don't exceed
83void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) { 84void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
84 if (state->count >= 7) { 85 if (state->count >= 7) {
85 diablo_key_time[diablo_key] = diablo_times[0]; 86 diablo_key_time[diablo_key] = diablo_times[0];
86 reset_tap_dance(state); 87 reset_tap_dance(state);
87 } 88 }
88 else { 89 else {
89 diablo_key_time[diablo_key] = diablo_times[state->count - 1]; 90 diablo_key_time[diablo_key] = diablo_times[state->count - 1];
90 } 91 }
91} 92}
92 93
93 94
94// Would rather have one function for all of this, but no idea how to do that... 95// Would rather have one function for all of this, but no idea how to do that...
95void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) { 96void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) {
96 diablo_tapdance_master(state, user_data, 0); 97 diablo_tapdance_master(state, user_data, 0);
97} 98}
98 99
99void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) { 100void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) {
100 diablo_tapdance_master(state, user_data, 1); 101 diablo_tapdance_master(state, user_data, 1);
101} 102}
102 103
103void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) { 104void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) {
104 diablo_tapdance_master(state, user_data, 2); 105 diablo_tapdance_master(state, user_data, 2);
105} 106}
106 107
107void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) { 108void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
108 diablo_tapdance_master(state, user_data, 3); 109 diablo_tapdance_master(state, user_data, 3);
109} 110}
110 111
111 112
112 113
113//Tap Dance Definitions 114//Tap Dance Definitions
114qk_tap_dance_action_t tap_dance_actions[] = { 115qk_tap_dance_action_t tap_dance_actions[] = {
115 // tap once to disable, and more to enable timed micros 116 // tap once to disable, and more to enable timed micros
116 [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1), 117 [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
117 [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2), 118 [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
118 [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3), 119 [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
119 [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4), 120 [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
120 121
121}; 122};
122#endif 123#endif
@@ -125,7 +126,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
125const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 126const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
126 127
127 [_NUMNAV] = KEYMAP( 128 [_NUMNAV] = KEYMAP(
128 MACROS, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 129 GMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
129 MEDIA, KC_CALC, COVECUBE,KC_P7, KC_P8, KC_P9, KC_PAST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 130 MEDIA, KC_CALC, COVECUBE,KC_P7, KC_P8, KC_P9, KC_PAST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
130 KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 131 KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
131 KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 132 KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
@@ -139,17 +140,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
139 KC_LCTL, (TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_DIABLO_CLEAR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 140 KC_LCTL, (TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_DIABLO_CLEAR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
140 KC_LALT, KC_F4, KC_F5, KC_F8, KC_F9, KC_F10, SFT_T(KC_SPACE), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ 141 KC_LALT, KC_F4, KC_F5, KC_F8, KC_F9, KC_F10, SFT_T(KC_SPACE), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
141 ), 142 ),
142 143
143 [_GAMEPAD] = KEYMAP( // Game pad layout designed primarily for Overwatch 144 [_GAMEPAD] = KEYMAP( // Game pad layout designed primarily for Overwatch
144 MACROS, KC_ESC, GAMEPAD, KC_1, KC_2, KC_3, KC_4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 145 GMACRO, KC_ESC, GAMEPAD, KC_1, KC_2, KC_3, KC_4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
145 MEDIA, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 146 MEDIA, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
146 KC_Z, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 147 KC_Z, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
147 KC_Y, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 148 KC_Y, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
148 KC_F1, KC_U, KC_I, KC_Y, KC_V, KC_SPC, KC_V, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ 149 KC_F1, KC_U, KC_I, KC_Y, KC_V, KC_SPC, KC_V, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
149 ), 150 ),
150 151
151 [_MACROS] = KEYMAP( 152 [_GMACRO] = KEYMAP(
152 MACROS, XXXXXXX, GAMEPAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 153 GMACRO, XXXXXXX, GAMEPAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
153 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 154 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
154 KC_SYMM, KC_TORB, KC_DOOMFIST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 155 KC_SYMM, KC_TORB, KC_DOOMFIST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
155 KC_GLHF, KC_GOODGAME, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 156 KC_GLHF, KC_GOODGAME, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
@@ -165,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
165 ), 166 ),
166 167
167 [_MEDIA] = KEYMAP( 168 [_MEDIA] = KEYMAP(
168 RESET, KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 169 KC_RESET,KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
169 MEDIA, XXXXXXX, RGB_SAI, RGB_VAI, RGB_M_P, RGB_M_B, RGB_M_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 170 MEDIA, XXXXXXX, RGB_SAI, RGB_VAI, RGB_M_P, RGB_M_B, RGB_M_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
170 RGB_TOG, RGB_MOD, RGB_SAD, RGB_VAD, RGB_M_SW,RGB_M_SN,RGB_M_K, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 171 RGB_TOG, RGB_MOD, RGB_SAD, RGB_VAD, RGB_M_SW,RGB_M_SN,RGB_M_K, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
171 KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 172 KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
@@ -178,179 +179,191 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
178 179
179 180
180bool process_record_user(uint16_t keycode, keyrecord_t *record) { 181bool process_record_user(uint16_t keycode, keyrecord_t *record) {
181 uint16_t kc; 182 uint16_t kc;
182 if (is_overwatch) { 183 if (is_overwatch) {
183 kc = KC_BSPC; 184 kc = KC_BSPC;
185 }
186 else {
187 kc = KC_ENTER;
188 }
189 // Once a delay command is added to "SEND_STRING",
190 // replace these with X_BSPC and X_ENTER instead.
191 // and add "SS_TAP(kc) SS_DELAY(50)" to all of the
192 // SEND_STRING commands, to compress things.
193 switch (keycode) {
194#ifdef TAP_DANCE_ENABLE
195 case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them
196 if (record->event.pressed) {
197 uint8_t dtime;
198
199 for (dtime = 0; dtime < 4; dtime++) {
200 diablo_key_time[dtime] = diablo_times[0];
201 }
184 } 202 }
185 else { 203 return false;
186 kc = KC_ENTER; 204 break;
205#endif
206 case KC_P00:
207 if (!record->event.pressed) {
208 register_code(KC_P0);
209 unregister_code(KC_P0);
210 register_code(KC_P0);
211 unregister_code(KC_P0);
187 } 212 }
188 // Once a delay command is added to "SEND_STRING", 213 return false;
189 // replace these with X_BSPC and X_ENTER instead. 214 break;
190 // and add "SS_TAP(kc) SS_DELAY(50)" to all of the 215 case KC_MAKE:
191 // SEND_STRING commands, to compress things. 216 if (!record->event.pressed) {
192 switch (keycode) { 217 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
193#ifdef TAP_DANCE_ENABLE 218 }
194 case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them 219 return false;
195 if (record->event.pressed) { 220 break;
196 uint8_t dtime; 221 case KC_RESET:
197 222 if (!record->event.pressed) {
198 for (dtime = 0; dtime < 4; dtime++) { 223#ifdef RGBLIGHT_ENABLE
199 diablo_key_time[dtime] = diablo_times[0]; 224 rgblight_enable();
200 } 225 rgblight_mode(1);
201 } 226 rgblight_setrgb(0xff, 0x00, 0x00);
202 return false;
203 break;
204#endif 227#endif
205 case KC_P00: 228 reset_keyboard();
206 if (!record->event.pressed) { 229 }
207 register_code(KC_P0); 230 return false;
208 unregister_code(KC_P0); 231 break;
209 register_code(KC_P0); 232
210 unregister_code(KC_P0); 233 case KC_OVERWATCH: // reset all Diable timers, disabling them
211 } 234 if (record->event.pressed) {
212 return false; 235 is_overwatch = !is_overwatch;
213 break; 236 }
214 case KC_MAKE:
215 if (!record->event.pressed) {
216 SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
217 }
218 return false;
219 break;
220 case KC_OVERWATCH: // reset all Diable timers, disabling them
221 if (record->event.pressed) {
222 is_overwatch = !is_overwatch;
223 }
224#ifdef RGBLIGHT_ENABLE 237#ifdef RGBLIGHT_ENABLE
225 is_overwatch ? rgblight_mode(17) : rgblight_mode(18); 238 is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
226#endif 239#endif
227 return false; 240 return false;
228 break; 241 break;
229 case KC_SALT: 242 case KC_SALT:
230 if (!record->event.pressed) { 243 if (!record->event.pressed) {
231 register_code(kc); 244 register_code(kc);
232 unregister_code(kc); 245 unregister_code(kc);
233 _delay_ms(50); 246 _delay_ms(50);
234 SEND_STRING("Salt, salt, salt..." SS_TAP(X_ENTER)); 247 SEND_STRING("Salt, salt, salt..." SS_TAP(X_ENTER));
235 } 248 }
236 return false; 249 return false;
237 break; 250 break;
238 case KC_MORESALT: 251 case KC_MORESALT:
239 if (!record->event.pressed) { 252 if (!record->event.pressed) {
240 register_code(kc); 253 register_code(kc);
241 unregister_code(kc); 254 unregister_code(kc);
242 _delay_ms(50); 255 _delay_ms(50);
243 SEND_STRING("Please sir, can I have some more salt?!" SS_TAP(X_ENTER)); 256 SEND_STRING("Please sir, can I have some more salt?!" SS_TAP(X_ENTER));
244 } 257 }
245 return false; 258 return false;
246 break; 259 break;
247 case KC_SALTHARD: 260 case KC_SALTHARD:
248 if (!record->event.pressed) { 261 if (!record->event.pressed) {
249 register_code(kc); 262 register_code(kc);
250 unregister_code(kc); 263 unregister_code(kc);
251 _delay_ms(50); 264 _delay_ms(50);
252 SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!" SS_TAP(X_ENTER)); 265 SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!" SS_TAP(X_ENTER));
253 } 266 }
254 return false; 267 return false;
255 break; 268 break;
256 case KC_GOODGAME: 269 case KC_GOODGAME:
257 if (!record->event.pressed) { 270 if (!record->event.pressed) {
258 register_code(kc); 271 register_code(kc);
259 unregister_code(kc); 272 unregister_code(kc);
260 _delay_ms(50); 273 _delay_ms(50);
261 SEND_STRING("Good game, everyone!" SS_TAP(X_ENTER)); 274 SEND_STRING("Good game, everyone!" SS_TAP(X_ENTER));
262 } 275 }
263 return false; 276 return false;
264 break; 277 break;
265 case KC_GLHF: 278 case KC_GLHF:
266 if (!record->event.pressed) { 279 if (!record->event.pressed) {
267 register_code(kc); 280 register_code(kc);
268 unregister_code(kc); 281 unregister_code(kc);
269 _delay_ms(50); 282 _delay_ms(50);
270 SEND_STRING("Good luck, have fun!!!" SS_TAP(X_ENTER)); 283 SEND_STRING("Good luck, have fun!!!" SS_TAP(X_ENTER));
271 } 284 }
272 return false; 285 return false;
273 break; 286 break;
274 case KC_SYMM: 287 case KC_SYMM:
275 if (!record->event.pressed) { 288 if (!record->event.pressed) {
276 register_code(kc); 289 register_code(kc);
277 unregister_code(kc); 290 unregister_code(kc);
278 _delay_ms(50); 291 _delay_ms(50);
279 SEND_STRING("Left click to win!" SS_TAP(X_ENTER)); 292 SEND_STRING("Left click to win!" SS_TAP(X_ENTER));
280 } 293 }
281 return false; 294 return false;
282 break; 295 break;
283 case KC_JUSTGAME: 296 case KC_JUSTGAME:
284 297
285 if (!record->event.pressed) { 298 if (!record->event.pressed) {
286 register_code(kc); 299 register_code(kc);
287 unregister_code(kc); 300 unregister_code(kc);
288 _delay_ms(50); 301 _delay_ms(50);
289 SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games." SS_TAP(X_ENTER)); 302 SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games." SS_TAP(X_ENTER));
290 } 303 }
291 return false; 304 return false;
292 break; 305 break;
293 case KC_TORB: 306 case KC_TORB:
294 307
295 if (!record->event.pressed) { 308 if (!record->event.pressed) {
296 register_code(kc); 309 register_code(kc);
297 unregister_code(kc); 310 unregister_code(kc);
298 _delay_ms(50); 311 _delay_ms(50);
299 SEND_STRING("That was positively riveting! SS_TAP(X_ENTER)"); 312 SEND_STRING("That was positively riveting! SS_TAP(X_ENTER)");
300 } 313 }
301 return false; 314 return false;
302 break; 315 break;
303 case KC_AIM: 316 case KC_AIM:
304 317
305 if (!record->event.pressed) { 318 if (!record->event.pressed) {
306 register_code(kc); 319 register_code(kc);
307 unregister_code(kc); 320 unregister_code(kc);
308 _delay_ms(50); 321 _delay_ms(50);
309 SEND_STRING("That aim is absolutely amazing. It's almost like you're a machine!" SS_TAP(X_ENTER)); 322 SEND_STRING("That aim is absolutely amazing. It's almost like you're a machine!" SS_TAP(X_ENTER));
310 _delay_ms(50); 323 _delay_ms(50);
311 SEND_STRING("Wait! That aim is TOO good! You're clearly using an aim hack! CHEATER!" SS_TAP(X_ENTER)); 324 SEND_STRING("Wait! That aim is TOO good! You're clearly using an aim hack! CHEATER!" SS_TAP(X_ENTER));
312 } 325 }
313 return false; 326 return false;
314 break; 327 break;
315 328
316 329
317 } 330 }
318 return true; 331 return true;
319} 332}
320 333
321#ifdef TAP_DANCE_ENABLE 334#ifdef TAP_DANCE_ENABLE
322 335
323// Sends the key press to system, but only if on the Diablo layer 336// Sends the key press to system, but only if on the Diablo layer
324void send_diablo_keystroke(uint8_t diablo_key) { 337void send_diablo_keystroke(uint8_t diablo_key) {
325 if (biton32(layer_state) == _DIABLO) { 338 if (biton32(layer_state) == _DIABLO) {
326 switch (diablo_key) { 339 switch (diablo_key) {
327 case 0: 340 case 0:
328 SEND_STRING("1"); 341 SEND_STRING("1");
329 break; 342 break;
330 case 1: 343 case 1:
331 SEND_STRING("2"); 344 SEND_STRING("2");
332 break; 345 break;
333 case 2: 346 case 2:
334 SEND_STRING("3"); 347 SEND_STRING("3");
335 break; 348 break;
336 case 3: 349 case 3:
337 SEND_STRING("4"); 350 SEND_STRING("4");
338 break; 351 break;
339 }
340 } 352 }
353 }
341} 354}
342 355
343// Checks each of the 4 timers/keys to see if enough time has elapsed 356// Checks each of the 4 timers/keys to see if enough time has elapsed
344// Runs the "send string" command if enough time has passed, and resets the timer. 357// Runs the "send string" command if enough time has passed, and resets the timer.
345void run_diablo_macro_check(void) { 358void run_diablo_macro_check(void) {
346 uint8_t dtime; 359 uint8_t dtime;
347 360
348 for (dtime = 0; dtime < 4; dtime++) { 361 for (dtime = 0; dtime < 4; dtime++) {
349 if (check_dtimer(dtime) && diablo_key_time[dtime]) { 362 if (check_dtimer(dtime) && diablo_key_time[dtime]) {
350 diablo_timer[dtime] = timer_read(); 363 diablo_timer[dtime] = timer_read();
351 send_diablo_keystroke(dtime); 364 send_diablo_keystroke(dtime);
352 }
353 } 365 }
366 }
354 367
355} 368}
356#endif 369#endif
@@ -358,9 +371,9 @@ void run_diablo_macro_check(void) {
358 371
359void matrix_init_user(void) { // Runs boot tasks for keyboard 372void matrix_init_user(void) { // Runs boot tasks for keyboard
360#ifdef RGBLIGHT_ENABLE 373#ifdef RGBLIGHT_ENABLE
361 rgblight_enable(); 374 rgblight_enable();
362 rgblight_set_teal; 375 rgblight_set_teal;
363 rgblight_mode(1); 376 rgblight_mode(1);
364#endif 377#endif
365}; 378};
366 379
@@ -368,39 +381,39 @@ void matrix_init_user(void) { // Runs boot tasks for keyboard
368void matrix_scan_user(void) { // runs frequently to update info 381void matrix_scan_user(void) { // runs frequently to update info
369#ifdef TAP_DANCE_ENABLE 382#ifdef TAP_DANCE_ENABLE
370 // Run Diablo 3 macro checking code. 383 // Run Diablo 3 macro checking code.
371 run_diablo_macro_check(); 384 run_diablo_macro_check();
372#endif 385#endif
373}; 386};
374 387
375 388
376uint32_t layer_state_set_kb(uint32_t state) { 389uint32_t layer_state_set_kb(uint32_t state) {
377#ifdef RGBLIGHT_ENABLE 390#ifdef RGBLIGHT_ENABLE
378 rgblight_enable(); 391 rgblight_enable();
379 switch (biton32(state)) { 392 switch (biton32(state)) {
380 case _NUMNAV: 393 case _NUMNAV:
381 rgblight_set_teal; 394 rgblight_set_teal;
382 rgblight_mode(2); 395 rgblight_mode(2);
383 break; 396 break;
384 case _MACROS: 397 case _GMACRO:
385 rgblight_set_orange; 398 rgblight_set_orange;
386 is_overwatch ? rgblight_mode(17) : rgblight_mode(18); 399 is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
387 break; 400 break;
388 case _DIABLO: 401 case _DIABLO:
389 rgblight_set_red; 402 rgblight_set_red;
390 rgblight_mode(5); 403 rgblight_mode(5);
391 break; 404 break;
392 case _GAMEPAD: 405 case _GAMEPAD:
393 rgblight_set_yellow; 406 rgblight_set_yellow;
394 rgblight_mode(1); 407 rgblight_mode(1);
395 break; 408 break;
396 case _MEDIA: 409 case _MEDIA:
397 rgblight_set_blue; 410 rgblight_set_blue;
398 rgblight_mode(1); 411 rgblight_mode(1);
399 break; 412 break;
400 case _COVECUBE: 413 case _COVECUBE:
401 rgblight_set_green; 414 rgblight_set_green;
402 rgblight_mode(2); 415 rgblight_mode(2);
403 } 416 }
404#endif 417#endif
405 return state; 418 return state;
406} 419}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 09:50:26 +0000