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

data/mappings/keyboard_aliases.hjson

@@ -68,6 +68,18 @@
     "bakeneko80": {
         "target": "kkatano/bakeneko80"
     },
+    "bastardkb/scylla/v2/elitec": {
+        "target": "bastardkb/scylla/promicro"
+    },
+    "bastardkb/scylla/v2/splinky_2": {
+        "target": "bastardkb/scylla/promicro"
+    },
+    "bastardkb/scylla/v2/splinky_3": {
+        "target": "bastardkb/scylla/promicro"
+    },
+    "bastardkb/scylla/v2/stemcell": {
+        "target": "bastardkb/scylla/promicro"
+    },
     "bastardkb/tbkmini/v2/elitec": {
         "target": "bastardkb/tbkmini/promicro"
     },

keyboards/bastardkb/scylla/blackpill/config.h

@@ -1,27 +1,9 @@
-/*
- * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
- * 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 Publicw 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/>.
- */
-
+// Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-/* Handedness. */
-#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
-
 /* RGB settings. */
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
@@ -30,13 +12,6 @@
 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
 #define WS2812_PWM_DMA_CHANNEL 3
 
-/* Serial configuration for split keyboard. */
-#define SERIAL_USART_TX_PIN A9
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
 /* SPI config for EEPROM. */
 #define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5

keyboards/bastardkb/scylla/blackpill/halconf.h

