gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 21:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 9e8433ce82 into f0b04b2a3a

Browse Source
This commit is contained in:
Jack Sangdahl 2025-07-14 11:34:46 -06:00 committed by GitHub
commit 88b0c160f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 141 additions and 816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/mappings/keyboard_aliases.hjson
View File

@ -80,6 +80,18 @@
"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/dilemma/3x5_2/splinky": {
"target": "bastardkb/dilemma/3x5_2/promicro"
},

91
keyboards/bastardkb/charybdis/3x6/3x6.c
View File

@ -1,91 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General 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

33
keyboards/bastardkb/charybdis/3x6/blackpill/config.h
View File

@ -1,26 +1,7 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Publicw License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* Handedness. */
#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
/* RGB settings. */
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
#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

21
keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
View File

@ -1,21 +1,6 @@
/**
* Copyright 2020 Nick Brassel (tzarc)
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Copyright 2020 Nick Brassel (tzarc)
// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE

43
keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json
View File

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

28
keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
View File

@ -1,22 +1,7 @@
/*
* Copyright 2020 Nick Brassel (tzarc)
* Copyright 2021 Stefan Kerkmann (@KarlK90)
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Copyright 2020 Nick Brassel (tzarc)
// Copyright 2021 Stefan Kerkmann (@KarlK90)
// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
@ -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

3
keyboards/bastardkb/charybdis/3x6/blackpill/readme.md
View File

@ -1,3 +0,0 @@
# Charybdis Mini (3x6) BlackPill
An ergonomic keyboard with integrated trackball, with BlackPill (STM32F411) mod.

6
keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
View File

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

22
keyboards/bastardkb/charybdis/3x6/config.h
View File

@ -1,22 +0,0 @@
/*
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25

5
keyboards/bastardkb/charybdis/3x6/elitec/config.h Normal file
View File

@ -0,0 +1,5 @@
// Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define POINTING_DEVICE_CS_PIN F0

19
keyboards/bastardkb/charybdis/3x6/elitec/keyboard.json Normal file
View File

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

68
keyboards/bastardkb/charybdis/3x6/info.json
View File

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

66
keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
View File

@ -1,66 +0,0 @@
/**
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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

25
keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.json Normal file
View File

@ -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", "_______", "_______",
"_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
"_______", "_______", "_______", "_______", "_______"
]
]
}

7
keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md
View File

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

15
keyboards/bastardkb/charybdis/3x6/readme.md
View File

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

1
keyboards/bastardkb/charybdis/3x6/rules.mk Normal file
View File

@ -0,0 +1 @@
POINTING_DEVICE_DRIVER = pmw3360

24
keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
View File

@ -1,24 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Handedness. */
#define MASTER_RIGHT
/* PMW3360 settings. */
#define POINTING_DEVICE_CS_PIN B0

41
keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
View File

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

4
keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
View File

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

24
keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
View File

@ -1,24 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Handedness. */
#define MASTER_RIGHT
/* PMW3360 settings. */
#define POINTING_DEVICE_CS_PIN F0

35
keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
View File

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

4
keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
View File

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

38
keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
View File

@ -1,38 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Handedness. */
#define MASTER_RIGHT
// To use the handedness pin, resistors need to be installed on the adapter PCB.
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #define 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

33
keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
View File

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

23
keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
View File

@ -1,23 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include_next <mcuconf.h>
#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE

5
keyboards/bastardkb/charybdis/3x6/v2/splinky_2/readme.md
View File

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

5
keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
View File

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

38
keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
View File

@ -1,38 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Handedness. */
#define MASTER_RIGHT
// To use the handedness pin, resistors need to be installed on the adapter PCB.
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #define 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

33
keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
View File

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

23
keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
View File

@ -1,23 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include_next <mcuconf.h>
#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE

5
keyboards/bastardkb/charybdis/3x6/v2/splinky_3/readme.md
View File

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

5
keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
View File

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

52
keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
View File

@ -1,52 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Handedness. */
#define MASTER_RIGHT
// To use the handedness pin, resistors need to be installed on the adapter PCB.
// If so, uncomment the following code, and undefine MASTER_RIGHT above.
// #define A0 PAL_LINE(GPIOA, 0)
// #define SPLIT_HAND_PIN A0
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
/* RGB settings. */
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 1
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
#define WS2812_PWM_DMA_CHANNEL 3
/* CRC. */
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED
/* 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

24
keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h
View File

@ -1,24 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define HAL_USE_PWM TRUE
#define HAL_USE_SERIAL TRUE
#define HAL_USE_SPI TRUE
#include_next <halconf.h>

38
keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
View File

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

32
keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h
View File

@ -1,32 +0,0 @@
/*
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#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

6
keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
View File

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