summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h37
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h (renamed from keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h)13
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json (renamed from keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json)0
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h (renamed from keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h)0
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk (renamed from keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk)2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h50
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json6
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h (renamed from keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h)0
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk (renamed from keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk)3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h50
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json (renamed from keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json)0
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h (renamed from keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h)0
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk (renamed from keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk)2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h50
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h (renamed from keyboards/bastardkb/skeletyl/v2/splinky/config.h)16
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk37
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h (renamed from keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h)13
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json (renamed from keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json)0
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h23
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk36
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h50
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h23
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk36
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/config.h33
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v2/config.h30
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v3/config.h30
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/config.h (renamed from keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h)18
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/info.json (renamed from keyboards/bastardkb/scylla/v2/splinky/info.json)0
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/rules.mk (renamed from keyboards/bastardkb/scylla/v2/splinky/rules.mk)2
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/config.h (renamed from keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h)18
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/info.json6
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/rules.mk33
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h30
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h30
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/config.h (renamed from keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h)18
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/info.json (renamed from keyboards/bastardkb/skeletyl/v2/splinky/info.json)0
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk (renamed from keyboards/bastardkb/skeletyl/v2/splinky/rules.mk)2
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/config.h (renamed from keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h)18
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/info.json6
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk34
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/config.h33
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h30
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h30
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/config.h (renamed from keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h)18
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/info.json (renamed from keyboards/bastardkb/tbkmini/v2/splinky/info.json)0
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk (renamed from keyboards/bastardkb/tbkmini/v2/splinky/rules.mk)2
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/config.h (renamed from keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h)18
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/info.json6
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk34
81 files changed, 660 insertions, 398 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
deleted file mode 100644
index 8e4a2de892..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP26, GP5, GP4, GP9 }
-
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
-/* SPI & PMW3360 settings. */
-#define SPI_DRIVER SPID0
-#define SPI_MISO_PIN GP20
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md
deleted file mode 100644
index 22df77bbaa..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See https://github.com/plut0nium/0xB2/#releases to figure out the right version
-for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
index 8e4a2de892..cbdc3ae855 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
@@ -20,6 +20,16 @@
/* Key matrix configuration. */
#define MATRIX_ROW_PINS \
{ GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+ { GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #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
@@ -29,7 +39,10 @@
/* SPI & PMW3360 settings. */
#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP18
#define SPI_MISO_PIN GP20
+#define SPI_MOSI_PIN GP19
+#define POINTING_DEVICE_CS_PIN GP14
/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 98f436f52b..98f436f52b 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
index 0fdd67c3a2..0fdd67c3a2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 7e38f33d5d..21a9506077 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -35,5 +35,3 @@ POINTING_DEVICE_DRIVER = pmw3360
SERIAL_DRIVER = vendor
WS2812_DRIVER = vendor
-
-DEFAULT_FOLDER = bastardkb/charybdis/3x5/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
new file mode 100644
index 0000000000..3772044c15
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+ { GP28, GP21, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #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
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP22
+#define SPI_MISO_PIN GP20
+#define SPI_MOSI_PIN GP23
+#define POINTING_DEVICE_CS_PIN GP16
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
new file mode 100644
index 0000000000..98f436f52b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Charybdis Nano (3x5) Splinky",
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
index 0fdd67c3a2..0fdd67c3a2 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 34ef782d2f..21a9506077 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -28,11 +28,10 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
SERIAL_DRIVER = vendor
WS2812_DRIVER = vendor
-
-DEFAULT_FOLDER = bastardkb/charybdis/4x6/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md
deleted file mode 100644
index 22df77bbaa..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See https://github.com/plut0nium/0xB2/#releases to figure out the right version
-for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
new file mode 100644
index 0000000000..3f72897c56
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+ { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #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
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP18
+#define SPI_MISO_PIN GP20
+#define SPI_MOSI_PIN GP19
+#define POINTING_DEVICE_CS_PIN GP14
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 64c663c7c9..64c663c7c9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
index 0fdd67c3a2..0fdd67c3a2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 4dfff6dfd6..6ab474a76f 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -35,5 +35,3 @@ POINTING_DEVICE_DRIVER = pmw3360
SERIAL_DRIVER = vendor
WS2812_DRIVER = vendor
-
-DEFAULT_FOLDER = bastardkb/charybdis/3x6/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
new file mode 100644
index 0000000000..1828aaa98b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+ { GP27, GP28, GP21, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #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
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP22
+#define SPI_MISO_PIN GP20
+#define SPI_MOSI_PIN GP23
+#define POINTING_DEVICE_CS_PIN GP16
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
new file mode 100644
index 0000000000..64c663c7c9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Charybdis Mini (3x6) Splinky",
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
index b5539989b4..0fdd67c3a2 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
@@ -17,17 +17,7 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP26, GP5, GP4, GP9 }
+#include_next "mcuconf.h"
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
new file mode 100644
index 0000000000..6ab474a76f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+
+AUDIO_SUPPORTED = no # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md
deleted file mode 100644
index 22df77bbaa..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See https://github.com/plut0nium/0xB2/#releases to figure out the right version
-for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
index 7d4ed86e84..53d88652e1 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
@@ -20,6 +20,16 @@
/* Key matrix configuration. */
#define MATRIX_ROW_PINS \
{ GP29, GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+ { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #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
@@ -29,7 +39,10 @@
/* SPI & PMW3360 settings. */
#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP18
#define SPI_MISO_PIN GP20
+#define SPI_MOSI_PIN GP19
+#define POINTING_DEVICE_CS_PIN GP14
/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 928a850860..928a850860 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
new file mode 100644
index 0000000000..0fdd67c3a2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
new file mode 100644
index 0000000000..13c1b39961
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+
+AUDIO_SUPPORTED = no # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
new file mode 100644
index 0000000000..8fd108a506
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP29, GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+ { GP27, GP28, GP21, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #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
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP22
+#define SPI_MISO_PIN GP20
+#define SPI_MOSI_PIN GP23
+#define POINTING_DEVICE_CS_PIN GP16
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
new file mode 100644
index 0000000000..928a850860
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Charybdis (4x6) Splinky",
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
new file mode 100644
index 0000000000..0fdd67c3a2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
new file mode 100644
index 0000000000..13c1b39961
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+
+AUDIO_SUPPORTED = no # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky/config.h b/keyboards/bastardkb/scylla/v2/splinky/config.h
deleted file mode 100644
index 1628340822..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP29, GP26, GP5, GP4, GP9 }
-
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky/readme.md b/keyboards/bastardkb/scylla/v2/splinky/readme.md
deleted file mode 100644
index 22df77bbaa..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See https://github.com/plut0nium/0xB2/#releases to figure out the right version
-for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
deleted file mode 100644
index 8397b931c5..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP15, GP6, GP7, GP8 }
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
deleted file mode 100644
index 36b25dffff..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP21, GP6, GP7, GP8 }
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP15
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index f3d3e982e3..5f678fb331 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
@@ -18,14 +18,11 @@
#pragma once
/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP29, GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP27, GP28, GP15, GP6, GP7, GP8 }
-/* SPI & PMW3360 settings. */
-#define SPI_SCK_PIN GP18
-#define SPI_MOSI_PIN GP19
-#define POINTING_DEVICE_CS_PIN GP14
-
/* Handedness. */
#define MASTER_RIGHT
@@ -33,3 +30,14 @@
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #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
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index e6bcc6ca2f..e6bcc6ca2f 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/readme.md b/keyboards/bastardkb/scylla/v2/splinky_2/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/scylla/v2/splinky/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 67846c1ab3..8dfc0256ab 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -31,5 +31,3 @@ SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor
WS2812_DRIVER = vendor
-
-DEFAULT_FOLDER = bastardkb/scylla/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index 5f5476b1f7..56020397da 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
@@ -18,14 +18,11 @@
#pragma once
/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP29, GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP27, GP28, GP21, GP6, GP7, GP8 }
-/* SPI & PMW3360 settings. */
-#define SPI_SCK_PIN GP22
-#define SPI_MOSI_PIN GP23
-#define POINTING_DEVICE_CS_PIN GP16
-
/* Handedness. */
#define MASTER_RIGHT
@@ -33,3 +30,14 @@
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #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
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
new file mode 100644
index 0000000000..e6bcc6ca2f
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Scylla Splinky",
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/readme.md b/keyboards/bastardkb/scylla/v2/splinky_3/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
new file mode 100644
index 0000000000..8dfc0256ab
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+
+AUDIO_SUPPORTED = no # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky/readme.md
deleted file mode 100644
index 22df77bbaa..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See https://github.com/plut0nium/0xB2/#releases to figure out the right version
-for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
deleted file mode 100644
index 825370337d..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_COL_PINS \
- { GP28, GP15, GP6, GP7, GP8 }
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
deleted file mode 100644
index bb1de74d3c..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_COL_PINS \
- { GP28, GP21, GP6, GP7, GP8 }
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP15
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
index 516f3d9df7..02a8bd6551 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
@@ -18,14 +18,11 @@
#pragma once
/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP28, GP15, GP6, GP7, GP8 }
-/* SPI & PMW3360 settings. */
-#define SPI_SCK_PIN GP18
-#define SPI_MOSI_PIN GP19
-#define POINTING_DEVICE_CS_PIN GP14
-
/* Handedness. */
#define MASTER_RIGHT
@@ -33,3 +30,14 @@
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #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
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index cdcf967c35..cdcf967c35 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 2749d4fc2c..1ce16352dd 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -32,5 +32,3 @@ LAYOUTS = split_3x5_3
SERIAL_DRIVER = vendor
WS2812_DRIVER = vendor
-
-DEFAULT_FOLDER = bastardkb/skeletyl/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
index 09165a8e97..e33ced273d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
@@ -18,14 +18,11 @@
#pragma once
/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP28, GP21, GP6, GP7, GP8 }
-/* SPI & PMW3360 settings. */
-#define SPI_SCK_PIN GP22
-#define SPI_MOSI_PIN GP23
-#define POINTING_DEVICE_CS_PIN GP16
-
/* Handedness. */
#define MASTER_RIGHT
@@ -33,3 +30,14 @@
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #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
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
new file mode 100644
index 0000000000..cdcf967c35
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Skeletyl Splinky",
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
new file mode 100644
index 0000000000..1ce16352dd
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+
+AUDIO_SUPPORTED = no # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
+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/tbkmini/v2/splinky/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
deleted file mode 100644
index b5539989b4..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP26, GP5, GP4, GP9 }
-
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/readme.md b/keyboards/bastardkb/tbkmini/v2/splinky/readme.md
deleted file mode 100644
index 22df77bbaa..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See https://github.com/plut0nium/0xB2/#releases to figure out the right version
-for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
deleted file mode 100644
index 8397b931c5..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP15, GP6, GP7, GP8 }
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
deleted file mode 100644
index 36b25dffff..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Key matrix configuration. */
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP21, GP6, GP7, GP8 }
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP15
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk
deleted file mode 100644
index c9c50319db..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentionally blank so that QMK detects this folder as a valid keyboard
-# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
index f3d3e982e3..ed0b4a6a54 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
@@ -18,14 +18,11 @@
#pragma once
/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP27, GP28, GP15, GP6, GP7, GP8 }
-/* SPI & PMW3360 settings. */
-#define SPI_SCK_PIN GP18
-#define SPI_MOSI_PIN GP19
-#define POINTING_DEVICE_CS_PIN GP14
-
/* Handedness. */
#define MASTER_RIGHT
@@ -33,3 +30,14 @@
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #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
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index b0b05fba8a..b0b05fba8a 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md b/keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index 7bf3459d04..6b55f6e595 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -32,5 +32,3 @@ LAYOUTS = split_3x6_3
SERIAL_DRIVER = vendor
WS2812_DRIVER = vendor
-
-DEFAULT_FOLDER = bastardkb/tbkmini/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
index 5f5476b1f7..849fcec968 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
@@ -18,14 +18,11 @@
#pragma once
/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+ { GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP27, GP28, GP21, GP6, GP7, GP8 }
-/* SPI & PMW3360 settings. */
-#define SPI_SCK_PIN GP22
-#define SPI_MOSI_PIN GP23
-#define POINTING_DEVICE_CS_PIN GP16
-
/* Handedness. */
#define MASTER_RIGHT
@@ -33,3 +30,14 @@
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #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
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
new file mode 100644
index 0000000000..b0b05fba8a
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "TBK Mini Splinky",
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md b/keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md
new file mode 100644
index 0000000000..662eb5825c
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md
@@ -0,0 +1,5 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
new file mode 100644
index 0000000000..6b55f6e595
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+
+AUDIO_SUPPORTED = no # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor