aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/crkbd/keymaps/drashna/keymap.c24
-rw-r--r--keyboards/keebio/iris/keymaps/drashna/keymap.c24
-rw-r--r--keyboards/keebio/iris/keymaps/drashna/rules.mk2
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna/config.h21
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna/keymap.c2
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna/rules.mk2
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna_old/config.h65
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk26
-rw-r--r--keyboards/orthodox/keymaps/drashna/config.h1
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c120
-rw-r--r--keyboards/orthodox/keymaps/drashna/rules.mk2
-rw-r--r--layouts/community/ergodox/drashna/config.h2
-rw-r--r--layouts/community/ergodox/drashna/keymap.c72
-rw-r--r--layouts/community/ergodox/drashna_glow/rules.mk4
-rw-r--r--layouts/community/ortho_4x12/drashna/config.h2
-rw-r--r--layouts/community/ortho_4x12/drashna/keymap.c182
-rw-r--r--users/drashna/config.h63
-rw-r--r--users/drashna/drashna.h7
-rw-r--r--users/drashna/process_records.c24
-rw-r--r--users/drashna/process_records.h4
-rw-r--r--users/drashna/rgb_stuff.c8
-rw-r--r--users/drashna/wrappers.h4
22 files changed, 398 insertions, 263 deletions
diff --git a/keyboards/crkbd/keymaps/drashna/keymap.c b/keyboards/crkbd/keymaps/drashna/keymap.c
index 678fd33b5..0a9ff24ff 100644
--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
@@ -58,6 +58,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
58 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________ 58 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
59 ), 59 ),
60 60
61 [_NORMAN] = LAYOUT_crkbd_base_wrapper(
62 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
63 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
64 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
65 ),
66
67 [_MALTRON] = LAYOUT_crkbd_base_wrapper(
68 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
69 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
70 _________________MALTRON_L3________________, _________________MALTRON_R3________________
71 ),
72
73 [_EUCALYN] = LAYOUT_crkbd_base_wrapper(
74 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
75 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
76 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
77 ),
78
79 [_CARPLAX] = LAYOUT_crkbd_base_wrapper(
80 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
81 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
82 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
83 ),
84
61 [_MODS] = LAYOUT_wrapper( 85 [_MODS] = LAYOUT_wrapper(
62 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______, 86 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
63 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______, 87 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
diff --git a/keyboards/keebio/iris/keymaps/drashna/keymap.c b/keyboards/keebio/iris/keymaps/drashna/keymap.c
index d89656b7e..0c3b0d6d4 100644
--- a/keyboards/keebio/iris/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/iris/keymaps/drashna/keymap.c
@@ -44,6 +44,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________ 44 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
45 ), 45 ),
46 46
47 [_NORMAN] = LAYOUT_iris_base_wrapper(
48 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
49 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
50 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
51 ),
52
53 [_MALTRON] = LAYOUT_iris_base_wrapper(
54 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
55 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
56 _________________MALTRON_L3________________, _________________MALTRON_R3________________
57 ),
58
59 [_EUCALYN] = LAYOUT_iris_base_wrapper(
60 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
61 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
62 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
63 ),
64
65 [_CARPLAX] = LAYOUT_iris_base_wrapper(
66 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
67 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
68 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
69 ),
70
47 [_MODS] = LAYOUT_wrapper( 71 [_MODS] = LAYOUT_wrapper(
48 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______, 72 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
49 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______, 73 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
diff --git a/keyboards/keebio/iris/keymaps/drashna/rules.mk b/keyboards/keebio/iris/keymaps/drashna/rules.mk
index ccc33c06f..e8035176e 100644
--- a/keyboards/keebio/iris/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/iris/keymaps/drashna/rules.mk
@@ -12,6 +12,6 @@ SWAP_HANDS_ENABLE = no
12 12
13INDICATOR_LIGHTS = yes 13INDICATOR_LIGHTS = yes
14MACROS_ENABLED = no 14MACROS_ENABLED = no
15RGBLIGHT_TWINKLE = yes 15RGBLIGHT_TWINKLE = no
16 16
17BOOTLOADER = qmk-dfu 17BOOTLOADER = qmk-dfu
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/config.h b/keyboards/keebio/viterbi/keymaps/drashna/config.h
index 6eb871a50..c0a50cc04 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna/config.h
@@ -17,6 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
18#pragma once 18#pragma once
19 19
20#undef MATRIX_ROWS
21#define MATRIX_ROWS 5
22
20#ifdef RGBLIGHT_ENABLE 23#ifdef RGBLIGHT_ENABLE
21#undef RGBLED_NUM 24#undef RGBLED_NUM
22#define RGBLED_NUM 16 25#define RGBLED_NUM 16
@@ -44,15 +47,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
44#undef PRODUCT 47#undef PRODUCT
45#define PRODUCT Drashnas Viterbi Macro Pad 48#define PRODUCT Drashnas Viterbi Macro Pad
46 49
47#define USE_I2C
48
49#ifdef AUDIO_ENABLE 50#ifdef AUDIO_ENABLE
50#define C6_AUDIO 51#define C6_AUDIO
51#define NO_MUSIC_MODE 52#define NO_MUSIC_MODE
52#endif 53#endif
53 54
54#define STRICT_LAYER_RELEASE
55
56#define LAYOUT_ortho_5x7( \ 55#define LAYOUT_ortho_5x7( \
57 L00, L01, L02, L03, L04, L05, L06, \ 56 L00, L01, L02, L03, L04, L05, L06, \
58 L10, L11, L12, L13, L14, L15, L16, \ 57 L10, L11, L12, L13, L14, L15, L16, \
@@ -60,13 +59,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
60 L30, L31, L32, L33, L34, L35, L36, \ 59 L30, L31, L32, L33, L34, L35, L36, \
61 L40, L41, L42, L43, L44, L45, L46 \ 60 L40, L41, L42, L43, L44, L45, L46 \
62 ) \ 61 ) \
63 LAYOUT( \ 62 { \
64 L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 63 { L00, L01, L02, L03, L04, L05, L06 }, \
65 L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 64 { L10, L11, L12, L13, L14, L15, L16 }, \
66 L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 65 { L20, L21, L22, L23, L24, L25, L26 }, \
67 L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 66 { L30, L31, L32, L33, L34, L35, L36 }, \
68 L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \ 67 { L40, L41, L42, L43, L44, L45, L46 }, \
69 ) 68 }
70 69
71#define QMK_ESC_OUTPUT F5 // usually COL 70#define QMK_ESC_OUTPUT F5 // usually COL
72#define QMK_ESC_INPUT D4 // usually ROW 71#define QMK_ESC_INPUT D4 // usually ROW
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
index 12f7fe25e..1afc59fb9 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
@@ -8,6 +8,8 @@ extern keymap_config_t keymap_config;
8// Layer names don't all need to be of the same length, obviously, and you can also skip them 8// Layer names don't all need to be of the same length, obviously, and you can also skip them
9// entirely and just use numbers. 9// entirely and just use numbers.
10 10
11
12// Fillers to make layering more clear
11#define LMACRO OSL(_MACROS) 13#define LMACRO OSL(_MACROS)
12#define DIABLO TG(_DIABLO) 14#define DIABLO TG(_DIABLO)
13#define GAMEPAD TG(_GAMEPAD) 15#define GAMEPAD TG(_GAMEPAD)
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
index ec3befc0b..f28ecc533 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
@@ -7,12 +7,12 @@ TAP_DANCE_ENABLE = no
7RGBLIGHT_ENABLE = yes 7RGBLIGHT_ENABLE = yes
8AUDIO_ENABLE = yes 8AUDIO_ENABLE = yes
9NKRO_ENABLE = yes 9NKRO_ENABLE = yes
10SPLIT_KEYBOARD = no
10 11
11NO_SECRETS = yes 12NO_SECRETS = yes
12MACROS_ENABLED = yes 13MACROS_ENABLED = yes
13INDICATOR_LIGHTS = no 14INDICATOR_LIGHTS = no
14RGBLIGHT_TWINKLE = no 15RGBLIGHT_TWINKLE = no
15
16LAYOUTS = ortho_5x7 16LAYOUTS = ortho_5x7
17 17
18# SRC := $(filter-out serial.c matrix.c i2c.c split_util.c,$(SRC)) 18# SRC := $(filter-out serial.c matrix.c i2c.c split_util.c,$(SRC))
diff --git a/keyboards/keebio/viterbi/keymaps/drashna_old/config.h b/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
index ddf9d1a40..b36a4edd4 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
@@ -15,72 +15,11 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_USER_H 18#pragma once
19#define CONFIG_USER_H
20
21#include QMK_KEYBOARD_CONFIG_H
22 19
20#include "../drashna/config.h"
23 21
24#ifdef RGBLIGHT_ENABLE 22#ifdef RGBLIGHT_ENABLE
25#undef RGBLED_NUM 23#undef RGBLED_NUM
26#define RGBLIGHT_ANIMATIONS
27#define RGBLED_NUM 12 24#define RGBLED_NUM 12
28#define RGBLIGHT_HUE_STEP 8
29#define RGBLIGHT_SAT_STEP 8
30#define RGBLIGHT_VAL_STEP 8
31#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
32#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
33#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
34#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 300
35#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
36#endif // RGBLIGHT_ENABLE
37
38
39#undef LOCKING_SUPPORT_ENABLE
40#undef LOCKING_RESYNC_ENABLE
41
42#ifndef NO_DEBUG
43#define NO_DEBUG
44#endif // !NO_DEBUG
45#ifndef NO_PRINT
46#define NO_PRINT
47#endif // !NO_PRINT
48
49/* disable action features */
50//#define NO_ACTION_LAYER
51//#define NO_ACTION_TAPPING
52//#define NO_ACTION_ONESHOT
53//#define NO_ACTION_MACRO
54//#define NO_ACTION_FUNCTION
55
56#undef PRODUCT
57#define PRODUCT Drashnas Viterbi Macro Pad
58
59#define USE_I2C
60
61#ifdef AUDIO_ENABLE
62#define C6_AUDIO
63#define NO_MUSIC_MODE
64#endif
65
66#define LAYOUT_ortho_5x7( \
67 L00, L01, L02, L03, L04, L05, L06, \
68 L10, L11, L12, L13, L14, L15, L16, \
69 L20, L21, L22, L23, L24, L25, L26, \
70 L30, L31, L32, L33, L34, L35, L36, \
71 L40, L41, L42, L43, L44, L45, L46 \
72 ) \
73 LAYOUT( \
74 L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
75 L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
76 L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
77 L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
78 L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \
79 )
80
81#endif 25#endif
82
83#define QMK_ESC_OUTPUT F5 // usually COL
84#define QMK_ESC_INPUT D4 // usually ROW
85#define QMK_LED B0
86#define QMK_SPEAKER C6
diff --git a/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
index 14ac6a6b3..73f37c6c5 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
@@ -1,28 +1,4 @@
1BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
2MOUSEKEY_ENABLE = no # Mouse keys(+4700)
3EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
4CONSOLE_ENABLE = no # Console for debug(+400)
5COMMAND_ENABLE = no # Commands for debug and configuration
6TAP_DANCE_ENABLE = no
7RGBLIGHT_ENABLE = yes
8AUDIO_ENABLE = yes
9NKRO_ENABLE = yes
10
11NO_SECRETS = yes
12MACROS_ENABLED = yes
13INDICATOR_LIGHTS = no
14RGBLIGHT_TWINKLE = no
15
16LAYOUTS = ortho_5x7
17
18# SRC := $(filter-out serial.c matrix.c i2c.c split_util.c,$(SRC))
19# SRC := $(filter-out serial.c,$(SRC))
20# SRC := $(filter-out matrix.c,$(SRC))
21# SRC := $(filter-out i2c.c,$(SRC))
22# SRC := $(filter-out split_util.c,$(SRC))
23# SRC += quantum/matrix.c
24
25USER_NAME := drashna 1USER_NAME := drashna
26SRC += ../drashna/keymap.c 2SRC += ../drashna/keymap.c
27 3
28BOOTLOADER = qmk-dfu 4include $(KEYBOARD_PATH_2)/keymaps/drashna/rules.mk
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index eed1cbe89..a2eaf63c3 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33#define EE_HANDS 33#define EE_HANDS
34 34
35/* key combination for magic key command */ 35/* key combination for magic key command */
36#undef IS_COMMAND
36#define IS_COMMAND() ( \ 37#define IS_COMMAND() ( \
37 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \ 38 get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \
38) 39)
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index 9373d851d..0f23bd9aa 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -47,53 +47,79 @@ uint8_t last_osm;
47 47
48const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 48const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
49 49
50[_QWERTY] = LAYOUT_orthodox_base_wrapper( 50 [_QWERTY] = LAYOUT_orthodox_base_wrapper(
51 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 51 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
52 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 52 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
53 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 53 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
54), 54 ),
55 55
56[_COLEMAK] = LAYOUT_orthodox_base_wrapper( 56 [_COLEMAK] = LAYOUT_orthodox_base_wrapper(
57 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 57 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
58 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 58 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
59 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 59 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
60), 60 ),
61 61
62[_DVORAK] = LAYOUT_orthodox_base_wrapper( 62 [_DVORAK] = LAYOUT_orthodox_base_wrapper(
63 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 63 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
64 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 64 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
65 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 65 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
66), 66 ),
67 67
68[_WORKMAN] = LAYOUT_orthodox_base_wrapper( 68 [_WORKMAN] = LAYOUT_orthodox_base_wrapper(
69 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, 69 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
70 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, 70 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
71 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________ 71 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
72), 72 ),
73 73
74[_MODS] = LAYOUT_wrapper(\ 74 [_NORMAN] = LAYOUT_orthodox_base_wrapper(
75 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 75 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 76 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
77 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 77 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
78), 78 ),
79 79
80[_LOWER] = LAYOUT_wrapper(\ 80 [_MALTRON] = LAYOUT_orthodox_base_wrapper(
81 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC, 81 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
82 KC_F11, _________________LOWER_L2__________________, _______, _______, _______, _______, _________________LOWER_R2__________________, KC_PIPE, 82 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
83 KC_F12, _________________LOWER_L3__________________, _______, _______, _______, _______, _______, _______, _________________LOWER_R3__________________, _______ 83 _________________MALTRON_L3________________, _________________MALTRON_R3________________
84), 84 ),
85 85
86[_RAISE] = LAYOUT_wrapper(\ 86 [_EUCALYN] = LAYOUT_orthodox_base_wrapper(
87 KC_GRV, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_BSPC, 87 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
88 _______, _________________RAISE_L2__________________, _______, _______, _______, _______, _________________RAISE_R2__________________, KC_BSLS, 88 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
89 _______, _________________RAISE_L3__________________, _______, _______, _______, _______, _______, _______, _________________RAISE_R3__________________, _______ 89 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
90), 90 ),
91 91
92[_ADJUST] = LAYOUT_wrapper(\ 92 [_CARPLAX] = LAYOUT_orthodox_base_wrapper(
93 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, 93 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
94 VRSN, _________________ADJUST_L2_________________, _______, _______, _______, KC_NUKE, _________________ADJUST_R2_________________, EEP_RST, 94 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
95 TG_MODS, _________________ADJUST_L3_________________, _______, _______, _______, _______, _______, _______, _________________ADJUST_R3_________________, KC_MPLY 95 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
96) 96 ),
97
98
99 [_MODS] = LAYOUT_wrapper(\
100 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
101 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
102 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
103 ),
104
105 [_LOWER] = LAYOUT_wrapper(\
106 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC,
107 KC_F11, _________________LOWER_L2__________________, _______, _______, _______, _______, _________________LOWER_R2__________________, KC_PIPE,
108 KC_F12, _________________LOWER_L3__________________, _______, _______, _______, _______, _______, _______, _________________LOWER_R3__________________, _______
109 ),
110
111 [_RAISE] = LAYOUT_wrapper(\
112 KC_GRV, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_BSPC,
113 _______, _________________RAISE_L2__________________, _______, _______, _______, _______, _________________RAISE_R2__________________, KC_BSLS,
114 _______, _________________RAISE_L3__________________, _______, _______, _______, _______, _______, _______, _________________RAISE_R3__________________, _______
115 ),
116
117 [_ADJUST] = LAYOUT_wrapper(\
118 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
119 VRSN, _________________ADJUST_L2_________________, _______, _______, _______, KC_NUKE, _________________ADJUST_R2_________________, EEP_RST,
120 TG_MODS, _________________ADJUST_L3_________________, _______, _______, _______, _______, _______, _______, _________________ADJUST_R3_________________, KC_MPLY
121 )
122
97}; 123};
98 124
99void matrix_init_keymap(void) { 125void matrix_init_keymap(void) {
diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk
index f870c3a7d..a826c664a 100644
--- a/keyboards/orthodox/keymaps/drashna/rules.mk
+++ b/keyboards/orthodox/keymaps/drashna/rules.mk
@@ -10,6 +10,6 @@ NKRO_ENABLE = yes
10 10
11INDICATOR_LIGHTS = yes 11INDICATOR_LIGHTS = yes
12MACROS_ENABLED = no 12MACROS_ENABLED = no
13RGBLIGHT_TWINKLE = yes 13RGBLIGHT_TWINKLE = no
14 14
15BOOTLOADER = qmk-dfu 15BOOTLOADER = qmk-dfu
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index fee954d17..089441e52 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -1,7 +1,5 @@
1#pragma once 1#pragma once
2 2
3#include QMK_KEYBOARD_CONFIG_H
4
5#ifdef RGBLIGHT_ENABLE 3#ifdef RGBLIGHT_ENABLE
6#undef RGBLIGHT_SAT_STEP 4#undef RGBLIGHT_SAT_STEP
7#define RGBLIGHT_SAT_STEP 12 5#define RGBLIGHT_SAT_STEP 12
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 45860b874..e0100de8f 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -27,9 +27,9 @@ extern rgb_config_t rgb_matrix_config;
27#endif 27#endif
28extern userspace_config_t userspace_config; 28extern userspace_config_t userspace_config;
29 29
30//enum more_custom_keycodes { 30enum more_custom_keycodes {
31// KC_P00 = NEW_SAFE_RANGE 31 KC_SWAP_NUM = NEW_SAFE_RANGE
32//}; 32};
33 33
34//define layer change stuff for underglow indicator 34//define layer change stuff for underglow indicator
35bool skip_leds = false; 35bool skip_leds = false;
@@ -166,6 +166,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
166 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________ 166 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
167 ), 167 ),
168 168
169 [_NORMAN] = LAYOUT_ergodox_pretty_base_wrapper(
170 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
171 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
172 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
173 ),
174
175 [_MALTRON] = LAYOUT_ergodox_pretty_base_wrapper(
176 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
177 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
178 _________________MALTRON_L3________________, _________________MALTRON_R3________________
179 ),
180
181 [_EUCALYN] = LAYOUT_ergodox_pretty_base_wrapper(
182 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
183 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
184 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
185 ),
186
187 [_CARPLAX] = LAYOUT_ergodox_pretty_base_wrapper(
188 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
189 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
190 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
191 ),
192
193
169// Reverts OSM(Shift) to normal Shifts. However, may not need since we fixed the issue with RDP (LOCAL RESOURCES) 194// Reverts OSM(Shift) to normal Shifts. However, may not need since we fixed the issue with RDP (LOCAL RESOURCES)
170 [_MODS] = LAYOUT_ergodox_pretty_wrapper( 195 [_MODS] = LAYOUT_ergodox_pretty_wrapper(
171 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 196 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -206,9 +231,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
206 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO, 231 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO,
207 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, 232 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,
208 KC_GRV, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, 233 KC_GRV, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
209 KC_O, KC_P, KC_HYPR, MAGIC_TOGGLE_NKRO, 234 KC_O, KC_P, MAGIC_TOGGLE_NKRO, LALT(KC_PSCR),
210 KC_LGUI, KC_NO, 235 KC_LGUI, KC_HYPR,
211 KC_V, KC_SPC, KC_H, KC_PGDN, KC_DEL, KC_ENTER 236 KC_V, KC_SPC, KC_H, KC_NO, KC_NO, KC_SWAP_NUM
212 ), 237 ),
213 238
214/* Keymap 3: 239/* Keymap 3:
@@ -280,6 +305,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
280 305
281bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 306bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
282 307
308 switch (keycode) {
309 case KC_1:
310 if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
311 if (record->event.pressed) {
312 register_code(KC_2);
313 } else {
314 unregister_code(KC_2);
315 }
316 return false;
317 }
318 break;
319 case KC_2:
320 if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
321 if (record->event.pressed) {
322 register_code(KC_1);
323 } else {
324 unregister_code(KC_1);
325 }
326 return false;
327 }
328 break;
329 case KC_SWAP_NUM:
330 if (record->event.pressed) {
331 userspace_config.swapped_numbers ^= 1;
332 eeconfig_update_user(userspace_config.raw);
333 }
334 }
283 //switch (keycode) { 335 //switch (keycode) {
284 // case KC_P00: 336 // case KC_P00:
285 // if (!record->event.pressed) { 337 // if (!record->event.pressed) {
@@ -401,6 +453,14 @@ void rgb_matrix_indicators_user(void) {
401 rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break; 453 rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
402 case _WORKMAN: 454 case _WORKMAN:
403 rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break; 455 rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
456 case _NORMAN:
457 rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D); break;
458 case _MALTRON:
459 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
460 case _EUCALYN:
461 rgb_matrix_layer_helper(0xFF, 0x80, 0xBF); break;
462 case _CARPLAX:
463 rgb_matrix_layer_helper(0x00, 0x00, 0xFF); break;
404 } 464 }
405 } 465 }
406#if 0 466#if 0
diff --git a/layouts/community/ergodox/drashna_glow/rules.mk b/layouts/community/ergodox/drashna_glow/rules.mk
index c8941391e..e152fa01f 100644
--- a/layouts/community/ergodox/drashna_glow/rules.mk
+++ b/layouts/community/ergodox/drashna_glow/rules.mk
@@ -1,11 +1,9 @@
1USER_NAME := drashna 1USER_NAME := drashna
2SRC += ../drashna/keymap.c 2SRC += ../drashna/keymap.c
3 3
4-include $$(LAYOUT_KEYMAP_PATH)/../drashna/rules.mk 4-include $(LAYOUT_KEYMAP_PATH)/../drashna/rules.mk
5 5
6ifneq (,$(findstring ergodox_ez,$(KEYBOARD))) 6ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
7 RGBLIGHT_ENABLE = no 7 RGBLIGHT_ENABLE = no
8 RGB_MATRIX_ENABLE = yes 8 RGB_MATRIX_ENABLE = yes
9endif 9endif
10
11COMMAND_ENABLE = no
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 0b0110dfa..55862aec3 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -60,3 +60,5 @@
60 60
61/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ 61/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
62//#define MIDI_TONE_KEYCODE_OCTAVES 2 62//#define MIDI_TONE_KEYCODE_OCTAVES 2
63
64#define TAP_CODE_DELAY 10
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index 5d3218934..f5ead81da 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -45,58 +45,81 @@ enum planck_keycodes {
45 45
46const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 46const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
47 47
48[_QWERTY] = LAYOUT_ortho_4x12_base_wrapper( 48 [_QWERTY] = LAYOUT_ortho_4x12_base_wrapper(
49 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 49 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
50 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 50 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
51 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 51 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
52), 52 ),
53
54[_COLEMAK] = LAYOUT_ortho_4x12_base_wrapper(
55 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
56 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
57 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
58),
59
60[_DVORAK] = LAYOUT_ortho_4x12_base_wrapper(
61 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
62 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
63 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
64),
65
66[_WORKMAN] = LAYOUT_ortho_4x12_base_wrapper(
67 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
68 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
69 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
70),
71
72[_MODS] = LAYOUT_ortho_4x12_wrapper(
73 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
74 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
75 KC_LSFT, ___________________BLANK___________________, ___________________BLANK___________________, _______,
76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
77),
78
79[_LOWER] = LAYOUT_ortho_4x12_wrapper(
80 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC,
81 KC_DEL, _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE,
82 _______, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______,
83 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
84),
85
86[_RAISE] = LAYOUT_ortho_4x12_wrapper(
87 KC_GRV, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_BSPC,
88 KC_DEL, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
89 _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
90 _______, _______, _______, _______, _______, _______, _______, _________________RAISE_R3__________________
91),
92
93[_ADJUST] = LAYOUT_ortho_4x12_wrapper(
94 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
95 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
96 _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
97 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUKE
98)
99 53
54 [_COLEMAK] = LAYOUT_ortho_4x12_base_wrapper(
55 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
56 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
57 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
58 ),
59
60 [_DVORAK] = LAYOUT_ortho_4x12_base_wrapper(
61 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
62 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
63 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
64 ),
65
66 [_WORKMAN] = LAYOUT_ortho_4x12_base_wrapper(
67 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
68 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
69 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
70 ),
71
72 [_NORMAN] = LAYOUT_ortho_4x12_base_wrapper(
73 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
74 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
75 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
76 ),
77
78 [_MALTRON] = LAYOUT_ortho_4x12_base_wrapper(
79 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
80 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
81 _________________MALTRON_L3________________, _________________MALTRON_R3________________
82 ),
83
84 [_EUCALYN] = LAYOUT_ortho_4x12_base_wrapper(
85 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
86 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
87 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
88 ),
89
90 [_CARPLAX] = LAYOUT_ortho_4x12_base_wrapper(
91 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
92 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
93 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
94 ),
95
96 [_MODS] = LAYOUT_ortho_4x12_wrapper(
97 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
98 _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
99 KC_LSFT, ___________________BLANK___________________, ___________________BLANK___________________, _______,
100 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
101 ),
102
103 [_LOWER] = LAYOUT_ortho_4x12_wrapper(
104 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC,
105 KC_DEL, _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE,
106 _______, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______,
107 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
108 ),
109
110 [_RAISE] = LAYOUT_ortho_4x12_wrapper(
111 KC_GRV, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_BSPC,
112 KC_DEL, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
113 _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
114 _______, _______, _______, _______, _______, _______, _______, _________________RAISE_R3__________________
115 ),
116
117 [_ADJUST] = LAYOUT_ortho_4x12_wrapper(
118 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
119 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
120 _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
121 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUKE
122 )
100 123
101}; 124};
102 125
@@ -183,6 +206,14 @@ void rgb_matrix_indicators_user(void) {
183 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, true); break; 206 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, true); break;
184 case _WORKMAN: 207 case _WORKMAN:
185 rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, true); break; 208 rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, true); break;
209 case _NORMAN:
210 rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D, true); break;
211 case _MALTRON:
212 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, true); break;
213 case _EUCALYN:
214 rgb_matrix_layer_helper(0xFF, 0x80, 0xBF, true); break;
215 case _CARPLAX:
216 rgb_matrix_layer_helper(0x00, 0x00, 0xFF, true); break;
186 } 217 }
187 } 218 }
188 } 219 }
@@ -222,7 +253,7 @@ void matrix_init_keymap(void) {
222#else //RGB_MATRIX_INIT 253#else //RGB_MATRIX_INIT
223 254
224void matrix_init_keymap(void) { 255void matrix_init_keymap(void) {
225 #ifndef CONVERT_TO_PROTON_C 256 #if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck)
226 setPinOutput(D5); 257 setPinOutput(D5);
227 writePinHigh(D5); 258 writePinHigh(D5);
228 259
@@ -231,3 +262,50 @@ void matrix_init_keymap(void) {
231 #endif 262 #endif
232} 263}
233#endif //RGB_MATRIX_INIT 264#endif //RGB_MATRIX_INIT
265
266#ifdef ENCODER_ENABLE
267void encoder_update(bool clockwise) {
268 switch (biton32(layer_state)) {
269 case _RAISE:
270 clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
271 break;
272 case _LOWER:
273 #ifdef RGB_MATRIX_ENABLE
274 clockwise ? rgb_matrix_step() : rgblight_step_reverse();
275 #else
276 clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP);
277 #endif
278 case _ADJUST:
279 #ifdef AUDIO_CLICKY
280 clockwise ? clicky_freq_up() : clicky_freq_down();
281 #endif
282 break;
283 default:
284 clockwise ? tap_code(KC_DOWN) : tap_code(KC_UP);
285 }
286 #ifdef AUDIO_CLICKY
287 clicky_play();
288 #endif
289}
290#endif // ENCODER_ENABLE
291
292#ifdef KEYBOARD_planck_rev6
293extern audio_config_t audio_config;
294
295void dip_update(uint8_t index, bool active) {
296 switch (index) {
297 case 0:
298 audio_config.enable = active;
299 break;
300 case 1:
301 audio_config.clicky_enable = active;
302 break;
303 case 2:
304 keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = active;
305 break;
306 case 3:
307 userspace_config.nuke_switch = active;
308 break;
309 }
310}
311#endif // KEYBOARD_planck_rev6
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 827b1b8ac..20e58fd0b 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -2,43 +2,50 @@
2 2
3 3
4#ifdef AUDIO_ENABLE 4#ifdef AUDIO_ENABLE
5#define AUDIO_CLICKY 5 #define AUDIO_CLICKY
6#define STARTUP_SONG SONG(RICK_ROLL) 6 #define STARTUP_SONG SONG(RICK_ROLL)
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(OVERWATCH_THEME) \ 11 SONG(OVERWATCH_THEME) \
12 } 12 }
13 13
14#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f 14 #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
15// #ifdef RGBLIGHT_ENABLE 15 // #ifdef RGBLIGHT_ENABLE
16// #define NO_MUSIC_MODE 16 // #define NO_MUSIC_MODE
17// #endif //RGBLIGHT_ENABLE/ 17 // #endif //RGBLIGHT_ENABLE/
18#ifndef __arm__ 18 #ifndef __arm__
19#undef NOTE_REST 19 #undef NOTE_REST
20#define NOTE_REST 1.00f 20 #define NOTE_REST 1.00f
21#endif // !__arm__ 21 #endif // !__arm__
22
23#define UNICODE_SONG_OSX SONG(RICK_ROLL)
24#define UNICODE_SONG_LNX SONG(RICK_ROLL)
25#define UNICODE_SONG_WIN SONG(RICK_ROLL)
26#define UNICODE_SONG_BSD SONG(RICK_ROLL)
27#define UNICODE_SONG_WINC SONG(RICK_ROLL)
28
22#endif // !AUDIO_ENABLE 29#endif // !AUDIO_ENABLE
23 30
24#ifdef RGBLIGHT_ENABLE 31#ifdef RGBLIGHT_ENABLE
25#define RGBLIGHT_SLEEP 32 #define RGBLIGHT_SLEEP
26#undef RGBLIGHT_ANIMATIONS 33 #undef RGBLIGHT_ANIMATIONS
27#define RGBLIGHT_EFFECT_BREATHING 34 #define RGBLIGHT_EFFECT_BREATHING
28#define RGBLIGHT_EFFECT_SNAKE 35 #define RGBLIGHT_EFFECT_SNAKE
29#define RGBLIGHT_EFFECT_KNIGHT 36 #define RGBLIGHT_EFFECT_KNIGHT
30#endif // RGBLIGHT_ENABLE 37#endif // RGBLIGHT_ENABLE
31 38
32#ifndef ONESHOT_TAP_TOGGLE 39#ifndef ONESHOT_TAP_TOGGLE
33#define ONESHOT_TAP_TOGGLE 2 40 #define ONESHOT_TAP_TOGGLE 2
34#endif // !ONESHOT_TAP_TOGGLE 41#endif // !ONESHOT_TAP_TOGGLE
35 42
36#ifndef ONESHOT_TIMEOUT 43#ifndef ONESHOT_TIMEOUT
37#define ONESHOT_TIMEOUT 3000 44 #define ONESHOT_TIMEOUT 3000
38#endif// !ONESHOT_TIMEOUT 45#endif// !ONESHOT_TIMEOUT
39 46
40#ifndef QMK_KEYS_PER_SCAN 47#ifndef QMK_KEYS_PER_SCAN
41#define QMK_KEYS_PER_SCAN 4 48 #define QMK_KEYS_PER_SCAN 4
42#endif // !QMK_KEYS_PER_SCAN 49#endif // !QMK_KEYS_PER_SCAN
43 50
44 51
@@ -48,18 +55,18 @@
48// and when this option isn't enabled, z rapidly followed by x 55// and when this option isn't enabled, z rapidly followed by x
49// actually sends Ctrl-x. That's bad.) 56// actually sends Ctrl-x. That's bad.)
50#define IGNORE_MOD_TAP_INTERRUPT 57#define IGNORE_MOD_TAP_INTERRUPT
51#undef PERMISSIVE_HOLD 58// #define PERMISSIVE_HOLD
52//#define TAPPING_FORCE_HOLD 59//#define TAPPING_FORCE_HOLD
53//#define RETRO_TAPPING 60//#define RETRO_TAPPING
54 61
55#define FORCE_NKRO 62#define FORCE_NKRO
56 63
57#ifndef TAPPING_TOGGLE 64#ifndef TAPPING_TOGGLE
58#define TAPPING_TOGGLE 1 65 #define TAPPING_TOGGLE 1
59#endif 66#endif
60 67
61#ifdef TAPPING_TERM 68#ifdef TAPPING_TERM
62#undef TAPPING_TERM 69 #undef TAPPING_TERM
63#endif // TAPPING_TERM 70#endif // TAPPING_TERM
64#if defined(KEYBOARD_ergodox_ez) 71#if defined(KEYBOARD_ergodox_ez)
65 #define TAPPING_TERM 185 72 #define TAPPING_TERM 185
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 0a3d0f632..ca55198e3 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -36,7 +36,11 @@ enum userspace_layers {
36 _COLEMAK, 36 _COLEMAK,
37 _DVORAK, 37 _DVORAK,
38 _WORKMAN, 38 _WORKMAN,
39 _MODS, 39 _NORMAN,
40 _MALTRON,
41 _EUCALYN,
42 _CARPLAX,
43 _MODS, /* layer 8 */
40 _GAMEPAD, 44 _GAMEPAD,
41 _DIABLO, 45 _DIABLO,
42 _MACROS, 46 _MACROS,
@@ -76,6 +80,7 @@ typedef union {
76 bool is_overwatch :1; 80 bool is_overwatch :1;
77 bool nuke_switch :1; 81 bool nuke_switch :1;
78 uint8_t unicode_mod :4; 82 uint8_t unicode_mod :4;
83 bool swapped_numbers :1;
79 }; 84 };
80} userspace_config_t; 85} userspace_config_t;
81 86
diff --git a/users/drashna/process_records.c b/users/drashna/process_records.c
index 17d7dc01c..73cad92f6 100644
--- a/users/drashna/process_records.c
+++ b/users/drashna/process_records.c
@@ -20,34 +20,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
20 // If console is enabled, it will print the matrix position and status of each key pressed 20 // If console is enabled, it will print the matrix position and status of each key pressed
21#ifdef KEYLOGGER_ENABLE 21#ifdef KEYLOGGER_ENABLE
22 #if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_iris_rev2) 22 #if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_iris_rev2)
23 xprintf("KL: col: %u, row: %u, pressed: %u\n", record->event.key.row, record->event.key.col, record->event.pressed); 23 xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed);
24 #else 24 #else
25 xprintf("KL: col: %u, row: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed); 25 xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
26 #endif 26 #endif
27#endif //KEYLOGGER_ENABLE 27#endif //KEYLOGGER_ENABLE
28 28
29 switch (keycode) { 29 switch (keycode) {
30 case KC_QWERTY: 30 case KC_QWERTY ... KC_CARPLAX:
31 if (record->event.pressed) { 31 if (record->event.pressed) {
32 set_single_persistent_default_layer(_QWERTY); 32 set_single_persistent_default_layer(keycode - KC_QWERTY);
33 } 33 }
34 break; 34 break;
35 case KC_COLEMAK:
36 if (record->event.pressed) {
37 set_single_persistent_default_layer(_COLEMAK);
38 }
39 break;
40 case KC_DVORAK:
41 if (record->event.pressed) {
42 set_single_persistent_default_layer(_DVORAK);
43 }
44 break;
45 case KC_WORKMAN:
46 if (record->event.pressed) {
47 set_single_persistent_default_layer(_WORKMAN);
48 }
49 break;
50
51 35
52 case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader 36 case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader
53 if (!record->event.pressed) { 37 if (!record->event.pressed) {
diff --git a/users/drashna/process_records.h b/users/drashna/process_records.h
index 620997add..f7f2193ec 100644
--- a/users/drashna/process_records.h
+++ b/users/drashna/process_records.h
@@ -13,6 +13,10 @@ enum userspace_custom_keycodes {
13 KC_COLEMAK, // Sets default layer to COLEMAK 13 KC_COLEMAK, // Sets default layer to COLEMAK
14 KC_DVORAK, // Sets default layer to DVORAK 14 KC_DVORAK, // Sets default layer to DVORAK
15 KC_WORKMAN, // Sets default layer to WORKMAN 15 KC_WORKMAN, // Sets default layer to WORKMAN
16 KC_NORMAN, // Sets default layer to NORMAN
17 KC_MALTRON, // Sets default layer to MALTRON
18 KC_EUCALYN, // Sets default layer to EUCALYN
19 KC_CARPLAX, // Sets default layer to CARPLAX
16 KC_DIABLO_CLEAR, // Clears all Diablo Timers 20 KC_DIABLO_CLEAR, // Clears all Diablo Timers
17 KC_OVERWATCH, // Toggles game macro input mode (so in OW, it defaults to game chat) 21 KC_OVERWATCH, // Toggles game macro input mode (so in OW, it defaults to game chat)
18 KC_SALT, // See drashna.c for details 22 KC_SALT, // See drashna.c for details
diff --git a/users/drashna/rgb_stuff.c b/users/drashna/rgb_stuff.c
index 7d00604b4..37076ce99 100644
--- a/users/drashna/rgb_stuff.c
+++ b/users/drashna/rgb_stuff.c
@@ -315,6 +315,14 @@ uint32_t layer_state_set_rgb(uint32_t state) {
315 rgblight_sethsv_noeeprom_springgreen(); break; 315 rgblight_sethsv_noeeprom_springgreen(); break;
316 case _WORKMAN: 316 case _WORKMAN:
317 rgblight_sethsv_noeeprom_goldenrod(); break; 317 rgblight_sethsv_noeeprom_goldenrod(); break;
318 case _NORMAN:
319 rgblight_sethsv_noeeprom_coral(); break;
320 case _MALTRON:
321 rgblight_sethsv_noeeprom_yellow(); break;
322 case _EUCALYN:
323 rgblight_sethsv_noeeprom_pink(); break;
324 case _CARPLAX:
325 rgblight_sethsv_noeeprom_blue(); break;
318 default: 326 default:
319 rgblight_sethsv_noeeprom_cyan(); break; 327 rgblight_sethsv_noeeprom_cyan(); break;
320 } 328 }
diff --git a/users/drashna/wrappers.h b/users/drashna/wrappers.h
index 070a5a0a4..3260c58ae 100644
--- a/users/drashna/wrappers.h
+++ b/users/drashna/wrappers.h
@@ -91,11 +91,11 @@ NOTE: These are all the same length. If you do a search/replace
91 91
92#define _________________MALTRON_L1________________ KC_Q, KC_P, KC_Y, KC_C, KC_B 92#define _________________MALTRON_L1________________ KC_Q, KC_P, KC_Y, KC_C, KC_B
93#define _________________MALTRON_L2________________ KC_A, KC_N, KC_I, KC_S, KC_F 93#define _________________MALTRON_L2________________ KC_A, KC_N, KC_I, KC_S, KC_F
94#define _________________MALTRON_L3________________ KC_SCLN, KC_SLSH, KC_J KC_G, KC_COMM 94#define _________________MALTRON_L3________________ KC_SCLN, KC_SLSH, KC_J, KC_G, KC_COMM
95 95
96#define _________________MALTRON_R1________________ KC_V, KC_M, KC_U, KC_Z, KC_L 96#define _________________MALTRON_R1________________ KC_V, KC_M, KC_U, KC_Z, KC_L
97#define _________________MALTRON_R2________________ KC_D, KC_T, KC_D, KC_O, KC_R 97#define _________________MALTRON_R2________________ KC_D, KC_T, KC_D, KC_O, KC_R
98#define _________________MALTRON_R3________________ KC_DOT, KC_W, KC_K, KC_MINS, KC_X 98#define _________________MALTRON_R3________________ KC_DOT, KC_W, KC_K, KC_MINS, KC_X
99 99
100 100
101#define _________________EUCALYN_L1________________ KC_SLSH, KC_COMM, KC_DOT, KC_F, KC_Q 101#define _________________EUCALYN_L1________________ KC_SLSH, KC_COMM, KC_DOT, KC_F, KC_Q
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-22 17:59:03 +0000