aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/40percentclub/nano/keymaps/drashna/keymap.c8
-rwxr-xr-xkeyboards/c39/keymaps/drashna/keymap.c41
-rw-r--r--keyboards/gergo/keymaps/drashna/keymap.c46
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c78
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/config.h42
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c115
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rgblight_breathe_table.h117
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk1
-rw-r--r--keyboards/keebio/iris/keymaps/drashna/keymap.c72
-rw-r--r--keyboards/keebio/iris/keymaps/drashna_lp/config.h50
-rw-r--r--keyboards/keebio/iris/keymaps/drashna_lp/keymap.c1
-rw-r--r--keyboards/keebio/iris/keymaps/drashna_lp/rules.mk7
-rw-r--r--keyboards/keebio/iris/keymaps/drashna_old/config.h47
-rw-r--r--keyboards/keebio/iris/keymaps/drashna_old/keymap.c1
-rw-r--r--keyboards/keebio/iris/keymaps/drashna_old/rules.mk4
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna_old/config.h25
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna_old/keymap.c1
-rw-r--r--keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk4
-rw-r--r--keyboards/moonlander/keymaps/drashna/keymap.c82
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c71
-rw-r--r--keyboards/ploopyco/mouse/keymaps/drashna/config.h7
-rw-r--r--keyboards/ploopyco/mouse/keymaps/drashna/keymap.c4
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/keymap.c101
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/rules.mk8
-rw-r--r--keyboards/splitkb/zima/keymaps/drashna/keymap.c26
-rw-r--r--keyboards/splitkb/zima/keymaps/drashna/rules.mk1
27 files changed, 381 insertions, 583 deletions
diff --git a/keyboards/40percentclub/nano/keymaps/drashna/keymap.c b/keyboards/40percentclub/nano/keymaps/drashna/keymap.c
index b8947cce7..13f89dd53 100644
--- a/keyboards/40percentclub/nano/keymaps/drashna/keymap.c
+++ b/keyboards/40percentclub/nano/keymaps/drashna/keymap.c
@@ -85,15 +85,15 @@ int16_t axisCoordinate(uint8_t pin, uint16_t origin) {
85 85
86int8_t axisToMouseComponent(uint8_t pin, int16_t origin, uint8_t maxSpeed, int8_t polarity) { 86int8_t axisToMouseComponent(uint8_t pin, int16_t origin, uint8_t maxSpeed, int8_t polarity) {
87 int coordinate = axisCoordinate(pin, origin); 87 int coordinate = axisCoordinate(pin, origin);
88 if (coordinate == 0) { 88 if (coordinate != 0) {
89 return 0;
90 } else {
91 float percent = (float)coordinate / 100; 89 float percent = (float)coordinate / 100;
92 if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { 90 if (get_mods() & MOD_BIT(KC_LSFT)) {
93 return percent * precisionSpeed * polarity * (abs(coordinate) / speedRegulator); 91 return percent * precisionSpeed * polarity * (abs(coordinate) / speedRegulator);
94 } else { 92 } else {
95 return percent * maxCursorSpeed * polarity * (abs(coordinate) / speedRegulator); 93 return percent * maxCursorSpeed * polarity * (abs(coordinate) / speedRegulator);
96 } 94 }
95 } else {
96 return 0;
97 } 97 }
98} 98}
99 99
diff --git a/keyboards/c39/keymaps/drashna/keymap.c b/keyboards/c39/keymaps/drashna/keymap.c
index 88065263c..6fd1f1298 100755
--- a/keyboards/c39/keymaps/drashna/keymap.c
+++ b/keyboards/c39/keymaps/drashna/keymap.c
@@ -39,54 +39,29 @@
39 39
40const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 40const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 41
42 [_QWERTY] = LAYOUT_base_wrapper( 42 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
43 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 43 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
44 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 44 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
45 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 45 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
46 ), 46 ),
47 47
48 [_COLEMAK] = LAYOUT_base_wrapper( 48 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
49 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
50 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
51 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
52 ),
53 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
49 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 54 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
50 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 55 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
51 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 56 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
52 ), 57 ),
53 58
54 [_DVORAK] = LAYOUT_base_wrapper( 59 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
55 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 60 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
56 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 61 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
57 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 62 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
58 ), 63 ),
59 64
60 [_WORKMAN] = LAYOUT_base_wrapper(
61 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
62 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
63 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
64 ),
65
66 [_NORMAN] = LAYOUT_base_wrapper(
67 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
68 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
69 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
70 ),
71
72 [_MALTRON] = LAYOUT_base_wrapper(
73 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
74 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
75 _________________MALTRON_L3________________, _________________MALTRON_R3________________
76 ),
77
78 [_EUCALYN] = LAYOUT_base_wrapper(
79 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
80 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
81 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
82 ),
83
84 [_CARPLAX] = LAYOUT_base_wrapper(
85 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
86 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
87 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
88 ),
89
90 [_LOWER] = LAYOUT_wrapper( 65 [_LOWER] = LAYOUT_wrapper(
91 KC_TILD, _________________LOWER_L1__________________, _______, _________________LOWER_R1__________________, KC_BSPC, 66 KC_TILD, _________________LOWER_L1__________________, _______, _________________LOWER_R1__________________, KC_BSPC,
92 KC_DEL, _________________LOWER_L2__________________, _______, _________________LOWER_R2__________________, KC_PIPE, 67 KC_DEL, _________________LOWER_L2__________________, _______, _________________LOWER_R2__________________, KC_PIPE,
diff --git a/keyboards/gergo/keymaps/drashna/keymap.c b/keyboards/gergo/keymaps/drashna/keymap.c
index 81ff6852d..01d52ed16 100644
--- a/keyboards/gergo/keymaps/drashna/keymap.c
+++ b/keyboards/gergo/keymaps/drashna/keymap.c
@@ -37,56 +37,32 @@
37 KC_GRV, KC_SPC, BK_LWER, OS_LALT, OS_RGUI, DL_RAIS, KC_ENT, _______ \ 37 KC_GRV, KC_SPC, BK_LWER, OS_LALT, OS_RGUI, DL_RAIS, KC_ENT, _______ \
38 ) 38 )
39 39
40#define LAYOUT_gergo_base_wrapper(...) LAYOUT_gergo_base(__VA_ARGS__) 40#define LAYOUT_base_wrapper(...) LAYOUT_gergo_base(__VA_ARGS__)
41 41
42const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 42const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 [_QWERTY] = LAYOUT_gergo_base_wrapper( 43 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
44 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 44 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
45 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 45 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
46 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 46 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
47 ), 47 ),
48 [_COLEMAK] = LAYOUT_gergo_base_wrapper( 48
49 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
50 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
51 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
52 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
53 ),
54 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
49 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 55 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
50 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 56 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
51 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 57 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
52 ), 58 ),
53 59
54 [_DVORAK] = LAYOUT_gergo_base_wrapper( 60 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
55 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 61 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
56 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 62 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
57 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 63 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
58 ), 64 ),
59 65
60 [_WORKMAN] = LAYOUT_gergo_base_wrapper(
61 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
62 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
63 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
64 ),
65
66 [_NORMAN] = LAYOUT_gergo_base_wrapper(
67 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
68 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
69 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
70 ),
71
72 [_MALTRON] = LAYOUT_gergo_base_wrapper(
73 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
74 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
75 _________________MALTRON_L3________________, _________________MALTRON_R3________________
76 ),
77
78 [_EUCALYN] = LAYOUT_gergo_base_wrapper(
79 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
80 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
81 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
82 ),
83
84 [_CARPLAX] = LAYOUT_gergo_base_wrapper(
85 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
86 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
87 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
88 ),
89
90 [_LOWER] = LAYOUT_gergo_wrapper( 66 [_LOWER] = LAYOUT_gergo_wrapper(
91 KC_F12, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F11, 67 KC_F12, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F11,
92 _______, _________________LOWER_L2__________________, _______, _______, _________________LOWER_R2__________________, KC_PIPE, 68 _______, _________________LOWER_L2__________________, _______, _______, _________________LOWER_R2__________________, KC_PIPE,
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
index 7e3c356bd..28683cef3 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
@@ -32,58 +32,33 @@
32 KC_SPC, OS_LGUI, KC_ENT, \ 32 KC_SPC, OS_LGUI, KC_ENT, \
33 BK_LWER, TT(_MOUSE), TT(_MOUSE), DL_RAIS \ 33 BK_LWER, TT(_MOUSE), TT(_MOUSE), DL_RAIS \
34 ) 34 )
35#define LAYOUT_4x6_right_base_wrapper(...) LAYOUT_4x6_right_base(__VA_ARGS__) 35#define LAYOUT_base_wrapper(...) LAYOUT_4x6_right_base(__VA_ARGS__)
36 36
37 37
38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 [_QWERTY] = LAYOUT_4x6_right_base_wrapper( 39 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
40 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 40 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
41 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 41 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
42 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 42 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
43 ), 43 ),
44 44
45 [_COLEMAK] = LAYOUT_4x6_right_base_wrapper( 45 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
46 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
47 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
48 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
49 ),
50 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
46 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 51 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
47 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 52 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
48 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 53 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
49 ), 54 ),
50 55
51 [_DVORAK] = LAYOUT_4x6_right_base_wrapper( 56 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
52 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 57 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
53 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 58 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
54 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 59 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
55 ), 60 ),
56 61
57 [_WORKMAN] = LAYOUT_4x6_right_base_wrapper(
58 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
59 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
60 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
61 ),
62
63 [_NORMAN] = LAYOUT_4x6_right_base_wrapper(
64 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
65 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
66 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
67 ),
68
69 [_MALTRON] = LAYOUT_4x6_right_base_wrapper(
70 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
71 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
72 _________________MALTRON_L3________________, _________________MALTRON_R3________________
73 ),
74
75 [_EUCALYN] = LAYOUT_4x6_right_base_wrapper(
76 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
77 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
78 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
79 ),
80
81 [_CARPLAX] = LAYOUT_4x6_right_base_wrapper(
82 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
83 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
84 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
85 ),
86
87 [_MOUSE] = LAYOUT_4x6_right( 62 [_MOUSE] = LAYOUT_4x6_right(
88 _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, DPI_CONFIG, _______, 63 _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, DPI_CONFIG, _______,
89 _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______, 64 _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
@@ -182,26 +157,27 @@ void matrix_scan_keymap(void) {
182 157
183bool process_record_keymap(uint16_t keycode, keyrecord_t* record) { 158bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
184 switch (keycode) { 159 switch (keycode) {
185 case TT(_MOUSE): { 160 case TT(_MOUSE):
186 if (record->event.pressed) { 161 {
187 mouse_keycode_tracker++; 162 if (record->event.pressed) {
188 } else { 163 mouse_keycode_tracker++;
164 } else {
189# if TAPPING_TOGGLE != 0 165# if TAPPING_TOGGLE != 0
190 if (record->tap.count == TAPPING_TOGGLE) { 166 if (record->tap.count == TAPPING_TOGGLE) {
191 tap_toggling ^= 1; 167 tap_toggling ^= 1;
192# if TAPPING_TOGGLE == 1 168# if TAPPING_TOGGLE == 1
193 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count + 1; 169 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count + 1;
194# else 170# else
195 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count; 171 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count;
196# endif 172# endif
197 } else { 173 } else {
198 mouse_keycode_tracker--; 174 mouse_keycode_tracker--;
199 } 175 }
200# endif 176# endif
177 }
178 mouse_timer = timer_read();
179 break;
201 } 180 }
202 mouse_timer = timer_read();
203 break;
204 }
205 case MO(_MOUSE): 181 case MO(_MOUSE):
206 case DPI_CONFIG: 182 case DPI_CONFIG:
207 case KC_MS_UP ... KC_MS_WH_RIGHT: 183 case KC_MS_UP ... KC_MS_WH_RIGHT:
@@ -213,7 +189,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
213 layer_off(_MOUSE); 189 layer_off(_MOUSE);
214 } 190 }
215 mouse_keycode_tracker = 0; 191 mouse_keycode_tracker = 0;
216 mouse_debounce_timer = timer_read(); 192 mouse_debounce_timer = timer_read();
217 break; 193 break;
218 } 194 }
219 return true; 195 return true;
@@ -238,6 +214,4 @@ void matrix_init_keymap(void) {
238#endif 214#endif
239} 215}
240 216
241void keyboard_post_init_keymap(void) { 217void keyboard_post_init_keymap(void) { matrix_init_keymap(); }
242 matrix_init_keymap();
243}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c
index 1766312e1..af9cbda49 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c
@@ -32,4 +32,8 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
32 {{5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}}, 32 {{5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
33 {{5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}}, 33 {{5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
34 {{5, 5}, {4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}}}; 34 {{5, 5}, {4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}}};
35
36# ifdef ENCODER_MAP_ENABLE
37const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
38# endif
35#endif 39#endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index 9dc46f2e6..915582c07 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -30,52 +30,56 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30#define MATRIX_COLS 6 30#define MATRIX_COLS 6
31 31
32// wiring of each half 32// wiring of each half
33#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 } 33#define MATRIX_COL_PINS \
34#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2 } 34 { C0, C1, C2, C3, C4, C5 }
35#define MATRIX_ROW_PINS \
36 { F7, F6, F5, F4, F3, F2 }
35 37
36#define DIODE_DIRECTION COL2ROW 38#define DIODE_DIRECTION COL2ROW
37 39
38// WS2812 RGB LED strip input and number of LEDs 40// WS2812 RGB LED strip input and number of LEDs
39#define RGB_DI_PIN E7 41#define RGB_DI_PIN E7
40#define RGBLED_NUM 58 42#define RGBLED_NUM 20
41#define RGBLIGHT_SPLIT 43#define RGBLIGHT_SPLIT
42#define RGBLED_SPLIT { 30, 28 } 44#define RGBLED_SPLIT \
45 { 10, 10 }
43#define RGBLIGHT_SLEEP 46#define RGBLIGHT_SLEEP
44// #define RGBW 47// #define RGBW
45#define RGBLIGHT_LIMIT_VAL 50 48#define RGBLIGHT_LIMIT_VAL 100
46/* define if matrix has ghost */ 49/* define if matrix has ghost */
47//#define MATRIX_HAS_GHOST 50//#define MATRIX_HAS_GHOST
48 51
49/* number of backlight levels */ 52/* number of backlight levels */
50// #define BACKLIGHT_LEVELS 3 53// #define BACKLIGHT_LEVELS 3
51 54
52#define DEBUG_LED_PIN D6 55#define DEBUG_LED_PIN D6
53 56
54#define ROTATIONAL_TRANSFORM_ANGLE -25 57#define ROTATIONAL_TRANSFORM_ANGLE -25
55 58
56/* Bootmagic Lite key configuration */ 59/* Bootmagic Lite key configuration */
57#define BOOTMAGIC_LITE_ROW 0 60#define BOOTMAGIC_LITE_ROW 0
58#define BOOTMAGIC_LITE_COLUMN 0 61#define BOOTMAGIC_LITE_COLUMN 0
59#define BOOTMAGIC_LITE_ROW_RIGHT 6 62#define BOOTMAGIC_LITE_ROW_RIGHT 6
60#define BOOTMAGIC_LITE_COLUMN_RIGHT 5 63#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
61 64
62#define AUDIO_PIN C6 65#define AUDIO_PIN C6
63#define AUDIO_PIN_ALT B7 66#define AUDIO_PIN_ALT B7
64 67
65#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095 68#define DYNAMIC_KEYMAP_LAYER_COUNT 16
66#define DYNAMIC_KEYMAP_LAYER_COUNT 16
67#define LAYER_STATE_16BIT 69#define LAYER_STATE_16BIT
68 70
69/* serial.c configuration for split keyboard */ 71/* serial.c configuration for split keyboard */
70#define SOFT_SERIAL_PIN D2 72#define SOFT_SERIAL_PIN D2
71#define EE_HANDS 73#define EE_HANDS
72 74
73#define ENCODERS_PAD_A { D5 } 75#define ENCODERS_PAD_A \
74#define ENCODERS_PAD_B { D6 } 76 { D5 }
75#define ENCODER_RESOLUTION 1 77#define ENCODERS_PAD_B \
78 { D6 }
79#define ENCODER_RESOLUTION 4
76 80
77/* Set 0 if debouncing isn't needed */ 81/* Set 0 if debouncing isn't needed */
78#define DEBOUNCE 5 82#define DEBOUNCE 5
79 83
80/* disable action features */ 84/* disable action features */
81//#define NO_ACTION_LAYER 85//#define NO_ACTION_LAYER
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 6b6d1ab83..a57da64d5 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -28,70 +28,44 @@
28 SH_TT, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, SH_TT, \ 28 SH_TT, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, SH_TT, \
29 LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \ 29 LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \
30 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \ 30 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
31 OS_LGUI, OS_LALT, OS_RGUI, OS_RALT, \ 31 OS_LALT, OS_LGUI, OS_RGUI, OS_RALT, \
32 KC_PSCR, KC_GRV, MEH_T(KC_BTN3), \ 32 KC_MUTE, KC_GRV, KC_BTN3, \
33 KC_SPC, OS_LGUI, KC_ENT, \ 33 KC_SPC, OS_LGUI, KC_ENT, \
34 BK_LWER, TT(_MOUSE), TT(_MOUSE), DL_RAIS \ 34 BK_LWER, TT(_MOUSE), TT(_MOUSE), DL_RAIS \
35 ) 35 )
36#define LAYOUT_5x6_right_base_wrapper(...) LAYOUT_5x6_right_base(__VA_ARGS__) 36#define LAYOUT_base_wrapper(...) LAYOUT_5x6_right_base(__VA_ARGS__)
37
38 37
39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 [_QWERTY] = LAYOUT_5x6_right_base_wrapper( 39 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
41 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 40 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
42 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 41 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
43 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 42 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
44 ), 43 ),
45 44
46 [_COLEMAK] = LAYOUT_5x6_right_base_wrapper( 45 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
46 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
47 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
48 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
49 ),
50 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
47 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 51 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
48 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 52 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
49 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 53 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
50 ), 54 ),
51 55
52 [_DVORAK] = LAYOUT_5x6_right_base_wrapper( 56 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
53 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 57 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
54 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 58 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
55 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 59 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
56 ), 60 ),
57 61
58 [_WORKMAN] = LAYOUT_5x6_right_base_wrapper(
59 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
60 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
61 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
62 ),
63
64 [_NORMAN] = LAYOUT_5x6_right_base_wrapper(
65 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
66 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
67 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
68 ),
69
70 [_MALTRON] = LAYOUT_5x6_right_base_wrapper(
71 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
72 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
73 _________________MALTRON_L3________________, _________________MALTRON_R3________________
74 ),
75
76 [_EUCALYN] = LAYOUT_5x6_right_base_wrapper(
77 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
78 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
79 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
80 ),
81
82 [_CARPLAX] = LAYOUT_5x6_right_base_wrapper(
83 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
84 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
85 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
86 ),
87
88 [_MOUSE] = LAYOUT_5x6_right( 62 [_MOUSE] = LAYOUT_5x6_right(
89 _______, _______, _______, _______, _______, _______, DPI_CONFIG, _______, _______, _______, _______, _______, 63 _______, _______, _______, _______, _______, _______, DPI_CONFIG, _______, _______, _______, _______, _______,
90 _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______, 64 _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______,
91 _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______, 65 _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
92 _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______, 66 _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
93 _______, _______, _______, _______, 67 _______, _______, _______, _______,
94 _______, _______, _______, 68 _______, _______, KC_BTN3,
95 _______, _______, _______, 69 _______, _______, _______,
96 _______, _______, _______, _______ 70 _______, _______, _______, _______
97 ), 71 ),
@@ -146,6 +120,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
146 _______, _______, KC_NUKE, _______ 120 _______, _______, KC_NUKE, _______
147 ), 121 ),
148}; 122};
123
124#define BASE_ENCODERS { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } }
125
126#ifdef ENCODER_MAP_ENABLE
127const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
128 [_DEFAULT_LAYER_1] = BASE_ENCODERS,
129 [_DEFAULT_LAYER_2] = BASE_ENCODERS,
130 [_DEFAULT_LAYER_3] = BASE_ENCODERS,
131 [_DEFAULT_LAYER_4] = BASE_ENCODERS,
132 [_GAMEPAD] = { { _______, _______ }, { _______, _______ } },
133 [_DIABLO] = { { _______, _______ }, { _______, _______ } },
134 [_MOUSE] = { { _______, _______ }, { KC_WH_D, KC_WH_U } },
135 [_MEDIA] = { { _______, _______ }, { _______, _______ } },
136 [_RAISE] = { { _______, _______ }, { KC_PGDN, KC_PGUP } },
137 [_LOWER] = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } },
138 [_ADJUST] = { { CK_DOWN, CK_UP }, { _______, _______ } },
139};
140#else
141bool encoder_update_user(uint8_t index, bool clockwise) {
142 if (index == 0) {
143 tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 5);
144 } else if (index == 1) {
145 tap_code_delay(clockwise ? KC_WH_U : KC_WH_D, 5);
146 }
147 return false;
148}
149#endif
149// clang-format on 150// clang-format on
150 151
151#ifdef POINTING_DEVICE_ENABLE 152#ifdef POINTING_DEVICE_ENABLE
@@ -189,26 +190,27 @@ void matrix_scan_keymap(void) {
189 190
190bool process_record_keymap(uint16_t keycode, keyrecord_t* record) { 191bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
191 switch (keycode) { 192 switch (keycode) {
192 case TT(_MOUSE): { 193 case TT(_MOUSE):
193 if (record->event.pressed) { 194 {
194 mouse_keycode_tracker++; 195 if (record->event.pressed) {
195 } else { 196 mouse_keycode_tracker++;
197 } else {
196# if TAPPING_TOGGLE != 0 198# if TAPPING_TOGGLE != 0
197 if (record->tap.count == TAPPING_TOGGLE) { 199 if (record->tap.count == TAPPING_TOGGLE) {
198 tap_toggling ^= 1; 200 tap_toggling ^= 1;
199# if TAPPING_TOGGLE == 1 201# if TAPPING_TOGGLE == 1
200 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count + 1; 202 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count + 1;
201# else 203# else
202 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count; 204 if (!tap_toggling) mouse_keycode_tracker -= record->tap.count;
203# endif 205# endif
204 } else { 206 } else {
205 mouse_keycode_tracker--; 207 mouse_keycode_tracker--;
206 } 208 }
207# endif 209# endif
210 }
211 mouse_timer = timer_read();
212 break;
208 } 213 }
209 mouse_timer = timer_read();
210 break;
211 }
212 case MO(_MOUSE): 214 case MO(_MOUSE):
213 case DPI_CONFIG: 215 case DPI_CONFIG:
214 case KC_MS_UP ... KC_MS_WH_RIGHT: 216 case KC_MS_UP ... KC_MS_WH_RIGHT:
@@ -216,11 +218,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
216 mouse_timer = timer_read(); 218 mouse_timer = timer_read();
217 break; 219 break;
218 default: 220 default:
221 if (IS_NOEVENT(record->event)) break;
219 if (layer_state_is(_MOUSE) && !mouse_keycode_tracker) { 222 if (layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
220 layer_off(_MOUSE); 223 layer_off(_MOUSE);
221 } 224 }
222 mouse_keycode_tracker = 0; 225 mouse_keycode_tracker = 0;
223 mouse_debounce_timer = timer_read(); 226 mouse_debounce_timer = timer_read();
224 break; 227 break;
225 } 228 }
226 return true; 229 return true;
@@ -228,7 +231,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
228 231
229layer_state_t layer_state_set_keymap(layer_state_t state) { 232layer_state_t layer_state_set_keymap(layer_state_t state) {
230 if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO)) { 233 if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO)) {
231 state |= (1UL << _MOUSE); 234 state |= ((layer_state_t)1 << _MOUSE);
232 } 235 }
233 return state; 236 return state;
234} 237}
@@ -245,6 +248,4 @@ void matrix_init_keymap(void) {
245#endif 248#endif
246} 249}
247 250
248void keyboard_post_init_keymap(void) { 251void keyboard_post_init_keymap(void) { matrix_init_keymap(); }
249 matrix_init_keymap();
250}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rgblight_breathe_table.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rgblight_breathe_table.h
new file mode 100644
index 000000000..fb921079b
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rgblight_breathe_table.h
@@ -0,0 +1,117 @@
1#pragma once
2
3#define RGBLIGHT_EFFECT_BREATHE_TABLE
4
5// clang-format off
6
7// Breathing center: 1.85
8// Breathing max: 100
9
10const uint8_t PROGMEM rgblight_effect_breathe_table[] = {
11#if RGBLIGHT_BREATHE_TABLE_SIZE == 256
12 0x0D, 0x0E, 0x0E, 0x0F, 0x0F, 0x10, 0x10, 0x11,
13 0x11, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x16,
14 0x16, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1B,
15 0x1B, 0x1C, 0x1D, 0x1E, 0x1E, 0x1F, 0x20, 0x20,
16 0x21, 0x22, 0x22, 0x23, 0x24, 0x25, 0x25, 0x26,
17 0x27, 0x28, 0x28, 0x29, 0x2A, 0x2B, 0x2B, 0x2C,
18 0x2D, 0x2E, 0x2E, 0x2F, 0x30, 0x31, 0x31, 0x32,
19 0x33, 0x34, 0x34, 0x35, 0x36, 0x37, 0x38, 0x38,
20 0x39, 0x3A, 0x3B, 0x3B, 0x3C, 0x3D, 0x3D, 0x3E,
21 0x3F, 0x40, 0x40, 0x41, 0x42, 0x42, 0x43, 0x44,
22 0x44, 0x45, 0x46, 0x46, 0x47, 0x48, 0x48, 0x49,
23 0x4A, 0x4A, 0x4B, 0x4B, 0x4C, 0x4C, 0x4D, 0x4D,
24 0x4E, 0x4E, 0x4F, 0x4F, 0x50, 0x50, 0x51, 0x51,
25 0x51, 0x52, 0x52, 0x53, 0x53, 0x53, 0x54, 0x54,
26 0x54, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56,
27 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56,
28 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56,
29 0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x54, 0x54,
30 0x54, 0x54, 0x53, 0x53, 0x53, 0x52, 0x52, 0x51,
31 0x51, 0x51, 0x50, 0x50, 0x4F, 0x4F, 0x4E, 0x4E,
32 0x4D, 0x4D, 0x4C, 0x4C, 0x4B, 0x4B, 0x4A, 0x4A,
33 0x49, 0x48, 0x48, 0x47, 0x46, 0x46, 0x45, 0x44,
34 0x44, 0x43, 0x42, 0x42, 0x41, 0x40, 0x40, 0x3F,
35 0x3E, 0x3D, 0x3D, 0x3C, 0x3B, 0x3B, 0x3A, 0x39,
36 0x38, 0x38, 0x37, 0x36, 0x35, 0x34, 0x34, 0x33,
37 0x32, 0x31, 0x31, 0x30, 0x2F, 0x2E, 0x2E, 0x2D,
38 0x2C, 0x2B, 0x2B, 0x2A, 0x29, 0x28, 0x28, 0x27,
39 0x26, 0x25, 0x25, 0x24, 0x23, 0x22, 0x22, 0x21,
40 0x20, 0x20, 0x1F, 0x1E, 0x1E, 0x1D, 0x1C, 0x1B,
41 0x1B, 0x1A, 0x19, 0x19, 0x18, 0x18, 0x17, 0x16,
42 0x16, 0x15, 0x14, 0x14, 0x13, 0x13, 0x12, 0x11,
43 0x11, 0x10, 0x10, 0x0F, 0x0F, 0x0E, 0x0E, 0x0D
44#endif
45
46#if RGBLIGHT_BREATHE_TABLE_SIZE == 128
47 0x0D, 0x0E, 0x0F, 0x10,
48 0x11, 0x13, 0x14, 0x15,
49 0x16, 0x18, 0x19, 0x1A,
50 0x1B, 0x1D, 0x1E, 0x20,
51 0x21, 0x22, 0x24, 0x25,
52 0x27, 0x28, 0x2A, 0x2B,
53 0x2D, 0x2E, 0x30, 0x31,
54 0x33, 0x34, 0x36, 0x38,
55 0x39, 0x3B, 0x3C, 0x3D,
56 0x3F, 0x40, 0x42, 0x43,
57 0x44, 0x46, 0x47, 0x48,
58 0x4A, 0x4B, 0x4C, 0x4D,
59 0x4E, 0x4F, 0x50, 0x51,
60 0x51, 0x52, 0x53, 0x54,
61 0x54, 0x55, 0x55, 0x55,
62 0x56, 0x56, 0x56, 0x56,
63 0x56, 0x56, 0x56, 0x56,
64 0x56, 0x55, 0x55, 0x54,
65 0x54, 0x53, 0x53, 0x52,
66 0x51, 0x50, 0x4F, 0x4E,
67 0x4D, 0x4C, 0x4B, 0x4A,
68 0x49, 0x48, 0x46, 0x45,
69 0x44, 0x42, 0x41, 0x40,
70 0x3E, 0x3D, 0x3B, 0x3A,
71 0x38, 0x37, 0x35, 0x34,
72 0x32, 0x31, 0x2F, 0x2E,
73 0x2C, 0x2B, 0x29, 0x28,
74 0x26, 0x25, 0x23, 0x22,
75 0x20, 0x1F, 0x1E, 0x1C,
76 0x1B, 0x19, 0x18, 0x17,
77 0x16, 0x14, 0x13, 0x12,
78 0x11, 0x10, 0x0F, 0x0E
79#endif
80
81#if RGBLIGHT_BREATHE_TABLE_SIZE == 64
82 0x0D, 0x0F,
83 0x11, 0x14,
84 0x16, 0x19,
85 0x1B, 0x1E,
86 0x21, 0x24,
87 0x27, 0x2A,
88 0x2D, 0x30,
89 0x33, 0x36,
90 0x39, 0x3C,
91 0x3F, 0x42,
92 0x44, 0x47,
93 0x4A, 0x4C,
94 0x4E, 0x50,
95 0x51, 0x53,
96 0x54, 0x55,
97 0x56, 0x56,
98 0x56, 0x56,
99 0x56, 0x55,
100 0x54, 0x53,
101 0x51, 0x4F,
102 0x4D, 0x4B,
103 0x49, 0x46,
104 0x44, 0x41,
105 0x3E, 0x3B,
106 0x38, 0x35,
107 0x32, 0x2F,
108 0x2C, 0x29,
109 0x26, 0x23,
110 0x20, 0x1E,
111 0x1B, 0x18,
112 0x16, 0x13,
113 0x11, 0x0F
114#endif
115};
116
117static const int table_scale = 256 / sizeof(rgblight_effect_breathe_table);
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 7e0eee8bd..b95b166d8 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -8,4 +8,5 @@ UNICODE_ENABLE = yes
8OLED_DRIVER_ENABLE = yes 8OLED_DRIVER_ENABLE = yes
9WPM_ENABLE = yes 9WPM_ENABLE = yes
10ENCODER_ENABLE = yes 10ENCODER_ENABLE = yes
11ENCODER_MAP_ENABLE = yes
11# DEBOUNCE_TYPE = sym_eager_pk 12# DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/keebio/iris/keymaps/drashna/keymap.c b/keyboards/keebio/iris/keymaps/drashna/keymap.c
index fe5e67b52..45b05e350 100644
--- a/keyboards/keebio/iris/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/iris/keymaps/drashna/keymap.c
@@ -38,58 +38,32 @@
38 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, OS_LALT, OS_RGUI, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \ 38 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, OS_LALT, OS_RGUI, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
39 KC_GRV, KC_SPC, LT(_LOWER,KC_BSPC), LT(_RAISE,KC_DEL), KC_ENT, RAISE \ 39 KC_GRV, KC_SPC, LT(_LOWER,KC_BSPC), LT(_RAISE,KC_DEL), KC_ENT, RAISE \
40 ) 40 )
41#define LAYOUT_iris_base_wrapper(...) LAYOUT_iris_base(__VA_ARGS__) 41#define LAYOUT_base_wrapper(...) LAYOUT_iris_base(__VA_ARGS__)
42 42
43 43
44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
45 45 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
46 [_QWERTY] = LAYOUT_iris_base_wrapper( 46 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
47 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 47 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
48 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 48 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
49 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 49 ),
50 ), 50
51 51 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
52 [_COLEMAK] = LAYOUT_iris_base_wrapper( 52 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
53 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 53 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
54 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 54 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
55 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 55 ),
56 ), 56 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
57 57 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
58 [_DVORAK] = LAYOUT_iris_base_wrapper( 58 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
59 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 59 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
60 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 60 ),
61 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 61
62 ), 62 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
63 63 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
64 [_WORKMAN] = LAYOUT_iris_base_wrapper( 64 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
65 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, 65 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
66 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, 66 ),
67 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
68 ),
69
70 [_NORMAN] = LAYOUT_iris_base_wrapper(
71 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
72 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
73 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
74 ),
75
76 [_MALTRON] = LAYOUT_iris_base_wrapper(
77 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
78 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
79 _________________MALTRON_L3________________, _________________MALTRON_R3________________
80 ),
81
82 [_EUCALYN] = LAYOUT_iris_base_wrapper(
83 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
84 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
85 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
86 ),
87
88 [_CARPLAX] = LAYOUT_iris_base_wrapper(
89 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
90 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
91 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
92 ),
93 67
94 [_GAMEPAD] = LAYOUT_wrapper( 68 [_GAMEPAD] = LAYOUT_wrapper(
95 KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, _______, _______, _______, _______, _______, _______, 69 KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/iris/keymaps/drashna_lp/config.h b/keyboards/keebio/iris/keymaps/drashna_lp/config.h
deleted file mode 100644
index 414acab84..000000000
--- a/keyboards/keebio/iris/keymaps/drashna_lp/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
1/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19/* Use I2C or Serial, not both */
20#include "../drashna/config.h"
21
22#ifdef RGBLIGHT_ENABLE
23# undef RGBLED_NUM
24# define RGBLED_NUM 16 // Number of LEDs
25# undef RGBLED_SPLIT
26# define RGBLED_SPLIT \
27 { 8, 8 }
28#endif
29
30#undef PRODUCT
31#ifdef KEYBOARD_keebio_iris_rev2
32# define PRODUCT Drashna Hacked Iris LP Rev .2(Backlit)
33#endif
34
35#undef SHFT_LED1
36#define SHFT_LED1 5
37#undef SHFT_LED2
38#define SHFT_LED2 10
39
40#undef CTRL_LED1
41#define CTRL_LED1 6
42#undef CTRL_LED2
43#define CTRL_LED2 9
44
45#undef ALT_LED1
46#define ALT_LED1 7
47#undef GUI_LED1
48#define GUI_LED1 8
49
50#define DRASHNA_LP
diff --git a/keyboards/keebio/iris/keymaps/drashna_lp/keymap.c b/keyboards/keebio/iris/keymaps/drashna_lp/keymap.c
deleted file mode 100644
index ff7bd09c0..000000000
--- a/keyboards/keebio/iris/keymaps/drashna_lp/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
1// placeholder
diff --git a/keyboards/keebio/iris/keymaps/drashna_lp/rules.mk b/keyboards/keebio/iris/keymaps/drashna_lp/rules.mk
deleted file mode 100644
index d3f6f5550..000000000
--- a/keyboards/keebio/iris/keymaps/drashna_lp/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
1USER_NAME := drashna
2SRC += ../drashna/keymap.c
3
4include $(KEYBOARD_PATH_2)/keymaps/drashna/rules.mk
5
6AUDIO_ENABLE = no
7BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/drashna_old/config.h b/keyboards/keebio/iris/keymaps/drashna_old/config.h
deleted file mode 100644
index f08b22dca..000000000
--- a/keyboards/keebio/iris/keymaps/drashna_old/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
1/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19/* Use I2C or Serial, not both */
20#include "../drashna/config.h"
21
22#ifdef RGBLIGHT_ENABLE
23# undef RGBLED_NUM
24# define RGBLED_NUM 16 // Number of LEDs
25# undef RGBLED_SPLIT
26# define RGBLED_SPLIT { 8, 8 }
27#endif
28
29#undef PRODUCT
30#ifdef KEYBOARD_keebio_iris_rev2
31# define PRODUCT Drashna Hacked Iris Rev.2 (16 LED)
32#endif
33
34#undef SHFT_LED1
35#define SHFT_LED1 5
36#undef SHFT_LED2
37#define SHFT_LED2 10
38
39#undef CTRL_LED1
40#define CTRL_LED1 6
41#undef CTRL_LED2
42#define CTRL_LED2 9
43
44#undef ALT_LED1
45#define ALT_LED1 7
46#undef GUI_LED1
47#define GUI_LED1 8
diff --git a/keyboards/keebio/iris/keymaps/drashna_old/keymap.c b/keyboards/keebio/iris/keymaps/drashna_old/keymap.c
deleted file mode 100644
index ff7bd09c0..000000000
--- a/keyboards/keebio/iris/keymaps/drashna_old/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
1// placeholder
diff --git a/keyboards/keebio/iris/keymaps/drashna_old/rules.mk b/keyboards/keebio/iris/keymaps/drashna_old/rules.mk
deleted file mode 100644
index 73f37c6c5..000000000
--- a/keyboards/keebio/iris/keymaps/drashna_old/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
1USER_NAME := drashna
2SRC += ../drashna/keymap.c
3
4include $(KEYBOARD_PATH_2)/keymaps/drashna/rules.mk
diff --git a/keyboards/keebio/viterbi/keymaps/drashna_old/config.h b/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
deleted file mode 100644
index 5697f7f11..000000000
--- a/keyboards/keebio/viterbi/keymaps/drashna_old/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
1/*
2Copyright 2017 Danny Nguyen <danny@hexwire.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "../drashna/config.h"
21
22#ifdef RGBLIGHT_ENABLE
23# undef RGBLED_NUM
24# define RGBLED_NUM 12
25#endif
diff --git a/keyboards/keebio/viterbi/keymaps/drashna_old/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna_old/keymap.c
deleted file mode 100644
index 2d361da9a..000000000
--- a/keyboards/keebio/viterbi/keymaps/drashna_old/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
1//placeholder \ No newline at end of file
diff --git a/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
deleted file mode 100644
index 73f37c6c5..000000000
--- a/keyboards/keebio/viterbi/keymaps/drashna_old/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
1USER_NAME := drashna
2SRC += ../drashna/keymap.c
3
4include $(KEYBOARD_PATH_2)/keymaps/drashna/rules.mk
diff --git a/keyboards/moonlander/keymaps/drashna/keymap.c b/keyboards/moonlander/keymaps/drashna/keymap.c
index 57c69df48..f6af7e53a 100644
--- a/keyboards/moonlander/keymaps/drashna/keymap.c
+++ b/keyboards/moonlander/keymaps/drashna/keymap.c
@@ -39,68 +39,32 @@ enum more_custom_keycodes { KC_SWAP_NUM = NEW_SAFE_RANGE };
39 KC_SPC, BK_LWER, OS_LALT, OS_RGUI, DL_RAIS, KC_ENT \ 39 KC_SPC, BK_LWER, OS_LALT, OS_RGUI, DL_RAIS, KC_ENT \
40 ) 40 )
41 41
42#define LAYOUT_moonlander_base_wrapper(...) LAYOUT_moonlander_base(__VA_ARGS__) 42#define LAYOUT_base_wrapper(...) LAYOUT_moonlander_base(__VA_ARGS__)
43 43
44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
45 45 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
46 [_QWERTY] = LAYOUT_moonlander_base_wrapper(
47 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 46 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
48 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 47 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
49 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 48 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
50 ), 49 ),
51 50
52 [_COLEMAK] = LAYOUT_moonlander_base_wrapper( 51 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
52 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
53 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
54 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
55 ),
56 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
53 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 57 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
54 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 58 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
55 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 59 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
56 ), 60 ),
57 61
58 [_DVORAK] = LAYOUT_moonlander_base_wrapper( 62 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
59 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 63 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
60 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 64 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
61 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 65 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
62 ), 66 ),
63 67
64 [_WORKMAN] = LAYOUT_moonlander_base_wrapper(
65 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
66 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
67 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
68 ),
69
70 [_NORMAN] = LAYOUT_moonlander_base_wrapper(
71 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
72 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
73 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
74 ),
75
76 [_MALTRON] = LAYOUT_moonlander_base_wrapper(
77 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
78 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
79 _________________MALTRON_L3________________, _________________MALTRON_R3________________
80 ),
81
82 [_EUCALYN] = LAYOUT_moonlander_base_wrapper(
83 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
84 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
85 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
86 ),
87
88 [_CARPLAX] = LAYOUT_moonlander_base_wrapper(
89 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
90 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
91 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
92 ),
93
94#ifdef _MODS
95 [_MODS] = LAYOUT_moonlander_wrapper(
96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
97 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
98 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
99 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT,
100 _______, KC_MEH, KC_HYPR, _______, _______, _______, _______, _______, _______, _______, _______, _______,
101 KC_LALT, _______, _______, _______, _______, KC_RGUI
102 ),
103#endif
104 68
105 [_GAMEPAD] = LAYOUT_moonlander_wrapper( 69 [_GAMEPAD] = LAYOUT_moonlander_wrapper(
106 KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, HYPR(KC_Q), KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, 70 KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, HYPR(KC_Q), KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
@@ -214,29 +178,17 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
214 178
215 if (userspace_config.rgb_layer_change) { 179 if (userspace_config.rgb_layer_change) {
216 switch (get_highest_layer(layer_state|default_layer_state)) { 180 switch (get_highest_layer(layer_state|default_layer_state)) {
217 case _QWERTY: 181 case _DEFAULT_LAYER_1:
218 rgb_matrix_layer_helper(HSV_CYAN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 182 rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
219 break;
220 case _COLEMAK:
221 rgb_matrix_layer_helper(HSV_MAGENTA, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
222 break;
223 case _DVORAK:
224 rgb_matrix_layer_helper(HSV_SPRINGGREEN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
225 break;
226 case _WORKMAN:
227 rgb_matrix_layer_helper(HSV_GOLDENROD, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
228 break;
229 case _NORMAN:
230 rgb_matrix_layer_helper(HSV_CORAL, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
231 break; 183 break;
232 case _MALTRON: 184 case _DEFAULT_LAYER_2:
233 rgb_matrix_layer_helper(HSV_YELLOW, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 185 rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
234 break; 186 break;
235 case _EUCALYN: 187 case _DEFAULT_LAYER_3:
236 rgb_matrix_layer_helper(HSV_PINK, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 188 rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
237 break; 189 break;
238 case _CARPLAX: 190 case _DEFAULT_LAYER_4:
239 rgb_matrix_layer_helper(HSV_BLUE, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 191 rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
240 break; 192 break;
241 case _GAMEPAD: 193 case _GAMEPAD:
242 rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); 194 rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index 643a5b6b0..b7d83a5f2 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -19,59 +19,34 @@
19 LALT_T(KC_TAB), K11, K12, K13, K14, K15, OS_LALT, OS_LGUI, OS_RALT, RAISE, K16, K17, K18, K19, K1A, RALT_T(K1B), \ 19 LALT_T(KC_TAB), K11, K12, K13, K14, K15, OS_LALT, OS_LGUI, OS_RALT, RAISE, K16, K17, K18, K19, K1A, RALT_T(K1B), \
20 KC_MLSF, CTL_T(K21), K22, K23, K24, K25, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, K26, K27, K28, K29, RCTL_T(K2A), KC_MRSF \ 20 KC_MLSF, CTL_T(K21), K22, K23, K24, K25, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, K26, K27, K28, K29, RCTL_T(K2A), KC_MRSF \
21 ) 21 )
22#define LAYOUT_orthodox_base_wrapper(...) LAYOUT_orthodox_base(__VA_ARGS__) 22#define LAYOUT_base_wrapper(...) LAYOUT_orthodox_base(__VA_ARGS__)
23 23
24 24
25 25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
28 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
29 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
30 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
31 ),
32
33 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
34 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
35 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
36 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
37 ),
38 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
39 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
40 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
41 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
42 ),
43
44 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
45 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
46 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
47 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
48 ),
27 49
28 [_QWERTY] = LAYOUT_orthodox_base_wrapper(
29 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
30 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
31 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
32 ),
33
34 [_COLEMAK] = LAYOUT_orthodox_base_wrapper(
35 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
36 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
37 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
38 ),
39
40 [_DVORAK] = LAYOUT_orthodox_base_wrapper(
41 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
42 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
43 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
44 ),
45
46 [_WORKMAN] = LAYOUT_orthodox_base_wrapper(
47 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
48 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
49 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
50 ),
51
52 [_NORMAN] = LAYOUT_orthodox_base_wrapper(
53 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
54 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
55 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
56 ),
57
58 [_MALTRON] = LAYOUT_orthodox_base_wrapper(
59 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
60 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
61 _________________MALTRON_L3________________, _________________MALTRON_R3________________
62 ),
63
64 [_EUCALYN] = LAYOUT_orthodox_base_wrapper(
65 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
66 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
67 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
68 ),
69
70 [_CARPLAX] = LAYOUT_orthodox_base_wrapper(
71 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
72 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
73 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
74 ),
75 50
76 [_LOWER] = LAYOUT_wrapper(\ 51 [_LOWER] = LAYOUT_wrapper(\
77 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC, 52 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC,
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/config.h b/keyboards/ploopyco/mouse/keymaps/drashna/config.h
index 5bc704fec..5a220c801 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/config.h
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/config.h
@@ -20,5 +20,10 @@
20 20
21#undef RGBLIGHT_LIMIT_VAL 21#undef RGBLIGHT_LIMIT_VAL
22#define RGBLIGHT_LIMIT_VAL 255 22#define RGBLIGHT_LIMIT_VAL 255
23#define RGBLIGHT_ANIMATIONS 23#define RGBLIGHT_EFFECT_BREATHING
24#define RGBLIGHT_EFFECT_RAINBOW_MOOD
25#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
26#define RGBLIGHT_EFFECT_SNAKE
27#define RGBLIGHT_EFFECT_KNIGHT
28#define RGBLIGHT_EFFECT_TWINKLE
24#define RGBLIGHT_SLEEP 29#define RGBLIGHT_SLEEP
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
index 68b846f7b..a9b1c46fc 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
@@ -29,6 +29,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 29
30void eeconkfig_init_user(void) { 30void eeconkfig_init_user(void) {
31 rgblight_enable(); 31 rgblight_enable();
32#ifdef RGBLIGHT_EFFECT_TWINKLE
32 rgblight_mode(RGBLIGHT_MODE_TWINKLE+5); 33 rgblight_mode(RGBLIGHT_MODE_TWINKLE+5);
34#else
35 rgblight_mode(RGBLIGHT_MODE_BREATHING+5);
36#endif
33 rgblight_sethsv(HSV_MAGENTA); 37 rgblight_sethsv(HSV_MAGENTA);
34} 38}
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
index 14287d0ec..d55110e97 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
@@ -38,58 +38,32 @@
38 KC_MUTE, OS_LALT, KC_GRV, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI, UC(0x03A8), UC(0x2E2E) \ 38 KC_MUTE, OS_LALT, KC_GRV, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI, UC(0x03A8), UC(0x2E2E) \
39 ) 39 )
40/* Re-pass though to allow templates to be used */ 40/* Re-pass though to allow templates to be used */
41#define LAYOUT_kyria_base_wrapper(...) LAYOUT_kyria_base(__VA_ARGS__) 41#define LAYOUT_base_wrapper(...) LAYOUT_kyria_base(__VA_ARGS__)
42 42
43const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 43const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44 44 [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
45 [_QWERTY] = LAYOUT_kyria_base_wrapper(
46 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, 45 _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
47 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, 46 _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
48 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ 47 _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
49 ), 48 ),
50 49
51 [_COLEMAK] = LAYOUT_kyria_base_wrapper( 50 [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
51 ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
52 ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
53 ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
54 ),
55 [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
52 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, 56 _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
53 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, 57 _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
54 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ 58 _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
55 ), 59 ),
56 60
57 [_DVORAK] = LAYOUT_kyria_base_wrapper( 61 [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
58 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, 62 _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
59 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, 63 _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
60 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ 64 _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
61 ), 65 ),
62 66
63 [_WORKMAN] = LAYOUT_kyria_base_wrapper(
64 _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
65 _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
66 _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
67 ),
68
69 [_NORMAN] = LAYOUT_kyria_base_wrapper(
70 _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
71 _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
72 _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
73 ),
74
75 [_MALTRON] = LAYOUT_kyria_base_wrapper(
76 _________________MALTRON_L1________________, _________________MALTRON_R1________________,
77 _________________MALTRON_L2________________, _________________MALTRON_R2________________,
78 _________________MALTRON_L3________________, _________________MALTRON_R3________________
79 ),
80
81 [_EUCALYN] = LAYOUT_kyria_base_wrapper(
82 _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
83 _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
84 _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
85 ),
86
87 [_CARPLAX] = LAYOUT_kyria_base_wrapper(
88 _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
89 _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
90 _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
91 ),
92
93 [_GAMEPAD] = LAYOUT_wrapper( 67 [_GAMEPAD] = LAYOUT_wrapper(
94 KC_ESC, KC_K, KC_Q, KC_W, KC_E, KC_R, _______, _______, _______, _______, _______, _______, 68 KC_ESC, KC_K, KC_Q, KC_W, KC_E, KC_R, _______, _______, _______, _______, _______, _______,
95 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, _______, _______, _______, _______, _______, _______, 69 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, _______, _______, _______, _______, _______, _______,
@@ -128,6 +102,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
128// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 102// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
129// ), 103// ),
130}; 104};
105
106#ifdef ENCODER_MAP_ENABLE
107const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
108 [_DEFAULT_LAYER_1] = { { KC_DOWN, KC_UP }, { KC_VOLD, KC_VOLU } },
109 [_DEFAULT_LAYER_2] = { { _______, _______ }, { _______, _______ } },
110 [_DEFAULT_LAYER_3] = { { _______, _______ }, { _______, _______ } },
111 [_DEFAULT_LAYER_4] = { { _______, _______ }, { _______, _______ } },
112 [_GAMEPAD] = { { _______, _______ }, { _______, _______ } },
113 [_DIABLO] = { { _______, _______ }, { _______, _______ } },
114 [_MOUSE] = { { _______, _______ }, { KC_WH_D, KC_WH_U } },
115 [_MEDIA] = { { _______, _______ }, { _______, _______ } },
116 [_RAISE] = { { _______, _______ }, { KC_PGDN, KC_PGUP } },
117 [_LOWER] = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } },
118 [_ADJUST] = { { CK_DOWN, CK_UP }, { _______, _______ } },
119};
120#endif
131// clang-format on 121// clang-format on
132 122
133#ifdef OLED_DRIVER_ENABLE 123#ifdef OLED_DRIVER_ENABLE
@@ -156,39 +146,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
156#endif 146#endif
157 147
158#ifdef RGBLIGHT_LAYERS 148#ifdef RGBLIGHT_LAYERS
159const rgblight_segment_t PROGMEM shift_layers[] = RGBLIGHT_LAYER_SEGMENTS( 149const rgblight_segment_t PROGMEM shift_layers[] = RGBLIGHT_LAYER_SEGMENTS({8, 1, 120, 255, 255}, {18, 1, 120, 255, 255});
160 { 8, 1, 120, 255, 255}, 150const rgblight_segment_t PROGMEM control_layers[] = RGBLIGHT_LAYER_SEGMENTS({6, 1, 0, 255, 255}, {16, 1, 0, 255, 255});
161 { 18, 1, 120, 255, 255} 151const rgblight_segment_t PROGMEM alt_layers[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, 240, 255, 255}, {17, 1, 250, 255, 255});
162); 152const rgblight_segment_t PROGMEM gui_layers[] = RGBLIGHT_LAYER_SEGMENTS({7, 1, 51, 255, 255}, {12, 1, 51, 255, 255});
163const rgblight_segment_t PROGMEM control_layers[] = RGBLIGHT_LAYER_SEGMENTS(
164 { 6, 1, 0, 255, 255},
165 { 16, 1, 0, 255, 255}
166);
167const rgblight_segment_t PROGMEM alt_layers[] = RGBLIGHT_LAYER_SEGMENTS(
168 { 2, 1, 240, 255, 255},
169 { 17, 1, 250, 255, 255}
170);
171const rgblight_segment_t PROGMEM gui_layers[] = RGBLIGHT_LAYER_SEGMENTS(
172 { 7, 1, 51, 255, 255},
173 { 12, 1, 51, 255, 255}
174);
175 153
176const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 154const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(shift_layers, control_layers, alt_layers, gui_layers);
177 shift_layers,
178 control_layers,
179 alt_layers,
180 gui_layers
181);
182 155
183void keyboard_post_init_keymap(void) { 156void keyboard_post_init_keymap(void) { rgblight_layers = my_rgb_layers; }
184 rgblight_layers = my_rgb_layers;
185}
186 157
187void matrix_scan_keymap(void) { 158void matrix_scan_keymap(void) {
188 uint8_t mods = mod_config(get_mods()|get_oneshot_mods()); 159 uint8_t mods = mod_config(get_mods() | get_oneshot_mods());
189 rgblight_set_layer_state(0, mods & MOD_MASK_SHIFT); 160 rgblight_set_layer_state(0, mods & MOD_MASK_SHIFT);
190 rgblight_set_layer_state(1, mods & MOD_MASK_CTRL); 161 rgblight_set_layer_state(1, mods & MOD_MASK_CTRL);
191 rgblight_set_layer_state(2, mods & MOD_MASK_ALT); 162 rgblight_set_layer_state(2, mods & MOD_MASK_ALT);
192 rgblight_set_layer_state(3, mods & MOD_MASK_GUI); 163 rgblight_set_layer_state(3, mods & MOD_MASK_GUI);
193} 164}
194#endif 165#endif
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
index 4036f9145..91d10f5dd 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
@@ -3,13 +3,15 @@ ENCODER_ENABLE = yes # ENables the use of one or more encoders
3RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 3RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
4RGBLIGHT_STARTUP_ANIMATION = no 4RGBLIGHT_STARTUP_ANIMATION = no
5 5
6BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration 6BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
7MOUSEKEY_ENABLE = no # Mouse keys 7MOUSEKEY_ENABLE = no # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control 8EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = no # Console for debug 9CONSOLE_ENABLE = no # Console for debug
10COMMAND_ENABLE = no # Commands for debug and configuration 10COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = yes # USB Nkey Rollover 11NKRO_ENABLE = yes # USB Nkey Rollover
12UNICODE_ENABLE = yes # Unicode 12UNICODE_ENABLE = no # Unicode
13BOOTLOADER = atmel-dfu 13KEY_LOCK_ENABLE = no
14
14 15
16BOOTLOADER = atmel-dfu
15# TAP_DANCE_ENABLE = yes 17# TAP_DANCE_ENABLE = yes
diff --git a/keyboards/splitkb/zima/keymaps/drashna/keymap.c b/keyboards/splitkb/zima/keymaps/drashna/keymap.c
index d9e1f44e2..6e198e3dd 100644
--- a/keyboards/splitkb/zima/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/zima/keymaps/drashna/keymap.c
@@ -22,6 +22,7 @@
22extern haptic_config_t haptic_config; 22extern haptic_config_t haptic_config;
23#endif 23#endif
24 24
25// clang-format off
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [0] = LAYOUT_ortho_4x3( /* Base */ 27 [0] = LAYOUT_ortho_4x3( /* Base */
27 KC_MUTE, TG(1), TG(2), 28 KC_MUTE, TG(1), TG(2),
@@ -43,12 +44,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 ) 44 )
44}; 45};
45 46
47#ifdef ENCODER_MAP_ENABLE
48const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
49 [0] = { { KC_DOWN, KC_UP } },
50 [1] = { { KC_VOLD, KC_VOLU } },
51 [2] = { { RGB_MOD, RGB_RMOD} },
52};
53#endif
54// clang-format on
46 55
47static bool is_asleep = false; 56static bool is_asleep = false;
48static uint32_t oled_timer; 57static uint32_t oled_timer;
49 58
50void render_oled_logo(void) { 59void render_oled_logo(void) {
51 // clang-format off 60 // clang-format off
52 static const char PROGMEM qmk_logo[] = { 61 static const char PROGMEM qmk_logo[] = {
53 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, 62 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
54 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, 63 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
@@ -68,9 +77,7 @@ void render_user_status(void) {
68 oled_write_P(nukem_good[0], haptic_config.enable); 77 oled_write_P(nukem_good[0], haptic_config.enable);
69} 78}
70 79
71void keyboard_post_init_user(void) { 80void keyboard_post_init_user(void) { oled_scroll_set_speed(0); }
72 oled_scroll_set_speed(0);
73}
74 81
75void oled_task_user(void) { 82void oled_task_user(void) {
76 if (is_asleep) { 83 if (is_asleep) {
@@ -107,13 +114,9 @@ void oled_task_user(void) {
107 } 114 }
108} 115}
109 116
110void suspend_power_down_user(void) { 117void suspend_power_down_user(void) { is_asleep = true; }
111 is_asleep = true;
112}
113 118
114void suspend_wakeup_init_user(void) { 119void suspend_wakeup_init_user(void) { is_asleep = false; }
115 is_asleep = false;
116}
117 120
118bool process_record_user(uint16_t keycode, keyrecord_t* record) { 121bool process_record_user(uint16_t keycode, keyrecord_t* record) {
119 oled_timer = timer_read32(); 122 oled_timer = timer_read32();
@@ -121,7 +124,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
121 return true; 124 return true;
122} 125}
123 126
124
125bool encoder_update_user(uint8_t index, bool clockwise) { 127bool encoder_update_user(uint8_t index, bool clockwise) {
126 if (clockwise) { 128 if (clockwise) {
127 tap_code16(KC_VOLU); 129 tap_code16(KC_VOLU);
diff --git a/keyboards/splitkb/zima/keymaps/drashna/rules.mk b/keyboards/splitkb/zima/keymaps/drashna/rules.mk
index b9a1f7f25..b9dc00915 100644
--- a/keyboards/splitkb/zima/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/zima/keymaps/drashna/rules.mk
@@ -1,2 +1,3 @@
1# is intentional. won't compile under size, otherwise. 1# is intentional. won't compile under size, otherwise.
2USER_NAME := not_drashna 2USER_NAME := not_drashna
3ENCODER_MAP_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-11 09:45:21 +0000