summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/iso_macro/config.h1
-rw-r--r--keyboards/merge/iso_macro/info.json3
-rw-r--r--keyboards/merge/uma/config.h2
-rw-r--r--keyboards/merge/uma/info.json3
4 files changed, 6 insertions, 3 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h
index b662589523..cde82e7341 100644
--- a/keyboards/merge/iso_macro/config.h
+++ b/keyboards/merge/iso_macro/config.h
@@ -19,7 +19,6 @@
#define MATRIX_ROW_PINS { F4, F5, F6}
#define MATRIX_COL_PINS { B4, B5, B6}
-#define BACKLIGHT_PIN B7
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index 3c5f6d6784..123438a5be 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -8,6 +8,9 @@
"pid": "0x1200",
"device_version": "0.0.1"
},
+ "backlight": {
+ "pin": "B7"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 8744fc0fd5..4cbb583321 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -19,8 +19,6 @@
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-#define BACKLIGHT_PIN C6
-
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 0031f4ae8e..11ccd102a5 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -8,6 +8,9 @@
"pid": "0x3232",
"device_version": "0.0.1"
},
+ "backlight": {
+ "pin": "C6"
+ },
"split": {
"soft_serial_pin": "D2"
},