summaryrefslogtreecommitdiff
path: root/keyboards/merge/iso_macro
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge/iso_macro')
-rw-r--r--keyboards/merge/iso_macro/config.h5
-rw-r--r--keyboards/merge/iso_macro/info.json6
2 files changed, 6 insertions, 5 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h
index cde82e7341..7bf2b1b33b 100644
--- a/keyboards/merge/iso_macro/config.h
+++ b/keyboards/merge/iso_macro/config.h
@@ -22,8 +22,3 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-
-
-#define ENCODERS_PAD_A { F0, D0 }
-#define ENCODERS_PAD_B { F1, D1 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index 123438a5be..bc4269755f 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -8,6 +8,12 @@
"pid": "0x1200",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F0", "pin_b": "F1"},
+ {"pin_a": "D0", "pin_b": "D1"}
+ ]
+ },
"backlight": {
"pin": "B7"
},