aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-03-31 19:38:06 -0700
committerJack Humbert <jack.humb@gmail.com>2018-03-31 22:38:06 -0400
commit61a2169ff9dea52136139ec156995efdc7929851 (patch)
tree5aebd210218859e55b211f10684ef15fc23f9dcc
parentadae37f19f0d16b703e1ebce0449822492098444 (diff)
downloadqmk_firmware-61a2169ff9dea52136139ec156995efdc7929851.tar.gz
qmk_firmware-61a2169ff9dea52136139ec156995efdc7929851.zip
Update to Drashna Keymaps and Userspace (#2650)
* Change global config.h settings * Make Shift LED brighter * Compatibility Tweaks * Update ASCII art and layer comments * Add comments about MOD layer * Change ASCII art for reset, since it was out of date * Use Overwatch theme for Workman layer * Fix RGB define comments * Make sure RGB set list matches * Stop all notes for custom Faux Click * Switch to OSM for everything, and remove RGB Sleep * Never use KEYMAP now * Only enable RGB Sleep on Non-Ergodox boards * Cleanup do to new rgblight_list.h file * Add redirect message for RGB codes * Update userspace documentation * Cleanup of Userspace Add unicode support, and cleaned up comments for ifdef statements * Remove unneeded slashes * Unicode handling * Force NKRO
Diffstat
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c64
-rw-r--r--keyboards/viterbi/keymaps/drashna/keymap.c60
-rw-r--r--layouts/community/ergodox/drashna/keymap.c31
-rw-r--r--users/drashna/config.h12
-rw-r--r--users/drashna/drashna.c38
-rw-r--r--users/drashna/drashna.h52
-rw-r--r--users/drashna/readme.md39
-rw-r--r--users/drashna/rules.mk4
8 files changed, 152 insertions, 148 deletions
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index a70da63bb..480540144 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -36,50 +36,50 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
36 36
37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 38
39[_QWERTY] = KEYMAP_wrapper(\ 39[_QWERTY] = LAYOUT_wrapper(\
40 KC_ESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ 40 KC_ESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC,
41 KC_TAB, _________________QWERTY_L2_________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________QWERTY_R2_________________, KC_QUOT, \ 41 KC_TAB, _________________QWERTY_L2_________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________QWERTY_R2_________________, KC_QUOT,
42 KC_MLSF, _________________QWERTY_L3_________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________QWERTY_R3_________________, KC_LGUI \ 42 KC_MLSF, _________________QWERTY_L3_________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________QWERTY_R3_________________, KC_LGUI
43), 43),
44 44
45[_COLEMAK] = KEYMAP_wrapper(\ 45[_COLEMAK] = LAYOUT_wrapper(\
46 KC_ESC, _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSPC, \ 46 KC_ESC, _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSPC,
47 KC_TAB, _________________COLEMAK_L2________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________COLEMAK_R2________________, KC_QUOT, \ 47 KC_TAB, _________________COLEMAK_L2________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________COLEMAK_R2________________, KC_QUOT,
48 KC_MLSF, _________________COLEMAK_L3________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________COLEMAK_R3________________, KC_LGUI \ 48 KC_MLSF, _________________COLEMAK_L3________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________COLEMAK_R3________________, KC_LGUI
49), 49),
50 50
51[_DVORAK] = KEYMAP_wrapper(\ 51[_DVORAK] = LAYOUT_wrapper(\
52 KC_ESC, _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSPC, \ 52 KC_ESC, _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSPC,
53 KC_TAB, _________________DVORAK_L2_________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________DVORAK_R2_________________, KC_MINS, \ 53 KC_TAB, _________________DVORAK_L2_________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________DVORAK_R2_________________, KC_MINS,
54 KC_MLSF, _________________DVORAK_L3_________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________DVORAK_R3_________________, KC_LGUI \ 54 KC_MLSF, _________________DVORAK_L3_________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________DVORAK_R3_________________, KC_LGUI
55), 55),
56[_WORKMAN] = KEYMAP_wrapper(\ 56[_WORKMAN] = LAYOUT_wrapper(\
57 KC_ESC, _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, KC_BSPC, \ 57 KC_ESC, _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, KC_BSPC,
58 KC_TAB, _________________WORKMAN_L2________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________WORKMAN_R2________________, KC_MINS, \ 58 KC_TAB, _________________WORKMAN_L2________________, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, _________________WORKMAN_R2________________, KC_MINS,
59 KC_MLSF, _________________WORKMAN_L3________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________WORKMAN_R3________________, KC_LGUI \ 59 KC_MLSF, _________________WORKMAN_L3________________, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, _________________WORKMAN_R3________________, KC_LGUI
60), 60),
61[_MODS] = KEYMAP(\ 61[_MODS] = LAYOUT(\
62 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 62 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
63 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 63 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
64 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 64 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
65), 65),
66 66
67[_LOWER] = KEYMAP(\ 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_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_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,
70 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ \ 70 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______
71), 71),
72 72
73[_RAISE] = KEYMAP(\ 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_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, 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_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,
76 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \ 76 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_HOME, KC_COMM, KC_DOT, KC_END, _______
77), 77),
78 78
79[_ADJUST] = KEYMAP(\ 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, KC_FXCL, 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
85 85
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/viterbi/keymaps/drashna/keymap.c
index cff6ebf69..b5a7c18f8 100644
--- a/keyboards/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/viterbi/keymaps/drashna/keymap.c
@@ -27,51 +27,51 @@ extern keymap_config_t keymap_config;
27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28 28
29 [_NUMLOCK] = LAYOUT_ortho_5x7( 29 [_NUMLOCK] = LAYOUT_ortho_5x7(
30 LMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS, \ 30 LMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS,
31 MEDIA, KC_CALC, COVECUBE,KC_P7, KC_P8, KC_P9, KC_PAST, \ 31 MEDIA, KC_CALC, COVECUBE,KC_P7, KC_P8, KC_P9, KC_PAST,
32 KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS, \ 32 KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS,
33 KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS, \ 33 KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS,
34 KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_COLN, KC_PENT \ 34 KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_COLN, KC_PENT
35 ), 35 ),
36 36
37 [_DIABLO] = LAYOUT_ortho_5x7( 37 [_DIABLO] = LAYOUT_ortho_5x7(
38 KC_ESC, DIABLO, KC_V, KC_D, XXXXXXX, XXXXXXX, KC_L, \ 38 KC_ESC, DIABLO, KC_V, KC_D, XXXXXXX, XXXXXXX, KC_L,
39 KC_TAB, KC_S, KC_F, KC_I, KC_M, KC_T, KC_J, \ 39 KC_TAB, KC_S, KC_F, KC_I, KC_M, KC_T, KC_J,
40 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, KC_F, \ 40 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, KC_F,
41 KC_LCTL, KC_D3_3, KC_D3_3, KC_D3_3, KC_D3_3, KC_Z, KC_DIABLO_CLEAR, \ 41 KC_LCTL, KC_D3_3, KC_D3_3, KC_D3_3, KC_D3_3, KC_Z, KC_DIABLO_CLEAR,
42 KC_LALT, KC_F4, KC_F5, KC_F8, KC_F9, KC_F10, SFT_T(KC_SPACE) \ 42 KC_LALT, KC_F4, KC_F5, KC_F8, KC_F9, KC_F10, SFT_T(KC_SPACE)
43 ), 43 ),
44 44
45 [_GAMEPAD] = LAYOUT_ortho_5x7( // Game pad layout designed primarily for Overwatch 45 [_GAMEPAD] = LAYOUT_ortho_5x7( // Game pad layout designed primarily for Overwatch
46 LMACRO, KC_ESC, GAMEPAD, KC_1, KC_2, KC_3, KC_4, \ 46 LMACRO, KC_ESC, GAMEPAD, KC_1, KC_2, KC_3, KC_4,
47 MEDIA, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, \ 47 MEDIA, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
48 KC_Z, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, \ 48 KC_Z, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
49 KC_Y, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, \ 49 KC_Y, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
50 KC_F1, KC_U, KC_I, KC_Y, KC_V, KC_SPC, KC_V \ 50 KC_F1, KC_U, KC_I, KC_Y, KC_V, KC_SPC, KC_V
51 ), 51 ),
52 52
53 [_MACROS] = LAYOUT_ortho_5x7( 53 [_MACROS] = LAYOUT_ortho_5x7(
54 LMACRO, KC_OVERWATCH,GAMEPAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 54 LMACRO, KC_OVERWATCH,GAMEPAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
55 KC_C9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 55 KC_C9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
56 KC_SYMM, KC_TORB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 56 KC_SYMM, KC_TORB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
57 KC_GLHF, KC_GOODGAME, KC_GGEZ, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 57 KC_GLHF, KC_GOODGAME, KC_GGEZ, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
58 KC_SALT, KC_MORESALT, KC_SALTHARD, KC_JUSTGAME, KC_AIM, XXXXXXX, KC_PENT \ 58 KC_SALT, KC_MORESALT, KC_SALTHARD, KC_JUSTGAME, KC_AIM, XXXXXXX, KC_PENT
59 ), 59 ),
60 60
61 [_COVECUBE] = LAYOUT_ortho_5x7( 61 [_COVECUBE] = LAYOUT_ortho_5x7(
62 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 62 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
63 XXXXXXX, XXXXXXX, COVECUBE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 63 XXXXXXX, XXXXXXX, COVECUBE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
64 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 64 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
65 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 65 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
66 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ 66 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
67 ), 67 ),
68 68
69 [_MEDIA] = LAYOUT_ortho_5x7( 69 [_MEDIA] = LAYOUT_ortho_5x7(
70 KC_MAKE, KC_RESET,MU_TOG, AUD_ON, AUD_OFF, KC_FXCL, RGB_SAD, \ 70 KC_MAKE, KC_RESET,MU_TOG, AUD_ON, AUD_OFF, KC_FXCL, RGB_SAD,
71 MEDIA, EPRM, KC_RGB_T,RGB_M_P, RGB_M_B, RGB_M_R, RGB_SAI, \ 71 MEDIA, EPRM, KC_RGB_T,RGB_M_P, RGB_M_B, RGB_M_R, RGB_SAI,
72 RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_HUD, \ 72 RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_HUD,
73 KC_MPLY, KC_MPRV, KC_MNXT, RGB_M_X, RGB_M_G, RGB_M_P, RGB_HUI, \ 73 KC_MPLY, KC_MPRV, KC_MNXT, RGB_M_X, RGB_M_G, RGB_M_P, RGB_HUI,
74 KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI \ 74 KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI
75 ) 75 )
76 76
77 77
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 6801f4f49..f29c57f2e 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -30,7 +30,7 @@ bool skip_leds = false;
30 30
31 31
32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33/* Keymap 0: Basic layer 33/* Keymap 0: QWERTY Layer
34 * 34 *
35 * 35 *
36 * ,--------------------------------------------------. ,--------------------------------------------------. 36 * ,--------------------------------------------------. ,--------------------------------------------------.
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
42 * |--------+------+------+------+------+------| TG(2)| | TG(2)|------+------+------+------+------+--------| 42 * |--------+------+------+------+------+------| TG(2)| | TG(2)|------+------+------+------+------+--------|
43 * | Shift | Z | X | C | V | B | | | | N | M | , < | . > | ? / | Shift | 43 * | Shift | Z | X | C | V | B | | | | N | M | , < | . > | ? / | Shift |
44 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 44 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
45 * | `/SYM| ' " | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB | 45 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
46 * `----------------------------------' `----------------------------------' 46 * `----------------------------------' `----------------------------------'
47 * ,--------------. ,--------------. 47 * ,--------------. ,--------------.
48 * |Alt/Ap| Win | | Alt |Ctl/Esc| 48 * |Alt/Ap| Win | | Alt |Ctl/Esc|
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
65 65
66 66
67 ), 67 ),
68/* Keymap 0: Basic layer 68/* Keymap 0: COLEMAK layer
69 * 69 *
70 * ,--------------------------------------------------. ,--------------------------------------------------. 70 * ,--------------------------------------------------. ,--------------------------------------------------.
71 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | 71 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
76 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------| 76 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
77 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift | 77 * | LShift |Z/Ctrl| X | C | V | B | | | | K | M | , | . |//Ctrl| RShift |
78 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 78 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
79 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | 79 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
80 * `----------------------------------' `----------------------------------' 80 * `----------------------------------' `----------------------------------'
81 * ,-------------. ,-------------. 81 * ,-------------. ,-------------.
82 * | App | LGui | | Alt |Ctrl/Esc| 82 * | App | LGui | | Alt |Ctrl/Esc|
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
88 */ 88 */
89// If it accepts an argument (i.e, is a function), it doesn't need KC_. 89// If it accepts an argument (i.e, is a function), it doesn't need KC_.
90// Otherwise, it needs KC_* 90// Otherwise, it needs KC_*
91[_COLEMAK] = LAYOUT_ergodox_pretty_wrapper( 91 [_COLEMAK] = LAYOUT_ergodox_pretty_wrapper(
92 // left hand // right hand 92 // 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, 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,
94 KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS, 94 KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
99 KC_HOME, KC_PGUP, 99 KC_HOME, KC_PGUP,
100 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER 100 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
101 ), 101 ),
102/* Keymap 0: Basic layer 102/* Keymap 0: DVORAK Layout
103 * 103 *
104 * ,--------------------------------------------------. ,--------------------------------------------------. 104 * ,--------------------------------------------------. ,--------------------------------------------------.
105 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ | 105 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ |
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
110 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| 110 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
111 * | LShift |:/Ctrl| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift | 111 * | LShift |:/Ctrl| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift |
112 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 112 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
113 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | 113 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
114 * `----------------------------------' `----------------------------------' 114 * `----------------------------------' `----------------------------------'
115 * ,-------------. ,-------------. 115 * ,-------------. ,-------------.
116 * | App | LGui | | Alt |Ctrl/Esc| 116 * | App | LGui | | Alt |Ctrl/Esc|
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
122 */ 122 */
123// If it accepts an argument (i.e, is a function), it doesn't need KC_. 123// If it accepts an argument (i.e, is a function), it doesn't need KC_.
124// Otherwise, it needs KC_* 124// Otherwise, it needs KC_*
125[_DVORAK] = LAYOUT_ergodox_pretty_wrapper( 125 [_DVORAK] = LAYOUT_ergodox_pretty_wrapper(
126 // left hand // right hand 126 // 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, 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,
128 KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH, 128 KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133 KC_HOME, KC_PGUP, 133 KC_HOME, KC_PGUP,
134 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER 134 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
135 ), 135 ),
136/* Keymap 0: Basic layer 136/* Keymap 0: WORKMAN layer
137 * 137 *
138 * ,--------------------------------------------------. ,--------------------------------------------------. 138 * ,--------------------------------------------------. ,--------------------------------------------------.
139 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | 139 * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
144 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------| 144 * |--------+------+------+------+------+------| OVER | | Meh |------+------+------+------+------+--------|
145 * | LShift |Z/Ctrl| X | M | C | V | | | | K | L | , | . |//Ctrl| RShift | 145 * | LShift |Z/Ctrl| X | M | C | V | | | | K | L | , | . |//Ctrl| RShift |
146 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 146 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
147 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | 147 * | `/SYM| MEH | LGUI | [ { | ] } | | LEFT | DOWN | UP |RIGHT | SYMB |
148 * `----------------------------------' `----------------------------------' 148 * `----------------------------------' `----------------------------------'
149 * ,-------------. ,-------------. 149 * ,-------------. ,-------------.
150 * | App | LGui | | Alt |Ctrl/Esc| 150 * | App | LGui | | Alt |Ctrl/Esc|
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
156 */ 156 */
157// If it accepts an argument (i.e, is a function), it doesn't need KC_. 157// If it accepts an argument (i.e, is a function), it doesn't need KC_.
158// Otherwise, it needs KC_* 158// Otherwise, it needs KC_*
159[_WORKMAN] = LAYOUT_ergodox_pretty_wrapper( 159 [_WORKMAN] = LAYOUT_ergodox_pretty_wrapper(
160 // left hand 160 // 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, 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,
162 KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS, 162 KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
@@ -168,6 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
168 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER 168 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
169 ), 169 ),
170 170
171// Reverts OSM(Shift) to normal Shifts. However, may not need since we fixed the issue with RDP (LOCAL RESOURCES)
171 [_MODS] = LAYOUT_ergodox_pretty( 172 [_MODS] = LAYOUT_ergodox_pretty(
172 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 173 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
173 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 174 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -184,11 +185,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
184* ,--------------------------------------------------. ,--------------------------------------------------. 185* ,--------------------------------------------------. ,--------------------------------------------------.
185* | ESC | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | 186* | ESC | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
186* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| 187* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
187* | VERSION| ! | @ | { | } | | | | | | + | 7 | 8 | 9 | * | F12 | 188* | RESET | ! | @ | { | } | | | | | | + | 7 | 8 | 9 | * | F12 |
188* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 189* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
189* | MAKE | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | / | PrtSc | 190* | MAKE | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | / | PrtSc |
190* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 191* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
191* | RESET | % | ^ | [ | ] | ~ | | | | NUM | 1 | 2 | 3 | = | PAUSE | 192* | VRSN | % | ^ | [ | ] | ~ | | | | NUM | 1 | 2 | 3 | = | PAUSE |
192* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 193* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
193* | LT0 | & | * | : | ; | | | 0 | NUM. | ENT | ENT | 194* | LT0 | & | * | : | ; | | | 0 | NUM. | ENT | ENT |
194* `----------------------------------' `----------------------------------' 195* `----------------------------------' `----------------------------------'
@@ -202,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
202*/ 203*/
203 [_SYMB] = LAYOUT_ergodox_pretty( 204 [_SYMB] = LAYOUT_ergodox_pretty(
204 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, 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,
205 KC_RESET, 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, 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,
206 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, 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,
207 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, 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,
208 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCLN, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, KC_TRNS, 209 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCLN, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, KC_TRNS,
@@ -348,7 +349,7 @@ void matrix_scan_keymap(void) { // runs frequently to update info
348 // Also, no "else", since we want to know each, independently. 349 // Also, no "else", since we want to know each, independently.
349 if (modifiders & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) { 350 if (modifiders & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
350 ergodox_right_led_2_on(); 351 ergodox_right_led_2_on();
351 ergodox_right_led_2_set( 10 ); 352 ergodox_right_led_2_set( 50 );
352 } 353 }
353 if (modifiders & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) { 354 if (modifiders & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) {
354 ergodox_right_led_1_on(); 355 ergodox_right_led_1_on();
diff --git a/users/drashna/config.h b/users/drashna/config.h
index f33721d23..68394ee4d 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -3,17 +3,19 @@
3 3
4 4
5#ifdef AUDIO_ENABLE 5#ifdef AUDIO_ENABLE
6#define STARTUP_SONG SONG(IMPERIAL_MARCH) 6#define STARTUP_SONG SONG(E1M1_DOOM)
7#define GOODBYE_SONG SONG(SONIC_RING) 7#define GOODBYE_SONG SONG(SONIC_RING)
8#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ 8#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
9 SONG(COLEMAK_SOUND), \ 9 SONG(COLEMAK_SOUND), \
10 SONG(DVORAK_SOUND), \ 10 SONG(DVORAK_SOUND), \
11 SONG(PLOVER_SOUND) \ 11 SONG(OVERWATCH_THEME) \
12 } 12 }
13#endif 13#endif
14 14
15#ifdef RGBLIGHT_ENABLE 15#ifdef RGBLIGHT_ENABLE
16#define RGBLIGHT_SLEEP 16 #ifndef KEYBOARD_ergodox_ez
17 #define RGBLIGHT_SLEEP
18 #endif
17#endif // RGBLIGHT_ENABLE 19#endif // RGBLIGHT_ENABLE
18 20
19 21
@@ -40,6 +42,8 @@
40#undef PERMISSIVE_HOLD 42#undef PERMISSIVE_HOLD
41#undef PREVENT_STUCK_MODIFIERS 43#undef PREVENT_STUCK_MODIFIERS
42 44
45#define FORCE_NKRO
46
43#ifndef TAPPING_TOGGLE 47#ifndef TAPPING_TOGGLE
44#define TAPPING_TOGGLE 1 48#define TAPPING_TOGGLE 1
45#endif 49#endif
@@ -47,7 +51,7 @@
47#ifdef TAPPING_TERM 51#ifdef TAPPING_TERM
48#undef TAPPING_TERM 52#undef TAPPING_TERM
49#endif 53#endif
50#define TAPPING_TERM 150 54#define TAPPING_TERM 160
51 55
52 56
53// Disable action_get_macro and fn_actions, since we don't use these 57// 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 d23b9b9df..170c320d3 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18#include "drashna.h" 18#include "drashna.h"
19#include "version.h" 19#include "version.h"
20 20
21#if (__has_include("secrets.h")) 21#if (__has_include("secrets.h") && !defined(NO_SECRETS))
22#include "secrets.h" 22#include "secrets.h"
23#else 23#else
24// `PROGMEM const char secret[][x]` may work better, but it takes up more space in the firmware 24// `PROGMEM const char secret[][x]` may work better, but it takes up more space in the firmware
@@ -36,10 +36,10 @@ PROGMEM const char secret[][64] = {
36#ifdef FAUXCLICKY_ENABLE 36#ifdef FAUXCLICKY_ENABLE
37float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A6, 2); // (_D4, 0.25); 37float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A6, 2); // (_D4, 0.25);
38float fauxclicky_released_note[2] = MUSICAL_NOTE(_A6, 2); // (_C4, 0.125); 38float fauxclicky_released_note[2] = MUSICAL_NOTE(_A6, 2); // (_C4, 0.125);
39#else 39#else // FAUXCLICKY_ENABLE
40float fauxclicky_pressed[][2] = SONG(S__NOTE(_A6)); // change to your tastes 40float fauxclicky_pressed[][2] = SONG(S__NOTE(_A6)); // change to your tastes
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 42#endif // FAUXCLICKY_ENABLE
43 43
44bool faux_click_enabled = false; 44bool faux_click_enabled = false;
45bool is_overwatch = false; 45bool is_overwatch = false;
@@ -127,7 +127,7 @@ void run_diablo_macro_check(void) {
127 } 127 }
128} 128}
129 129
130#endif 130#endif // TAP_DANCE_ENABLE
131 131
132 132
133// Add reconfigurable functions here, for keymap customization 133// Add reconfigurable functions here, for keymap customization
@@ -178,10 +178,15 @@ void matrix_init_user(void) {
178 } 178 }
179 else 179 else
180 { 180 {
181 rgblight_set_red; 181 rgblight_setrgb_red();
182 rgblight_mode(5); 182 rgblight_mode(5);
183 } 183 }
184#endif 184#endif // RGBLIGHT_ENABLE
185
186#if ( defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) )
187 set_unicode_input_mode(UC_WINC);
188#endif //UNICODE_ENABLE
189
185 matrix_init_keymap(); 190 matrix_init_keymap();
186} 191}
187// No global matrix scan code, so just run keymap's matrix 192// No global matrix scan code, so just run keymap's matrix
@@ -189,7 +194,7 @@ void matrix_init_user(void) {
189void matrix_scan_user(void) { 194void matrix_scan_user(void) {
190#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. 195#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code.
191 run_diablo_macro_check(); 196 run_diablo_macro_check();
192#endif 197#endif // TAP_DANCE_ENABLE
193 matrix_scan_keymap(); 198 matrix_scan_keymap();
194} 199}
195 200
@@ -209,29 +214,24 @@ bool send_game_macro(const char *str, keyrecord_t *record, bool override) {
209 return false; 214 return false;
210} 215}
211 216
212// Sent the default layer
213void persistent_default_layer_set(uint16_t default_layer) {
214 eeconfig_update_default_layer(default_layer);
215 default_layer_set(default_layer);
216}
217
218 217
219// Defines actions tor my global custom keycodes. Defined in drashna.h file 218// Defines actions tor my global custom keycodes. Defined in drashna.h file
220// Then runs the _keymap's record handier if not processed here 219// Then runs the _keymap's record handier if not processed here
221bool process_record_user(uint16_t keycode, keyrecord_t *record) { 220bool process_record_user(uint16_t keycode, keyrecord_t *record) {
222 221
223// If console is enabled, it will print the matrix position and status of each key pressed 222 // If console is enabled, it will print the matrix position and status of each key pressed
224#ifdef CONSOLE_ENABLE 223#ifdef CONSOLE_ENABLE
225 xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed); 224 xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
226#endif //CONSOLE_ENABLE 225#endif //CONSOLE_ENABLE
227 226
228// Run custom faux click code, but only if faux clicky is enabled 227 // Run custom faux click code, but only if faux clicky is enabled
229#ifdef AUDIO_ENABLE 228#ifdef AUDIO_ENABLE
230 if ( (faux_click_enabled && keycode != KC_FXCL) || (!faux_click_enabled && keycode == KC_FXCL) ) { 229 if ( (faux_click_enabled && keycode != KC_FXCL) || (!faux_click_enabled && keycode == KC_FXCL) ) {
231 if (record->event.pressed) { 230 if (record->event.pressed) {
231 stop_all_notes();
232 PLAY_SONG(fauxclicky_pressed); 232 PLAY_SONG(fauxclicky_pressed);
233 } else { 233 } else {
234 stop_note(NOTE_A6); 234 stop_all_notes();
235 PLAY_SONG(fauxclicky_released); 235 PLAY_SONG(fauxclicky_released);
236 } 236 }
237 } 237 }
@@ -307,7 +307,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
307 ":teensy" 307 ":teensy"
308#elif defined(BOOTLOADER_CATERINA) 308#elif defined(BOOTLOADER_CATERINA)
309 ":avrdude" 309 ":avrdude"
310#endif 310#endif // bootloader options
311 SS_TAP(X_ENTER)); 311 SS_TAP(X_ENTER));
312 } 312 }
313 return false; 313 return false;
@@ -320,7 +320,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
320 rgblight_enable(); 320 rgblight_enable();
321 rgblight_mode(1); 321 rgblight_mode(1);
322 rgblight_setrgb_red(); 322 rgblight_setrgb_red();
323#endif 323#endif // RGBLIGHT_ENABLE
324 reset_keyboard(); 324 reset_keyboard();
325 } 325 }
326 return false; 326 return false;
@@ -498,7 +498,7 @@ uint32_t layer_state_set_user(uint32_t state) {
498 break; 498 break;
499 } 499 }
500 } 500 }
501#endif 501#endif // RGBLIGHT_ENABLE
502 return layer_state_set_keymap (state); 502 return layer_state_set_keymap (state);
503} 503}
504 504
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index e723c846f..1086fa02e 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -46,47 +46,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
46#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) 46#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
47#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) 47#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
48 48
49#ifndef RGBLIGHT_ANIMATIONS // add "EXTRA_FLADS=-DDRASHNA_SETRGB" to enable this ... but don't 49// RGB color codes are no longer located here anymore. Instead, you will want to
50#define rgblight_set_white rgblight_setrgb (0xFF, 0xFF, 0xFF); 50// head to https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h
51#define rgblight_set_red rgblight_setrgb (0xFF, 0x00, 0x00);
52#define rgblight_set_coral rgblight_setrgb (0xFF, 0x7C, 0x4D);
53#define rgblight_set_orange rgblight_setrgb (0xFF, 0x80, 0x00);
54#define rgblight_set_goldenrod rgblight_setrgb (0xD9, 0xA5, 0x21);
55#define rgblight_set_gold rgblight_setrgb (0xFF, 0xD9, 0x00);
56#define rgblight_set_yellow rgblight_setrgb (0xFF, 0xFF, 0x00);
57#define rgblight_set_chartreuse rgblight_setrgb (0x80, 0xFF, 0x00);
58#define rgblight_set_green rgblight_setrgb (0x00, 0xFF, 0x00);
59#define rgblight_set_springgreen rgblight_setrgb (0x00, 0xFF, 0x80);
60#define rgblight_set_turquoise rgblight_setrgb (0x47, 0x6E, 0x6A);
61#define rgblight_set_teal rgblight_setrgb (0x00, 0x80, 0x80);
62#define rgblight_set_cyan rgblight_setrgb (0x00, 0xFF, 0xFF);
63#define rgblight_set_azure rgblight_setrgb (0x99, 0xf5, 0xFF);
64#define rgblight_set_blue rgblight_setrgb (0x00, 0x00, 0xFF);
65#define rgblight_set_purple rgblight_setrgb (0x7A, 0x00, 0xFF);
66#define rgblight_set_magenta rgblight_setrgb (0xFF, 0x00, 0xFF);
67#define rgblight_set_pink rgblight_setrgb (0xFF, 0x80, 0xBF);
68#else
69#define rgblight_set_white rgblight_sethsv (0, 0x00, 255);
70#define rgblight_set_red rgblight_sethsv (0, 255, 255);
71#define rgblight_set_coral rgblight_sethsv (16, 176, 255);
72#define rgblight_set_orange rgblight_sethsv (39, 255, 255);
73#define rgblight_set_goldenrod rgblight_sethsv (43, 218, 218);
74#define rgblight_set_gold rgblight_sethsv (51, 255, 255);
75#define rgblight_set_yellow rgblight_sethsv (60, 255, 255);
76#define rgblight_set_chartreuse rgblight_sethsv (90, 255, 255);
77#define rgblight_set_green rgblight_sethsv (120, 255, 255);
78#define rgblight_set_springgreen rgblight_sethsv (150, 255, 255);
79#define rgblight_set_turquoise rgblight_sethsv (174, 90, 112);
80#define rgblight_set_teal rgblight_sethsv (180, 255, 128);
81#define rgblight_set_cyan rgblight_sethsv (180, 255, 255);
82#define rgblight_set_azure rgblight_sethsv (186, 102, 255);
83#define rgblight_set_blue rgblight_sethsv (240, 255, 255);
84#define rgblight_set_purple rgblight_sethsv (270, 255, 255);
85#define rgblight_set_magenta rgblight_sethsv (300, 255, 255);
86#define rgblight_set_pink rgblight_sethsv (330, 128, 255);
87
88//#define rgblight_set_ rgblight_sethsv (0, 255, 255);
89#endif // DRASHNA_SETRGB
90 51
91extern bool is_overwatch; 52extern bool is_overwatch;
92extern bool rgb_layer_change; 53extern bool rgb_layer_change;
@@ -132,6 +93,12 @@ enum userspace_custom_keycodes {
132#define KC_SEC4 KC_SECRET_4 93#define KC_SEC4 KC_SECRET_4
133#define KC_SEC5 KC_SECRET_5 94#define KC_SEC5 KC_SECRET_5
134 95
96#define QWERTY KC_QWERTY
97#define DVORAK KC_DVORAK
98#define COLEMAK KC_COLEMAK
99#define WORKMAN KC_WORKMAN
100#define KC_RST KC_RESET
101
135#ifdef TAP_DANCE_ENABLE 102#ifdef TAP_DANCE_ENABLE
136enum { 103enum {
137 TD_D3_1 = 0, 104 TD_D3_1 = 0,
@@ -185,6 +152,7 @@ enum {
185#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) 152#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__)
186#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) 153#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__)
187#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) 154#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__)
155#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
188 156
189 157
190// Blocks for each of the four major keyboard layouts 158// Blocks for each of the four major keyboard layouts
@@ -255,7 +223,7 @@ enum {
255// this allows us to quickly modify the bottom row for all of the layouts 223// this allows us to quickly modify the bottom row for all of the layouts
256// so we don't have to alter it 4 times and hope that we haven't missed 224// so we don't have to alter it 4 times and hope that we haven't missed
257// anything 225// anything
258#define ___________ERGODOX_BOTTOM_LEFT_____________ KC_MEH, KC_LGUI, KC_LBRC, KC_RBRC 226#define ___________ERGODOX_BOTTOM_LEFT_____________ OSM(MOD_MEH), OSM(MOD_LGUI), KC_LBRC, KC_RBRC
259#define ___________ERGODOX_BOTTOM_RIGHT____________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 227#define ___________ERGODOX_BOTTOM_RIGHT____________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
260 228
261 229
diff --git a/users/drashna/readme.md b/users/drashna/readme.md
index 2229a3fe0..e3e5d399d 100644
--- a/users/drashna/readme.md
+++ b/users/drashna/readme.md
@@ -12,7 +12,7 @@ The reason for using seperate files here is that the `drashna.h` file doesn't ge
12 12
13However, the `rules.mk` file is included when building the firmware. So we can hijack that process to "manually" add a `config.h`. To do so, you would need to add the following to the `rules.mk` in your userspace: 13However, the `rules.mk` file is included when building the firmware. So we can hijack that process to "manually" add a `config.h`. To do so, you would need to add the following to the `rules.mk` in your userspace:
14 14
15``` 15```c
16ifneq ("$(wildcard users/$(KEYMAP)/config.h)","") 16ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
17 CONFIG_H += users/$(KEYMAP)/config.h 17 CONFIG_H += users/$(KEYMAP)/config.h
18endif 18endif
@@ -22,7 +22,7 @@ You can replace `$(KEYMAP)` with your name, but it's not necessary. This checks
22 22
23As for the `config.h` file, you want to make sure that it has an "ifdef" in it to make sure it's only used once. So you want something like this: 23As for the `config.h` file, you want to make sure that it has an "ifdef" in it to make sure it's only used once. So you want something like this:
24 24
25``` 25```c
26#ifndef USERSPACE_CONFIG_H 26#ifndef USERSPACE_CONFIG_H
27#define USERSPACE_CONFIG_H 27#define USERSPACE_CONFIG_H
28 28
@@ -122,7 +122,7 @@ If you would *also* like to take advantage of this feature, you'll first want to
122Then you can create this file and add your macro strings to it: 122Then you can create this file and add your macro strings to it:
123 123
124###### secrets.h 124###### secrets.h
125``` 125```c
126PROGMEM const char secret[][64] = { 126PROGMEM const char secret[][64] = {
127 "secret1", 127 "secret1",
128 "secret2", 128 "secret2",
@@ -132,11 +132,29 @@ PROGMEM const char secret[][64] = {
132}; 132};
133``` 133```
134 134
135Replacing the strings with the codes that you need. 135Replacing the strings with the codes that you need.
136 136
137In the `<name>.c` file, you will want to add this to the top:
137 138
138These are called in the `process_record_user` function, using this block: 139```c
140
141#if (__has_include("secrets.h") && !defined(NO_SECRETS))
142#include "secrets.h"
143#else
144// `PROGMEM const char secret[][x]` may work better, but it takes up more space in the firmware
145// And I'm not familiar enough to know which is better or why...
146PROGMEM const char secret[][64] = {
147 "test1",
148 "test2",
149 "test3",
150 "test4",
151 "test5"
152};
153#endif
139``` 154```
155
156And then, in the `process_record_user` function, you'll want to add this block:
157```c
140 case KC_SECRET_1 ... KC_SECRET_5: 158 case KC_SECRET_1 ... KC_SECRET_5:
141 if (!record->event.pressed) { 159 if (!record->event.pressed) {
142 send_string_P(secret[keycode - KC_SECRET_1]); 160 send_string_P(secret[keycode - KC_SECRET_1]);
@@ -145,4 +163,13 @@ These are called in the `process_record_user` function, using this block:
145 break; 163 break;
146``` 164```
147 165
148And this requires `KC_SECRET_1` through `KC_SECRET_5` to be defined, as well. 166And this requires `KC_SECRET_1` through `KC_SECRET_5` to be defined in your `<name>.h` file fo the new macros, as well.
167
168Additionally, if you want to make sure that you can disable the function without messing with the file, you need to add this to your `/users/<name>/rules.mk`, so that it catches the flag:
169```c
170ifeq ($(strip $(NO_SECRETS)), yes)
171 OPT_DEFS += -DNO_SECRETS
172endif
173```
174
175Then, if you run `make keyboard:name NO_SECRETS=yes`, it will default to the test strings in your `<name>.c` file, rather than reading from your file.
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 6d9f0664e..53e5da43d 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -5,3 +5,7 @@ EXTRAFLAGS += -flto
5ifneq ("$(wildcard users/$(KEYMAP)/config.h)","") 5ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
6 CONFIG_H += users/$(KEYMAP)/config.h 6 CONFIG_H += users/$(KEYMAP)/config.h
7endif 7endif
8
9ifeq ($(strip $(NO_SECRETS)), yes)
10 OPT_DEFS += -DNO_SECRETS
11endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-27 16:06:38 +0000