Move SOFT_SERIAL_PIN to data driven

qmk · tzarc · Feb 17, 2023 · Feb 17, 2023 · Feb 17, 2023 · Feb 17, 2023
commit 28b44807016df19487702382d2d5b257da63fd3e
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 100
 
-/* Use I2C or Serial */
-#define SOFT_SERIAL_PIN D2
-
 /* Select hand configuration */
 #define MASTER_LEFT
 //#define MASTER_RIGHT

diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
@@ -1,3 +1,6 @@
 {
-  "keyboard_name": "Zinc rev.1"
+  "keyboard_name": "Zinc rev.1",
+  "split": {
+    "soft_serial_pin": "D2"
+  }
 }
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 100
 
-/* Use I2C or Serial */
-#define SOFT_SERIAL_PIN D2
-
 /* Select hand configuration */
 #define MASTER_LEFT
 //#define MASTER_RIGHT

diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
@@ -1,3 +1,6 @@
 {
-  "keyboard_name": "Zinc rev.A"
+  "keyboard_name": "Zinc rev.A",
+  "split": {
+    "soft_serial_pin": "D2"
+  }
 }
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Select hand configuration */
 #define MASTER_LEFT
 //#define MASTER_RIGHT

diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0F25",
         "device_version": "1.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x5", "ortho_5x10"],

diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Select hand configuration */
 #define MASTER_LEFT
 //#define MASTER_RIGHT

diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0F61",
         "device_version": "1.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_2x3", "ortho_2x6"],

diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Select hand configuration */
 #define MASTER_LEFT
 //#define MASTER_RIGHT

diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0F00",
         "device_version": "1.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_3x10"],

diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
@@ -8,6 +8,9 @@
     "pid": "0x4A1F",
     "device_version": "1.0.0"
   },
+  "split": {
+    "soft_serial_pin": "D0"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {

diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
@@ -22,7 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D1
-
 #define EE_HANDS
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
@@ -19,6 +19,7 @@
         ]
     },
     "split": {
+        "soft_serial_pin": "D1",
         "bootmagic": {
             "matrix": [4, 4]
         },

diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
@@ -8,6 +8,9 @@
 		"pid": "0xAD96",
 		"device_version": "0.0.1"
 	},
+	"split": {
+		"soft_serial_pin": "D0"
+	},
 	"processor": "atmega32u4",
 	"bootloader": "caterina",
 	"layouts": {

diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN D0
-
 /* define tapping term */
 #define TAPPING_TERM 100
 

diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
@@ -29,6 +29,4 @@
 
 #define SPLIT_HAND_PIN B3
 
-#define SOFT_SERIAL_PIN D2
-
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },

diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h
@@ -29,6 +29,4 @@
 
 #define SPLIT_HAND_PIN B3
 
-#define SOFT_SERIAL_PIN D2
-
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },

diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
@@ -29,6 +29,4 @@
 
 #define SPLIT_HAND_PIN B3
 
-#define SOFT_SERIAL_PIN D2
-
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },

diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
@@ -29,6 +29,4 @@
 
 #define SPLIT_HAND_PIN B3
 
-#define SOFT_SERIAL_PIN D2
-
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },

diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
@@ -29,6 +29,4 @@
 
 #define SPLIT_HAND_PIN B3
 
-#define SOFT_SERIAL_PIN D2
-
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },

diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define SPLIT_LED_STATE_ENABLE

diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.3"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 #define SPLIT_HAND_PIN D5
 #define SPLIT_USB_DETECT
 #define SPLIT_USB_TIMEOUT 2500

diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-#define SOFT_SERIAL_PIN D3
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 /* key matrix size */

diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
@@ -8,6 +8,9 @@
         "pid": "0xF902",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define SOFT_SERIAL_PIN D2
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8

diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h
@@ -11,6 +11,4 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN D2
-
 #define BACKLIGHT_PIN B0
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
@@ -11,8 +11,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN D2
-
 #define RGB_DI_PIN D3
 
 #define RGBLED_NUM 12

diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0002",
         "device_version": "0.0.2"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
@@ -11,8 +11,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN D2
-
 #define RGB_DI_PIN D3
 
 #define RGBLED_NUM 12

diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.3"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
@@ -11,9 +11,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN D2
-
-
 #define ENCODERS_PAD_A { B5 }
 #define ENCODERS_PAD_B { F4 }
 #define ENCODER_RESOLUTION 2

diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0004",
         "device_version": "0.0.4"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
Original file line number	Diff line number	Diff line change
		@@ -29,6 +29,4 @@

		#define SPLIT_HAND_PIN B3

		#define SOFT_SERIAL_PIN D2

		#define DIODE_DIRECTION COL2ROW
Original file line number	Diff line number	Diff line change
		@@ -11,6 +11,4 @@

		#define DIODE_DIRECTION COL2ROW

		#define SOFT_SERIAL_PIN D2

		#define BACKLIGHT_PIN B0