summaryrefslogtreecommitdiff
path: root/keyboards/wekey/we27
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-26 09:45:12 +1100
committerGitHub <noreply@github.com>2023-02-26 09:45:12 +1100
commit7e0299117b389b1c7fcdfa2f20891ba2287ea771 (patch)
tree00bb5bb7b3b73a9de365d1839ba7d41240d439f1 /keyboards/wekey/we27
parent314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 (diff)
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/wekey/we27')
-rw-r--r--keyboards/wekey/we27/config.h13
-rw-r--r--keyboards/wekey/we27/encoder_actions.c15
-rw-r--r--keyboards/wekey/we27/info.json5
3 files changed, 10 insertions, 23 deletions
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index 605400150e..c720fc2103 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -99,19 +99,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
-#ifdef ENCODER_ENABLE
-#define ENCODERS_PAD_A { D3 }
-# define ENCODERS_PAD_B \
- { D2 }
-# define ENCODER_RESOLUTION 2
-
-# define ENCODERS 1
-# define ENCODERS_CW_KEY \
- { \
- { 4, 5 } \
- }
+#define ENCODERS_CW_KEY { { 4, 5 } }
#define ENCODERS_CCW_KEY { { 4, 3 } }
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wekey/we27/encoder_actions.c b/keyboards/wekey/we27/encoder_actions.c
index 0f32ac2723..72970a2ffc 100644
--- a/keyboards/wekey/we27/encoder_actions.c
+++ b/keyboards/wekey/we27/encoder_actions.c
@@ -19,16 +19,12 @@
#include "encoder_actions.h"
#ifdef ENCODER_ENABLE
-
-# ifdef ENCODERS
-static uint8_t encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY;
-# endif
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
void encoder_action_unregister(void) {
-# ifdef ENCODERS
- for (int index = 0; index < ENCODERS; ++index) {
+ for (int index = 0; index < NUM_ENCODERS; ++index) {
if (encoder_state[index]) {
keyevent_t encoder_event = (keyevent_t) {
.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
@@ -39,11 +35,9 @@ void encoder_action_unregister(void) {
action_exec(encoder_event);
}
}
-# endif
}
void encoder_action_register(uint8_t index, bool clockwise) {
-# ifdef ENCODERS
keyevent_t encoder_event = (keyevent_t) {
.key = clockwise ? encoder_cw[index] : encoder_ccw[index],
.pressed = true,
@@ -51,7 +45,6 @@ void encoder_action_register(uint8_t index, bool clockwise) {
};
encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
action_exec(encoder_event);
-# endif
}
#endif
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index e47fb35185..0a114ad548 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["numpad_6x5"],