summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb
diff options
context:
space:
mode:
authorjack <jack@pngu.org>2025-07-08 14:08:49 -0600
committerGitHub <noreply@github.com>2025-07-08 14:08:49 -0600
commit8d29bd07c25a6a42e47ddbf918db3773027168f1 (patch)
treef57428cf63a7da64bf7c6dfed0ce64425c7ddeb1 /keyboards/bastardkb
parent75b899d87d226d0d9dc9488a0170c6f364108292 (diff)
Refactor `bastardkb/scylla` (#25459)
* Refactor bastardkb/scylla - Update keyboard aliases accordingly - Migrate keymap to JSON and better represent physical layout - scylla/blackpill - Migrate common configuration to keyboard level - Remove unnecessary or user-specific configuration - Migrate some configuration to data-driven - Use short SPDX license headers - Remove unnecessary rules.mk file - Formatting pass on keyboard.json - scylla/v1 - Remove likely unneeded version, per qmk#23814 - scylla/v2 - Remove splinky_2 revision, per qmk#23814 - Remove splinky_3, stemcell revisions; converter feature should be used here - Rename scylla/v2/elitec -> scylla/promicro, as a converter can be used for any pin-compatible microcontrollers * Small keymap fix
Diffstat (limited to 'keyboards/bastardkb')
-rw-r--r--keyboards/bastardkb/scylla/blackpill/config.h33
-rw-r--r--keyboards/bastardkb/scylla/blackpill/halconf.h21
-rw-r--r--keyboards/bastardkb/scylla/blackpill/keyboard.json42
-rw-r--r--keyboards/bastardkb/scylla/blackpill/mcuconf.h23
-rw-r--r--keyboards/bastardkb/scylla/blackpill/rules.mk5
-rw-r--r--keyboards/bastardkb/scylla/info.json97
-rw-r--r--keyboards/bastardkb/scylla/keymaps/default/keymap.c51
-rw-r--r--keyboards/bastardkb/scylla/keymaps/default/keymap.json31
-rw-r--r--keyboards/bastardkb/scylla/promicro/keyboard.json15
-rw-r--r--keyboards/bastardkb/scylla/readme.md36
-rw-r--r--keyboards/bastardkb/scylla/scylla.c63
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/config.h22
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/config.h21
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/config.h31
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json32
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/rules.mk3
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/config.h31
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json32
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/rules.mk3
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/config.h38
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/halconf.h23
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/keyboard.json34
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h29
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/rules.mk3
30 files changed, 162 insertions, 631 deletions
diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
index bf7879edbe..c6b40f3e5f 100644
--- a/keyboards/bastardkb/scylla/blackpill/config.h
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -1,27 +1,9 @@
1/* 1// Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
2 * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna) 2// Copyright 2021 Stefan Kerkmann (@KarlK90)
3 * Copyright 2021 Stefan Kerkmann (@KarlK90) 3// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
4 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) 4// SPDX-License-Identifier: GPL-2.0-or-later
5 *
6 * This program is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Publicw License as published by
8 * the Free Software Foundation, either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */
19
20#pragma once 5#pragma once
21 6
22/* Handedness. */
23#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
24
25/* RGB settings. */ 7/* RGB settings. */
26#define WS2812_PWM_DRIVER PWMD2 8#define WS2812_PWM_DRIVER PWMD2
27#define WS2812_PWM_CHANNEL 2 9#define WS2812_PWM_CHANNEL 2
@@ -30,13 +12,6 @@
30#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 12#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
31#define WS2812_PWM_DMA_CHANNEL 3 13#define WS2812_PWM_DMA_CHANNEL 3
32 14
33/* Serial configuration for split keyboard. */
34#define SERIAL_USART_TX_PIN A9
35
36/* CRC. */
37#define CRC8_USE_TABLE
38#define CRC8_OPTIMIZE_SPEED
39
40/* SPI config for EEPROM. */ 15/* SPI config for EEPROM. */
41#define SPI_DRIVER SPID1 16#define SPI_DRIVER SPID1
42#define SPI_SCK_PIN A5 17#define SPI_SCK_PIN A5
diff --git a/keyboards/bastardkb/scylla/blackpill/halconf.h b/keyboards/bastardkb/scylla/blackpill/halconf.h
index 5c5dff98d4..545fc20cb3 100644
--- a/keyboards/bastardkb/scylla/blackpill/halconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/halconf.h
@@ -1,21 +1,6 @@
1/** 1// Copyright 2020 Nick Brassel (tzarc)
2 * Copyright 2020 Nick Brassel (tzarc) 2// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
3 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) 3// SPDX-License-Identifier: GPL-2.0-or-later
4 *
5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation, either version 2 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19#pragma once 4#pragma once
20 5
21#define HAL_USE_PWM TRUE 6#define HAL_USE_PWM TRUE
diff --git a/keyboards/bastardkb/scylla/blackpill/keyboard.json b/keyboards/bastardkb/scylla/blackpill/keyboard.json
index 5294976fd3..4bef461b6b 100644
--- a/keyboards/bastardkb/scylla/blackpill/keyboard.json
+++ b/keyboards/bastardkb/scylla/blackpill/keyboard.json
@@ -1,37 +1,23 @@
1{ 1{
2 "keyboard_name": "Scylla Blackpill", 2 "development_board": "blackpill_f411",
3 "usb": {
4 "device_version": "1.0.0",
5 "shared_endpoint": {
6 "keyboard": true
7 }
8 },
9 "features": {
10 "bootmagic": true,
11 "mousekey": true,
12 "extrakey": true,
13 "rgb_matrix": true
14 },
15 "eeprom": { 3 "eeprom": {
16 "driver": "spi" 4 "driver": "spi"
17 }, 5 },
18 "split": {
19 "enabled": true
20 },
21 "rgb_matrix": {
22 "driver": "ws2812"
23 },
24 "ws2812": {
25 "pin": "A1",
26 "driver": "pwm"
27 },
28 "build": {
29 "debounce_type": "asym_eager_defer_pk"
30 },
31 "matrix_pins": { 6 "matrix_pins": {
32 "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], 7 "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
33 "rows": ["B15", "A2", "B8", "A8", "B9"] 8 "rows": ["B15", "A2", "B8", "A8", "B9"]
34 }, 9 },
35 "diode_direction": "ROW2COL", 10 "split": {
36 "development_board": "blackpill_f411" 11 "handedness": {
12 "pin": "A3"
13 },
14 "serial": {
15 "driver": "usart",
16 "pin": "A9"
17 }
18 },
19 "ws2812": {
20 "driver": "pwm",
21 "pin": "A1"
22 }
37} 23}
diff --git a/keyboards/bastardkb/scylla/blackpill/mcuconf.h b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
index 2b3f30cbfe..cc77ec94ae 100644
--- a/keyboards/bastardkb/scylla/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
@@ -1,22 +1,7 @@
1/* 1// Copyright 2020 Nick Brassel (tzarc)
2 * Copyright 2020 Nick Brassel (tzarc) 2// Copyright 2021 Stefan Kerkmann (@KarlK90)
3 * Copyright 2021 Stefan Kerkmann (@KarlK90) 3// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
4 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) 4// SPDX-License-Identifier: GPL-2.0-or-later
5 *
6 * This program is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */
19
20#pragma once 5#pragma once
21 6
22#include_next <mcuconf.h> 7#include_next <mcuconf.h>
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
deleted file mode 100644
index 48c904dd64..0000000000
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
1AUDIO_SUPPORTED = no # Audio is not supported
2
3MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
4
5SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 6508c15b5a..7f3619c6d0 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,23 +1,85 @@
1{ 1{
2 "url": "https://bastardkb.com/scylla", 2 "keyboard_name": "Scylla",
3 "usb": { 3 "diode_direction": "ROW2COL",
4 "pid": "0x1829" 4 "features": {
5 "bootmagic": true,
6 "extrakey": true,
7 "mousekey": true,
8 "rgb_matrix": true
5 }, 9 },
6 "rgb_matrix": { 10 "rgb_matrix": {
11 "driver": "ws2812",
12 "layout": [
13 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 2},
14 {"matrix": [1, 0], "x": 0, "y": 16, "flags": 2},
15 {"matrix": [2, 0], "x": 0, "y": 32, "flags": 2},
16 {"matrix": [3, 0], "x": 0, "y": 48, "flags": 2},
17 {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4},
18 {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4},
19 {"matrix": [1, 1], "x": 20, "y": 16, "flags": 4},
20 {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
21 {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
22 {"matrix": [1, 2], "x": 41, "y": 16, "flags": 4},
23 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
24 {"matrix": [3, 2], "x": 41, "y": 48, "flags": 4},
25 {"matrix": [3, 3], "x": 61, "y": 48, "flags": 4},
26 {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
27 {"matrix": [1, 3], "x": 61, "y": 16, "flags": 4},
28 {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
29 {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
30 {"matrix": [1, 4], "x": 81, "y": 16, "flags": 4},
31 {"matrix": [2, 4], "x": 81, "y": 32, "flags": 4},
32 {"matrix": [3, 4], "x": 81, "y": 48, "flags": 4},
33 {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4},
34 {"matrix": [1, 5], "x": 102, "y": 16, "flags": 4},
35 {"matrix": [2, 5], "x": 102, "y": 32, "flags": 4},
36 {"matrix": [3, 5], "x": 102, "y": 48, "flags": 4},
37 {"matrix": [4, 2], "x": 102, "y": 64, "flags": 2},
38 {"matrix": [4, 5], "x": 81, "y": 64, "flags": 2},
39 {"matrix": [4, 3], "x": 61, "y": 56, "flags": 2},
40 {"matrix": [4, 4], "x": 81, "y": 56, "flags": 2},
41 {"matrix": [4, 1], "x": 102, "y": 56, "flags": 2},
42 {"matrix": [5, 0], "x": 224, "y": 0, "flags": 2},
43 {"matrix": [6, 0], "x": 224, "y": 16, "flags": 2},
44 {"matrix": [7, 0], "x": 224, "y": 32, "flags": 2},
45 {"matrix": [8, 0], "x": 224, "y": 48, "flags": 2},
46 {"matrix": [8, 1], "x": 204, "y": 48, "flags": 4},
47 {"matrix": [7, 1], "x": 204, "y": 32, "flags": 4},
48 {"matrix": [6, 1], "x": 204, "y": 16, "flags": 4},
49 {"matrix": [5, 1], "x": 204, "y": 0, "flags": 4},
50 {"matrix": [5, 2], "x": 183, "y": 0, "flags": 4},
51 {"matrix": [6, 2], "x": 183, "y": 16, "flags": 4},
52 {"matrix": [7, 2], "x": 183, "y": 32, "flags": 4},
53 {"matrix": [8, 2], "x": 183, "y": 48, "flags": 4},
54 {"matrix": [8, 3], "x": 163, "y": 48, "flags": 4},
55 {"matrix": [7, 3], "x": 163, "y": 32, "flags": 4},
56 {"matrix": [6, 3], "x": 163, "y": 16, "flags": 4},
57 {"matrix": [5, 3], "x": 163, "y": 0, "flags": 4},
58 {"matrix": [5, 4], "x": 142, "y": 0, "flags": 4},
59 {"matrix": [6, 4], "x": 142, "y": 16, "flags": 4},
60 {"matrix": [7, 4], "x": 142, "y": 32, "flags": 4},
61 {"matrix": [8, 4], "x": 142, "y": 48, "flags": 4},
62 {"matrix": [5, 5], "x": 122, "y": 0, "flags": 4},
63 {"matrix": [6, 5], "x": 122, "y": 16, "flags": 4},
64 {"matrix": [7, 5], "x": 122, "y": 32, "flags": 4},
65 {"matrix": [8, 5], "x": 122, "y": 48, "flags": 4},
66 {"matrix": [9, 2], "x": 122, "y": 64, "flags": 2},
67 {"matrix": [9, 5], "x": 142, "y": 64, "flags": 2},
68 {"matrix": [9, 3], "x": 163, "y": 56, "flags": 2},
69 {"matrix": [9, 4], "x": 142, "y": 56, "flags": 2},
70 {"matrix": [9, 1], "x": 122, "y": 56, "flags": 2}
71 ],
7 "max_brightness": 50, 72 "max_brightness": 50,
8 "sleep": true, 73 "sleep": true,
9 "split_count": [29, 29] 74 "split_count": [29, 29]
10 }, 75 },
11 "rgblight": {
12 "led_count": 58,
13 "split_count": [29, 29]
14 },
15 "split": { 76 "split": {
16 "transport": { 77 "enabled": true
17 "sync": { 78 },
18 "matrix_state": true 79 "url": "https://github.com/Bastardkb/Scylla",
19 } 80 "usb": {
20 } 81 "device_version": "2.0.0",
82 "pid": "0x1829"
21 }, 83 },
22 "layouts": { 84 "layouts": {
23 "LAYOUT_split_4x6_5": { 85 "LAYOUT_split_4x6_5": {
@@ -28,67 +90,56 @@
28 {"matrix": [0, 3], "x": 3, "y": 0}, 90 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"matrix": [0, 4], "x": 4, "y": 0}, 91 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"matrix": [0, 5], "x": 5, "y": 0}, 92 {"matrix": [0, 5], "x": 5, "y": 0},
31
32 {"matrix": [5, 5], "x": 11, "y": 0}, 93 {"matrix": [5, 5], "x": 11, "y": 0},
33 {"matrix": [5, 4], "x": 12, "y": 0}, 94 {"matrix": [5, 4], "x": 12, "y": 0},
34 {"matrix": [5, 3], "x": 13, "y": 0}, 95 {"matrix": [5, 3], "x": 13, "y": 0},
35 {"matrix": [5, 2], "x": 14, "y": 0}, 96 {"matrix": [5, 2], "x": 14, "y": 0},
36 {"matrix": [5, 1], "x": 15, "y": 0}, 97 {"matrix": [5, 1], "x": 15, "y": 0},
37 {"matrix": [5, 0], "x": 16, "y": 0}, 98 {"matrix": [5, 0], "x": 16, "y": 0},
38
39 {"matrix": [1, 0], "x": 0, "y": 1}, 99 {"matrix": [1, 0], "x": 0, "y": 1},
40 {"matrix": [1, 1], "x": 1, "y": 1}, 100 {"matrix": [1, 1], "x": 1, "y": 1},
41 {"matrix": [1, 2], "x": 2, "y": 1}, 101 {"matrix": [1, 2], "x": 2, "y": 1},
42 {"matrix": [1, 3], "x": 3, "y": 1}, 102 {"matrix": [1, 3], "x": 3, "y": 1},
43 {"matrix": [1, 4], "x": 4, "y": 1}, 103 {"matrix": [1, 4], "x": 4, "y": 1},
44 {"matrix": [1, 5], "x": 5, "y": 1}, 104 {"matrix": [1, 5], "x": 5, "y": 1},
45
46 {"matrix": [6, 5], "x": 11, "y": 1}, 105 {"matrix": [6, 5], "x": 11, "y": 1},
47 {"matrix": [6, 4], "x": 12, "y": 1}, 106 {"matrix": [6, 4], "x": 12, "y": 1},
48 {"matrix": [6, 3], "x": 13, "y": 1}, 107 {"matrix": [6, 3], "x": 13, "y": 1},
49 {"matrix": [6, 2], "x": 14, "y": 1}, 108 {"matrix": [6, 2], "x": 14, "y": 1},
50 {"matrix": [6, 1], "x": 15, "y": 1}, 109 {"matrix": [6, 1], "x": 15, "y": 1},
51 {"matrix": [6, 0], "x": 16, "y": 1}, 110 {"matrix": [6, 0], "x": 16, "y": 1},
52
53 {"matrix": [2, 0], "x": 0, "y": 2}, 111 {"matrix": [2, 0], "x": 0, "y": 2},
54 {"matrix": [2, 1], "x": 1, "y": 2}, 112 {"matrix": [2, 1], "x": 1, "y": 2},
55 {"matrix": [2, 2], "x": 2, "y": 2}, 113 {"matrix": [2, 2], "x": 2, "y": 2},
56 {"matrix": [2, 3], "x": 3, "y": 2}, 114 {"matrix": [2, 3], "x": 3, "y": 2},
57 {"matrix": [2, 4], "x": 4, "y": 2}, 115 {"matrix": [2, 4], "x": 4, "y": 2},
58 {"matrix": [2, 5], "x": 5, "y": 2}, 116 {"matrix": [2, 5], "x": 5, "y": 2},
59
60 {"matrix": [7, 5], "x": 11, "y": 2}, 117 {"matrix": [7, 5], "x": 11, "y": 2},
61 {"matrix": [7, 4], "x": 12, "y": 2}, 118 {"matrix": [7, 4], "x": 12, "y": 2},
62 {"matrix": [7, 3], "x": 13, "y": 2}, 119 {"matrix": [7, 3], "x": 13, "y": 2},
63 {"matrix": [7, 2], "x": 14, "y": 2}, 120 {"matrix": [7, 2], "x": 14, "y": 2},
64 {"matrix": [7, 1], "x": 15, "y": 2}, 121 {"matrix": [7, 1], "x": 15, "y": 2},
65 {"matrix": [7, 0], "x": 16, "y": 2}, 122 {"matrix": [7, 0], "x": 16, "y": 2},
66
67 {"matrix": [3, 0], "x": 0, "y": 3}, 123 {"matrix": [3, 0], "x": 0, "y": 3},
68 {"matrix": [3, 1], "x": 1, "y": 3}, 124 {"matrix": [3, 1], "x": 1, "y": 3},
69 {"matrix": [3, 2], "x": 2, "y": 3}, 125 {"matrix": [3, 2], "x": 2, "y": 3},
70 {"matrix": [3, 3], "x": 3, "y": 3}, 126 {"matrix": [3, 3], "x": 3, "y": 3},
71 {"matrix": [3, 4], "x": 4, "y": 3}, 127 {"matrix": [3, 4], "x": 4, "y": 3},
72 {"matrix": [3, 5], "x": 5, "y": 3}, 128 {"matrix": [3, 5], "x": 5, "y": 3},
73
74 {"matrix": [8, 5], "x": 11, "y": 3}, 129 {"matrix": [8, 5], "x": 11, "y": 3},
75 {"matrix": [8, 4], "x": 12, "y": 3}, 130 {"matrix": [8, 4], "x": 12, "y": 3},
76 {"matrix": [8, 3], "x": 13, "y": 3}, 131 {"matrix": [8, 3], "x": 13, "y": 3},
77 {"matrix": [8, 2], "x": 14, "y": 3}, 132 {"matrix": [8, 2], "x": 14, "y": 3},
78 {"matrix": [8, 1], "x": 15, "y": 3}, 133 {"matrix": [8, 1], "x": 15, "y": 3},
79 {"matrix": [8, 0], "x": 16, "y": 3}, 134 {"matrix": [8, 0], "x": 16, "y": 3},
80
81 {"matrix": [4, 3], "x": 5, "y": 4}, 135 {"matrix": [4, 3], "x": 5, "y": 4},
82 {"matrix": [4, 4], "x": 6, "y": 4}, 136 {"matrix": [4, 4], "x": 6, "y": 4},
83 {"matrix": [4, 1], "x": 7, "y": 4}, 137 {"matrix": [4, 1], "x": 7, "y": 4},
84
85 {"matrix": [9, 1], "x": 9, "y": 4}, 138 {"matrix": [9, 1], "x": 9, "y": 4},
86 {"matrix": [9, 4], "x": 10, "y": 4}, 139 {"matrix": [9, 4], "x": 10, "y": 4},
87 {"matrix": [9, 3], "x": 11, "y": 4}, 140 {"matrix": [9, 3], "x": 11, "y": 4},
88
89 {"matrix": [4, 5], "x": 6, "y": 5}, 141 {"matrix": [4, 5], "x": 6, "y": 5},
90 {"matrix": [4, 2], "x": 7, "y": 5}, 142 {"matrix": [4, 2], "x": 7, "y": 5},
91
92 {"matrix": [9, 2], "x": 9, "y": 5}, 143 {"matrix": [9, 2], "x": 9, "y": 5},
93 {"matrix": [9, 5], "x": 10, "y": 5} 144 {"matrix": [9, 5], "x": 10, "y": 5}
94 ] 145 ]
diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.c b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
deleted file mode 100644
index 8e9b0190d4..0000000000
--- a/keyboards/bastardkb/scylla/keymaps/default/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
1/*
2 * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#include QMK_KEYBOARD_H
19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21
22 [0] = LAYOUT_split_4x6_5(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
23 //-------------------------------------------------//-----------------------------------------------------------//
24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
25 //-------------------------------------------------//-----------------------------------------------------------//
26 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
27 //-------------------------------------------------//-----------------------------------------------------------//
28 KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
29 //-------------------------------------------------//-----------------------------------------------------------//
30 KC_LCTL, KC_SPC, MO(1), MO(2), KC_ENT, KC_RGUI, KC_HOME, KC_BSPC, KC_DEL, KC_RALT),
31
32 [1] = LAYOUT_split_4x6_5(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
33 //---------------------------------------------------------//-----------------------------------------------------------//
34 QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS,
35 //---------------------------------------------------------//-----------------------------------------------------------//
36 _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE,
37 //---------------------------------------------------------//-----------------------------------------------------------//
38 _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS,
39 //---------------------------------------------------------//-----------------------------------------------------------//
40 KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, KC_RGUI, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
41
42 [2] = LAYOUT_split_4x6_5(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
43 //---------------------------------------------------------//--------------------------------------------------------------//
44 _______, _______, RM_PREV, RM_TOGG, RM_NEXT, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE,
45 //---------------------------------------------------------//--------------------------------------------------------------//
46 _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
47 //---------------------------------------------------------//--------------------------------------------------------------//
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
49 //---------------------------------------------------------//--------------------------------------------------------------//
50 KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, QK_BOOT, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
51};
diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.json b/keyboards/bastardkb/scylla/keymaps/default/keymap.json
new file mode 100644
index 0000000000..d06e183517
--- /dev/null
+++ b/keyboards/bastardkb/scylla/keymaps/default/keymap.json
@@ -0,0 +1,31 @@
1{
2 "keyboard": "bastardkb/scylla/promicro",
3 "keymap": "default",
4 "layout": "LAYOUT_split_4x6_5",
5 "layers": [
6 [
7 "KC_ESC" , "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_GRV" ,
8 "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC",
9 "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT",
10 "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_CAPS",
11 "KC_LGUI", "MO(1)", "KC_SPC", "KC_ENT", "MO(2)", "KC_RGUI",
12 "KC_LALT", "KC_SPC", "KC_BSPC", "KC_RALT"
13 ],
14 [
15 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
16 "_______", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "_______",
17 "_______", "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "_______",
18 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
19 "_______", "_______", "_______", "_______", "_______", "_______",
20 "_______", "_______", "_______", "_______"
21 ],
22 [
23 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
24 "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT", "RM_TOGG", "_______",
25 "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV", "_______", "_______",
26 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
27 "_______", "_______", "_______", "_______", "_______", "_______",
28 "_______", "_______", "_______", "_______"
29 ]
30 ]
31}
diff --git a/keyboards/bastardkb/scylla/promicro/keyboard.json b/keyboards/bastardkb/scylla/promicro/keyboard.json
new file mode 100644
index 0000000000..89116f7dcd
--- /dev/null
+++ b/keyboards/bastardkb/scylla/promicro/keyboard.json
@@ -0,0 +1,15 @@
1{
2 "development_board": "elite_c",
3 "matrix_pins": {
4 "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
5 "rows": ["F4", "F7", "C6", "D4", "B5"]
6 },
7 "split": {
8 "serial": {
9 "pin": "D2"
10 }
11 },
12 "ws2812": {
13 "pin": "D3"
14 }
15}
diff --git a/keyboards/bastardkb/scylla/readme.md b/keyboards/bastardkb/scylla/readme.md
index 830b8eacda..fd40c418c7 100644
--- a/keyboards/bastardkb/scylla/readme.md
+++ b/keyboards/bastardkb/scylla/readme.md
@@ -1,29 +1,27 @@
1# Scylla 1# Scylla
2 2
3A modern, low-profile split ergonomic keyboard 3* Keyboard Maintainer: [Quentin Lebastard](https://github.com/bastardkb)
4* Hardware Supported: BastardKB Blackpill or Pro Micro adapter & compatible development boards
5* Hardware Availability: [GitHub](https://github.com/Bastardkb/Scylla)
4 6
5* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/) 7Make example for this keyboard (after setting up your build environment):
6* Hardware Supported: elite-C V4
7* Hardware Availability: [Bastard Keyboards](https://bastardkb.com/)
8 8
9## Building the firmware 9 make bastardkb/scylla/blackpill:default
10 make bastardkb/scylla/promicro:default
10 11
11**You must specify the shield version when compiling/flashing the firmware.** 12Flashing example for this keyboard:
12 13
13The template is: 14 make bastardkb/scylla/blackpill:default:flash
15 make bastardkb/scylla/promicro:default:flash
14 16
15```shell 17Note if using the `promicro` version: If you are using an Elite-C compatible development board, see [here](../readme.md#handedness-pin-on-elite-c-holder) for setting handedness by pin.
16qmk compile -kb bastardkb/scylla/{VERSION}/elitec -km {KEYMAP}
17```
18
19| Shield Version | default | via |
20| --------------- | ------------------------------------------------------------- | --------------------------------------------------------- |
21| v1 (Elite-C) | `qmk compile -kb bastardkb/scylla/v1/elitec -km default` | `qmk compile -kb bastardkb/scylla/v1/elitec -km via` |
22| v2 (Elite-C) | `qmk compile -kb bastardkb/scylla/v2/elitec -km default` | `qmk compile -kb bastardkb/scylla/v2/elitec -km via` |
23| v2 (Splinky v2) | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km default` | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km via` |
24| v2 (Splinky v3) | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km default` | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km via` |
25| v2 (STeMCell) | `qmk compile -kb bastardkb/scylla/v2/stemcell -km default` | `qmk compile -kb bastardkb/scylla/v2/stemcell -km via` |
26 18
27See 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). 19See 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).
28 20
29See the [keyboard build instructions](https://docs.bastardkb.com) 21## Bootloader
22
23Enter the bootloader in 3 ways:
24
25* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
26* **Physical reset button**: Briefly press the button on the back of the adapter PCB
27* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c
deleted file mode 100644
index 7aaa0fc1ce..0000000000
--- a/keyboards/bastardkb/scylla/scylla.c
+++ /dev/null
@@ -1,63 +0,0 @@
1/**
2 * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#include "quantum.h"
19
20// clang-format off
21#ifdef RGB_MATRIX_ENABLE
22led_config_t g_led_config = { {
23 // left
24 { 0, 7, 8, 15, 16, 20 },
25 { 1, 6, 9, 14, 17, 21 },
26 { 2, 5, 10, 13, 18, 22 },
27 { 3, 4, 11, 12, 19, 23 },
28 { NO_LED, 28, 24, 26, 27, 25 },
29 // right
30 { 29, 36, 37, 44, 45, 49 },
31 { 30, 35, 38, 43, 46, 50 },
32 { 31, 34, 39, 42, 47, 51 },
33 { 32, 33, 40, 41, 48, 52 },
34 { NO_LED, 57, 53, 55, 56, 54 }
35}, {
36 // left
37 { 0, 0 }, { 0, 16 }, { 0, 32 }, { 0, 48 }, // col 1
38 { 20, 48 }, { 20, 32 }, { 20, 16 }, { 20, 0 }, // col 2
39 { 41, 0 }, { 41, 16 }, { 41, 32 }, { 41, 48 },
40 { 61, 48 }, { 61, 32 }, { 61, 16 }, { 61, 0 },
41 { 81, 0 }, { 81, 16 }, { 81, 32 }, { 81, 48 },
42 { 102, 0 }, { 102, 16 }, { 102, 32 }, { 102, 48 },
43 { 102, 64 }, { 81, 64 }, { 61, 56 }, { 81, 56 }, { 102, 56 }, // left thumb cluster
44 // right
45 { 224, 0 }, { 224, 16 }, { 224, 32 }, { 224, 48 }, // col 12
46 { 204, 48 }, { 204, 32 }, { 204, 16 }, { 204, 0 }, // col 11
47 { 183, 0 }, { 183, 16 }, { 183, 32 }, { 183, 48 },
48 { 163, 48 }, { 163, 32 }, { 163, 16 }, { 163, 0 },
49 { 142, 0 }, { 142, 16 }, { 142, 32 }, { 142, 48 },
50 { 122, 0 }, { 122, 16 }, { 122, 32 }, { 122, 48 },
51 { 122, 64 }, { 142, 64 }, { 163, 56 }, { 142, 56 }, { 122, 56 } // right thumb cluster
52}, {
53 // left
54 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4,
55 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
56 2, 2, 2, 2, 2,
57 // right
58 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4,
59 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
60 2, 2, 2, 2, 2
61} };
62#endif
63// clang-format on
diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h
deleted file mode 100644
index 41b5aa1c66..0000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
1/*
2 * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
3 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
4 *
5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation, either version 2 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19#pragma once
20
21/* Handedness. */
22#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
deleted file mode 100644
index 25963f006c..0000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
1{
2 "keyboard_name": "Scylla Elite-C",
3 "usb": {
4 "device_version": "1.0.0"
5 },
6 "features": {
7 "bootmagic": true,
8 "mousekey": true,
9 "extrakey": true,
10 "rgb_matrix": true
11 },
12 "ws2812": {
13 "pin": "D2"
14 },
15 "rgb_matrix": {
16 "driver": "ws2812"
17 },
18 "matrix_pins": {
19 "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
20 "rows": ["D7", "B5", "F7", "F6", "B6"]
21 },
22 "diode_direction": "ROW2COL",
23 "split": {
24 "enabled": true,
25 "serial": {
26 "pin": "D0"
27 }
28 },
29 "processor": "atmega32u4",
30 "bootloader": "atmel-dfu"
31}
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
deleted file mode 100644
index e6b7fefa66..0000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
1/*
2 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20/* Handedness. */
21#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
deleted file mode 100644
index 316606b17b..0000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
1{
2 "keyboard_name": "Scylla Elite-C",
3 "usb": {
4 "device_version": "2.0.0"
5 },
6 "features": {
7 "bootmagic": true,
8 "mousekey": true,
9 "extrakey": true,
10 "rgb_matrix": true
11 },
12 "ws2812": {
13 "pin": "D3"
14 },
15 "rgb_matrix": {
16 "driver": "ws2812"
17 },
18 "matrix_pins": {
19 "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
20 "rows": ["F4", "F7", "C6", "D4", "B5"]
21 },
22 "diode_direction": "ROW2COL",
23 "split": {
24 "enabled": true,
25 "serial": {
26 "pin": "D2"
27 }
28 },
29 "processor": "atmega32u4",
30 "bootloader": "atmel-dfu"
31}
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
deleted file mode 100644
index 977fb0a6e8..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
1/*
2 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20/* Handedness. */
21#define MASTER_RIGHT
22
23// To use the handedness pin, resistors need to be installed on the adapter PCB.
24// If so, uncomment the following code, and undefine MASTER_RIGHT above.
25// #define SPLIT_HAND_PIN GP13
26// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
27
28/* Reset. */
29#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
30#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
31#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
deleted file mode 100644
index 2c0beb5c1d..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
1{
2 "keyboard_name": "Scylla Splinky",
3 "usb": {
4 "device_version": "2.0.0"
5 },
6 "features": {
7 "bootmagic": true,
8 "mousekey": false,
9 "extrakey": true,
10 "rgb_matrix": true
11 },
12 "rgb_matrix": {
13 "driver": "ws2812"
14 },
15 "matrix_pins": {
16 "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
17 "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
18 },
19 "diode_direction": "ROW2COL",
20 "split": {
21 "enabled": true,
22 "serial": {
23 "pin": "GP1"
24 }
25 },
26 "ws2812": {
27 "pin": "GP0",
28 "driver": "vendor"
29 },
30 "processor": "RP2040",
31 "bootloader": "rp2040"
32}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/readme.md b/keyboards/bastardkb/scylla/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
1# Splinky controller
2
3The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
4
5See [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_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
1AUDIO_SUPPORTED = no # Audio is not supported
2
3SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
deleted file mode 100644
index e496023656..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
1/*
2 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20/* Handedness. */
21#define MASTER_RIGHT
22
23// To use the handedness pin, resistors need to be installed on the adapter PCB.
24// If so, uncomment the following code, and undefine MASTER_RIGHT above.
25// #define SPLIT_HAND_PIN GP15
26// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
27
28/* Reset. */
29#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
30#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
31#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
deleted file mode 100644
index ed92be5a45..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
1{
2 "keyboard_name": "Scylla Splinky",
3 "usb": {
4 "device_version": "2.0.0"
5 },
6 "features": {
7 "bootmagic": true,
8 "mousekey": false,
9 "extrakey": true,
10 "rgb_matrix": true
11 },
12 "rgb_matrix": {
13 "driver": "ws2812"
14 },
15 "matrix_pins": {
16 "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
17 "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
18 },
19 "diode_direction": "ROW2COL",
20 "split": {
21 "enabled": true,
22 "serial": {
23 "pin": "GP1"
24 }
25 },
26 "ws2812": {
27 "pin": "GP0",
28 "driver": "vendor"
29 },
30 "processor": "RP2040",
31 "bootloader": "rp2040"
32}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/readme.md b/keyboards/bastardkb/scylla/v2/splinky_3/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
1# Splinky controller
2
3The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
4
5See [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
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
1AUDIO_SUPPORTED = no # Audio is not supported
2
3SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
deleted file mode 100644
index ca1cc0f719..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
1/*
2 * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20/* Handedness. */
21#define MASTER_RIGHT
22
23// To use the handedness pin, resistors need to be installed on the adapter PCB.
24// If so, uncomment the following code, and undefine MASTER_RIGHT above.
25// #define A0 PAL_LINE(GPIOA, 0)
26// #define SPLIT_HAND_PIN A0
27// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
28
29/* RGB settings. */
30#define WS2812_PWM_DRIVER PWMD2
31#define WS2812_PWM_CHANNEL 4
32#define WS2812_PWM_PAL_MODE 1
33#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
34#define WS2812_PWM_DMA_CHANNEL 3
35
36/* CRC. */
37#define CRC8_USE_TABLE
38#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/halconf.h b/keyboards/bastardkb/scylla/v2/stemcell/halconf.h
deleted file mode 100644
index dbeb6aeaa0..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2 * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20#define HAL_USE_PWM TRUE
21#define HAL_USE_SERIAL TRUE
22
23#include_next <halconf.h>
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
deleted file mode 100644
index 80325bfea3..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
+++ /dev/null
@@ -1,34 +0,0 @@
1{
2 "keyboard_name": "Scylla STeMCell",
3 "usb": {
4 "device_version": "2.0.0"
5 },
6 "features": {
7 "bootmagic": true,
8 "mousekey": true,
9 "extrakey": true,
10 "rgb_matrix": true
11 },
12 "rgb_matrix": {
13 "driver": "ws2812"
14 },
15 "ws2812": {
16 "pin": "A2",
17 "driver": "pwm"
18 },
19 "build": {
20 "debounce_type": "asym_eager_defer_pk"
21 },
22 "matrix_pins": {
23 "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
24 "rows": ["B10", "B0", "B3", "A15", "B9"]
25 },
26 "diode_direction": "ROW2COL",
27 "split": {
28 "enabled": true,
29 "serial": {
30 "pin": "A3"
31 }
32 },
33 "development_board": "stemcell"
34}
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h b/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
deleted file mode 100644
index 6afebade36..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
1/*
2 * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20#include_next <mcuconf.h>
21
22#undef STM32_SERIAL_USE_USART1
23#define STM32_SERIAL_USE_USART1 FALSE
24
25#undef STM32_PWM_USE_TIM2
26#define STM32_PWM_USE_TIM2 TRUE
27
28#undef STM32_ST_USE_TIMER
29#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
deleted file mode 100644
index 3fe3e4ffbe..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
1AUDIO_SUPPORTED = no # Audio is not supported
2
3SERIAL_DRIVER = usart
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 06:04:09 +0000