From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 10 Jan 2023 13:48:20 +1100
Subject: Migrate `LAYOUTS` to data driven (#19541)

* Migrate `LAYOUTS` to data driven, 0-9

* Migrate `LAYOUTS` to data driven, A

* Migrate `LAYOUTS` to data driven, B

* Migrate `LAYOUTS` to data driven, C

* Migrate `LAYOUTS` to data driven, D

* Migrate `LAYOUTS` to data driven, E

* Migrate `LAYOUTS` to data driven, F

* Migrate `LAYOUTS` to data driven, G

* Migrate `LAYOUTS` to data driven, H

* Migrate `LAYOUTS` to data driven, handwired

* Migrate `LAYOUTS` to data driven, I

* Migrate `LAYOUTS` to data driven, J

* Migrate `LAYOUTS` to data driven, K

* Migrate `LAYOUTS` to data driven, L

* Migrate `LAYOUTS` to data driven, M

* Migrate `LAYOUTS` to data driven, N

* Migrate `LAYOUTS` to data driven, O

* Migrate `LAYOUTS` to data driven, P

* Migrate `LAYOUTS` to data driven, Q

* Migrate `LAYOUTS` to data driven, R

* Migrate `LAYOUTS` to data driven, S

* Migrate `LAYOUTS` to data driven, T

* Migrate `LAYOUTS` to data driven, U

* Migrate `LAYOUTS` to data driven, V

* Migrate `LAYOUTS` to data driven, W

* Migrate `LAYOUTS` to data driven, X

* Migrate `LAYOUTS` to data driven, Y

* Migrate `LAYOUTS` to data driven, Z
---
 keyboards/bastardkb/skeletyl/blackpill/rules.mk    | 1 -
 keyboards/bastardkb/skeletyl/info.json             | 1 +
 keyboards/bastardkb/skeletyl/v1/elitec/rules.mk    | 1 -
 keyboards/bastardkb/skeletyl/v2/elitec/rules.mk    | 1 -
 keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk | 1 -
 keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk | 1 -
 keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk  | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'keyboards/bastardkb/skeletyl')

diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index 4ecd8c6924..cf2041ea1c 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 799f630124..90568ef1fd 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -3,6 +3,7 @@
     "usb": {
         "pid": "0x1830"
     },
+    "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 399e03a2a5..0c131a2eaf 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -24,4 +24,3 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together wi
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index 399e03a2a5..0c131a2eaf 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -24,4 +24,3 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together wi
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 1ce16352dd..8dfc0256ab 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -28,7 +28,6 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 1ce16352dd..8dfc0256ab 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -28,7 +28,6 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index ff20b0c742..39fc183e1d 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
 
 SERIAL_DRIVER = usart
 WS2812_DRIVER = pwm
-- 
cgit v1.2.3


From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 31 Jan 2023 06:03:30 +1100
Subject: Remove usages of config_common.h from config.h files. (#19714)

---
 keyboards/bastardkb/skeletyl/config.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'keyboards/bastardkb/skeletyl')

diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index 82a07c5921..144b9868bf 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* Key matrix configuration. */
 #define MATRIX_ROWS 8 // Rows are doubled-up.
-- 
cgit v1.2.3


From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 4 Feb 2023 06:19:58 +1100
Subject: Debounce defines cleanup (#19742)

* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
---
 keyboards/bastardkb/skeletyl/config.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'keyboards/bastardkb/skeletyl')

diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index 144b9868bf..c221eb24c5 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -25,9 +25,6 @@
 
 #define DIODE_DIRECTION ROW2COL
 
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
 /* RGB settings. */
 #define RGBLED_NUM 36
 #define RGBLED_SPLIT \
-- 
cgit v1.2.3


From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 8 Feb 2023 18:41:46 +1100
Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)

---
 keyboards/bastardkb/skeletyl/blackpill/info.json    | 5 ++++-
 keyboards/bastardkb/skeletyl/blackpill/rules.mk     | 7 -------
 keyboards/bastardkb/skeletyl/v1/elitec/info.json    | 4 +++-
 keyboards/bastardkb/skeletyl/v1/elitec/rules.mk     | 6 ------
 keyboards/bastardkb/skeletyl/v1/info.json           | 5 -----
 keyboards/bastardkb/skeletyl/v2/elitec/info.json    | 4 +++-
 keyboards/bastardkb/skeletyl/v2/elitec/rules.mk     | 6 ------
 keyboards/bastardkb/skeletyl/v2/splinky_2/info.json | 4 +++-
 keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk  | 6 ------
 keyboards/bastardkb/skeletyl/v2/splinky_3/info.json | 4 +++-
 keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk  | 6 ------
 keyboards/bastardkb/skeletyl/v2/stemcell/info.json  | 4 +++-
 keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk   | 5 -----
 13 files changed, 19 insertions(+), 47 deletions(-)
 delete mode 100644 keyboards/bastardkb/skeletyl/v1/info.json

