summaryrefslogtreecommitdiff
path: root/keyboards/keycapsss
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-11-30 10:19:17 +1100
committerGitHub <noreply@github.com>2023-11-30 10:19:17 +1100
commit2886c335a0e8a9bb6b6549e648ece7e51519f787 (patch)
tree1c07710bf759698bef6863aa58e7a997c212fc57 /keyboards/keycapsss
parent7cc90c234f55364bb5ebf45f9bb4274fd9926b9d (diff)
`keycapsss/plaid_pad`: switch to encoder map (#22474)
Diffstat (limited to 'keyboards/keycapsss')
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c42
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk1
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c102
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk1
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c61
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk1
6 files changed, 34 insertions, 174 deletions
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
index 2382185362..789bb7af02 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
@@ -42,9 +42,8 @@ bool oled_task_user(void) {
42#endif 42#endif
43 43
44 44
45#ifdef ENCODER_ENABLE 45#ifdef ENCODER_MAP_ENABLE
46 46
47bool encoder_update_user(uint8_t index, bool clockwise) {
48/* 47/*
49Rev1.1 Rev1 48Rev1.1 Rev1
50,-----------------------, ,-----------------------, 49,-----------------------, ,-----------------------,
@@ -57,37 +56,12 @@ Rev1.1 Rev1
57| | | | E1 | | | | | | 56| | | | E1 | | | | | |
58`-----------------------' `-----------------------' 57`-----------------------' `-----------------------'
59 */ 58 */
60 59const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
61 // First encoder (E1) 60#ifdef KEYBOARD_keycapsss_plaid_pad_rev1
62 if (index == 0) { 61 { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) }
63 if (clockwise) { 62#else
64 tap_code(KC_F17); 63 { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) }
65 } else { 64#endif
66 tap_code(KC_F18); 65};
67 }
68 // Second encoder (E2)
69 } else if (index == 1) {
70 if (clockwise) {
71 tap_code(KC_F19);
72 } else {
73 tap_code(KC_F20);
74 }
75 // Third encoder (E3)
76 } else if (index == 2) {
77 if (clockwise) {
78 tap_code(KC_F21);
79 } else {
80 tap_code(KC_F22);
81 }
82 // Forth encoder (E4)
83 } else if (index == 3) {
84 if (clockwise) {
85 tap_code(KC_F23);
86 } else {
87 tap_code(KC_F24);
88 }
89 }
90 return true;
91}
92 66
93#endif 67#endif
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
index 371e8e9941..944f822fb3 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
@@ -125,8 +125,7 @@ bool oled_task_user(void) {
125 125
126#endif 126#endif
127 127
128#ifdef ENCODER_ENABLE 128#ifdef ENCODER_MAP_ENABLE
129bool encoder_update_user(uint8_t index, bool clockwise) {
130/* 129/*
131 ,-----------------------, 130 ,-----------------------,
132 | E1 | E2 | E3 | E4 | 131 | E1 | E2 | E3 | E4 |
@@ -138,93 +137,16 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
138 | | | | E1 | 137 | | | | E1 |
139 `-----------------------' 138 `-----------------------'
140 */ 139 */
140const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
141#ifdef KEYBOARD_keycapsss_plaid_pad_rev1
142 [_NUMPAD] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) },
143 [_NAVIGATION] = { ENCODER_CCW_CW(C(S(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
144 [_MEDIA] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) }
145#else
146 [_NUMPAD] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) },
147 [_NAVIGATION] = { ENCODER_CCW_CW(C(S(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
148 [_MEDIA] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_BRID, KC_BRIU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
149#endif
150};
141 151
142 // First encoder (E1)
143 if (index == 0) {
144 switch (get_highest_layer(layer_state)) {
145 case _NAVIGATION:
146 // Browser tab switching
147 if (clockwise) {
148 tap_code16(LCTL(KC_TAB));
149 } else {
150 tap_code16(LCTL(LSFT(KC_TAB)));
151 }
152 break;
153 default:
154 if (clockwise) {
155 tap_code(KC_F17);
156 } else {
157 tap_code(KC_F18);
158 }
159 break;
160 }
161 // Second encoder (E2)
162 } else if (index == 1) {
163 switch (get_highest_layer(layer_state)) {
164 case _NAVIGATION:
165 // Page Down/Up
166 if (clockwise) {
167 tap_code16(KC_PGDN);
168 } else {
169 tap_code16(KC_PGUP);
170 }
171 break;
172 default:
173 if (clockwise) {
174 tap_code(KC_F19);
175 } else {
176 tap_code(KC_F20);
177 }
178 break;
179 }
180 // Third encoder (E3)
181 } else if (index == 2) {
182 switch (get_highest_layer(layer_state)) {
183 case _NAVIGATION:
184 // Mouse wheel up/down
185 if (clockwise) {
186 tap_code(KC_MS_WH_DOWN);
187 } else {
188 tap_code(KC_MS_WH_UP);
189 }
190 break;
191 case _MEDIA:
192 // BRIGHTNESS Up/Down
193 if (clockwise) {
194 tap_code16(KC_BRIGHTNESS_UP);
195 } else {
196 tap_code16(KC_BRIGHTNESS_DOWN);
197 }
198 break;
199 default:
200 if (clockwise) {
201 tap_code(KC_F21);
202 } else {
203 tap_code(KC_F22);
204 }
205 break;
206 }
207 // Forth encoder (E4)
208 } else if (index == 3) {
209 switch (get_highest_layer(layer_state)) {
210 case _NAVIGATION:
211 case _MEDIA:
212 // Volume Up/Down
213 if (clockwise) {
214 tap_code16(KC_AUDIO_VOL_UP);
215 } else {
216 tap_code16(KC_AUDIO_VOL_DOWN);
217 }
218 break;
219 default:
220 if (clockwise) {
221 tap_code(KC_F23);
222 } else {
223 tap_code(KC_F24);
224 }
225 break;
226 }
227 }
228 return true;
229}
230#endif 152#endif
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
index dc3e29cf8b..33bd0c3611 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
@@ -1,2 +1,3 @@
1OLED_ENABLE = yes 1OLED_ENABLE = yes
2COMBO_ENABLE = yes 2COMBO_ENABLE = yes
3ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
index 7d48591cd2..4ca3fc944b 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
@@ -27,26 +27,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 * | 0 | . | = | + | 27 * | 0 | . | = | + |
28 * `-----------------------' 28 * `-----------------------'
29 */ 29 */
30 [0] = LAYOUT_ortho_4x4( 30 LAYOUT_ortho_4x4(
31 KC_P7, KC_P8, KC_P9, KC_PSLS, 31 KC_P7, KC_P8, KC_P9, KC_PSLS,
32 KC_P4, KC_P5, KC_P6, KC_PAST, 32 KC_P4, KC_P5, KC_P6, KC_PAST,
33 KC_P1, KC_P2, KC_P3, KC_PMNS, 33 KC_P1, KC_P2, KC_P3, KC_PMNS,
34 KC_P0, KC_PDOT, KC_PEQL, KC_PPLS ), 34 KC_P0, KC_PDOT, KC_PEQL, KC_PPLS
35 [1] = LAYOUT_ortho_4x4( 35 ),
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
40 [2] = LAYOUT_ortho_4x4(
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
45 [3] = LAYOUT_ortho_4x4(
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
50}; 36};
51 37
52 38
@@ -69,8 +55,7 @@ bool oled_task_user(void) {
69#endif 55#endif
70 56
71 57
72#ifdef ENCODER_ENABLE 58#ifdef ENCODER_MAP_ENABLE
73bool encoder_update_user(uint8_t index, bool clockwise) {
74/* 59/*
75Rev1.1 Rev1 60Rev1.1 Rev1
76,-----------------------, ,-----------------------, 61,-----------------------, ,-----------------------,
@@ -84,35 +69,11 @@ Rev1.1 Rev1
84`-----------------------' `-----------------------' 69`-----------------------' `-----------------------'
85 */ 70 */
86 71
87 // First encoder (E1) 72const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
88 if (index == 0) { 73#ifdef KEYBOARD_keycapsss_plaid_pad_rev1
89 if (clockwise) { 74 { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) }
90 tap_code(KC_F17); 75#else
91 } else { 76 { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) }
92 tap_code(KC_F18); 77#endif
93 } 78};
94 // Second encoder (E2)
95 } else if (index == 1) {
96 if (clockwise) {
97 tap_code(KC_F19);
98 } else {
99 tap_code(KC_F20);
100 }
101 // Third encoder (E3)
102 } else if (index == 2) {
103 if (clockwise) {
104 tap_code(KC_F21);
105 } else {
106 tap_code(KC_F22);
107 }
108 // Forth encoder (E4)
109 } else if (index == 3) {
110 if (clockwise) {
111 tap_code(KC_F23);
112 } else {
113 tap_code(KC_F24);
114 }
115 }
116 return true;
117}
118#endif 79#endif
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2LTO_ENABLE = yes 2LTO_ENABLE = yes
3ENCODER_MAP_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:34:34 +0000