@@ -1,21 +1,6 @@
-/**
- * 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/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
 #define HAL_USE_PWM TRUE

keyboards/bastardkb/scylla/blackpill/keyboard.json

@@ -1,37 +1,23 @@
 {
-    "keyboard_name": "Scylla Blackpill",
-    "usb": {
-        "device_version": "1.0.0",
-        "shared_endpoint": {
-            "keyboard": true
-        }
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "rgb_matrix": true
-    },
+    "development_board": "blackpill_f411",
     "eeprom": {
         "driver": "spi"
     },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
         "rows": ["B15", "A2", "B8", "A8", "B9"]
     },
-    "diode_direction": "ROW2COL",
-    "development_board": "blackpill_f411"
+    "split": {
+        "handedness": {
+            "pin": "A3"
+        },
+        "serial": {
+            "driver": "usart",
+            "pin": "A9"
+        }
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A1"
+    }
 }

keyboards/bastardkb/scylla/blackpill/mcuconf.h

@@ -1,22 +1,7 @@
-/*
- * 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/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
 #include_next <mcuconf.h>

keyboards/bastardkb/scylla/blackpill/rules.mk

@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no        # Audio is not supported
-
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart

keyboards/bastardkb/scylla/info.json

@@ -1,23 +1,85 @@
 {
-    "url": "https://bastardkb.com/scylla",
-    "usb": {
-        "pid": "0x1829"
+    "keyboard_name": "Scylla",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
     },
     "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 2},
+            {"matrix": [1, 0], "x": 0, "y": 16, "flags": 2},
+            {"matrix": [2, 0], "x": 0, "y": 32, "flags": 2},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 2},
+            {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4},
+            {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4},
+            {"matrix": [1, 1], "x": 20, "y": 16, "flags": 4},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 41, "y": 16, "flags": 4},
+            {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+            {"matrix": [3, 2], "x": 41, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 61, "y": 48, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
+            {"matrix": [1, 3], "x": 61, "y": 16, "flags": 4},
+            {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [1, 4], "x": 81, "y": 16, "flags": 4},
+            {"matrix": [2, 4], "x": 81, "y": 32, "flags": 4},
+            {"matrix": [3, 4], "x": 81, "y": 48, "flags": 4},
+            {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4},
+            {"matrix": [1, 5], "x": 102, "y": 16, "flags": 4},
+            {"matrix": [2, 5], "x": 102, "y": 32, "flags": 4},
+            {"matrix": [3, 5], "x": 102, "y": 48, "flags": 4},
+            {"matrix": [4, 2], "x": 102, "y": 64, "flags": 2},
+            {"matrix": [4, 5], "x": 81, "y": 64, "flags": 2},
+            {"matrix": [4, 3], "x": 61, "y": 56, "flags": 2},
+            {"matrix": [4, 4], "x": 81, "y": 56, "flags": 2},
+            {"matrix": [4, 1], "x": 102, "y": 56, "flags": 2},
+            {"matrix": [5, 0], "x": 224, "y": 0, "flags": 2},
+            {"matrix": [6, 0], "x": 224, "y": 16, "flags": 2},
+            {"matrix": [7, 0], "x": 224, "y": 32, "flags": 2},
+            {"matrix": [8, 0], "x": 224, "y": 48, "flags": 2},
+            {"matrix": [8, 1], "x": 204, "y": 48, "flags": 4},
+            {"matrix": [7, 1], "x": 204, "y": 32, "flags": 4},
+            {"matrix": [6, 1], "x": 204, "y": 16, "flags": 4},
+            {"matrix": [5, 1], "x": 204, "y": 0, "flags": 4},
+            {"matrix": [5, 2], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [6, 2], "x": 183, "y": 16, "flags": 4},
+            {"matrix": [7, 2], "x": 183, "y": 32, "flags": 4},
+            {"matrix": [8, 2], "x": 183, "y": 48, "flags": 4},
+            {"matrix": [8, 3], "x": 163, "y": 48, "flags": 4},
+            {"matrix": [7, 3], "x": 163, "y": 32, "flags": 4},
+            {"matrix": [6, 3], "x": 163, "y": 16, "flags": 4},
+            {"matrix": [5, 3], "x": 163, "y": 0, "flags": 4},
+            {"matrix": [5, 4], "x": 142, "y": 0, "flags": 4},
+            {"matrix": [6, 4], "x": 142, "y": 16, "flags": 4},
+            {"matrix": [7, 4], "x": 142, "y": 32, "flags": 4},
+            {"matrix": [8, 4], "x": 142, "y": 48, "flags": 4},
+            {"matrix": [5, 5], "x": 122, "y": 0, "flags": 4},
+            {"matrix": [6, 5], "x": 122, "y": 16, "flags": 4},
+            {"matrix": [7, 5], "x": 122, "y": 32, "flags": 4},
+            {"matrix": [8, 5], "x": 122, "y": 48, "flags": 4},
+            {"matrix": [9, 2], "x": 122, "y": 64, "flags": 2},
+            {"matrix": [9, 5], "x": 142, "y": 64, "flags": 2},
+            {"matrix": [9, 3], "x": 163, "y": 56, "flags": 2},
+            {"matrix": [9, 4], "x": 142, "y": 56, "flags": 2},
+            {"matrix": [9, 1], "x": 122, "y": 56, "flags": 2}
+        ],
         "max_brightness": 50,
         "sleep": true,
         "split_count": [29, 29]
     },
-    "rgblight": {
-        "led_count": 58,
-        "split_count": [29, 29]
-    },
     "split": {
-        "transport": {
-            "sync": {
-                "matrix_state": true
-            }
-        }
+        "enabled": true
+    },
+    "url": "https://github.com/Bastardkb/Scylla",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x1829"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {
@@ -28,67 +90,56 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-
                 {"matrix": [5, 5], "x": 11, "y": 0},
                 {"matrix": [5, 4], "x": 12, "y": 0},
                 {"matrix": [5, 3], "x": 13, "y": 0},
                 {"matrix": [5, 2], "x": 14, "y": 0},
                 {"matrix": [5, 1], "x": 15, "y": 0},
                 {"matrix": [5, 0], "x": 16, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
                 {"matrix": [1, 4], "x": 4, "y": 1},
                 {"matrix": [1, 5], "x": 5, "y": 1},
-
                 {"matrix": [6, 5], "x": 11, "y": 1},
                 {"matrix": [6, 4], "x": 12, "y": 1},
                 {"matrix": [6, 3], "x": 13, "y": 1},
                 {"matrix": [6, 2], "x": 14, "y": 1},
                 {"matrix": [6, 1], "x": 15, "y": 1},
                 {"matrix": [6, 0], "x": 16, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1, "y": 2},
                 {"matrix": [2, 2], "x": 2, "y": 2},
                 {"matrix": [2, 3], "x": 3, "y": 2},
                 {"matrix": [2, 4], "x": 4, "y": 2},
                 {"matrix": [2, 5], "x": 5, "y": 2},
-
                 {"matrix": [7, 5], "x": 11, "y": 2},
                 {"matrix": [7, 4], "x": 12, "y": 2},
                 {"matrix": [7, 3], "x": 13, "y": 2},
                 {"matrix": [7, 2], "x": 14, "y": 2},
                 {"matrix": [7, 1], "x": 15, "y": 2},
                 {"matrix": [7, 0], "x": 16, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1, "y": 3},
                 {"matrix": [3, 2], "x": 2, "y": 3},
                 {"matrix": [3, 3], "x": 3, "y": 3},
                 {"matrix": [3, 4], "x": 4, "y": 3},
                 {"matrix": [3, 5], "x": 5, "y": 3},
-
                 {"matrix": [8, 5], "x": 11, "y": 3},
                 {"matrix": [8, 4], "x": 12, "y": 3},
                 {"matrix": [8, 3], "x": 13, "y": 3},
                 {"matrix": [8, 2], "x": 14, "y": 3},
                 {"matrix": [8, 1], "x": 15, "y": 3},
                 {"matrix": [8, 0], "x": 16, "y": 3},
-
                 {"matrix": [4, 3], "x": 5, "y": 4},
                 {"matrix": [4, 4], "x": 6, "y": 4},
                 {"matrix": [4, 1], "x": 7, "y": 4},
-
                 {"matrix": [9, 1], "x": 9, "y": 4},
                 {"matrix": [9, 4], "x": 10, "y": 4},
                 {"matrix": [9, 3], "x": 11, "y": 4},
-
                 {"matrix": [4, 5], "x": 6, "y": 5},
                 {"matrix": [4, 2], "x": 7, "y": 5},
-
                 {"matrix": [9, 2], "x": 9, "y": 5},
                 {"matrix": [9, 5], "x": 10, "y": 5}
             ]

keyboards/bastardkb/scylla/keymaps/default/keymap.c

@@ -1,51 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [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,
-                             //-------------------------------------------------//-----------------------------------------------------------//
-                             KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
-                             //-------------------------------------------------//-----------------------------------------------------------//
-                             KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-                             //-------------------------------------------------//-----------------------------------------------------------//
-                             KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
-                             //-------------------------------------------------//-----------------------------------------------------------//
-                             KC_LCTL, KC_SPC, MO(1), MO(2), KC_ENT, KC_RGUI, KC_HOME, KC_BSPC, KC_DEL, KC_RALT),
-
-    [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,
-                             //---------------------------------------------------------//-----------------------------------------------------------//
-                             QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS,
-                             //---------------------------------------------------------//-----------------------------------------------------------//
-                             _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE,
-                             //---------------------------------------------------------//-----------------------------------------------------------//
-                             _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS,
-                             //---------------------------------------------------------//-----------------------------------------------------------//
-                             KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, KC_RGUI, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
-
-    [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,
-                             //---------------------------------------------------------//--------------------------------------------------------------//
-                             _______, _______, RM_PREV,  RM_TOGG, RM_NEXT, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE,
-                             //---------------------------------------------------------//--------------------------------------------------------------//
-                             _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
-                             //---------------------------------------------------------//--------------------------------------------------------------//
-                             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
-                             //---------------------------------------------------------//--------------------------------------------------------------//
-                             KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, QK_BOOT, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
-};

keyboards/bastardkb/scylla/keymaps/default/keymap.json

@@ -0,0 +1,31 @@
+{
+    "keyboard": "bastardkb/scylla/promicro",
+    "keymap": "default",
+    "layout": "LAYOUT_split_4x6_5",
+    "layers": [
+        [
+            "KC_ESC" , "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",          "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_GRV" ,
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",          "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_BSPC",
+            "KC_LCTL", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",          "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",          "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_CAPS",
+                                             "KC_LGUI", "MO(1)",   "KC_SPC",        "KC_ENT",  "MO(2)",   "KC_RGUI",
+                                                        "KC_LALT", "KC_SPC",        "KC_BSPC", "KC_RALT"
+        ],
+        [
+            "_______", "_______", "_______", "_______", "_______", "_______",       "_______", "_______", "_______", "_______", "_______", "_______",
+            "_______", "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",          "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "_______",
+            "_______", "KC_EXLM", "KC_AT",   "KC_HASH", "KC_DLR",  "KC_PERC",       "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "_______",
+            "_______", "_______", "_______", "_______", "_______", "_______",       "_______", "_______", "_______", "_______", "_______", "_______",
+                                             "_______", "_______", "_______",       "_______", "_______", "_______",
+                                                        "_______", "_______",       "_______", "_______"
+        ],
+        [
+            "_______", "_______", "_______", "_______", "_______", "_______",       "_______", "_______", "_______", "_______",  "_______", "_______",
+            "QK_BOOT", "_______", "_______", "_______", "_______", "_______",       "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT",  "RM_TOGG", "_______",
+            "EE_CLR",  "_______", "_______", "_______", "_______", "_______",       "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV",  "_______", "_______",
+            "_______", "_______", "_______", "_______", "_______", "_______",       "_______", "_______", "_______", "_______",  "_______", "_______",
+                                             "_______", "_______", "_______",       "_______", "_______", "_______",
+                                                        "_______", "_______",       "_______", "_______"
+        ]
+    ]
+}

keyboards/bastardkb/scylla/promicro/keyboard.json

@@ -0,0 +1,15 @@
+{
+    "development_board": "elite_c",
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "split": {
+        "serial": {
+            "pin": "D2"
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    }
+}

keyboards/bastardkb/scylla/readme.md

@@ -1,29 +1,27 @@
 # Scylla
 
-A modern, low-profile split ergonomic keyboard
+* Keyboard Maintainer: [Quentin Lebastard](https://github.com/bastardkb)
+* Hardware Supported: BastardKB Blackpill or Pro Micro adapter & compatible development boards
+* Hardware Availability: [GitHub](https://github.com/Bastardkb/Scylla)
 
-* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastard Keyboards](https://bastardkb.com/)
+Make example for this keyboard (after setting up your build environment):
 
-## Building the firmware
+    make bastardkb/scylla/blackpill:default
+    make bastardkb/scylla/promicro:default
 
-**You must specify the shield version when compiling/flashing the firmware.**
+Flashing example for this keyboard:
 
-The template is:
+    make bastardkb/scylla/blackpill:default:flash
+    make bastardkb/scylla/promicro:default:flash
 
-```shell
-qmk compile -kb bastardkb/scylla/{VERSION}/elitec -km {KEYMAP}
-```
-
-| Shield Version  | default                                                       | via                                                       |
-| --------------- | ------------------------------------------------------------- | --------------------------------------------------------- |
-| v1 (Elite-C)    | `qmk compile -kb bastardkb/scylla/v1/elitec -km default`      | `qmk compile -kb bastardkb/scylla/v1/elitec -km via`      |
-| v2 (Elite-C)    | `qmk compile -kb bastardkb/scylla/v2/elitec -km default`      | `qmk compile -kb bastardkb/scylla/v2/elitec -km via`      |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km via`  |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km via`  |
-| v2 (STeMCell)   | `qmk compile -kb bastardkb/scylla/v2/stemcell -km default`    | `qmk compile -kb bastardkb/scylla/v2/stemcell -km via`    |
+Note 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.
 
 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](https://docs.bastardkb.com)
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the adapter PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/bastardkb/scylla/scylla.c

@@ -1,63 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    // left
-    {  0,  7,  8, 15, 16, 20 },
-    {  1,  6,  9, 14, 17, 21 },
-    {  2,  5, 10, 13, 18, 22 },
-    {  3,  4, 11, 12, 19, 23 },
-    { NO_LED, 28, 24, 26, 27, 25 },
-    // right
-    { 29, 36, 37, 44, 45, 49 },
-    { 30, 35, 38, 43, 46, 50 },
-    { 31, 34, 39, 42, 47, 51 },
-    { 32, 33, 40, 41, 48, 52 },
-    { NO_LED, 57, 53, 55, 56, 54 }
-}, {
-    // left
-    {   0,   0 }, {   0,  16 }, {   0,  32 }, {   0,  48 }, // col 1
-    {  20,  48 }, {  20,  32 }, {  20,  16 }, {  20,   0 }, // col 2
-    {  41,   0 }, {  41,  16 }, {  41,  32 }, {  41,  48 },
-    {  61,  48 }, {  61,  32 }, {  61,  16 }, {  61,   0 },
-    {  81,   0 }, {  81,  16 }, {  81,  32 }, {  81,  48 },
-    { 102,   0 }, { 102,  16 }, { 102,  32 }, { 102,  48 },
-    { 102,  64 }, {  81,  64 }, {  61,  56 }, {  81,  56 }, { 102,  56 }, // left thumb cluster
-    // right
-    { 224,   0 }, { 224,  16 }, { 224,  32 }, { 224,  48 }, // col 12
-    { 204,  48 }, { 204,  32 }, { 204,  16 }, { 204,   0 }, // col 11
-    { 183,   0 }, { 183,  16 }, { 183,  32 }, { 183,  48 },
-    { 163,  48 }, { 163,  32 }, { 163,  16 }, { 163,   0 },
-    { 142,   0 }, { 142,  16 }, { 142,  32 }, { 142,  48 },
-    { 122,   0 }, { 122,  16 }, { 122,  32 }, { 122,  48 },
-    { 122,  64 }, { 142,  64 }, { 163,  56 }, { 142,  56 }, { 122,  56 } // right thumb cluster
-}, {
-    // left
-    2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    2, 2, 2, 2, 2,
-    // right
-    2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    2, 2, 2, 2, 2
-} };
-#endif
-// clang-format on

keyboards/bastardkb/scylla/v1/elitec/config.h

@@ -1,22 +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
-
-/* Handedness. */
-#define MASTER_RIGHT