(limited to 'keyboards/bastardkb/skeletyl')

diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index 2e0f758704..b058d2424a 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -2,5 +2,8 @@
     "keyboard_name": "Skeletyl Blackpill",
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
 }
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index cf2041ea1c..b68437c19e 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index 0d20c14c3d..91bb069a75 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Skeletyl Elite-C",
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 0c131a2eaf..985f9489c2 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/skeletyl/v1/info.json b/keyboards/bastardkb/skeletyl/v1/info.json
deleted file mode 100644
index ad889c2304..0000000000
--- a/keyboards/bastardkb/skeletyl/v1/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "usb": {
-        "device_version": "1.0.0"
-    }
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index b339ca877c..a0d6611bf3 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Skeletyl Elite-C",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index 0c131a2eaf..985f9489c2 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index cdcf967c35..7b89748f81 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Skeletyl Splinky",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 8dfc0256ab..8e2235ee9f 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # RP2040-specific options
 ALLOW_WARNINGS = yes
 PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index cdcf967c35..7b89748f81 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Skeletyl Splinky",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 8dfc0256ab..8e2235ee9f 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # RP2040-specific options
 ALLOW_WARNINGS = yes
 PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index 34e40c9b38..2713d23e58 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Skeletyl STeMCell",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index 39fc183e1d..70f7784de6 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -1,8 +1,3 @@
-# MCU name
-MCU = STM32F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
 CONVERT_TO = stemcell
 
 # Build Options
-- 
cgit v1.2.3


From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 17 Feb 2023 16:08:25 +1100
Subject: Remove matrix size defines (#19581)

---
 keyboards/bastardkb/skeletyl/config.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'keyboards/bastardkb/skeletyl')

diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index c221eb24c5..c1e0e0aa19 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -19,10 +19,6 @@
 #pragma once
 
 
-/* Key matrix configuration. */
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 5
-
 #define DIODE_DIRECTION ROW2COL
 
 /* RGB settings. */
-- 
cgit v1.2.3


From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 17 Feb 2023 16:40:49 +1100
Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863)

---
 keyboards/bastardkb/skeletyl/v1/elitec/config.h     | 3 ---
 keyboards/bastardkb/skeletyl/v1/elitec/info.json    | 3 +++
 keyboards/bastardkb/skeletyl/v2/elitec/config.h     | 3 ---
 keyboards/bastardkb/skeletyl/v2/elitec/info.json    | 3 +++
 keyboards/bastardkb/skeletyl/v2/splinky_2/config.h  | 3 ---
 keyboards/bastardkb/skeletyl/v2/splinky_2/info.json | 3 +++
 keyboards/bastardkb/skeletyl/v2/splinky_3/config.h  | 3 ---
 keyboards/bastardkb/skeletyl/v2/splinky_3/info.json | 3 +++
 keyboards/bastardkb/skeletyl/v2/stemcell/config.h   | 3 ---
 keyboards/bastardkb/skeletyl/v2/stemcell/info.json  | 3 +++
 10 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'keyboards/bastardkb/skeletyl')

diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
index fd2101ec55..f98185755f 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
@@ -27,8 +27,5 @@
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D0
-
 /* RGB settings. */
 #define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index 91bb069a75..392e3168ff 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
index 5d4e48d49d..6f001c5e24 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
@@ -26,8 +26,5 @@
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D2
-
 /* RGB settings. */
 #define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index a0d6611bf3..ae98ff793a 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
index 02a8bd6551..7fef28b05e 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
@@ -31,9 +31,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
 /* RGB settings. */
 #define RGB_DI_PIN GP0
 
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index 7b89748f81..a39c13a0ae 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "split": {
+        "soft_serial_pin": "GP1"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
index e33ced273d..eda378df84 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
@@ -31,9 +31,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
 /* RGB settings. */
 #define RGB_DI_PIN GP0
 
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index 7b89748f81..a39c13a0ae 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "split": {
+        "soft_serial_pin": "GP1"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
index 44acd40e7b..86bbdd199b 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
@@ -32,9 +32,6 @@
 // #define SPLIT_HAND_PIN A0
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D2
-
 /* RGB settings. */
 #define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index 2713d23e58..257eb6f62e 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu"
 }
-- 
cgit v1.2.3