Merge upstream master to 2022 Q4 breaking change

22 files changed, 0 insertions, 527 deletions

diff --git a/keyboards/bastardkb/skeletyl/blackpill/halconf.h b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
deleted file mode 100644
index 1ba700a80f..0000000000
--- a/keyboards/bastardkb/skeletyl/blackpill/halconf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright 2020 Nick Brassel (tzarc)
- * 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
-
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
-#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
deleted file mode 100644
index 2e0f758704..0000000000
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    }
-}
diff --git a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
deleted file mode 100644
index 2b3f30cbfe..0000000000
--- a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * 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 STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 TRUE
-
-#undef STM32_GPT_USE_TIM3
-#define STM32_GPT_USE_TIM3 TRUE
-
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
deleted file mode 100644
index 82a07c5921..0000000000
--- a/keyboards/bastardkb/skeletyl/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * 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 "config_common.h"
-
-/* Key matrix configuration. */
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 5
-
-#define DIODE_DIRECTION ROW2COL
-
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
-/* RGB settings. */
-#define RGBLED_NUM 36
-#define RGBLED_SPLIT \
-    { 18, 18 }
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
deleted file mode 100644
index 799f630124..0000000000
--- a/keyboards/bastardkb/skeletyl/info.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "url": "https://www.bastardkb.com/skeletyl",
-    "usb": {
-        "pid": "0x1830"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "L33", "x": 4, "y": 3 },
-                { "label": "L34", "x": 5, "y": 3 },
-                { "label": "L31", "x": 6, "y": 3 },
-                { "label": "R33", "x": 9, "y": 3 },
-                { "label": "R34", "x": 10, "y": 3 },
-                { "label": "R31", "x": 11, "y": 3 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/bastardkb/skeletyl/readme.md b/keyboards/bastardkb/skeletyl/readme.md
deleted file mode 100644
index 5a595d338f..0000000000
--- a/keyboards/bastardkb/skeletyl/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Skeletyl
-
-A very small keyboard made for ergonomic enthusiasts.
-
-* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
-
-## Building the firmware
-
-**You must specify the shield version when compiling/flashing the firmware.**
-
-The template is:
-
-```shell
-qmk compile -kb bastardkb/skeletyl/{VERSION}/elitec -km {KEYMAP}
-```
-
-| Shield Version  | default                                                         | via                                                         |
-| --------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
-| v1 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km via`      |
-| v2 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km via`      |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km via`  |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km via`  |
-| v2 (STeMCell)   | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km default`    | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km via`    |
-
-This keyboard is made to be used with the Miryoku layout, do not use the default keymap.
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-See the [keyboard build instructions](http://docs.bastardkb.com/)
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
deleted file mode 100644
index 0d20c14c3d..0000000000
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    }
-}
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
deleted file mode 100644
index b339ca877c..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    }
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
deleted file mode 100644
index 02a8bd6551..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
+++ /dev/null
@@ -1,43 +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 }
-#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
-
-/* 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_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
deleted file mode 100644
index cdcf967c35..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    }
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
deleted file mode 100644
index 1ce16352dd..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
deleted file mode 100644
index e33ced273d..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
+++ /dev/null
@@ -1,43 +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 }
-#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
-
-/* 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
deleted file mode 100644
index cdcf967c35..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
deleted file mode 100644
index 1ce16352dd..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
deleted file mode 100644
index 44acd40e7b..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
+++ /dev/null
@@ -1,48 +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 \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F5, B6, D7, E6, B4 }
-
-/* 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 A0 PAL_LINE(GPIOA, 0)
-// #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
-#define WS2812_PWM_CHANNEL 4
-#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h b/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
deleted file mode 100644
index dbeb6aeaa0..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2021 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
-
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
deleted file mode 100644
index 34e40c9b38..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Skeletyl STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    }
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h b/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
deleted file mode 100644
index 6afebade36..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 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 STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 FALSE
-
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
deleted file mode 100644
index ff20b0c742..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# MCU name
-MCU = STM32F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-CONVERT_TO = stemcell
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # 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 = usart
-WS2812_DRIVER = pwm
-
-DEBOUNCE_TYPE = asym_eager_defer_pk