aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/mappings/keyboard_aliases.hjson24
-rw-r--r--docs/ChangeLog/20250831/HelixRefactor.md37
-rw-r--r--keyboards/bastardkb/charybdis/3x6/3x6.c91
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/config.h33
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h21
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json43
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h28
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/readme.md3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/config.h22
-rw-r--r--keyboards/bastardkb/charybdis/3x6/elitec/config.h5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json19
-rw-r--r--keyboards/bastardkb/charybdis/3x6/info.json68
-rw-r--r--keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c66
-rw-r--r--keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json25
-rw-r--r--keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/readme.md15
-rw-r--r--keyboards/bastardkb/charybdis/3x6/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h24
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json41
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h24
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json35
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h38
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json33
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h23
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h38
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json33
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h23
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h52
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h24
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json38
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h32
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/4x6.c100
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/config.h37
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h21
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json43
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h28
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/readme.md3
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/config.h22
-rw-r--r--keyboards/bastardkb/charybdis/4x6/elitec/config.h5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/elitec/keyboard.json19
-rw-r--r--keyboards/bastardkb/charybdis/4x6/info.json90
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c75
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.json31
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md7
-rw-r--r--keyboards/bastardkb/charybdis/4x6/readme.md15
-rw-r--r--keyboards/bastardkb/charybdis/4x6/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h25
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json41
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h24
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json35
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h38
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json33
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h23
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h38
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json33
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h23
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h52
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h24
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json38
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h32
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk6
-rw-r--r--keyboards/helix/beta/beta.c77
-rw-r--r--keyboards/helix/beta/keyboard.json102
-rw-r--r--keyboards/helix/common/glcdfont.c233
-rw-r--r--keyboards/helix/config.h (renamed from keyboards/helix/beta/config.h)2
-rw-r--r--keyboards/helix/glcdfont.c232
-rw-r--r--keyboards/helix/helix.c (renamed from keyboards/helix/rev3/rev3.c)0
-rw-r--r--keyboards/helix/info.json40
-rw-r--r--keyboards/helix/pico/keyboard.json87
-rw-r--r--keyboards/helix/readme.md51
-rw-r--r--keyboards/helix/rev3/config.h5
-rw-r--r--keyboards/helix/rev3/keyboard.json27
-rw-r--r--keyboards/helix/rules.mk1
-rw-r--r--keyboards/inland/kb83/kb83.c410
-rw-r--r--keyboards/inland/kb83/keyboard.json94
-rw-r--r--keyboards/inland/kb83/keymaps/default/keymap.c5
-rw-r--r--keyboards/inland/kb83/keymaps/default/rules.mk1
-rw-r--r--keyboards/inland/kb83/readme.md9
93 files changed, 890 insertions, 2488 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 73339a2c56..cd5ce6e9ab 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -80,6 +80,30 @@
"bastardkb/charybdis/3x5/v2/stemcell": {
"target": "bastardkb/charybdis/3x5/elitec"
},
+ "bastardkb/charybdis/3x6/v2/elitec": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/3x6/v2/splinky_2": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/3x6/v2/splinky_3": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/3x6/v2/stemcell": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/elitec": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/splinky_2": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/splinky_3": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/stemcell": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
"bastardkb/dilemma/3x5_2/splinky": {
"target": "bastardkb/dilemma/3x5_2/promicro"
},
diff --git a/docs/ChangeLog/20250831/HelixRefactor.md b/docs/ChangeLog/20250831/HelixRefactor.md
new file mode 100644
index 0000000000..58136ce06b
--- /dev/null
+++ b/docs/ChangeLog/20250831/HelixRefactor.md
@@ -0,0 +1,37 @@
+# Refactor of `keyboards/helix`
+
+This series of PRs aims to align this keyboard's configuration with current standards, and also remove unnecessary contents.
+
+### Refactor `helix/pico` [#25428](https://github.com/qmk/qmk_firmware/pull/25428)
+ - Removes redundant `back`, `base`, `sc`, `under`, & `qmk_conf` revisions
+ - Migrates legacy defines and configuration to JSON
+ - Migrates `default` keymap to JSON
+ - Fixes RGB configuration to illuminate 25 LEDs per half
+ - Enables standard features like Bootmagic, extrakey, etc.
+ - Updates keyboard aliases accordingly
+
+### Refactor `helix/rev2` [#25429](https://github.com/qmk/qmk_firmware/pull/25429)
+ - Removes redundant `back`, `base`, `sc`, `under`, & `qmk_conf` revisions
+ - Renames `rev2` to `beta`, as the only PCB sources in the official Helix GitHub repository are named "[beta](https://github.com/MakotoKurauchi/helix/tree/master/PCB/beta)", this keyboard's name in QMK Firmware was already "beta", and this PCB is sold under the name "[beta](https://shop.yushakobo.jp/products/oss_pcb?variant=39452554231969)" on the Yushakobo store
+ - Migrates legacy defines and configuration to JSON
+ - Migrates `default` keymap to JSON
+ - Fixes RGB configuration to illuminate 32 LEDs per half
+ - Enables standard features like Bootmagic, extrakey, etc.
+ - Updates keyboard aliases accordingly
+ - Tidy's up OLED code
+ - Adds alternate 4 row layout, as this PCB allows users to snap off the bottom row
+
+### Refactor `helix/rev3_{4,5}rows` [#25430](https://github.com/qmk/qmk_firmware/pull/25430)
+ - The `rev3_4rows` and `rev3_5rows` firmwares are identical, except for the extra row users can snap off. The 4 row PCB is not sold anywhere as an individual product, only the [5 row PCB](https://shop.yushakobo.jp/products/2143). Thus, this PR removes the aforementioned two build targets and adds a single `rev3` revision
+ - Migrates legacy defines and configuration to JSON
+ - Migrates `default` keymap to JSON
+ - Removes RGB Light configuration
+ - Updates keyboard aliases accordingly
+ - Tidy's up OLED code
+ - Adds alternate 4 row layout, as this PCB allows users to snap off the bottom row
+
+### Migrate helix common configuration [#25433](https://github.com/qmk/qmk_firmware/pull/25433)
+ - Migrates common configuration shared between revisions to the top-level keyboard directory
+ - Improves `readme.md` to provide more detail regarding PCB revisions
+ - Removes unnecessary top-level `rules.mk` file and other general tidying
+ - Migrates `beta` and `pico` revisions to use RGB Matrix, which is more appropriate as these PCBs are fit with per-key RGB LEDs
diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c
deleted file mode 100644
index d2c0a39815..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/3x6.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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/>.
- */
-
-#include "charybdis.h"
-
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-/**
- * \brief LEDs index.
- *
- # 0,0 14 28 42 56 70 84 98 126 140 154 168 182 196 210 224,0
- # 0,0 15 30 45 60 75 90 105 119 134 149 164 179 194 209 224,0
- * ╭────────────────────────╮ ╭────────────────────────╮
- * 0 5 6 11 12 15 36 33 32 27 26 21
- * ├────────────────────────┤ ├────────────────────────┤
- * 1 4 7 10 13 16 37 34 31 28 25 22
- * ├────────────────────────┤ ├────────────────────────┤
- * 2 3 8 9 14 17 38 35 30 29 24 23
- * ╰────────────────────────╯ ╰────────────────────────╯
- * 18 19 20 39 40 XX
- * ╰────────────╯ ╰────────────╯
- *
- * Note: the LED config simulates 42 LEDs instead of the actual 41 to prevent
- * confusion when testing LEDs during assembly when handedness is not set
- * correctly. Those fake LEDs are bound to the physical top-left corner.
- */
-led_config_t g_led_config = { {
- /* Key Matrix to LED index. */
- // Left split.
- { 0, 5, 6, 11, 12, 15 }, // Top row
- { 1, 4, 7, 10, 13, 16 }, // Middle row
- { 2, 3, 8, 9, 14, 17 }, // Bottom row
- { NO_LED, 20, NO_LED, 18, 19, NO_LED }, // Thumb cluster
- // Right split.
- { 21, 26, 27, 32, 33, 36 }, // Top row
- { 22, 25, 28, 31, 34, 37 }, // Middle row
- { 23, 24, 29, 30, 35, 38 }, // Bottom row
- { NO_LED, 41, NO_LED, 39, 40, NO_LED }, // Thumb cluster
-}, {
- /* LED index to physical position. */
- // Left split.
- /* index=0 */ { 0, 0 }, { 0, 21 }, { 0, 42 }, // col 1 (left most)
- /* index=3 */ { 15, 42 }, { 15, 21 }, { 15, 0 }, // col 2
- /* index=6 */ { 30, 0 }, { 30, 21 }, { 30, 42 },
- /* index=9 */ { 45, 42 }, { 45, 21 }, { 45, 0 },
- /* index=12 */ { 60, 0 }, { 60, 21 }, { 60, 42 },
- /* index=15 */ { 75, 0 }, { 75, 21 }, { 75, 42 },
- /* index=18 */ { 75, 64 }, { 90, 64 }, { 105, 64 }, // Thumb cluster
- // Right split.
- /* index=21 */ { 224, 0 }, { 224, 21 }, { 224, 42 }, // col 12 (right most)
- /* index=24 */ { 209, 42 }, { 209, 21 }, { 209, 0 }, // col 10
- /* index=27 */ { 194, 0 }, { 194, 21 }, { 194, 42 },
- /* index=30 */ { 179, 42 }, { 179, 21 }, { 179, 0 },
- /* index=33 */ { 164, 0 }, { 164, 21 }, { 164, 42 },
- /* index=36 */ { 149, 0 }, { 149, 21 }, { 149, 42 },
- /* index=39 */ { 119, 64 }, { 134, 64 }, { 0, 0 }, // Thumb cluster
-}, {
- /* LED index to flag. */
- // Left split.
- /* index=0 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
- /* index=3 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
- /* index=6 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=9 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=15 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
- // Right split.
- /* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
- /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
- /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=36 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=39 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
-} };
-#endif
-// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
index e1365a109d..bb870669c8 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -1,26 +1,7 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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 2022 Charly Delay <[email protected]> (@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
#define WS2812_PWM_PAL_MODE 1
@@ -28,14 +9,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 and pmw3360 sensor. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5
@@ -44,9 +17,7 @@
#define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5
-/* EEPROM config. */
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
-/* PMW3360 settings. */
#define POINTING_DEVICE_CS_PIN B14
#define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
index 5c5dff98d4..545fc20cb3 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -1,21 +1,6 @@
-/**
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2022 Charly Delay <[email protected]> (@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 <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json
index ecefbbeb99..df77023bd6 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json
@@ -1,38 +1,23 @@
{
- "keyboard_name": "Charybdis Mini (3x6) Blackpill",
- "usb": {
- "device_version": "1.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": 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": ["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"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
index e4cde4880b..ca63a57218 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
@@ -1,22 +1,7 @@
-/*
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@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 <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
@@ -30,11 +15,6 @@
#undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE
-#undef STM32_SPI_SPI1_RX_DMA_STREAM
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-#undef STM32_SPI_SPI1_TX_DMA_STREAM
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
#undef STM32_SERIAL_USE_USART1
#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/readme.md b/keyboards/bastardkb/charybdis/3x6/blackpill/readme.md
deleted file mode 100644
index 6a9907c2ae..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Charybdis Mini (3x6) BlackPill
-
-An ergonomic keyboard with integrated trackball, with BlackPill (STM32F411) mod.
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
deleted file mode 100644
index 4373b9c33d..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
deleted file mode 100644
index 1c952759a7..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- * Copyright 2021 Charly Delay <[email protected]> (@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
-
-/* Trackball angle adjustment. */
-#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/3x6/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/elitec/config.h
new file mode 100644
index 0000000000..411ddaf6b9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/elitec/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json
new file mode 100644
index 0000000000..e736d9df98
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json
@@ -0,0 +1,19 @@
+{
+ "build": {
+ "lto": true
+ },
+ "development_board": "elite_c",
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F7", "C6", "D4", "B5"]
+ },
+ "pin_compatible": "elite_c",
+ "split": {
+ "serial": {
+ "pin": "D2"
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ }
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 3597e72534..5d1ba362f7 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -1,13 +1,64 @@
{
- "url": "https://bastardkb.com",
- "usb": {
- "pid": "0x1834"
+ "keyboard_name": "Charybdis Mini (3x6)",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "pointing_device": true,
+ "rgb_matrix": true
},
"rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 4},
+ {"matrix": [2, 1], "x": 15, "y": 42, "flags": 4},
+ {"matrix": [1, 1], "x": 15, "y": 21, "flags": 4},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 30, "y": 21, "flags": 4},
+ {"matrix": [2, 2], "x": 30, "y": 42, "flags": 4},
+ {"matrix": [2, 3], "x": 45, "y": 42, "flags": 4},
+ {"matrix": [1, 3], "x": 45, "y": 21, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 60, "y": 21, "flags": 4},
+ {"matrix": [2, 4], "x": 60, "y": 42, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [1, 5], "x": 75, "y": 21, "flags": 4},
+ {"matrix": [2, 5], "x": 75, "y": 42, "flags": 4},
+ {"matrix": [3, 3], "x": 75, "y": 64, "flags": 4},
+ {"matrix": [3, 4], "x": 90, "y": 64, "flags": 4},
+ {"matrix": [3, 1], "x": 105, "y": 64, "flags": 4},
+ {"matrix": [4, 0], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 21, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 42, "flags": 4},
+ {"matrix": [6, 1], "x": 209, "y": 42, "flags": 4},
+ {"matrix": [5, 1], "x": 209, "y": 21, "flags": 4},
+ {"matrix": [4, 1], "x": 209, "y": 0, "flags": 4},
+ {"matrix": [4, 2], "x": 194, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 194, "y": 21, "flags": 4},
+ {"matrix": [6, 2], "x": 194, "y": 42, "flags": 4},
+ {"matrix": [6, 3], "x": 179, "y": 42, "flags": 4},
+ {"matrix": [5, 3], "x": 179, "y": 21, "flags": 4},
+ {"matrix": [4, 3], "x": 179, "y": 0, "flags": 4},
+ {"matrix": [4, 4], "x": 164, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 164, "y": 21, "flags": 4},
+ {"matrix": [6, 4], "x": 164, "y": 42, "flags": 4},
+ {"matrix": [4, 5], "x": 149, "y": 0, "flags": 4},
+ {"matrix": [5, 5], "x": 149, "y": 21, "flags": 4},
+ {"matrix": [6, 5], "x": 149, "y": 42, "flags": 4},
+ {"matrix": [7, 3], "x": 119, "y": 64, "flags": 4},
+ {"matrix": [7, 4], "x": 134, "y": 64, "flags": 4},
+ {"matrix": [7, 1], "x": 149, "y": 64, "flags": 4}
+ ],
"split_count": [21, 21]
},
- "layout_aliases": {
- "LAYOUT_charybdis_3x6": "LAYOUT"
+ "usb": {
+ "device_version": "2.0.0",
+ "pid": "0x1834"
},
"layouts": {
"LAYOUT": {
@@ -18,46 +69,39 @@
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L04", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "L05", "matrix": [0, 5], "x": 5, "y": 0},
-
{"label": "R00", "matrix": [4, 5], "x": 11, "y": 0},
{"label": "R01", "matrix": [4, 4], "x": 12, "y": 0},
{"label": "R02", "matrix": [4, 3], "x": 13, "y": 0},
{"label": "R03", "matrix": [4, 2], "x": 14, "y": 0},
{"label": "R04", "matrix": [4, 1], "x": 15, "y": 0},
{"label": "R05", "matrix": [4, 0], "x": 16, "y": 0},
-
{"label": "L10", "matrix": [1, 0], "x": 0, "y": 1},
{"label": "L11", "matrix": [1, 1], "x": 1, "y": 1},
{"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
{"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L14", "matrix": [1, 4], "x": 4, "y": 1},
{"label": "L15", "matrix": [1, 5], "x": 5, "y": 1},
-
{"label": "R10", "matrix": [5, 5], "x": 11, "y": 1},
{"label": "R11", "matrix": [5, 4], "x": 12, "y": 1},
{"label": "R12", "matrix": [5, 3], "x": 13, "y": 1},
{"label": "R13", "matrix": [5, 2], "x": 14, "y": 1},
{"label": "R14", "matrix": [5, 1], "x": 15, "y": 1},
{"label": "R15", "matrix": [5, 0], "x": 16, "y": 1},
-
{"label": "L20", "matrix": [2, 0], "x": 0, "y": 2},
{"label": "L21", "matrix": [2, 1], "x": 1, "y": 2},
{"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L24", "matrix": [2, 4], "x": 4, "y": 2},
{"label": "L25", "matrix": [2, 5], "x": 5, "y": 2},
-
{"label": "R20", "matrix": [6, 5], "x": 11, "y": 2},
{"label": "R21", "matrix": [6, 4], "x": 12, "y": 2},
{"label": "R22", "matrix": [6, 3], "x": 13, "y": 2},
{"label": "R23", "matrix": [6, 2], "x": 14, "y": 2},
{"label": "R24", "matrix": [6, 1], "x": 15, "y": 2},
{"label": "R25", "matrix": [6, 0], "x": 16, "y": 2},
-
{"label": "L33", "matrix": [3, 3], "x": 5, "y": 3},
{"label": "L34", "matrix": [3, 4], "x": 6, "y": 3},
{"label": "L31", "matrix": [3, 1], "x": 7, "y": 3},
-
{"label": "R31", "matrix": [7, 1], "x": 9, "y": 3},
{"label": "R33", "matrix": [7, 3], "x": 10, "y": 3}
]
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
deleted file mode 100644
index ba8028104e..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <[email protected]> (@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/>.
- */
-#include QMK_KEYBOARD_H
-
-enum charybdis_keymap_layers {
- LAYER_BASE = 0,
- LAYER_LOWER,
- LAYER_RAISE,
-};
-
-#define LOWER MO(LAYER_LOWER)
-#define RAISE MO(LAYER_RAISE)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT(
- // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
- KC_LGUI, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RGUI,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_RCTL,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
- KC_BSPC, KC_SPC, LOWER, RAISE, KC_ENT
- // ╰───────────────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_LOWER] = LAYOUT(
- // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
- XXXXXXX, RM_TOGG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_4, KC_5, KC_6, KC_PMNS, XXXXXXX,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS, XXXXXXX,
- // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
- XXXXXXX, XXXXXXX, _______, XXXXXXX, _______
- // ╰───────────────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_RAISE] = LAYOUT(
- // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- XXXXXXX, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
- _______, _______, XXXXXXX, _______, XXXXXXX
- // ╰───────────────────────────╯ ╰──────────────────╯
- ),
-};
-// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json
new file mode 100644
index 0000000000..e87fe18f34
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json
@@ -0,0 +1,25 @@
+{
+ "keyboard": "bastardkb/charybdis/3x6/elitec",
+ "keymap": "default",
+ "layout": "LAYOUT",
+ "layers": [
+ [
+ "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_ESC",
+ "KC_LGUI", "MO(1)", "KC_SPC", "KC_ENT", "MO(2)"
+ ],
+ [
+ "_______", "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", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______"
+ ]
+ ]
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md b/keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md
deleted file mode 100644
index 8b407f68a2..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Charybdis Mini (3x6) default keymap
-
-> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout.
-
-The Charydbis Mini (3x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap.
-
-This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
diff --git a/keyboards/bastardkb/charybdis/3x6/readme.md b/keyboards/bastardkb/charybdis/3x6/readme.md
deleted file mode 100644
index c6385ed8f1..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Charybdis Nano (3x6)
-
-An ergonomic keyboard with integrated trackball.
-
-The Charybdis is available in 4x6, 3x6 and 3x5 form factor at [bastardkb.com](https://bastardkb.com).
-
-## Keymaps
-
-### [`default`](keymaps/default)
-
-A simple QWERTY layout with 4 layers.
-
-### [`via`](keymaps/via)
-
-A [Miryoku-inspired](https://github.com/manna-harbour/miryoku), feature-rich, keymap with VIA support.
diff --git a/keyboards/bastardkb/charybdis/3x6/rules.mk b/keyboards/bastardkb/charybdis/3x6/rules.mk
new file mode 100644
index 0000000000..fab9162dc6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
deleted file mode 100644
index f5c54c58ae..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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
-
-/* PMW3360 settings. */
-#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
deleted file mode 100644
index cef4eab72f..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "keyboard_name": "Charybdis Mini (3x6) Elite-C",
- "usb": {
- "device_version": "1.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": true
- },
- "build": {
- "lto": true
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
- "rows": ["B7", "C6", "D4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- },
- "matrix_pins": {
- "right": {
- "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
- "rows": ["F0", "C6", "D4", "B5"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
deleted file mode 100644
index 17dae28bd1..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
deleted file mode 100644
index 3b91322247..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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
-
-/* PMW3360 settings. */
-#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
deleted file mode 100644
index fdfd2c38f9..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "keyboard_name": "Charybdis Mini (3x6) Elite-C",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": true
- },
- "build": {
- "lto": true
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
- "rows": ["F7", "C6", "D4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
deleted file mode 100644
index 17dae28bd1..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
deleted file mode 100644
index e6e2a4f216..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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.
-
-/* SPI & PMW3360 settings. */
-#define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP18
-#define SPI_MISO_PIN GP20
-#define SPI_MOSI_PIN GP19
-#define POINTING_DEVICE_CS_PIN GP14
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
deleted file mode 100644
index 650bf46481..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "keyboard_name": "Charybdis Mini (3x6) Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
- "rows": ["GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
deleted file mode 100644
index 6aaf31428c..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_SPI_USE_SPI0
-#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/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/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
deleted file mode 100644
index db29cb6789..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
deleted file mode 100644
index ee7745d41e..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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.
-
-/* SPI & PMW3360 settings. */
-#define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP22
-#define SPI_MISO_PIN GP20
-#define SPI_MOSI_PIN GP23
-#define POINTING_DEVICE_CS_PIN GP16
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
deleted file mode 100644
index b2a4890f56..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "keyboard_name": "Charybdis Mini (3x6) Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
- "rows": ["GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
deleted file mode 100644
index 6aaf31428c..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_SPI_USE_SPI0
-#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/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/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
deleted file mode 100644
index db29cb6789..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
deleted file mode 100644
index 3efb323302..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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
-
-/* SPI config for pmw3360 sensor. */
-#define SPI_DRIVER SPID1
-#define SPI_SCK_PIN A5
-#define SPI_SCK_PAL_MODE 5
-#define SPI_MOSI_PIN A7
-#define SPI_MOSI_PAL_MODE 5
-#define SPI_MISO_PIN A6
-#define SPI_MISO_PAL_MODE 5
-
-/* PMW3360 settings. */
-#define POINTING_DEVICE_CS_PIN A1
-#define PMW3360_CS_MODE 3
-#define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h
deleted file mode 100644
index 8141e0cf4b..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
deleted file mode 100644
index a405395438..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "keyboard_name": "Charybdis Mini (3x6) STeMCell",
- "usb": {
- "device_version": "2.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": 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": ["B0", "B3", "A15", "B9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "A3"
- }
- },
- "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h
deleted file mode 100644
index 1a3c4433db..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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_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/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
deleted file mode 100644
index 4373b9c33d..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c
deleted file mode 100644
index ff1bbea470..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/4x6.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- * Copyright 2021 Charly Delay <[email protected]> (@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/>.
- */
-
-#include "charybdis.h"
-
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-/**
- * \brief LEDs index.
- *
- * ╭────────────────────────╮ ╭────────────────────────╮
- * 0 7 8 15 16 20 49 45 44 37 36 29
- * ├────────────────────────┤ ├────────────────────────┤
- * 1 6 9 14 17 21 50 46 43 38 35 30
- * ├────────────────────────┤ ├────────────────────────┤
- * 2 5 10 13 18 22 51 47 42 39 34 31
- * ├────────────────────────┤ ├────────────────────────┤
- * 3 4 11 12 19 23 52 48 41 40 33 32
- * ╰────────────────────────╯ ╰────────────────────────╯
- * 26 27 28 53 54 XX
- * 25 24 55 XX
- * ╰────────────╯ ╰────────────╯
- *
- * Note: the LED config simulates 58 LEDs instead of the actual 56 to prevent
- * confusion when testing LEDs during assembly when handedness is not set
- * correctly. Those fake LEDs are bound to the physical bottom-left corner.
- */
-led_config_t g_led_config = { {
- /* Key Matrix to LED index. */
- // Left split.
- { 0, 7, 8, 15, 16, 20 }, // Num row
- { 1, 6, 9, 14, 17, 21 }, // Top row
- { 2, 5, 10, 13, 18, 22 }, // Middle row
- { 3, 4, 11, 12, 19, 23 }, // Bottom row
- { NO_LED, 28, 24, 26, 27, 25 }, // Thumb cluster
- // Right split.
- { 29, 36, 37, 44, 45, 49 }, // Num row
- { 30, 35, 38, 43, 46, 50 }, // Top row
- { 31, 34, 39, 42, 47, 51 }, // Middle row
- { 32, 33, 40, 41, 48, 52 }, // Bottom row
- { NO_LED, 53, 55, 54, NO_LED, NO_LED }, // Thumb cluster
-}, {
- /* LED index to physical position. */
- // Left split.
- /* index=0 */ { 0, 0 }, { 0, 12 }, { 0, 24 }, { 0, 36 }, // col 1 (left most)
- /* index=4 */ { 16, 36 }, { 16, 24 }, { 16, 12 }, { 16, 0 }, // col 2
- /* index=8 */ { 32, 0 }, { 32, 12 }, { 32, 24 }, { 32, 36 },
- /* index=12 */ { 48, 36 }, { 48, 24 }, { 48, 12 }, { 48, 0 },
- /* index=16 */ { 64, 0 }, { 64, 12 }, { 64, 24 }, { 64, 36 },
- /* index=20 */ { 80, 0 }, { 80, 12 }, { 80, 24 }, { 80, 36 },
- /* index=24 */ { 112, 64 }, { 96, 64 }, { 80, 52 },
- /* index=27 */ { 96, 52 }, { 112, 52 },
- // Right split.
- /* index=29 */ { 224, 0 }, { 224, 12 }, { 224, 24 }, { 224, 36 }, // col 12 (right most)
- /* index=33 */ { 208, 36 }, { 208, 24 }, { 208, 12 }, { 208, 0 }, // col 11
- /* index=37 */ { 192, 0 }, { 192, 12 }, { 192, 24 }, { 192, 36 },
- /* index=41 */ { 176, 36 }, { 176, 24 }, { 176, 12 }, { 176, 0 },
- /* index=45 */ { 160, 0 }, { 160, 12 }, { 160, 24 }, { 160, 36 },
- /* index=49 */ { 144, 0 }, { 144, 12 }, { 144, 24 }, { 144, 36 },
- /* index=53 */ { 112, 52 }, { 128, 64 }, { 112, 64 },
- /* index=56 */ { 0, 0 }, { 0, 0 },
-}, {
- /* LED index to flag. */
- // Left split.
- /* index=0 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
- /* index=4 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
- /* index=8 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=16 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=20 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=24 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster top
- /* index=27 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster bottom
- // Right split.
- /* index=29 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 12
- /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 11
- /* index=37 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=41 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=45 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=49 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=53 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
- /* index=55 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster fakes
-} };
-#endif
-// clang-format on
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index bd1e0fe31e..9c01986583 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -1,28 +1,9 @@
-/*
- * Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2021 Charly Delay <[email protected]> (@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 <[email protected]> (@drashna)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2021 Charly Delay <[email protected]> (@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
#define WS2812_PWM_PAL_MODE 1
@@ -30,14 +11,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 and pmw3360 sensor. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5
@@ -46,9 +19,7 @@
#define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5
-/* EEPROM config. */
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
-/* PMW3360 settings. */
#define POINTING_DEVICE_CS_PIN B14
#define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
index 300b0eeaed..6876cc3e00 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -1,21 +1,6 @@
-/**
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Charly Delay <[email protected]> (@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 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json
index b55dc29445..4bef461b6b 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json
@@ -1,38 +1,23 @@
{
- "keyboard_name": "Charybdis (4x6) Blackpill",
- "usb": {
- "device_version": "1.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": 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"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
index 46b3b42f8b..be641fb899 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
@@ -1,22 +1,7 @@
-/*
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2021 Charly Delay <[email protected]> (@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 2021 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
@@ -30,11 +15,6 @@
#undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE
-#undef STM32_SPI_SPI1_RX_DMA_STREAM
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-#undef STM32_SPI_SPI1_TX_DMA_STREAM
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
#undef STM32_SERIAL_USE_USART1
#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/readme.md b/keyboards/bastardkb/charybdis/4x6/blackpill/readme.md
deleted file mode 100644
index bbae15bb85..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Charybdis (4x6) BlackPill
-
-An ergonomic keyboard with integrated trackball, with BlackPill (STM32F411) mod.
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
deleted file mode 100644
index 3caafdef92..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported.
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
deleted file mode 100644
index 1c952759a7..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- * Copyright 2021 Charly Delay <[email protected]> (@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
-
-/* Trackball angle adjustment. */
-#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/4x6/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/elitec/config.h
new file mode 100644
index 0000000000..411ddaf6b9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/elitec/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/4x6/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/elitec/keyboard.json
new file mode 100644
index 0000000000..839598e85e
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/elitec/keyboard.json
@@ -0,0 +1,19 @@
+{
+ "build": {
+ "lto": true
+ },
+ "development_board": "elite_c",
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F4", "F7", "C6", "D4", "B5"]
+ },
+ "pin_compatible": "elite_c",
+ "split": {
+ "serial": {
+ "pin": "D2"
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ }
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
index 54bb564306..17d68900df 100644
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -1,15 +1,80 @@
{
- "manufacturer": "Bastard Keyboards",
- "url": "https://bastardkb.com/charybdis",
- "usb": {
- "pid": "0x1833",
- "vid": "0xA8F8"
+ "keyboard_name": "Charybdis (4x6)",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "pointing_device": true,
+ "rgb_matrix": true
},
"rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 24, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 36, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 36, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 24, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 12, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 12, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 24, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 36, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 36, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 24, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 12, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 12, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 24, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 36, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 12, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 24, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 36, "flags": 4},
+ {"matrix": [4, 2], "x": 112, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 96, "y": 64, "flags": 1},
+ {"matrix": [4, 3], "x": 80, "y": 52, "flags": 1},
+ {"matrix": [4, 4], "x": 96, "y": 52, "flags": 1},
+ {"matrix": [4, 1], "x": 112, "y": 52, "flags": 1},
+ {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 12, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 24, "flags": 4},
+ {"matrix": [8, 0], "x": 224, "y": 36, "flags": 4},
+ {"matrix": [8, 1], "x": 208, "y": 36, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 24, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 12, "flags": 4},
+ {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [6, 2], "x": 192, "y": 12, "flags": 4},
+ {"matrix": [7, 2], "x": 192, "y": 24, "flags": 4},
+ {"matrix": [8, 2], "x": 192, "y": 36, "flags": 4},
+ {"matrix": [8, 3], "x": 176, "y": 36, "flags": 4},
+ {"matrix": [7, 3], "x": 176, "y": 24, "flags": 4},
+ {"matrix": [6, 3], "x": 176, "y": 12, "flags": 4},
+ {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [6, 4], "x": 160, "y": 12, "flags": 4},
+ {"matrix": [7, 4], "x": 160, "y": 24, "flags": 4},
+ {"matrix": [8, 4], "x": 160, "y": 36, "flags": 4},
+ {"matrix": [5, 5], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [6, 5], "x": 144, "y": 12, "flags": 4},
+ {"matrix": [7, 5], "x": 144, "y": 24, "flags": 4},
+ {"matrix": [8, 5], "x": 144, "y": 36, "flags": 4},
+ {"matrix": [9, 1], "x": 112, "y": 52, "flags": 4},
+ {"matrix": [9, 3], "x": 128, "y": 64, "flags": 4},
+ {"matrix": [9, 2], "x": 112, "y": 64, "flags": 4},
+ {"x": 128, "y": 52, "flags": 1},
+ {"x": 144, "y": 52, "flags": 1}
+ ],
"split_count": [29, 29]
},
- "layout_aliases": {
- "LAYOUT_charybdis_4x6": "LAYOUT"
+ "usb": {
+ "device_version": "2.0.0",
+ "pid": "0x1833"
},
"layouts": {
"LAYOUT": {
@@ -20,66 +85,55 @@
{"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, 3], "x": 10, "y": 4},
-
{"matrix": [4, 5], "x": 6, "y": 5},
{"matrix": [4, 2], "x": 7, "y": 5},
-
{"matrix": [9, 5], "x": 9, "y": 5}
]
}
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
deleted file mode 100644
index f440dac8cb..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright 2021 Charly Delay <[email protected]> (@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/>.
- */
-#include QMK_KEYBOARD_H
-
-enum charybdis_keymap_layers {
- LAYER_BASE = 0,
- LAYER_LOWER,
- LAYER_RAISE,
-};
-
-#define LOWER MO(LAYER_LOWER)
-#define RAISE MO(LAYER_RAISE)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT(
- // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- 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_LALT,
- // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
- KC_LGUI, KC_SPC, LOWER, RAISE, KC_ENT,
- KC_LALT, KC_BSPC, KC_DEL
- // ╰───────────────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_LOWER] = LAYOUT(
- // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- RM_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_P7, KC_P8, KC_P9, KC_RBRC, XXXXXXX,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- RM_TOGG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- RM_PREV, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
- // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
- XXXXXXX, XXXXXXX, _______, XXXXXXX, _______,
- XXXXXXX, XXXXXXX, KC_P0
- // ╰───────────────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_RAISE] = LAYOUT(
- // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
- KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- KC_MPLY, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
- // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
- KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
- // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
- _______, _______, XXXXXXX, _______, XXXXXXX,
- _______, _______, XXXXXXX
- // ╰───────────────────────────╯ ╰──────────────────╯
- ),
-};
-// clang-format on
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.json b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.json
new file mode 100644
index 0000000000..2df4f16675
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.json
@@ -0,0 +1,31 @@
+{
+ "keyboard": "bastardkb/charybdis/4x6/elitec",
+ "keymap": "default",
+ "layout": "LAYOUT",
+ "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_LALT", "KC_SPC", "KC_BSPC"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "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", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______"
+ ]
+ ]
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md b/keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md
deleted file mode 100644
index 23a85e54d5..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Charybdis (4x6) default keymap
-
-> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout.
-
-The Charydbis (4x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap.
-
-This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
diff --git a/keyboards/bastardkb/charybdis/4x6/readme.md b/keyboards/bastardkb/charybdis/4x6/readme.md
deleted file mode 100644
index af2396cd6d..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Charybdis (4x6)
-
-An ergonomic keyboard with integrated trackball.
-
-The Charybdis is available in 4x6 and 3x5 form factor at [bastardkb.com](https://bastardkb.com).
-
-## Keymaps
-
-### [`default`](keymaps/default)
-
-A simple QWERTY layout with 3 layers.
-
-### [`via`](keymaps/via)
-
-Same as the [default](keymaps/default) keymap, but with VIA support.
diff --git a/keyboards/bastardkb/charybdis/4x6/rules.mk b/keyboards/bastardkb/charybdis/4x6/rules.mk
new file mode 100644
index 0000000000..fab9162dc6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
deleted file mode 100644
index dc0c6e4e03..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
- * Copyright 2021 Charly Delay <[email protected]> (@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
-
-/* PMW3360 settings. */
-#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
deleted file mode 100644
index 6b0caff82e..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "keyboard_name": "Charybdis (4x6) Elite-C",
- "usb": {
- "device_version": "1.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": true
- },
- "build": {
- "lto": true
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
- "rows": ["F1", "B7", "C6", "D4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- },
- "matrix_pins": {
- "right": {
- "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
- "rows": ["D5", "F0", "C6", "D4", "B5"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
deleted file mode 100644
index 0e4d15d5bc..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported.
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
deleted file mode 100644
index 3b91322247..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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
-
-/* PMW3360 settings. */
-#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
deleted file mode 100644
index 4163f9d476..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "keyboard_name": "Charybdis (4x6) Elite-C",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": true
- },
- "build": {
- "lto": 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"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
deleted file mode 100644
index 0e4d15d5bc..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported.
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
deleted file mode 100644
index e6e2a4f216..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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.
-
-/* SPI & PMW3360 settings. */
-#define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP18
-#define SPI_MISO_PIN GP20
-#define SPI_MOSI_PIN GP19
-#define POINTING_DEVICE_CS_PIN GP14
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
deleted file mode 100644
index 0da7d0b442..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "keyboard_name": "Charybdis (4x6) Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": 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"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
deleted file mode 100644
index 6aaf31428c..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_SPI_USE_SPI0
-#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/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/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
deleted file mode 100644
index db29cb6789..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
deleted file mode 100644
index ee7745d41e..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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.
-
-/* SPI & PMW3360 settings. */
-#define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP22
-#define SPI_MISO_PIN GP20
-#define SPI_MOSI_PIN GP23
-#define POINTING_DEVICE_CS_PIN GP16
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
deleted file mode 100644
index 026684eb92..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "keyboard_name": "Charybdis (4x6) Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": 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"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
deleted file mode 100644
index 6aaf31428c..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_SPI_USE_SPI0
-#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/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/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
deleted file mode 100644
index db29cb6789..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
deleted file mode 100644
index 3efb323302..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@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
-
-/* SPI config for pmw3360 sensor. */
-#define SPI_DRIVER SPID1
-#define SPI_SCK_PIN A5
-#define SPI_SCK_PAL_MODE 5
-#define SPI_MOSI_PIN A7
-#define SPI_MOSI_PAL_MODE 5
-#define SPI_MISO_PIN A6
-#define SPI_MISO_PAL_MODE 5
-
-/* PMW3360 settings. */
-#define POINTING_DEVICE_CS_PIN A1
-#define PMW3360_CS_MODE 3
-#define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h
deleted file mode 100644
index 0397de50b7..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@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
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
deleted file mode 100644
index ed929f7fb7..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "keyboard_name": "Charybdis (4x6) STeMCell",
- "usb": {
- "device_version": "2.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true,
- "pointing_device": 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"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h
deleted file mode 100644
index 17a46d8f95..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@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_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/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
deleted file mode 100644
index 4373b9c33d..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-POINTING_DEVICE_DRIVER = pmw3360
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/helix/beta/beta.c b/keyboards/helix/beta/beta.c
deleted file mode 100644
index 8020772b96..0000000000
--- a/keyboards/helix/beta/beta.c
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2020 Yushakobo
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "quantum.h"
-
-#ifdef OLED_ENABLE
-void render_status(void) {
- static const char os_logo[][2][3] PROGMEM = {{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}};
- if (!keymap_config.swap_lalt_lgui) {
- oled_write_P(os_logo[0][0], false);
- oled_write_P(PSTR("\n"), false);
- oled_write_P(os_logo[0][1], false);
- } else {
- oled_write_P(os_logo[1][0], false);
- oled_write_P(PSTR("\n"), false);
- oled_write_P(os_logo[1][1], false);
- }
-
- oled_write_P(PSTR(" Layer: "), false);
- switch (get_highest_layer(layer_state)) {
- case 0:
- oled_write_ln_P(PSTR("Default"), false);
- break;
- case 1:
- oled_write_ln_P(PSTR("Lower"), false);
- break;
- case 2:
- oled_write_ln_P(PSTR("Raise"), false);
- break;
- case 3:
- oled_write_ln_P(PSTR("Adjust"), false);
- break;
- default:
- oled_write_ln_P(PSTR("Undefined"), false);
- }
- oled_write_P(PSTR("\n"), false);
-
- led_t led_state = host_keyboard_led_state();
- oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
- oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
- oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
-}
-
-static void render_logo(void) {
- static const char PROGMEM qmk_logo[] = {
- // clang-format off
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
- 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
- 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
- // clang-format on
- };
- oled_write_P(qmk_logo, false);
-}
-
-static void render_rgblight_status(void) {
- oled_write_P(PSTR(" LED"), false);
- oled_write(get_u8_str(rgblight_get_mode(), ' '), false);
- oled_write_char(':', false);
- oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false);
- oled_write_char(',', false);
- oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false);
- oled_write_char(',', false);
- oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false);
-}
-
-bool oled_task_kb(void) {
- if (!oled_task_user()) {
- return false;
- }
- if (is_keyboard_master()) {
- render_status();
- } else {
- render_logo();
- render_rgblight_status();
- }
- return false;
-}
-#endif
diff --git a/keyboards/helix/beta/keyboard.json b/keyboards/helix/beta/keyboard.json
index 240a0a8869..c4eb48aab1 100644
--- a/keyboards/helix/beta/keyboard.json
+++ b/keyboards/helix/beta/keyboard.json
@@ -1,48 +1,82 @@
{
- "manufacturer": "Yushakobo",
"keyboard_name": "Helix Beta",
- "maintainer": "MakotoKurauchi",
- "development_board": "promicro",
- "diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "extrakey": true,
- "mousekey": true,
- "oled": true,
- "rgblight": true
- },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
- "rgblight": {
- "animations": {
- "breathing": true,
- "christmas": true,
- "knight": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "static_gradient": true
- },
- "led_count": 64,
- "max_brightness": 45,
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
+ {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4},
+ {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
+ {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [5, 5], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 16, "flags": 4},
+ {"matrix": [6, 2], "x": 192, "y": 16, "flags": 4},
+ {"matrix": [6, 3], "x": 176, "y": 16, "flags": 4},
+ {"matrix": [6, 4], "x": 160, "y": 16, "flags": 4},
+ {"matrix": [6, 5], "x": 144, "y": 16, "flags": 4},
+ {"matrix": [7, 5], "x": 144, "y": 32, "flags": 4},
+ {"matrix": [7, 4], "x": 160, "y": 32, "flags": 4},
+ {"matrix": [7, 3], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [7, 2], "x": 192, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4},
+ {"matrix": [8, 2], "x": 192, "y": 48, "flags": 4},
+ {"matrix": [8, 3], "x": 176, "y": 48, "flags": 4},
+ {"matrix": [8, 4], "x": 160, "y": 48, "flags": 4},
+ {"matrix": [8, 5], "x": 144, "y": 48, "flags": 4},
+ {"matrix": [8, 6], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [9, 6], "x": 128, "y": 64, "flags": 4},
+ {"matrix": [9, 5], "x": 144, "y": 64, "flags": 4},
+ {"matrix": [9, 4], "x": 160, "y": 64, "flags": 4},
+ {"matrix": [9, 3], "x": 176, "y": 64, "flags": 4},
+ {"matrix": [9, 2], "x": 192, "y": 64, "flags": 4},
+ {"matrix": [9, 1], "x": 208, "y": 64, "flags": 4},
+ {"matrix": [9, 0], "x": 224, "y": 64, "flags": 4}
+ ],
"split_count": [32, 32]
},
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
- },
"url": "https://shop.yushakobo.jp/products/oss_pcb?variant=39452554231969",
"usb": {
"device_version": "0.0.1",
- "pid": "0x0000",
- "vid": "0x3265"
- },
- "ws2812": {
- "pin": "D3"
+ "pid": "0x0000"
},
"layouts": {
"LAYOUT_4row": {
diff --git a/keyboards/helix/common/glcdfont.c b/keyboards/helix/common/glcdfont.c
deleted file mode 100644
index 697d58886e..0000000000
--- a/keyboards/helix/common/glcdfont.c
+++ /dev/null
@@ -1,233 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
- 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
- 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
- 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
- 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
- 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
- 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
- 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
- 0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
- 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
- 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
- 0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
- 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
- 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
- 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
- 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
- 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
- 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
- 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
- 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
- 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
- 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
- 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
- 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
- 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
- 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
- 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
- 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
- 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
- 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
- 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
- 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
- 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
- 0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
- 0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
- 0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
- 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
- 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
- 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
- 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
- 0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
- 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
- 0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
- 0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
- 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
- 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
- 0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
- 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
- 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
- 0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
- 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
- 0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
- 0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
- 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
- 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
- 0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
- 0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
- 0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
- 0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
- 0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
- 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
- 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
- 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
- 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
- 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
- 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
- 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
- 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
- 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
- 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
- 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
- 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
- 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
- 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
- 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
- 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
- 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
- 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
- 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
- 0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
- 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
- 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
- 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
- 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
- 0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
- 0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
- 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
- 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
- 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
- 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
- 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
- 0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
- 0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
- 0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
- 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
- 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
- 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
- 0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
- 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
- 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
- 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
- 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
- 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
- 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
- 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
- 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
- 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
- 0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
- 0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
- 0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
- 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
- 0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
- 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
- 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
- 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
- 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
- 0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
- 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
- 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
- 0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
- 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
- 0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
- 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
- 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
- 0x03, 0x07, 0x1F, 0x7F, 0xFF, 0xFF,
- 0xFE, 0xF8, 0xF0, 0xC0, 0x20, 0xF8,
- 0xFE, 0xFF, 0xFE, 0x79, 0x27, 0x1F,
- 0x7F, 0xFF, 0xFF, 0xFE, 0xF8, 0xF0,
- 0xC0, 0x20, 0xF8, 0xFE, 0xFF, 0xFF,
- 0x7F, 0x3F, 0x3F, 0x7F, 0xFF, 0xFE,
- 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x00,
- 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0xFF, 0x7F, 0x7F, 0x7F,
- 0xBF, 0xBF, 0xC0, 0xC0, 0xC0, 0xE0,
- 0xE0, 0xE0, 0xE0, 0xF0, 0xF0, 0xF0,
- 0xF8, 0x78, 0x78, 0x7C, 0x3C, 0x3C,
- 0xFE, 0xFE, 0xFE, 0xFF, 0xFF, 0xFF,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
- 0xBF, 0xBF, 0xDF, 0xDF, 0xEF, 0xEF,
- 0x00, 0x03, 0x07, 0x1F, 0x7F, 0xFF,
- 0xFF, 0xFF, 0xFE, 0xF8, 0xE0, 0xC0,
- 0xE0, 0xF8, 0xFE, 0xFF, 0xFF, 0xFF,
- 0x7F, 0x1F, 0x07, 0x03, 0x00, 0x00,
- 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
- 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
- 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
- 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
- 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
- 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
- 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
- 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xC1, 0xF3,
- 0xCF, 0xBF, 0x7F, 0xFF, 0xFF, 0xFC,
- 0xFB, 0xE7, 0x81, 0x00, 0x00, 0x00,
- 0x00, 0x80, 0xE3, 0xCF, 0x3F, 0xFF,
- 0xFF, 0xFF, 0xFC, 0xFB, 0xE7, 0x81,
- 0x00, 0x00, 0x00, 0x00, 0x81, 0xE7,
- 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0x00,
- 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xF8, 0xF8, 0xFC, 0x7C, 0x7E,
- 0x7E, 0x3E, 0xFE, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xF7, 0xF7, 0xF7, 0xFB,
- 0xFB, 0x7D, 0x7D, 0x7D, 0xBE, 0xBE,
- 0xBE, 0xDF, 0xDF, 0xE0, 0xE0, 0x00,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x00, 0xFC, 0xFC, 0x7C, 0x7E, 0x7E,
- 0x3E, 0x3E, 0x1F, 0x1F, 0x1F, 0x0F,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x81,
- 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x81,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
- 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
- 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
- 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
- 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
- 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
- 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
- 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x60, 0x70, 0x7C, 0x7F, 0x7F, 0x7F,
- 0x7F, 0x1F, 0x06, 0x01, 0x03, 0x0F,
- 0x3F, 0x7F, 0x7F, 0x7E, 0x7C, 0x7C,
- 0x7E, 0x7F, 0x7F, 0x7F, 0x1F, 0x06,
- 0x01, 0x07, 0x0F, 0x3F, 0x7F, 0x7F,
- 0x7E, 0x7C, 0x7C, 0x7E, 0x7F, 0x7F,
- 0x3F, 0x0F, 0x03, 0x00, 0x00, 0x00,
- 0x00, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
- 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x7F, 0x7F, 0x7F, 0x7F,
- 0x7F, 0x7F, 0x7D, 0x7D, 0x3D, 0x3E,
- 0x1E, 0x1F, 0x1F, 0x1F, 0x0F, 0x0F,
- 0x07, 0x07, 0x07, 0x03, 0x03, 0x00,
- 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
- 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C,
- 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x00,
- 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
- 0x00, 0x40, 0x70, 0x78, 0x7E, 0x7F,
- 0x7F, 0x7F, 0x3F, 0x0F, 0x03, 0x01,
- 0x03, 0x0F, 0x3F, 0x7F, 0x7F, 0x7F,
- 0x7E, 0x78, 0x70, 0x40, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
diff --git a/keyboards/helix/beta/config.h b/keyboards/helix/config.h
index dac611de9a..01040ab49f 100644
--- a/keyboards/helix/beta/config.h
+++ b/keyboards/helix/config.h
@@ -2,4 +2,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/helix/glcdfont.c"
diff --git a/keyboards/helix/glcdfont.c b/keyboards/helix/glcdfont.c
new file mode 100644
index 0000000000..1b81bbcbfe
--- /dev/null
+++ b/keyboards/helix/glcdfont.c
@@ -0,0 +1,232 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "progmem.h"
+
+static const unsigned char font[] PROGMEM = {
+ // clang-format off
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+ 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+ 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+ 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+ 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+ 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+ 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+ 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+ 0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+ 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+ 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+ 0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+ 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+ 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+ 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+ 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+ 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+ 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+ 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+ 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+ 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+ 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+ 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+ 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+ 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+ 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+ 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+ 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+ 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+ 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+ 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+ 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+ 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+ 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+ 0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+ 0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+ 0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+ 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+ 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+ 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+ 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+ 0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+ 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+ 0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+ 0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+ 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+ 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+ 0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+ 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+ 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+ 0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+ 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+ 0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+ 0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+ 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+ 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+ 0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+ 0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+ 0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+ 0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+ 0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+ 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+ 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+ 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+ 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+ 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+ 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+ 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+ 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+ 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+ 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+ 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+ 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+ 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+ 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+ 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+ 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+ 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+ 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+ 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+ 0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+ 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+ 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+ 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+ 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+ 0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+ 0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+ 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+ 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+ 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+ 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+ 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+ 0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+ 0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+ 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+ 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+ 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+ 0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+ 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+ 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
+ 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+ 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+ 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+ 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+ 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+ 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+ 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+ 0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+ 0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
+ 0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
+ 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+ 0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+ 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+ 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+ 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+ 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+ 0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+ 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+ 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+ 0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+ 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+ 0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+ 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+ 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+ 0x03, 0x07, 0x1F, 0x7F, 0xFF, 0xFF,
+ 0xFE, 0xF8, 0xF0, 0xC0, 0x20, 0xF8,
+ 0xFE, 0xFF, 0xFE, 0x79, 0x27, 0x1F,
+ 0x7F, 0xFF, 0xFF, 0xFE, 0xF8, 0xF0,
+ 0xC0, 0x20, 0xF8, 0xFE, 0xFF, 0xFF,
+ 0x7F, 0x3F, 0x3F, 0x7F, 0xFF, 0xFE,
+ 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x00,
+ 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xFF, 0x7F, 0x7F, 0x7F,
+ 0xBF, 0xBF, 0xC0, 0xC0, 0xC0, 0xE0,
+ 0xE0, 0xE0, 0xE0, 0xF0, 0xF0, 0xF0,
+ 0xF8, 0x78, 0x78, 0x7C, 0x3C, 0x3C,
+ 0xFE, 0xFE, 0xFE, 0xFF, 0xFF, 0xFF,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
+ 0xBF, 0xBF, 0xDF, 0xDF, 0xEF, 0xEF,
+ 0x00, 0x03, 0x07, 0x1F, 0x7F, 0xFF,
+ 0xFF, 0xFF, 0xFE, 0xF8, 0xE0, 0xC0,
+ 0xE0, 0xF8, 0xFE, 0xFF, 0xFF, 0xFF,
+ 0x7F, 0x1F, 0x07, 0x03, 0x00, 0x00,
+ 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+ 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
+ 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
+ 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
+ 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
+ 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
+ 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
+ 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xC1, 0xF3,
+ 0xCF, 0xBF, 0x7F, 0xFF, 0xFF, 0xFC,
+ 0xFB, 0xE7, 0x81, 0x00, 0x00, 0x00,
+ 0x00, 0x80, 0xE3, 0xCF, 0x3F, 0xFF,
+ 0xFF, 0xFF, 0xFC, 0xFB, 0xE7, 0x81,
+ 0x00, 0x00, 0x00, 0x00, 0x81, 0xE7,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0x00,
+ 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xF8, 0xF8, 0xFC, 0x7C, 0x7E,
+ 0x7E, 0x3E, 0xFE, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xF7, 0xF7, 0xF7, 0xFB,
+ 0xFB, 0x7D, 0x7D, 0x7D, 0xBE, 0xBE,
+ 0xBE, 0xDF, 0xDF, 0xE0, 0xE0, 0x00,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x00, 0xFC, 0xFC, 0x7C, 0x7E, 0x7E,
+ 0x3E, 0x3E, 0x1F, 0x1F, 0x1F, 0x0F,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x81,
+ 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x81,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
+ 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
+ 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
+ 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
+ 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
+ 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
+ 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
+ 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x60, 0x70, 0x7C, 0x7F, 0x7F, 0x7F,
+ 0x7F, 0x1F, 0x06, 0x01, 0x03, 0x0F,
+ 0x3F, 0x7F, 0x7F, 0x7E, 0x7C, 0x7C,
+ 0x7E, 0x7F, 0x7F, 0x7F, 0x1F, 0x06,
+ 0x01, 0x07, 0x0F, 0x3F, 0x7F, 0x7F,
+ 0x7E, 0x7C, 0x7C, 0x7E, 0x7F, 0x7F,
+ 0x3F, 0x0F, 0x03, 0x00, 0x00, 0x00,
+ 0x00, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
+ 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7F, 0x7F, 0x7F, 0x7F,
+ 0x7F, 0x7F, 0x7D, 0x7D, 0x3D, 0x3E,
+ 0x1E, 0x1F, 0x1F, 0x1F, 0x0F, 0x0F,
+ 0x07, 0x07, 0x07, 0x03, 0x03, 0x00,
+ 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
+ 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C,
+ 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x00,
+ 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
+ 0x00, 0x40, 0x70, 0x78, 0x7E, 0x7F,
+ 0x7F, 0x7F, 0x3F, 0x0F, 0x03, 0x01,
+ 0x03, 0x0F, 0x3F, 0x7F, 0x7F, 0x7F,
+ 0x7E, 0x78, 0x70, 0x40, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ // clang-format on
+};
diff --git a/keyboards/helix/rev3/rev3.c b/keyboards/helix/helix.c
index b9960a11bf..b9960a11bf 100644
--- a/keyboards/helix/rev3/rev3.c
+++ b/keyboards/helix/helix.c
diff --git a/keyboards/helix/info.json b/keyboards/helix/info.json
new file mode 100644
index 0000000000..a9ad385b7d
--- /dev/null
+++ b/keyboards/helix/info.json
@@ -0,0 +1,40 @@
+{
+ "manufacturer": "Yushakobo",
+ "maintainer": "MakotoKurauchi",
+ "build": {
+ "lto": true
+ },
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "oled": true,
+ "rgb_matrix": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "breathing": true,
+ "cycle_left_right": true,
+ "cycle_pinwheel": true,
+ "multisplash": true,
+ "solid_splash": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 150,
+ "sleep": true
+ },
+ "split": {
+ "enabled": true,
+ "serial": {
+ "pin": "D2"
+ }
+ },
+ "usb": {
+ "vid": "0x3265"
+ },
+ "ws2812": {
+ "pin": "D3"
+ }
+}
diff --git a/keyboards/helix/pico/keyboard.json b/keyboards/helix/pico/keyboard.json
index 61ea537576..62b25b753b 100644
--- a/keyboards/helix/pico/keyboard.json
+++ b/keyboards/helix/pico/keyboard.json
@@ -1,48 +1,71 @@
{
- "manufacturer": "Yushakobo",
"keyboard_name": "Helix Pico",
- "maintainer": "MakotoKurauchi",
- "development_board": "promicro",
- "diode_direction": "COL2ROW",
"features": {
- "audio": false,
- "bootmagic": true,
- "extrakey": true,
- "mousekey": true,
- "rgblight": true
+ "audio": false
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6"]
},
- "rgblight": {
- "animations": {
- "breathing": true,
- "christmas": true,
- "knight": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "static_gradient": true
- },
- "led_count": 50,
- "max_brightness": 45,
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 21, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 21, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 21, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 21, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 21, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 42, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 42, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 42, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 42, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 42, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 64, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 64, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 64, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 64, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 64, "flags": 4},
+ {"matrix": [3, 6], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 5], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [4, 4], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [4, 3], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [4, 2], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [4, 1], "x": 208, "y": 0, "flags": 4},
+ {"matrix": [4, 0], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 21, "flags": 4},
+ {"matrix": [5, 1], "x": 208, "y": 21, "flags": 4},
+ {"matrix": [5, 2], "x": 192, "y": 21, "flags": 4},
+ {"matrix": [5, 3], "x": 176, "y": 21, "flags": 4},
+ {"matrix": [5, 4], "x": 160, "y": 21, "flags": 4},
+ {"matrix": [5, 5], "x": 144, "y": 21, "flags": 4},
+ {"matrix": [6, 5], "x": 144, "y": 42, "flags": 4},
+ {"matrix": [6, 4], "x": 160, "y": 42, "flags": 4},
+ {"matrix": [6, 3], "x": 176, "y": 42, "flags": 4},
+ {"matrix": [6, 2], "x": 192, "y": 42, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 42, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 42, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 64, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 64, "flags": 4},
+ {"matrix": [7, 2], "x": 192, "y": 64, "flags": 4},
+ {"matrix": [7, 3], "x": 176, "y": 64, "flags": 4},
+ {"matrix": [7, 4], "x": 160, "y": 64, "flags": 4},
+ {"matrix": [7, 5], "x": 144, "y": 64, "flags": 4},
+ {"matrix": [7, 6], "x": 128, "y": 64, "flags": 4}
+ ],
"split_count": [25, 25]
},
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
- },
"url": "https://shop.yushakobo.jp/products/helixpico-pcb",
"usb": {
"device_version": "0.0.2",
- "pid": "0x0001",
- "vid": "0x3265"
- },
- "ws2812": {
- "pin": "D3"
+ "pid": "0x0001"
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/helix/readme.md b/keyboards/helix/readme.md
index 0c190f7626..810e0c1658 100644
--- a/keyboards/helix/readme.md
+++ b/keyboards/helix/readme.md
@@ -1,16 +1,45 @@
-Helix
-===
+# Helix
-![Helix](https://i.imgur.com/XBAmynN.jpg)
+![image](https://i.imgur.com/11o4MRV.jpeg)
-A compact split ortholinear keyboard.
+* Keyboard Maintainer: [MakotoKurauchi](https://github.com/MakotoKurauchi)
+* Hardware Supported: Helix Pico, Beta, rev3 PCBs w/ Pro Micro compatible development board
+* Hardware Availability: [Yushakobo](https://shop.yushakobo.jp), [GitHub](https://github.com/MakotoKurauchi/helix)
-Keyboard Maintainer: [Makoto Kurauchi](https://github.com/MakotoKurauchi/) [@pluis9](https://twitter.com/pluis9) [yushakobo](https://github.com/yushakobo)
-Hardware Supported: Helix PCB Alpha, Beta, Rev3, Pro Micro
-Hardware Availability: [PCB & Case Data](https://github.com/MakotoKurauchi/helix), [Yushakobo Shop](https://yushakobo.jp/shop/), [Little Keyboards](https://littlekeyboards.com/collections/helix)
+## Revisions
+- [Pico](https://shop.yushakobo.jp/products/helixpico-pcb)
+ - 4 row PCB
+ - per-key RGB
+ - support for a 128x32 OLED display
+ - footprint for speaker
+- [Beta](https://shop.yushakobo.jp/products/oss_pcb?variant=39452554231969)
+ - 4 or 5 row PCB with snappable bottom row
+ - per-key RGB
+ - support for a 128x32 OLED display
+- [rev3](https://shop.yushakobo.jp/products/2143)
+ - 4 or 5 row PCB with snappable bottom row
+ - per-key RGB
+ - support for a 128x32 OLED display
+ - rotary encoders
-## How to build
- * [Helix how to Customize and Compile](rev2/keymaps/default/readme.md#customize)
- * [HelixPico how to Customize and Compile](pico/keymaps/default/readme.md#customize)
+Make example for this keyboard (after setting up your build environment):
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+ make helix/pico:default
+ make helix/beta:default
+ make helix/rev3:default
+
+Flashing example for this keyboard:
+
+ make helix/pico:default:flash
+ make helix/beta:default:flash
+ make helix/rev3:default:flash
+
+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).
+
+## 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 tap or double-tap the button near the TRRS jack
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`
diff --git a/keyboards/helix/rev3/config.h b/keyboards/helix/rev3/config.h
deleted file mode 100644
index dac611de9a..0000000000
--- a/keyboards/helix/rev3/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2025 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
diff --git a/keyboards/helix/rev3/keyboard.json b/keyboards/helix/rev3/keyboard.json
index 7122afdd64..887a5c8024 100644
--- a/keyboards/helix/rev3/keyboard.json
+++ b/keyboards/helix/rev3/keyboard.json
@@ -1,12 +1,5 @@
{
- "manufacturer": "Yushakobo",
"keyboard_name": "Helix rev3",
- "maintainer": "MakotoKurauchi",
- "build": {
- "lto": true
- },
- "development_board": "promicro",
- "diode_direction": "COL2ROW",
"dip_switch": {
"matrix_grid": [
[0, 6],
@@ -21,20 +14,14 @@
]
},
"features": {
- "bootmagic": true,
"dip_switch": false,
- "encoder": true,
- "extrakey": true,
- "mousekey": true,
- "oled": true,
- "rgb_matrix": true
+ "encoder": true
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"rgb_matrix": {
- "driver": "ws2812",
"layout": [
{"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
@@ -101,27 +88,17 @@
{"matrix": [9, 1], "x": 208, "y": 64, "flags": 4},
{"matrix": [9, 0], "x": 224, "y": 64, "flags": 4}
],
- "max_brightness": 150,
- "sleep": true,
"split_count": [32, 32]
},
"split": {
- "enabled": true,
"handedness": {
"matrix_grid": ["D7", "B2"]
- },
- "serial": {
- "pin": "D2"
}
},
"url": "https://shop.yushakobo.jp/products/2143",
"usb": {
"device_version": "0.0.1",
- "pid": "0x0003",
- "vid": "0x3265"
- },
- "ws2812": {
- "pin": "D3"
+ "pid": "0x0003"
},
"layouts": {
"LAYOUT_4row": {
diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk
deleted file mode 100644
index a2f233cf91..0000000000
--- a/keyboards/helix/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-HELIX_TOP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
diff --git a/keyboards/inland/kb83/kb83.c b/keyboards/inland/kb83/kb83.c
index 07d8bdbdb4..431406d008 100644
--- a/keyboards/inland/kb83/kb83.c
+++ b/keyboards/inland/kb83/kb83.c
@@ -128,128 +128,6 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, CB10_CA5, CB11_CA5, CB12_CA5},
};
-led_config_t g_led_config = {
- {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, NO_LED, NO_LED},
- { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, NO_LED, 28},
- { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43},
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, NO_LED, 57},
- { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, NO_LED, NO_LED, 69, 70, 71},
- { 72, 73, 74, NO_LED, NO_LED, 75, NO_LED, NO_LED, NO_LED, 76, 77, 78, NO_LED, 79, 80, 81}
- },
- {
- { 0, 0}, // 0
- { 14, 0}, // 1
- { 29, 0}, // 2
- { 44, 0}, // 3
- { 59, 0}, // 4
- { 74, 0}, // 5
- { 89, 0}, // 6
- {104, 0}, // 7
- {119, 0}, // 8
- {134, 0}, // 9
- {149, 0}, // 10
- {164, 0}, // 11
- {179, 0}, // 12
- {194, 0}, // 13
-
- { 0, 12}, // 14
- { 14, 12}, // 15
- { 28, 12}, // 16
- { 42, 12}, // 17
- { 56, 12}, // 18
- { 70, 12}, // 19
- { 84, 12}, // 20
- { 98, 12}, // 21
- {112, 12}, // 22
- {126, 12}, // 23
- {140, 12}, // 24
- {154, 12}, // 25
- {168, 12}, // 26
- {182, 12}, // 27
- {224, 12}, // 28
-
- { 0, 25}, // 29
- { 14, 25}, // 30
- { 28, 25}, // 31
- { 42, 25}, // 32
- { 56, 25}, // 33
- { 70, 25}, // 34
- { 84, 25}, // 35
- { 98, 25}, // 36
- {112, 25}, // 37
- {126, 25}, // 38
- {140, 25}, // 39
- {154, 25}, // 40
- {168, 25}, // 41
- {182, 25}, // 42
- {224, 25}, // 43
-
- { 0, 38}, // 44
- { 28, 38}, // 45
- { 42, 38}, // 46
- { 56, 38}, // 47
- { 70, 38}, // 48
- { 84, 38}, // 49
- { 98, 38}, // 50
- {112, 38}, // 51
- {126, 38}, // 52
- {140, 38}, // 53
- {154, 38}, // 54
- {168, 38}, // 55
- {182, 38}, // 56
- {224, 38}, // 57
-
- { 0, 51}, // 58
- { 18, 51}, // 59
- { 37, 51}, // 60
- { 56, 51}, // 61
- { 74, 51}, // 62
- { 93, 51}, // 63
- {112, 51}, // 64
- {130, 51}, // 65
- {149, 51}, // 66
- {168, 51}, // 67
- {186, 51}, // 68
- {200, 51}, // 69
- {214, 51}, // 70
- {224, 51}, // 71
-
- { 0, 64}, // 72
- { 18, 64}, // 73
- { 37, 64}, // 74
- { 92, 64}, // 75
- {140, 64}, // 76
- {154, 64}, // 77
- {168, 64}, // 78
- {196, 64}, // 80
- {210, 64}, // 81
- {224, 64}, // 82
-
- {0, 0}, // 68 LED 1
- {0, 16}, // 69 LED 2
- {0, 32}, // 70 LED 3
- {0, 48}, // 71 LED 4
- {0, 64}, // 72 LED 5
-
- {224, 0 }, // 78 LED 12
- {224, 16}, // 79 LED 13
- {224, 32}, // 80 LED 14
- {224, 48}, // 81 LED 15
- {224, 64}, // 82 LED 16
- },
- {
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 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,
- 2, 2, 2, 2, 2,
- }
-};
-
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;
@@ -275,45 +153,14 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
#endif
-enum __layers {
- WIN_B,
- WIN_FN,
- MAC_B,
- MAC_FN
-};
-
-enum colors {
- WHITE,
- RED,
- GREEN,
- BLUE
-};
-enum colors led_color_status = WHITE;
-
// clang-format on
-static bool fn_make_flag = false;
-static bool Lkey_flag = false;
-static bool reset_glint_flag = false;
-static bool while_test_flag = false;
-static bool alarm_flag = false;
-static uint16_t current_time = 0;
-static uint8_t glint_cnt = 0;
-static uint16_t scancode = 0;
-static uint8_t alarm_cnt = 0;
-static uint8_t RGB_HSV_level;
-
-hsv_t hsv;
-
-void led_test(uint8_t color);
-void clear_eeprom(void);
-void rgb_hsv_updata_user(void);
bool dip_switch_update_kb(uint8_t index, bool active) {
if (!dip_switch_update_user(index, active)) {
return false;
}
if (index == 0) {
- default_layer_set(1UL << (active ? MAC_B : WIN_B));
+ set_single_default_layer(active ? 2 : 0);
}
return true;
}
@@ -323,163 +170,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
return false;
}
switch (keycode) {
- case MO(WIN_FN):
- case MO(MAC_FN):
- fn_make_flag = record->event.pressed;
- return true;
- case KC_ESC:
- if (fn_make_flag && record->event.pressed) {
- Lkey_flag = true;
- current_time = timer_read();
- scancode = KC_ESC;
- return false;
- } else {
- Lkey_flag = 0;
- }
- return true;
- case KC_END:
- if (fn_make_flag && record->event.pressed) {
- if (while_test_flag) {
- while_test_flag = false;
- rgb_matrix_init();
- } else {
- Lkey_flag = true;
- current_time = timer_read();
- scancode = KC_END;
- }
- return false;
- } else {
- Lkey_flag = 0;
- }
- return true;
- case KC_LEFT:
- if (while_test_flag == true) {
- if (record->event.pressed) {
- if (glint_cnt == 0)
- glint_cnt = 3;
- else
- glint_cnt--;
- if ((glint_cnt % 4) == 0) {
- rgb_matrix_sethsv_noeeprom(HSV_WHITE);
- } else if ((glint_cnt % 4) == 1) {
- rgb_matrix_sethsv_noeeprom(HSV_RED);
- } else if ((glint_cnt % 4) == 2) {
- rgb_matrix_sethsv_noeeprom(HSV_GREEN);
- } else if ((glint_cnt % 4) == 3) {
- rgb_matrix_sethsv_noeeprom(HSV_BLUE);
- }
- }
- return false;
- }
- return true;
- case KC_RGHT:
- if (while_test_flag == true) {
- if (record->event.pressed) {
- glint_cnt++;
- if (glint_cnt >= 4) glint_cnt = 0;
-
- if ((glint_cnt % 4) == 0) {
- rgb_matrix_sethsv_noeeprom(HSV_WHITE);
- } else if ((glint_cnt % 4) == 1) {
- rgb_matrix_sethsv_noeeprom(HSV_RED);
- } else if ((glint_cnt % 4) == 2) {
- rgb_matrix_sethsv_noeeprom(HSV_GREEN);
- } else if ((glint_cnt % 4) == 3) {
- rgb_matrix_sethsv_noeeprom(HSV_BLUE);
- }
- }
- return false;
- }
- return true;
- case DF(WIN_B):
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- alarm_flag = true;
- rgb_matrix_toggle_noeeprom();
- current_time = timer_read();
- set_single_persistent_default_layer(WIN_B);
- return false;
- }
- return true;
- case DF(MAC_B):
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- alarm_flag = true;
- rgb_matrix_toggle_noeeprom();
- current_time = timer_read();
- set_single_persistent_default_layer(MAC_B);
- return false;
- }
- return true;
-
- case QK_RGB_MATRIX_VALUE_UP:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) < 4) {
- RGB_HSV_level++;
- rgb_matrix_config.hsv.v = (uint8_t)(RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4) * RGB_HSV_level;
- }
- rgb_hsv_updata_user();
- }
- return false;
- case QK_RGB_MATRIX_VALUE_DOWN:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) > 0) {
- RGB_HSV_level--;
- rgb_matrix_config.hsv.v = (uint8_t)(RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4) * RGB_HSV_level;
- }
- rgb_hsv_updata_user();
- }
- return false;
- case QK_RGB_MATRIX_SATURATION_UP:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) < 4) {
- RGB_HSV_level++;
- rgb_matrix_config.hsv.s = (uint8_t)(UINT8_MAX / 4) * RGB_HSV_level;
- }
- rgb_hsv_updata_user();
- }
- return false;
- case QK_RGB_MATRIX_SATURATION_DOWN:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) > 0) {
- RGB_HSV_level--;
- rgb_matrix_config.hsv.s = (uint8_t)(UINT8_MAX / 4) * RGB_HSV_level;
- }
- rgb_hsv_updata_user();
- }
- return false;
- case QK_RGB_MATRIX_HUE_UP:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_hue() / (UINT8_MAX / 6)) < 6) {
- RGB_HSV_level++;
- rgb_matrix_config.hsv.h = (uint8_t)(UINT8_MAX / 6) * RGB_HSV_level;
- }
- rgb_hsv_updata_user();
- }
- return false;
- case QK_RGB_MATRIX_HUE_DOWN:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_hue() / (UINT8_MAX / 6)) > 0) {
- RGB_HSV_level--;
- rgb_matrix_config.hsv.h = (uint8_t)(UINT8_MAX / 6) * RGB_HSV_level;
- }
- rgb_hsv_updata_user();
- }
- return false;
- case QK_RGB_MATRIX_SPEED_UP:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) < 4) {
- RGB_HSV_level++;
- rgb_matrix_set_speed((uint8_t)(UINT8_MAX / 4) * RGB_HSV_level);
- }
- }
- return false;
- case QK_RGB_MATRIX_SPEED_DOWN:
- if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) {
- if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) > 0) {
- RGB_HSV_level--;
- rgb_matrix_set_speed((uint8_t)(UINT8_MAX / 4) * RGB_HSV_level);
- }
- }
- return false;
case QK_RGB_MATRIX_TOGGLE:
if (record->event.pressed) {
switch (rgb_matrix_get_flags()) {
@@ -499,102 +189,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
return false;
default:
- return process_record_user(keycode, record);
- }
-}
-
-void housekeeping_task_kb(void) {
- if (Lkey_flag) {
- if (scancode == KC_ESC) {
- if (timer_elapsed(current_time) >= 3000) {
- Lkey_flag = false;
- clear_eeprom();
-
- current_time = timer_read();
- reset_glint_flag = true;
- glint_cnt = 0;
- rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
- rgb_matrix_sethsv_noeeprom(HSV_OFF);
- }
- } else if (scancode == KC_END) {
- if (timer_elapsed(current_time) >= 3000) {
- Lkey_flag = false;
- clear_eeprom();
-
- while_test_flag = true;
- glint_cnt = 0;
- rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
- rgb_matrix_sethsv_noeeprom(HSV_WHITE);
- }
- }
- } else if (reset_glint_flag) {
- if ((timer_elapsed(current_time)) >= 300) {
- current_time = timer_read();
- if (((glint_cnt++) & 0x01) == 0) {
- rgb_matrix_sethsv_noeeprom(HSV_RED);
- } else {
- rgb_matrix_sethsv_noeeprom(HSV_OFF);
- }
- if (glint_cnt >= 7) {
- glint_cnt = 0;
- reset_glint_flag = false;
- rgb_matrix_init();
- }
- }
- } else if (alarm_cnt != 0) {
- alarm_cnt--;
- if (alarm_cnt == 0) {
- alarm_flag = true;
- rgb_matrix_toggle_noeeprom();
- current_time = timer_read();
- }
- } else if (alarm_flag) {
- if ((timer_elapsed(current_time)) >= 200) {
- rgb_matrix_toggle_noeeprom();
- alarm_flag = 0;
- }
- }
-}
-
-void led_test(uint8_t color) {
- rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-
- switch (color) {
- case WHITE:
- rgb_matrix_sethsv_noeeprom(HSV_WHITE);
- break;
-
- case RED:
- rgb_matrix_sethsv_noeeprom(HSV_RED);
- break;
-
- case GREEN:
- rgb_matrix_sethsv_noeeprom(HSV_GREEN);
- break;
-
- case BLUE:
- rgb_matrix_sethsv_noeeprom(HSV_BLUE);
- break;
+ return true;
}
}
-
-void clear_eeprom(void) {
- layer_state_t default_layer_temp = default_layer_state;
- eeconfig_init();
- default_layer_set(default_layer_temp);
-
-#ifdef VIA_ENABLE
- // This resets the layout options
- via_set_layout_options(VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT);
- // This resets the keymaps in EEPROM to what is in flash.
- dynamic_keymap_reset();
- // This resets the macros in EEPROM to nothing.
- dynamic_keymap_macro_reset();
-#endif
-
- rgb_matrix_enable_noeeprom();
-}
-
-void rgb_hsv_updata_user(void) {
- rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v);
-}
diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json
index 9e88019bd4..8686e33885 100644
--- a/keyboards/inland/kb83/keyboard.json
+++ b/keyboards/inland/kb83/keyboard.json
@@ -32,6 +32,100 @@
"multisplash": true
},
"driver": "snled27351",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 74, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 89, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 104, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 194, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
+ {"matrix": [1, 1], "x": 14, "y": 12, "flags": 4},
+ {"matrix": [1, 2], "x": 28, "y": 12, "flags": 4},
+ {"matrix": [1, 3], "x": 42, "y": 12, "flags": 4},
+ {"matrix": [1, 4], "x": 56, "y": 12, "flags": 4},
+ {"matrix": [1, 5], "x": 70, "y": 12, "flags": 4},
+ {"matrix": [1, 6], "x": 84, "y": 12, "flags": 4},
+ {"matrix": [1, 7], "x": 98, "y": 12, "flags": 4},
+ {"matrix": [1, 8], "x": 112, "y": 12, "flags": 4},
+ {"matrix": [1, 9], "x": 126, "y": 12, "flags": 4},
+ {"matrix": [1, 10], "x": 140, "y": 12, "flags": 4},
+ {"matrix": [1, 11], "x": 154, "y": 12, "flags": 4},
+ {"matrix": [1, 12], "x": 168, "y": 12, "flags": 4},
+ {"matrix": [1, 13], "x": 182, "y": 12, "flags": 4},
+ {"matrix": [1, 15], "x": 224, "y": 12, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4},
+ {"matrix": [2, 1], "x": 14, "y": 25, "flags": 4},
+ {"matrix": [2, 2], "x": 28, "y": 25, "flags": 4},
+ {"matrix": [2, 3], "x": 42, "y": 25, "flags": 4},
+ {"matrix": [2, 4], "x": 56, "y": 25, "flags": 4},
+ {"matrix": [2, 5], "x": 70, "y": 25, "flags": 4},
+ {"matrix": [2, 6], "x": 84, "y": 25, "flags": 4},
+ {"matrix": [2, 7], "x": 98, "y": 25, "flags": 4},
+ {"matrix": [2, 8], "x": 112, "y": 25, "flags": 4},
+ {"matrix": [2, 9], "x": 126, "y": 25, "flags": 4},
+ {"matrix": [2, 10], "x": 140, "y": 25, "flags": 4},
+ {"matrix": [2, 11], "x": 154, "y": 25, "flags": 4},
+ {"matrix": [2, 12], "x": 168, "y": 25, "flags": 4},
+ {"matrix": [2, 13], "x": 182, "y": 25, "flags": 4},
+ {"matrix": [2, 15], "x": 224, "y": 25, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
+ {"matrix": [3, 1], "x": 28, "y": 38, "flags": 4},
+ {"matrix": [3, 2], "x": 42, "y": 38, "flags": 4},
+ {"matrix": [3, 3], "x": 56, "y": 38, "flags": 4},
+ {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+ {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+ {"matrix": [3, 6], "x": 98, "y": 38, "flags": 4},
+ {"matrix": [3, 7], "x": 112, "y": 38, "flags": 4},
+ {"matrix": [3, 8], "x": 126, "y": 38, "flags": 4},
+ {"matrix": [3, 9], "x": 140, "y": 38, "flags": 4},
+ {"matrix": [3, 10], "x": 154, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 168, "y": 38, "flags": 4},
+ {"matrix": [3, 13], "x": 182, "y": 38, "flags": 4},
+ {"matrix": [3, 15], "x": 224, "y": 38, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
+ {"matrix": [4, 1], "x": 18, "y": 51, "flags": 4},
+ {"matrix": [4, 2], "x": 37, "y": 51, "flags": 4},
+ {"matrix": [4, 3], "x": 56, "y": 51, "flags": 4},
+ {"matrix": [4, 4], "x": 74, "y": 51, "flags": 4},
+ {"matrix": [4, 5], "x": 93, "y": 51, "flags": 4},
+ {"matrix": [4, 6], "x": 112, "y": 51, "flags": 4},
+ {"matrix": [4, 7], "x": 130, "y": 51, "flags": 4},
+ {"matrix": [4, 8], "x": 149, "y": 51, "flags": 4},
+ {"matrix": [4, 9], "x": 168, "y": 51, "flags": 4},
+ {"matrix": [4, 10], "x": 186, "y": 51, "flags": 4},
+ {"matrix": [4, 13], "x": 200, "y": 51, "flags": 4},
+ {"matrix": [4, 14], "x": 214, "y": 51, "flags": 4},
+ {"matrix": [4, 15], "x": 224, "y": 51, "flags": 4},
+ {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [5, 1], "x": 18, "y": 64, "flags": 4},
+ {"matrix": [5, 2], "x": 37, "y": 64, "flags": 4},
+ {"matrix": [5, 5], "x": 92, "y": 64, "flags": 4},
+ {"matrix": [5, 9], "x": 140, "y": 64, "flags": 4},
+ {"matrix": [5, 10], "x": 154, "y": 64, "flags": 4},
+ {"matrix": [5, 11], "x": 168, "y": 64, "flags": 4},
+ {"matrix": [5, 13], "x": 196, "y": 64, "flags": 4},
+ {"matrix": [5, 14], "x": 210, "y": 64, "flags": 4},
+ {"matrix": [5, 15], "x": 224, "y": 64, "flags": 4},
+ {"x": 0, "y": 0, "flags": 2},
+ {"x": 0, "y": 16, "flags": 2},
+ {"x": 0, "y": 32, "flags": 2},
+ {"x": 0, "y": 48, "flags": 2},
+ {"x": 0, "y": 64, "flags": 2},
+ {"x": 224, "y": 0, "flags": 2},
+ {"x": 224, "y": 16, "flags": 2},
+ {"x": 224, "y": 32, "flags": 2},
+ {"x": 224, "y": 48, "flags": 2},
+ {"x": 224, "y": 64, "flags": 2}
+ ],
"max_brightness": 200,
"react_on_keyup": true,
"sleep": true
diff --git a/keyboards/inland/kb83/keymaps/default/keymap.c b/keyboards/inland/kb83/keymaps/default/keymap.c
index df7df65678..ac2aa5e7f7 100644
--- a/keyboards/inland/kb83/keymaps/default/keymap.c
+++ b/keyboards/inland/kb83/keymaps/default/keymap.c
@@ -71,3 +71,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
};
#endif
+#if defined(DIP_SWITCH_MAP_ENABLE)
+const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = {
+ DIP_SWITCH_OFF_ON(DF(WIN_B), DF(MAC_B))
+};
+#endif
diff --git a/keyboards/inland/kb83/keymaps/default/rules.mk b/keyboards/inland/kb83/keymaps/default/rules.mk
index ee32568148..d64aefdfb8 100644
--- a/keyboards/inland/kb83/keymaps/default/rules.mk
+++ b/keyboards/inland/kb83/keymaps/default/rules.mk
@@ -1 +1,2 @@
ENCODER_MAP_ENABLE = yes
+DIP_SWITCH_MAP_ENABLE = yes
diff --git a/keyboards/inland/kb83/readme.md b/keyboards/inland/kb83/readme.md
index e6f1d45990..a56b5c5b5a 100644
--- a/keyboards/inland/kb83/readme.md
+++ b/keyboards/inland/kb83/readme.md
@@ -14,6 +14,11 @@ Flashing example for this keyboard:
make inland/kb83:default:flash
-**Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard.
-
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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the top left key, which programmed as *Esc* while plugging in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available