summaryrefslogtreecommitdiff
path: root/keyboards/ml/gas75
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ml/gas75')
-rw-r--r--keyboards/ml/gas75/config.h4
-rw-r--r--keyboards/ml/gas75/info.json5
-rw-r--r--keyboards/ml/gas75/keymaps/via/keymap.c10
3 files changed, 9 insertions, 10 deletions
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
index 0005f030e4..bd9c4b6e4e 100644
--- a/keyboards/ml/gas75/config.h
+++ b/keyboards/ml/gas75/config.h
@@ -27,10 +27,6 @@
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
-/* Encoder pins */
-#define ENCODERS_PAD_A { F0 }
-#define ENCODERS_PAD_B { F1 }
-
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 3
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 8ee1c8f94d..2687ada0d9 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F0", "pin_b": "F1"}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/ml/gas75/keymaps/via/keymap.c b/keyboards/ml/gas75/keymaps/via/keymap.c
index b609f9d142..b5e3055427 100644
--- a/keyboards/ml/gas75/keymaps/via/keymap.c
+++ b/keyboards/ml/gas75/keymaps/via/keymap.c
@@ -159,14 +159,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) {
- 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],