summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-17 16:40:49 +1100
committerGitHub <noreply@github.com>2023-02-17 16:40:49 +1100
commit8f6c228adbfec98828f0411f62bab07f96e5c020 (patch)
treee3e7c485942dd7a089b34bfb17be8ef644829f12 /keyboards/merge
parent2da0827d4ffbcba161126d6001f370e97d0172a8 (diff)
Move `SOFT_SERIAL_PIN` to data driven (#19863)
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/config.h1
-rw-r--r--keyboards/merge/um70/info.json3
-rw-r--r--keyboards/merge/um80/config.h1
-rw-r--r--keyboards/merge/um80/info.json3
-rw-r--r--keyboards/merge/uma/config.h1
-rw-r--r--keyboards/merge/uma/info.json3
6 files changed, 9 insertions, 3 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 7fa3544c66..553b939ee2 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -21,7 +21,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-#define SOFT_SERIAL_PIN D2
#define SPLIT_USB_DETECT
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index 74ed0a7308..3c57c77492 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -8,6 +8,9 @@
"pid": "0x3222",
"device_version": "0.0.1"
},
+ "split": {
+ "soft_serial_pin": "D2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 76fb97583d..0dd371ddc2 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -21,7 +21,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-#define SOFT_SERIAL_PIN D2
#define SPLIT_USB_DETECT
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index f17b9d7691..a467a97c77 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -8,6 +8,9 @@
"pid": "0x3241",
"device_version": "0.0.1"
},
+ "split": {
+ "soft_serial_pin": "D2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 8763728483..6e7d2b959c 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -23,7 +23,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-#define SOFT_SERIAL_PIN D2
#define SPLIT_USB_DETECT
#define SPLIT_MODS_ENABLE
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 48170cfd6e..0031f4ae8e 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -8,6 +8,9 @@
"pid": "0x3232",
"device_version": "0.0.1"
},
+ "split": {
+ "soft_serial_pin": "D2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {