From 3cbf0e37bad65a3b01c09722de4d8cc762def220 Mon Sep 17 00:00:00 2001 From: oco9oco Date: Tue, 21 Oct 2025 10:11:39 +0900 Subject: [PATCH] ONEHAND KEYMAP CHANGE --- .../charybdis/3x5/blackpill/config.h | 25 ---- .../charybdis/3x5/blackpill/halconf.h | 10 -- .../charybdis/3x5/blackpill/keyboard.json | 23 ---- .../charybdis/3x5/blackpill/mcuconf.h | 25 ---- .../bastardkb/charybdis/3x5/elitec/config.h | 5 - .../charybdis/3x5/elitec/keyboard.json | 19 --- keyboards/bastardkb/charybdis/3x5/info.json | 98 ---------------- .../charybdis/3x5/keymaps/default/keymap.json | 26 ----- keyboards/bastardkb/charybdis/3x5/rules.mk | 1 - .../charybdis/3x6/blackpill/config.h | 23 ---- .../charybdis/3x6/blackpill/halconf.h | 10 -- .../charybdis/3x6/blackpill/keyboard.json | 23 ---- .../charybdis/3x6/blackpill/mcuconf.h | 25 ---- .../bastardkb/charybdis/3x6/elitec/config.h | 5 - .../charybdis/3x6/elitec/keyboard.json | 19 --- keyboards/bastardkb/charybdis/3x6/info.json | 110 ------------------ .../charybdis/3x6/keymaps/default/keymap.json | 25 ---- keyboards/bastardkb/charybdis/3x6/rules.mk | 1 - .../4x6/keymaps/oco9oco/keyboard.json | 8 -- .../charybdis/4x6/keymaps/oco9oco/keymap.c | 20 ++-- qmk.json | 2 +- 21 files changed, 9 insertions(+), 494 deletions(-) delete mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/config.h delete mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h delete mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json delete mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h delete mode 100644 keyboards/bastardkb/charybdis/3x5/elitec/config.h delete mode 100644 keyboards/bastardkb/charybdis/3x5/elitec/keyboard.json delete mode 100644 keyboards/bastardkb/charybdis/3x5/info.json delete mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.json delete mode 100644 keyboards/bastardkb/charybdis/3x5/rules.mk delete mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/config.h delete mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h delete mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json delete mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h delete mode 100644 keyboards/bastardkb/charybdis/3x6/elitec/config.h delete mode 100644 keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json delete mode 100644 keyboards/bastardkb/charybdis/3x6/info.json delete mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json delete mode 100644 keyboards/bastardkb/charybdis/3x6/rules.mk delete mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h deleted file mode 100644 index 9c019865..00000000 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2020 Christopher Courtney (@drashna) -// Copyright 2021 Stefan Kerkmann (@KarlK90) -// Copyright 2021 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define WS2812_PWM_DRIVER PWMD2 -#define WS2812_PWM_CHANNEL 2 -#define WS2812_PWM_PAL_MODE 1 -#define WS2812_EXTERNAL_PULLUP -#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_PWM_DMA_CHANNEL 3 - -#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 - -#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 - -#define POINTING_DEVICE_CS_PIN B14 -#define PMW33XX_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h deleted file mode 100644 index 6876cc3e..00000000 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2020 Nick Brassel (tzarc) -// Copyright 2021 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define HAL_USE_PWM TRUE -#define HAL_USE_SERIAL TRUE -#define HAL_USE_SPI TRUE - -#include_next diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json deleted file mode 100644 index 15edbf74..00000000 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "development_board": "blackpill_f411", - "eeprom": { - "driver": "spi" - }, - "matrix_pins": { - "cols": ["B1", "B10", "B3", "B4", "B5"], - "rows": ["A2", "B8", "A8", "B9"] - }, - "split": { - "handedness": { - "pin": "A3" - }, - "serial": { - "driver": "usart", - "pin": "A9" - } - }, - "ws2812": { - "driver": "pwm", - "pin": "A1" - } -} diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h deleted file mode 100644 index be641fb8..00000000 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2020 Nick Brassel (tzarc) -// Copyright 2021 Stefan Kerkmann (@KarlK90) -// Copyright 2021 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include_next - -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE - -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 TRUE - -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE - -#undef STM32_SERIAL_USE_USART1 -#define STM32_SERIAL_USE_USART1 TRUE - -#undef STM32_GPT_USE_TIM4 -#define STM32_GPT_USE_TIM4 TRUE - -#undef STM32_ST_USE_TIMER -#define STM32_ST_USE_TIMER 5 diff --git a/keyboards/bastardkb/charybdis/3x5/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/elitec/config.h deleted file mode 100644 index 411ddaf6..00000000 --- a/keyboards/bastardkb/charybdis/3x5/elitec/config.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/3x5/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/elitec/keyboard.json deleted file mode 100644 index 22064f13..00000000 --- a/keyboards/bastardkb/charybdis/3x5/elitec/keyboard.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "build": { - "lto": true - }, - "development_board": "elite_c", - "matrix_pins": { - "cols": ["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/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json deleted file mode 100644 index 3953cb43..00000000 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "keyboard_name": "Charybdis Nano (3x5)", - "diode_direction": "ROW2COL", - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": false, - "pointing_device": true, - "rgb_matrix": true - }, - "rgb_matrix": { - "driver": "ws2812", - "layout": [ - {"matrix": [2, 0], "x": 0, "y": 42, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 21, "flags": 4}, - {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [0, 1], "x": 18, "y": 0, "flags": 4}, - {"matrix": [1, 1], "x": 18, "y": 21, "flags": 4}, - {"matrix": [2, 1], "x": 18, "y": 42, "flags": 4}, - {"matrix": [2, 2], "x": 36, "y": 42, "flags": 4}, - {"matrix": [1, 2], "x": 36, "y": 21, "flags": 4}, - {"matrix": [0, 2], "x": 36, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 54, "y": 0, "flags": 4}, - {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4}, - {"matrix": [2, 3], "x": 54, "y": 42, "flags": 4}, - {"matrix": [0, 4], "x": 72, "y": 0, "flags": 4}, - {"matrix": [1, 4], "x": 72, "y": 21, "flags": 4}, - {"matrix": [2, 4], "x": 72, "y": 42, "flags": 4}, - {"matrix": [3, 2], "x": 72, "y": 64, "flags": 1}, - {"matrix": [3, 3], "x": 90, "y": 64, "flags": 1}, - {"matrix": [3, 0], "x": 108, "y": 64, "flags": 1}, - {"matrix": [6, 0], "x": 224, "y": 42, "flags": 4}, - {"matrix": [5, 0], "x": 224, "y": 21, "flags": 4}, - {"matrix": [4, 0], "x": 224, "y": 0, "flags": 4}, - {"matrix": [4, 1], "x": 206, "y": 0, "flags": 4}, - {"matrix": [5, 1], "x": 206, "y": 21, "flags": 4}, - {"matrix": [6, 1], "x": 206, "y": 42, "flags": 4}, - {"matrix": [6, 2], "x": 188, "y": 42, "flags": 4}, - {"matrix": [5, 2], "x": 188, "y": 21, "flags": 4}, - {"matrix": [4, 2], "x": 188, "y": 0, "flags": 4}, - {"matrix": [4, 3], "x": 170, "y": 0, "flags": 4}, - {"matrix": [5, 3], "x": 170, "y": 21, "flags": 4}, - {"matrix": [6, 3], "x": 170, "y": 42, "flags": 4}, - {"matrix": [4, 4], "x": 152, "y": 0, "flags": 4}, - {"matrix": [5, 4], "x": 152, "y": 21, "flags": 4}, - {"matrix": [6, 4], "x": 152, "y": 42, "flags": 4}, - {"matrix": [7, 0], "x": 134, "y": 64, "flags": 4}, - {"matrix": [7, 2], "x": 152, "y": 64, "flags": 4}, - {"x": 170, "y": 64, "flags": 4} - ], - "split_count": [18, 18] - }, - "usb": { - "device_version": "2.0.0", - "pid": "0x1832" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [4, 4], "x": 11, "y": 0}, - {"matrix": [4, 3], "x": 12, "y": 0}, - {"matrix": [4, 2], "x": 13, "y": 0}, - {"matrix": [4, 1], "x": 14, "y": 0}, - {"matrix": [4, 0], "x": 15, "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": [5, 4], "x": 11, "y": 1}, - {"matrix": [5, 3], "x": 12, "y": 1}, - {"matrix": [5, 2], "x": 13, "y": 1}, - {"matrix": [5, 1], "x": 14, "y": 1}, - {"matrix": [5, 0], "x": 15, "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": [6, 4], "x": 11, "y": 2}, - {"matrix": [6, 3], "x": 12, "y": 2}, - {"matrix": [6, 2], "x": 13, "y": 2}, - {"matrix": [6, 1], "x": 14, "y": 2}, - {"matrix": [6, 0], "x": 15, "y": 2}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 0], "x": 6, "y": 3}, - {"matrix": [7, 0], "x": 9, "y": 3}, - {"matrix": [7, 2], "x": 10, "y": 3} - ] - } - } -} diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.json b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.json deleted file mode 100644 index f92366cd..00000000 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "keyboard": "bastardkb/charybdis/3x5/elitec", - "keymap": "default", - "layout": "LAYOUT", - "layers": [ - [ - "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", - "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", - "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", - "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/3x5/rules.mk b/keyboards/bastardkb/charybdis/3x5/rules.mk deleted file mode 100644 index fab9162d..00000000 --- a/keyboards/bastardkb/charybdis/3x5/rules.mk +++ /dev/null @@ -1 +0,0 @@ -POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h deleted file mode 100644 index bb870669..00000000 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2022 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define WS2812_PWM_DRIVER PWMD2 -#define WS2812_PWM_CHANNEL 2 -#define WS2812_PWM_PAL_MODE 1 -#define WS2812_EXTERNAL_PULLUP -#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_PWM_DMA_CHANNEL 3 - -#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 - -#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 - -#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 deleted file mode 100644 index 545fc20c..00000000 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2020 Nick Brassel (tzarc) -// Copyright 2022 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define HAL_USE_PWM TRUE -#define HAL_USE_SERIAL TRUE -#define HAL_USE_SPI TRUE - -#include_next diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json deleted file mode 100644 index df77023b..00000000 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "development_board": "blackpill_f411", - "eeprom": { - "driver": "spi" - }, - "matrix_pins": { - "cols": ["B0", "B1", "B10", "B3", "B4", "B5"], - "rows": ["A2", "B8", "A8", "B9"] - }, - "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 deleted file mode 100644 index ca63a572..00000000 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2020 Nick Brassel (tzarc) -// Copyright 2021 Stefan Kerkmann (@KarlK90) -// Copyright 2022 Charly Delay (@0xcharly) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include_next - -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE - -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 TRUE - -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE - -#undef STM32_SERIAL_USE_USART1 -#define STM32_SERIAL_USE_USART1 TRUE - -#undef STM32_GPT_USE_TIM4 -#define STM32_GPT_USE_TIM4 TRUE - -#undef STM32_ST_USE_TIMER -#define STM32_ST_USE_TIMER 5 diff --git a/keyboards/bastardkb/charybdis/3x6/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/elitec/config.h deleted file mode 100644 index 411ddaf6..00000000 --- a/keyboards/bastardkb/charybdis/3x6/elitec/config.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Charly Delay (@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 deleted file mode 100644 index e736d9df..00000000 --- a/keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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 deleted file mode 100644 index 5d1ba362..00000000 --- a/keyboards/bastardkb/charybdis/3x6/info.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "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] - }, - "usb": { - "device_version": "2.0.0", - "pid": "0x1834" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0}, - {"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.json b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json deleted file mode 100644 index e87fe18f..00000000 --- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "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/rules.mk b/keyboards/bastardkb/charybdis/3x6/rules.mk deleted file mode 100644 index fab9162d..00000000 --- a/keyboards/bastardkb/charybdis/3x6/rules.mk +++ /dev/null @@ -1 +0,0 @@ -POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keyboard.json b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keyboard.json deleted file mode 100644 index cb77593a..00000000 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keyboard.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "build":{ - "firmware_format" : "uf2" - }, - "development_board" : "promicro_rp2040", - "processor": "RP2040", - "bootloader": "rp2040" -} \ No newline at end of file diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c index a67661f6..f8bc3555 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { G_LNG, KC_Z, KC_X, KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, - TG(_ONEHAND), TG(_BASE_NOMOD), THUMB_R1 + TG(_BASE_NOMOD), KC_LNG1, THUMB_R1 // ╰───────────────────────────╯ ╰──────────────────╯ ), @@ -85,10 +85,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ALT_F4, C(KC_F1),XXXXXXX, SCRNSHOT,INV_DSP, TO(_ONEHAND), XXXXXXX, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, _______, ALT_TAB, XXXXXXX, IME_CHG, CLASS_A, XXXXXXX, XXXXXXX, KC_GRV, _________NUM_789_________, XXXXXXX, _______, _______, IPC(A), IPC(S), IPC_D_, IPC(F), KC_DOT, AT_IPC, _________NUM_456_________, KC_COLN, KC_DQUO, - _______, IPC(Z), HWP_CITE, IPC(C), KC_EQL, KC_ENT, HWP_MACRO, _________NUM_123_________, _______, KC_PIPE, + _______, IPC(Z), HWP_CITE, IPC(C), KC_EQL, KC_ENT, KC_LNG1, _________NUM_123_________, _______, KC_PIPE, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ _______, KC_TRNS, _______,/* */_______, LT(_NAV, KC_0), - XXXXXXX, TO(_DOOM),/* */IME_CHG + XXXXXXX, TO(_DOOM),/* */HWP_MACRO // ╰───────────────────────────╯ ╰──────────────────╯ ), @@ -146,9 +146,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ONEHAND] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F5, S_D_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, - KC_TAB, XXXXXXX, XXXXXXX, SNIPING, XXXXXXX, KC_F6, S_D_RMOD, C(A(KC_7)), C(A(KC_8)), C(A(KC_9)), XXXXXXX, QK_MAKE, - _______, KC_LSFT, MS_BTN2, MS_BTN3, MS_BTN1, KC_F7, DPI_MOD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, - KC_ENT, XXXXXXX, XXXXXXX, DRGSCRL, MS_BTN3, XXXXXXX, DPI_RMOD, KC_ENT, MS_BTN1, MS_BTN2, SNIPING, XXXXXXX, + KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F6, S_D_RMOD, C(A(KC_7)), C(A(KC_8)), C(A(KC_9)), XXXXXXX, QK_MAKE, + _______, KC_LSFT, SNIPING, MS_BTN3, MS_BTN1, KC_F7, DPI_MOD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + KC_ENT, KC_LGUI, KC_LALT, KC_LCTL, MS_BTN2, XXXXXXX, DPI_RMOD, SNIPING, MS_BTN1, DRGSCRL, MS_BTN2, XXXXXXX, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ _______, _______, _______,/* */_______, _______, KC_TRNS, _______,/* */TO(_BASE) @@ -207,15 +207,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool now_on = layer_state_cmp(state, _ONEHAND); if (now_on && !mouse_layer_on) { // 마우스 레이어 진입 시 - // register_code(KC_LCTL); - // tap_code(KC_F9); - // unregister_code(KC_LCTL); + tap_code(KC_F14); } else if (!now_on && mouse_layer_on) { // 마우스 레이어 탈출 시 - // register_code(KC_LCTL); - // tap_code(KC_F9); - // unregister_code(KC_LCTL); + tap_code(KC_F14); } mouse_layer_on = now_on; return state; diff --git a/qmk.json b/qmk.json index 2b3fd039..3bce3a34 100644 --- a/qmk.json +++ b/qmk.json @@ -2,7 +2,7 @@ "userspace_version": "1.1", "build_targets": [ ["keycapsss/kimiko/rev2", "oco9oco"], - ["bastardkb/charybdis/4x6/v2/splinky_3", "oco9oco"], + ["bastardkb/charybdis/4x6/elitec", "oco9oco"], ["crkbd/rev1", "default"] ] } \ No newline at end of file