summaryrefslogtreecommitdiff
path: root/keyboards/merge/uc1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge/uc1')
-rw-r--r--keyboards/merge/uc1/config.h4
-rw-r--r--keyboards/merge/uc1/info.json5
2 files changed, 5 insertions, 4 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 488b2cfed3..9dcfb6e074 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -39,7 +39,3 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-
-#define ENCODERS_PAD_A { F5 }
-#define ENCODERS_PAD_B { F6 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index d42f88c794..55b68a4510 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,11 @@
"pid": "0x5543",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F6"}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {