aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c14
-rw-r--r--layouts/community/ergodox/drashna/keymap.c50
-rw-r--r--layouts/community/ergodox/drashna/notes.txt6
-rw-r--r--layouts/community/ergodox/drashna/rules.mk4
-rw-r--r--quantum/process_keycode/process_audio.c2
-rw-r--r--users/drashna/config.h7
-rw-r--r--users/drashna/drashna.c68
-rw-r--r--users/drashna/drashna.h125
-rw-r--r--users/drashna/rules.mk4
9 files changed, 213 insertions, 67 deletions
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index 480540144..ed5f32b98 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -65,20 +65,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
65), 65),
66 66
67[_LOWER] = LAYOUT(\ 67[_LOWER] = LAYOUT(\
68 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 68 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
69 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, _______, _______, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 69 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PGUP, KC_PGDN, KC_HOME, KC_END, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
70 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ 70 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, _______, _______
71), 71),
72 72
73[_RAISE] = LAYOUT(\ 73[_RAISE] = LAYOUT(\
74 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 74 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
75 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, _______, KC_RCTL, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 75 _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
76 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ 76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, _______, _______
77), 77),
78 78
79[_ADJUST] = LAYOUT(\ 79[_ADJUST] = LAYOUT(\
80 KC_MAKE,KC_RESET, EPRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, 80 KC_MAKE,KC_RESET, EPRM, _______, _______, _______, _______, _______, _______, _______, _______, _______,
81 RGB_SMOD,RGB_HUI, KC_FXCL, AUD_ON, AUD_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, TG(_MODS), 81 RGB_SMOD,RGB_HUI, CK_TOGG, AUD_ON, AUD_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, TG(_MODS),
82 KC_RGB_T,RGB_HUD, MU_ON, MU_OFF, MU_TOG, MU_MOD, _______, _______, _______, _______, _______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY 82 KC_RGB_T,RGB_HUD, MU_ON, MU_OFF, MU_TOG, MU_MOD, _______, _______, _______, _______, _______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY
83) 83)
84 84
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index f29c57f2e..7ff103ed6 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28bool skip_leds = false; 28bool skip_leds = false;
29 29
30 30
31 31#ifdef KEYBOARD_ergodox_ez
32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33/* Keymap 0: QWERTY Layer 33/* Keymap 0: QWERTY Layer
34 * 34 *
@@ -56,14 +56,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
56 // left hand // right hand 56 // left hand // right hand
57 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 57 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
58 KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS, 58 KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS,
59 TG(_MODS), _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, GUI_T(KC_QUOT), 59 SH_TT, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT,
60 KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF, 60 KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF,
61 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), 61 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
62 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE), 62 __________________ERGODOX_THUMB_CLUSTER_____________________
63 KC_HOME, KC_PGUP,
64 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
65
66
67 ), 63 ),
68/* Keymap 0: COLEMAK layer 64/* Keymap 0: COLEMAK layer
69 * 65 *
@@ -92,12 +88,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
92 // left hand // right hand 88 // left hand // right hand
93 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 89 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
94 KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS, 90 KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
95 TG(_MODS), _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, GUI_T(KC_QUOT), 91 SH_TT, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_QUOT,
96 KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF, 92 KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF,
97 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), 93 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
98 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE), 94 __________________ERGODOX_THUMB_CLUSTER_____________________
99 KC_HOME, KC_PGUP,
100 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
101 ), 95 ),
102/* Keymap 0: DVORAK Layout 96/* Keymap 0: DVORAK Layout
103 * 97 *
@@ -126,12 +120,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
126 // left hand // right hand 120 // left hand // right hand
127 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, 121 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
128 KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH, 122 KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
129 TG(_MODS), _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, GUI_T(KC_MINS), 123 SH_TT, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_MINS,
130 KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF, 124 KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF,
131 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), 125 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
132 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE), 126 __________________ERGODOX_THUMB_CLUSTER_____________________
133 KC_HOME, KC_PGUP,
134 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
135 ), 127 ),
136/* Keymap 0: WORKMAN layer 128/* Keymap 0: WORKMAN layer
137 * 129 *
@@ -160,12 +152,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
160 // left hand 152 // left hand
161 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 153 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
162 KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS, 154 KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
163 TG(_MODS), _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, GUI_T(KC_QUOT), 155 SH_TT, _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, KC_QUOT,
164 KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF, 156 KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF,
165 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), 157 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
166 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE), 158 __________________ERGODOX_THUMB_CLUSTER_____________________
167 KC_HOME, KC_PGUP,
168 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
169 ), 159 ),
170 160
171// Reverts OSM(Shift) to normal Shifts. However, may not need since we fixed the issue with RDP (LOCAL RESOURCES) 161// Reverts OSM(Shift) to normal Shifts. However, may not need since we fixed the issue with RDP (LOCAL RESOURCES)
@@ -203,9 +193,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
203*/ 193*/
204 [_SYMB] = LAYOUT_ergodox_pretty( 194 [_SYMB] = LAYOUT_ergodox_pretty(
205 EPRM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_QWERTY, KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 195 EPRM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_QWERTY, KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
206 KC_RST, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_WORKMAN, KC_DVORAK, KC_PPLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PAST, KC_F12, 196 KC_RST, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_COLEMAK, KC_WORKMAN, KC_PPLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PAST, KC_F12,
207 KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, KC_PMNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, KC_PSCREEN, 197 KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, KC_PMNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, KC_PSCREEN,
208 VRSN, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_COLEMAK, KC_COLEMAK, KC_NLCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_PEQL, KC_PAUSE, 198 VRSN, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_DVORAK, TG(_MODS), KC_NLCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_PEQL, KC_PAUSE,
209 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCLN, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, KC_TRNS, 199 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCLN, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, KC_TRNS,
210 RGB_SMOD, KC_RGB_T, KC_TRNS, KC_TRNS, 200 RGB_SMOD, KC_RGB_T, KC_TRNS, KC_TRNS,
211 RGB_HUI, KC_TRNS, 201 RGB_HUI, KC_TRNS,
@@ -238,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
238 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 228 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
239 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO, 229 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO,
240 KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS, TG(_GAMEPAD), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO, 230 KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS, TG(_GAMEPAD), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
241 KC_G, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, 231 KC_GRV, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
242 KC_O, KC_P, KC_HYPR, MAGIC_TOGGLE_NKRO, 232 KC_O, KC_P, KC_HYPR, MAGIC_TOGGLE_NKRO,
243 KC_LGUI, KC_NO, 233 KC_LGUI, KC_NO,
244 KC_V, KC_SPC, KC_H, KC_PGDN, KC_DEL, KC_ENTER 234 KC_V, KC_SPC, KC_H, KC_PGDN, KC_DEL, KC_ENTER
@@ -309,7 +299,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
309 ), 299 ),
310 300
311}; 301};
312 302#else // KEYBOARD_ergodox_ez
303const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
304 [_QWERTY] = LAYOUT_ergodox_wrapper(KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO), KC_BSPC, _________________QWERTY_L2_________________, KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD), LT(_SYMB, KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ALT_T(KC_APP), KC_LGUI, KC_HOME, KC_SPACE, KC_BSPC, KC_END, OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS, _________________QWERTY_R2_________________, GUI_T(KC_QUOT), TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), KC_RGUI, CTL_T(KC_ESCAPE), KC_PGUP, KC_PGDOWN, KC_DELETE, KC_ENTER),
305 [_COLEMAK] = LAYOUT_ergodox_wrapper(KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), KC_BSPC, _________________COLEMAK_L2________________, KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD), LT(_SYMB, KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ALT_T(KC_APP), KC_LGUI, KC_HOME, KC_SPACE, KC_BSPC, KC_END, OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS, _________________COLEMAK_R2________________, GUI_T(KC_QUOT), TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), KC_RGUI, CTL_T(KC_ESCAPE), KC_PGUP, KC_PGDOWN, KC_DELETE, KC_ENTER),
306 [_DVORAK] = LAYOUT_ergodox_wrapper(KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), KC_BSPC, _________________DVORAK_L2_________________, KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD), LT(_SYMB, KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ALT_T(KC_APP), KC_LGUI, KC_HOME, KC_SPACE, KC_BSPC, KC_END, OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH, _________________DVORAK_R2_________________, GUI_T(KC_MINS), TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), KC_RGUI, CTL_T(KC_ESCAPE), KC_PGUP, KC_PGDOWN, KC_DELETE, KC_ENTER),
307 [_WORKMAN] = LAYOUT_ergodox_wrapper(KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), KC_BSPC, _________________WORKMAN_L2________________, KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD), LT(_SYMB, KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ALT_T(KC_APP), KC_LGUI, KC_HOME, KC_SPACE, KC_BSPC, KC_END, OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS, _________________WORKMAN_R2________________, GUI_T(KC_QUOT), TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB), KC_RGUI, CTL_T(KC_ESCAPE), KC_PGUP, KC_PGDOWN, KC_DELETE, KC_ENTER),
308 [_MODS] = LAYOUT_ergodox(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
309 [_SYMB] = LAYOUT_ergodox(EPRM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, TG(_MODS), KC_RESET, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_WORKMAN, KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, VRSN, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_COLEMAK, KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON, RGB_SMOD, KC_RGB_T, RGB_HUI, RGB_M_R, RGB_M_SW, RGB_HUD, KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_DVORAK, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12, KC_KP_MINUS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_SLASH, KC_PSCREEN, KC_COLEMAK, KC_NUMLOCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_EQUAL, KC_PAUSE, KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_DOT, KC_KP_0, KC_KP_ENTER),
310 [_GAMEPAD] = LAYOUT_ergodox(KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, HYPR(KC_D), HYPR(KC_Q), HYPR(KC_GRV), KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO, KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS, TG(_GAMEPAD), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_O, KC_P, KC_HYPR, MAGIC_TOGGLE_NKRO, KC_LGUI, KC_NO, KC_V, KC_SPC, KC_H, KC_PGDN, KC_DEL, KC_ENTER),
311 [_DIABLO] = LAYOUT_ergodox(KC_ESC, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_TAB, KC_S, KC_I, KC_F, KC_M, KC_T, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z, KC_NO, KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_L, KC_J, KC_NO, KC_NO, KC_F, KC_NO, SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DIABLO_CLEAR, KC_PGDN, KC_DEL, KC_ENT),
312 [_MOUS] = LAYOUT_ergodox(KC_NO, KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_NO, KC_BTN1, KC_BTN2, KC_WH_D, KC_BTN3, KC_BTN4, KC_BTN5),
313};
314#endif // KEYBOARD_ergodox_ez
313 315
314bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 316bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
315 317
@@ -327,8 +329,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
327 return true; 329 return true;
328} 330}
329 331
330
331
332void matrix_init_keymap(void) { // Runs boot tasks for keyboard 332void matrix_init_keymap(void) { // Runs boot tasks for keyboard
333}; 333};
334 334
diff --git a/layouts/community/ergodox/drashna/notes.txt b/layouts/community/ergodox/drashna/notes.txt
new file mode 100644
index 000000000..0f3959ff6
--- /dev/null
+++ b/layouts/community/ergodox/drashna/notes.txt
@@ -0,0 +1,6 @@
1Pins used by Ergodox EZ
2
3Column Pins: F0 F1 F4 F5 F6 F7
4Row Pins : B0 B1 B2 B3 D2 D3 C6
5LEDs : D6 B5 B6 B7
6:
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index 12f100d66..536d5308a 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -1,7 +1,9 @@
1TAP_DANCE_ENABLE = yes 1TAP_DANCE_ENABLE = yes
2SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 2SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
3COMMAND_ENABLE = yes # Commands for debug and configuration 3COMMAND_ENABLE = yes # Commands for debug and configuration
4RGBLIGHT_ENABLE = yes 4ifeq ($(strip $(KEYBOARD)), ergodox_ez)
5 RGBLIGHT_ENABLE = yes
6endif
5CONSOLE_ENABLE = no 7CONSOLE_ENABLE = no
6BOOTMAGIC_ENABLE = yes 8BOOTMAGIC_ENABLE = yes
7 9
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index 2d92e4064..fc0f23ee3 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -108,7 +108,7 @@ bool process_audio(uint16_t keycode, keyrecord_t *record) {
108 } 108 }
109 109
110 110
111 if ( (clicky_enable && keycode != CLICKY_TOGGLE) || (!clicky_enable && keycode == CLICKY_TOGGLE) ) { 111 if ( clicky_enable ) {
112 if (record->event.pressed) { 112 if (record->event.pressed) {
113 stop_all_notes(); 113 stop_all_notes();
114 clicky_play();; 114 clicky_play();;
diff --git a/users/drashna/config.h b/users/drashna/config.h
index f9b0d4d17..e48f72355 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -4,6 +4,7 @@
4 4
5#ifdef AUDIO_ENABLE 5#ifdef AUDIO_ENABLE
6#define AUDIO_CLICKY 6#define AUDIO_CLICKY
7#define AUDIO_CLICKY_ON
7#define STARTUP_SONG SONG(E1M1_DOOM) 8#define STARTUP_SONG SONG(E1M1_DOOM)
8#define GOODBYE_SONG SONG(SONIC_RING) 9#define GOODBYE_SONG SONG(SONIC_RING)
9#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ 10#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
@@ -16,7 +17,7 @@
16#ifdef RGBLIGHT_ENABLE 17#ifdef RGBLIGHT_ENABLE
17 #ifndef KEYBOARD_ergodox_ez 18 #ifndef KEYBOARD_ergodox_ez
18 #define RGBLIGHT_SLEEP 19 #define RGBLIGHT_SLEEP
19 #endif 20 #endif // !KEYBOARD_ergodox_ez
20#endif // RGBLIGHT_ENABLE 21#endif // RGBLIGHT_ENABLE
21 22
22 23
@@ -51,8 +52,8 @@
51 52
52#ifdef TAPPING_TERM 53#ifdef TAPPING_TERM
53#undef TAPPING_TERM 54#undef TAPPING_TERM
54#endif 55#endif // TAPPING_TERM
55#define TAPPING_TERM 160 56#define TAPPING_TERM 176
56 57
57 58
58// Disable action_get_macro and fn_actions, since we don't use these 59// Disable action_get_macro and fn_actions, since we don't use these
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 73bd249e4..d9d412b08 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -41,8 +41,13 @@ float fauxclicky_pressed[][2] = SONG(S__NOTE(_A6)); // change to you
41float fauxclicky_released[][2] = SONG(S__NOTE(_A6)); // change to your tastes 41float fauxclicky_released[][2] = SONG(S__NOTE(_A6)); // change to your tastes
42#endif // FAUXCLICKY_ENABLE 42#endif // FAUXCLICKY_ENABLE
43 43
44float tone_copy[][2] = SONG(SCROLL_LOCK_ON_SOUND);
45float tone_paste[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
46
47
44bool faux_click_enabled = false; 48bool faux_click_enabled = false;
45bool is_overwatch = false; 49bool is_overwatch = false;
50static uint16_t copy_paste_timer;
46#ifdef RGBLIGHT_ENABLE 51#ifdef RGBLIGHT_ENABLE
47bool rgb_layer_change = true; 52bool rgb_layer_change = true;
48#endif 53#endif
@@ -198,17 +203,21 @@ void matrix_scan_user(void) {
198 matrix_scan_keymap(); 203 matrix_scan_keymap();
199} 204}
200 205
206void tap(uint16_t keycode){
207 register_code(keycode);
208 unregister_code(keycode);
209};
210
201// This block is for all of the gaming macros, as they were all doing 211// This block is for all of the gaming macros, as they were all doing
202// the same thing, but with differring text sent. 212// the same thing, but with differring text sent.
203bool send_game_macro(const char *str, keyrecord_t *record, bool override) { 213bool send_game_macro(const char *str, keyrecord_t *record, bool override) {
204 if (!record->event.pressed || override) { 214 if (!record->event.pressed || override) {
205 clear_keyboard(); 215 clear_keyboard();
206 register_code(is_overwatch ? KC_BSPC : KC_ENTER); 216 tap(is_overwatch ? KC_BSPC : KC_ENTER);
207 unregister_code(is_overwatch ? KC_BSPC : KC_ENTER);
208 wait_ms(50); 217 wait_ms(50);
209 send_string(str); 218 send_string(str);
210 register_code(KC_ENTER); 219 wait_ms(50);
211 unregister_code(KC_ENTER); 220 tap(KC_ENTER);
212 } 221 }
213 if (override) wait_ms(3000); 222 if (override) wait_ms(3000);
214 return false; 223 return false;
@@ -402,6 +411,56 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
402 } 411 }
403 return true; break; 412 return true; break;
404#endif // RGBLIGHT_ENABLE 413#endif // RGBLIGHT_ENABLE
414
415
416 case KC_CCCV: // One key copy/paste
417 if(record->event.pressed){
418 copy_paste_timer = timer_read();
419 } else {
420 if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy
421 register_code(KC_LCTL);
422 tap(KC_C);
423 unregister_code(KC_LCTL);
424#ifdef AUDIO_ENABLE
425 PLAY_SONG(tone_copy);
426#endif
427 } else { // Tap, paste
428 register_code(KC_LCTL);
429 tap(KC_V);
430 unregister_code(KC_LCTL);
431#ifdef AUDIO_ENABLE
432 PLAY_SONG(tone_paste);
433#endif
434 }
435 }
436 return false;
437 break;
438
439#ifdef UNICODE_ENABLE
440 case UC_FLIP: // (╯°□°)╯ ︵ ┻━┻
441 if (record->event.pressed) {
442 register_code(KC_RSFT);
443 tap(KC_9);
444 unregister_code(KC_RSFT);
445 process_unicode((0x256F | QK_UNICODE), record); // Arm
446 process_unicode((0x00B0 | QK_UNICODE), record); // Eye
447 process_unicode((0x25A1 | QK_UNICODE), record); // Mouth
448 process_unicode((0x00B0 | QK_UNICODE), record); // Eye
449 register_code(KC_RSFT);
450 tap(KC_0);
451 unregister_code(KC_RSFT);
452 process_unicode((0x256F | QK_UNICODE), record); // Arm
453 tap(KC_SPC);
454 process_unicode((0x0361 | QK_UNICODE), record); // Flippy
455 tap(KC_SPC);
456 process_unicode((0x253B | QK_UNICODE), record); // Table
457 process_unicode((0x2501 | QK_UNICODE), record); // Table
458 process_unicode((0x253B | QK_UNICODE), record); // Table
459 }
460 return false;
461 break;
462#endif // UNICODE_ENABLE
463
405 } 464 }
406 return process_record_keymap(keycode, record); 465 return process_record_keymap(keycode, record);
407} 466}
@@ -413,6 +472,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
413uint32_t layer_state_set_user(uint32_t state) { 472uint32_t layer_state_set_user(uint32_t state) {
414#ifdef RGBLIGHT_ENABLE 473#ifdef RGBLIGHT_ENABLE
415 uint8_t default_layer = eeconfig_read_default_layer(); 474 uint8_t default_layer = eeconfig_read_default_layer();
475
416 if (rgb_layer_change) { 476 if (rgb_layer_change) {
417 switch (biton32(state)) { 477 switch (biton32(state)) {
418 case _NAV: 478 case _NAV:
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index b7cbaa44a..746c7e20a 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -20,25 +20,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "quantum.h" 20#include "quantum.h"
21 21
22// Define layer names 22// Define layer names
23#define _QWERTY 0 23enum userspace_layers {
24#define _NUMLOCK 0 24 _QWERTY = 0,
25#define _COLEMAK 1 25 _NUMLOCK = 0,
26#define _DVORAK 2 26 _COLEMAK,
27#define _WORKMAN 3 27 _DVORAK,
28#define _MODS 4 28 _WORKMAN,
29//#define _MISC 5 29 _MODS,
30#define _NAV 6 30 _NAV,
31#define _COVECUBE 7 31 _COVECUBE,
32#define _SYMB 8 32 _SYMB,
33#define _GAMEPAD 9 33 _GAMEPAD,
34#define _DIABLO 10 34 _DIABLO,
35#define _MOUS 11 35 _MOUS,
36#define _MACROS 12 36 _MACROS,
37#define _MEDIA 13 37 _MEDIA,
38#define _LOWER 14 38 _LOWER,
39#define _RAISE 15 39 _RAISE,
40#define _ADJUST 16 40 _ADJUST,
41 41};
42 42
43//define modifiers 43//define modifiers
44#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 44#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
@@ -83,6 +83,10 @@ enum userspace_custom_keycodes {
83 KC_SECRET_3, 83 KC_SECRET_3,
84 KC_SECRET_4, 84 KC_SECRET_4,
85 KC_SECRET_5, 85 KC_SECRET_5,
86 KC_CCCV,
87#ifdef UNICODE_ENABLE
88 UC_FLIP,
89#endif //UNICODE_ENABLE
86 NEW_SAFE_RANGE //use "NEWPLACEHOLDER for keymap specific codes 90 NEW_SAFE_RANGE //use "NEWPLACEHOLDER for keymap specific codes
87}; 91};
88 92
@@ -107,6 +111,72 @@ enum {
107}; 111};
108#endif // TAP_DANCE_ENABLE 112#endif // TAP_DANCE_ENABLE
109 113
114#ifdef UNICODEMAP_ENABLE
115
116/* use X(n) to call the */
117
118
119enum unicode_name {
120 THINK, // thinking face 🤔
121 GRIN, // grinning face 😊
122 SMRK, // smirk 😏
123 WEARY, // good shit 😩
124 UNAMU, // unamused 😒
125
126 SNEK, // snke 🐍
127 PENGUIN, // 🐧
128 DRAGON, // 🐉
129 MONKEY, // 🐒
130 CHICK, // 🐥
131
132 OKOK, // 👌
133 EFFU, // 🖕
134 INUP, // 👆
135 THUP, // 👍
136 THDN, // 👎
137
138 BBB, // dat B 🅱
139 POO, // poop 💩
140 HUNDR, // 100 💯
141 EGGPL, // EGGPLANT 🍆
142 WATER, // wet 💦
143 TUMBLER, // 🥃
144
145 LIT, // fire 🔥
146 IRONY, // ‽
147 DEGREE, // °
148};
149
150
151const uint32_t PROGMEM unicode_map[] = {
152 [THINK] = 0x1F914,
153 [GRIN] = 0x1F600,
154 [BBB] = 0x1F171,
155 [POO] = 0x1F4A9,
156 [HUNDR] = 0x1F4AF,
157 [SMRK] = 0x1F60F,
158 [WEARY] = 0x1F629,
159 [EGGPL] = 0x1F346,
160 [WATER] = 0x1F4A6,
161 [LIT] = 0x1F525,
162 [UNAMU] = 0x1F612,
163 [SNEK] = 0x1F40D,
164 [PENGUIN] = 0x1F427,
165 [BOAR] = 0x1F417,
166 [MONKEY] = 0x1F412,
167 [CHICK] = 0x1F425,
168 [DRAGON] = 0x1F409,
169 [OKOK] = 0x1F44C,
170 [EFFU] = 0x1F595,
171 [INUP] = 0x1F446,
172 [THDN] = 0x1F44E,
173 [THUP] = 0x1F44D,
174 [TUMBLER] = 0x1F943,
175 [IRONY] = 0x0203D,
176 [DEGREE] = 0x000B0,
177 };
178
179#endif //UNICODEMAP_ENABLE
110 180
111// Custom Keycodes for Diablo 3 layer 181// Custom Keycodes for Diablo 3 layer
112// But since TD() doesn't work when tap dance is disabled 182// But since TD() doesn't work when tap dance is disabled
@@ -199,13 +269,13 @@ enum {
199#define _________________DVORAK_R3_________________ KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z) 269#define _________________DVORAK_R3_________________ KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z)
200 270
201 271
202#define _________________WORKMAN_L1________________ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y 272#define _________________WORKMAN_L1________________ KC_Q, KC_D, KC_R, KC_W, KC_B
203#define _________________WORKMAN_L2________________ KC_A, KC_O, KC_E, KC_U, KC_I 273#define _________________WORKMAN_L2________________ KC_A, KC_S, KC_H, KC_T, KC_G
204#define _________________WORKMAN_L3________________ CTL_T(KC_SCLN),KC_Q, KC_J, KC_K, KC_X 274#define _________________WORKMAN_L3________________ CTL_T(KC_Z), KC_X, KC_M, KC_C, KC_V
205 275
206#define _________________WORKMAN_R1________________ KC_F, KC_G, KC_C, KC_R, KC_L 276#define _________________WORKMAN_R1________________ KC_J, KC_F, KC_U, KC_P, KC_SCLN
207#define _________________WORKMAN_R2________________ KC_D, KC_H, KC_T, KC_N, KC_S 277#define _________________WORKMAN_R2________________ KC_Y, KC_N, KC_E, KC_O, KC_I
208#define _________________WORKMAN_R3________________ KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z) 278#define _________________WORKMAN_R3________________ KC_K, KC_L, KC_COMM, KC_DOT, CTL_T(KC_SLASH)
209 279
210 280
211#define _________________NORMAN_L1_________________ KC_Q, KC_W, KC_D, KC_F, KC_K 281#define _________________NORMAN_L1_________________ KC_Q, KC_W, KC_D, KC_F, KC_K
@@ -226,4 +296,9 @@ enum {
226#define ___________ERGODOX_BOTTOM_RIGHT____________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 296#define ___________ERGODOX_BOTTOM_RIGHT____________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
227 297
228 298
299#define __________________ERGODOX_THUMB_CLUSTER_____________________ ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE), \
300 KC_HOME, KC_PGUP, \
301 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
302
303
229#endif 304#endif
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 062ecd3c4..123c0cc70 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -2,4 +2,6 @@
2SRC += drashna.c 2SRC += drashna.c
3EXTRAFLAGS += -flto 3EXTRAFLAGS += -flto
4 4
5 5ifeq ($(strip $(NO_SECRETS)), yes)
6 OPT_DEFS += -DNO_SECRETS
7endif