keyboards/bastardkb/scylla/v1/elitec/keyboard.json

@@ -1,31 +0,0 @@
-{
-    "keyboard_name": "Scylla Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "rgb_matrix": true
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
-        "rows": ["D7", "B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "serial": {
-            "pin": "D0"
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}

keyboards/bastardkb/scylla/v1/elitec/rules.mk

@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no        # Audio is not supported

keyboards/bastardkb/scylla/v2/elitec/config.h

@@ -1,21 +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
-
-/* Handedness. */
-#define MASTER_RIGHT

keyboards/bastardkb/scylla/v2/elitec/keyboard.json

@@ -1,31 +0,0 @@
-{
-    "keyboard_name": "Scylla Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "rgb_matrix": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F4", "F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "serial": {
-            "pin": "D2"
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}

keyboards/bastardkb/scylla/v2/elitec/rules.mk

@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no        # Audio is not supported

keyboards/bastardkb/scylla/v2/splinky_2/config.h

@@ -1,31 +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
-
-/* 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.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U

keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json

@@ -1,32 +0,0 @@
-{
-    "keyboard_name": "Scylla Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": false,
-        "extrakey": true,
-        "rgb_matrix": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "serial": {
-            "pin": "GP1"
-        }
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}

keyboards/bastardkb/scylla/v2/splinky_2/readme.md

@@ -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).

keyboards/bastardkb/scylla/v2/splinky_2/rules.mk

@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no        # Audio is not supported
-
-SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/splinky_3/config.h

@@ -1,31 +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
-
-/* 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.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U

keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json

@@ -1,32 +0,0 @@
-{
-    "keyboard_name": "Scylla Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": false,
-        "extrakey": true,
-        "rgb_matrix": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "serial": {
-            "pin": "GP1"
-        }
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}

keyboards/bastardkb/scylla/v2/splinky_3/readme.md

@@ -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).

keyboards/bastardkb/scylla/v2/splinky_3/rules.mk

@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no        # Audio is not supported
-
-SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/stemcell/config.h

@@ -1,38 +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
-
-/* 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.
-
-/* RGB settings. */
-#define WS2812_PWM_DRIVER PWMD2
-#define WS2812_PWM_CHANNEL 4
-#define WS2812_PWM_PAL_MODE 1
-#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_PWM_DMA_CHANNEL 3
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED

keyboards/bastardkb/scylla/v2/stemcell/halconf.h

@@ -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>

keyboards/bastardkb/scylla/v2/stemcell/keyboard.json

@@ -1,34 +0,0 @@
-{
-    "keyboard_name": "Scylla STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "rgb_matrix": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B10", "B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "serial": {
-            "pin": "A3"
-        }
-    },
-    "development_board": "stemcell"
-}

keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h

@@ -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

keyboards/bastardkb/scylla/v2/stemcell/rules.mk

@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no        # Audio is not supported
-
-SERIAL_DRIVER = usart