summaryrefslogtreecommitdiff
path: root/keyboards/mwstudio/mw75r2
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/mwstudio/mw75r2
parent314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 (diff)
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/mwstudio/mw75r2')
-rw-r--r--keyboards/mwstudio/mw75r2/config.h3
-rw-r--r--keyboards/mwstudio/mw75r2/info.json5
-rw-r--r--keyboards/mwstudio/mw75r2/keymaps/via/keymap.c12
3 files changed, 9 insertions, 11 deletions
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index bd39ed9b28..b5f4500d58 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -56,6 +56,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-
-#define ENCODERS_PAD_A { B1 }
-#define ENCODERS_PAD_B { B2 }
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index 621d9beafa..4d794246eb 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -8,6 +8,11 @@
"pid": "0x7502",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B1", "pin_b": "B2"}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
index e94667954e..7b7e1877f5 100644
--- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
@@ -105,15 +105,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
#ifdef ENCODER_ENABLE
-#define ENCODERS 1
-static uint8_t encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS] = {{3, 5}};
-static keypos_t encoder_ccw[ENCODERS] = {{4, 5}};
-
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static keypos_t encoder_cw[NUM_ENCODERS] = {{3, 5}};
+static keypos_t encoder_ccw[NUM_ENCODERS] = {{4, 5}};
void encoder_action_unregister(void) {
-#ifdef ENCODERS
- for (uint8_t index = 0; index < ENCODERS; ++index) {
+ for (uint8_t 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],
@@ -124,7 +121,6 @@ void encoder_action_unregister(void) {
action_exec(encoder_event);
}
}
-#endif
}
void encoder_action_register(uint8_t index, bool clockwise) {