Bastard Keyboards: upstream recent changes (#19083)

Co-authored-by: Simian <alex@Mandelbrot>
Co-authored-by: Charly Delay <0xcharly@users.noreply.github.com>
Co-authored-by: Alex Baldwin <alexbaldwin42@gmail.com>
master
Charly Delay 2022-11-21 05:34:42 +09:00 committed by GitHub
parent 127a70b6ca
commit 2b0a3cd2f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
77 changed files with 587 additions and 889 deletions

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Nano (3x5) Blackpill", "keyboard_name": "Charybdis Nano (3x5) Blackpill",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -31,17 +31,10 @@
#define ROTATIONAL_TRANSFORM_ANGLE -25 #define ROTATIONAL_TRANSFORM_ANGLE -25
/* RGB settings. */ /* RGB settings. */
#define RGBLED_NUM 36
#define RGBLED_SPLIT \
{ 18, 18 }
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR # define RGBLED_NUM 36
# define RGBLED_SPLIT \
{ 18, 18 }
# define DRIVER_LED_TOTAL RGBLED_NUM # define DRIVER_LED_TOTAL RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT # define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
#endif #endif

View File

@ -1,9 +1,9 @@
{ {
"url": "https://bastardkb.com/charybdis-nano",
"manufacturer": "Bastard Keyboards", "manufacturer": "Bastard Keyboards",
"url": "https://bastardkb.com/charybdis-nano",
"usb": { "usb": {
"vid": "0xA8F8",
"pid": "0x1832", "pid": "0x1832",
"vid": "0xA8F8"
}, },
"layouts": { "layouts": {
"LAYOUT_charybdis_3x5": { "LAYOUT_charybdis_3x5": {

View File

@ -1,54 +0,0 @@
/**
* Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/* RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Disable control of RGB matrix by keycodes (must use firmware implementation
// to control the feature).
# define RGB_MATRIX_DISABLE_KEYCODES
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -24,49 +24,6 @@
/* Disable unused features. */ /* Disable unused features. */
#define NO_ACTION_ONESHOT #define NO_ACTION_ONESHOT
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/**
* \brief Enable rapid switch from tap to hold.
*
* Note that a side-effect of this setting is to disable auto-repeat when
* pressing key twice, except for one-shot keys.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
*/
#define TAPPING_FORCE_HOLD
/*
* Tap-or-Hold decision modes.
*
* Note that the following flags behave differently when combined (ie. when 2 or
* more are enabled).
*
* See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
* decision modes.
*/
/**
* \brief Faster tap-hold trigger.
*
* Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ae
* With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 Mod+e
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
*/
#define PERMISSIVE_HOLD
/** /**
* \brief Prevent normal rollover on alphas from accidentally triggering mods. * \brief Prevent normal rollover on alphas from accidentally triggering mods.
* *
@ -76,8 +33,6 @@
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 Mod+e * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 Mod+e
* With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ae * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ae
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
*/ */
#define IGNORE_MOD_TAP_INTERRUPT #define IGNORE_MOD_TAP_INTERRUPT
@ -89,25 +44,3 @@
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD` // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
#endif // POINTING_DEVICE_ENABLE #endif // POINTING_DEVICE_ENABLE
/* RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Nano (3x5) Elite-C", "keyboard_name": "Charybdis Nano (3x5) Elite-C",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Nano (3x5) Elite-C", "keyboard_name": "Charybdis Nano (3x5) Elite-C",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ GP26, GP5, GP4, GP9 } { GP26, GP5, GP4, GP9 }
/* 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.
/* serial.c configuration (for split keyboard). */ /* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1 #define SOFT_SERIAL_PIN GP1
@ -43,68 +35,3 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
/** RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Enable all animations on ARM boards since they have plenty of memory
// available for it.
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_BAND_SAT
# define ENABLE_RGB_MATRIX_BAND_VAL
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
# define ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# define ENABLE_RGB_MATRIX_HUE_BREATHING
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
# define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
# define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Nano (3x5) Splinky", "keyboard_name": "Charybdis Nano (3x5) Splinky",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -25,3 +25,11 @@
#define SPI_SCK_PIN GP18 #define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19 #define SPI_MOSI_PIN GP19
#define POINTING_DEVICE_CS_PIN GP14 #define POINTING_DEVICE_CS_PIN GP14
/* 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.

View File

@ -25,3 +25,11 @@
#define SPI_SCK_PIN GP22 #define SPI_SCK_PIN GP22
#define SPI_MOSI_PIN GP23 #define SPI_MOSI_PIN GP23
#define POINTING_DEVICE_CS_PIN GP16 #define POINTING_DEVICE_CS_PIN GP16
/* 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.

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Nano (3x5) STeMCell", "keyboard_name": "Charybdis Nano (3x5) STeMCell",
"usb": { "usb": {
"device_version": "2.0.0" "device_version": "2.0.0"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Mini (3x6) Blackpill", "keyboard_name": "Charybdis Mini (3x6) Blackpill",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -18,8 +18,6 @@
#pragma once #pragma once
#include "config_common.h"
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_ROWS 8 // Rows are doubled-up. #define MATRIX_ROWS 8 // Rows are doubled-up.
#define MATRIX_COLS 6 #define MATRIX_COLS 6
@ -33,17 +31,10 @@
#define ROTATIONAL_TRANSFORM_ANGLE -25 #define ROTATIONAL_TRANSFORM_ANGLE -25
/* RGB settings. */ /* RGB settings. */
#define RGBLED_NUM 42
#define RGBLED_SPLIT \
{ 21, 21 }
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR # define RGBLED_NUM 42
# define RGBLED_SPLIT \
{ 21, 21 }
# define DRIVER_LED_TOTAL RGBLED_NUM # define DRIVER_LED_TOTAL RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT # define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
#endif #endif

View File

@ -1,98 +1,98 @@
{ {
"url": "https://bastardkb.com", "url": "https://bastardkb.com",
"usb": { "usb": {
"pid": "0x1834", "pid": "0x1834"
}, },
"layouts": { "layouts": {
"LAYOUT_charybdis_3x6": { "LAYOUT_charybdis_3x6": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"L05", "x":5, "y":0}, { "label": "L05", "x": 5, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"R05", "x":16, "y":0}, { "label": "R05", "x": 16, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"L15", "x":5, "y":1}, { "label": "L15", "x": 5, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"R15", "x":16, "y":1}, { "label": "R15", "x": 16, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"L25", "x":5, "y":2}, { "label": "L25", "x": 5, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"R25", "x":16, "y":2}, { "label": "R25", "x": 16, "y": 2 },
{"label":"L33", "x":5, "y":3}, { "label": "L33", "x": 5, "y": 3 },
{"label":"L34", "x":6, "y":3}, { "label": "L34", "x": 6, "y": 3 },
{"label":"L31", "x":7, "y":3}, { "label": "L31", "x": 7, "y": 3 },
{"label":"R31", "x":9, "y":3}, { "label": "R31", "x": 9, "y": 3 },
{"label":"R33", "x":10, "y":3} { "label": "R33", "x": 10, "y": 3 }
] ]
}, },
"LAYOUT_split_3x6_3": { "LAYOUT_split_3x6_3": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"L05", "x":5, "y":0}, { "label": "L05", "x": 5, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"R05", "x":16, "y":0}, { "label": "R05", "x": 16, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"L15", "x":5, "y":1}, { "label": "L15", "x": 5, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"R15", "x":16, "y":1}, { "label": "R15", "x": 16, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"L25", "x":5, "y":2}, { "label": "L25", "x": 5, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"R25", "x":16, "y":2}, { "label": "R25", "x": 16, "y": 2 },
{"label":"L33", "x":5, "y":3}, { "label": "L33", "x": 5, "y": 3 },
{"label":"L34", "x":6, "y":3}, { "label": "L34", "x": 6, "y": 3 },
{"label":"L31", "x":7, "y":3}, { "label": "L31", "x": 7, "y": 3 },
{"label":"R33", "x":9, "y":3}, { "label": "R33", "x": 9, "y": 3 },
{"label":"R34", "x":10, "y":3}, { "label": "R34", "x": 10, "y": 3 },
{"label":"R31", "x":11, "y":3} { "label": "R31", "x": 11, "y": 3 }
] ]
} }
} }

View File

@ -1,54 +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
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/* RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Disable control of RGB matrix by keycodes (must use firmware implementation
// to control the feature).
# define RGB_MATRIX_DISABLE_KEYCODES
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -24,17 +24,6 @@
/* Disable unused features. */ /* Disable unused features. */
#define NO_ACTION_ONESHOT #define NO_ACTION_ONESHOT
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/* Charybdis-specific features. */ /* Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE #ifdef POINTING_DEVICE_ENABLE
@ -43,29 +32,3 @@
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD` // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
#endif // POINTING_DEVICE_ENABLE #endif // POINTING_DEVICE_ENABLE
/* RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Disable control of RGB matrix by keycodes (must use firmware implementation
// to control the feature).
# define RGB_MATRIX_DISABLE_KEYCODES
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Mini (3x6) Elite-C", "keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Mini (3x6) Elite-C", "keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ GP26, GP5, GP4, GP9 } { GP26, GP5, GP4, GP9 }
/* 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.
/* serial.c configuration (for split keyboard). */ /* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1 #define SOFT_SERIAL_PIN GP1

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Mini (3x6) Splinky", "keyboard_name": "Charybdis Mini (3x6) Splinky",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -25,3 +25,11 @@
#define SPI_SCK_PIN GP18 #define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19 #define SPI_MOSI_PIN GP19
#define POINTING_DEVICE_CS_PIN GP14 #define POINTING_DEVICE_CS_PIN GP14
/* 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.

View File

@ -25,3 +25,11 @@
#define SPI_SCK_PIN GP22 #define SPI_SCK_PIN GP22
#define SPI_MOSI_PIN GP23 #define SPI_MOSI_PIN GP23
#define POINTING_DEVICE_CS_PIN GP16 #define POINTING_DEVICE_CS_PIN GP16
/* 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.

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis Mini (3x6) STeMCell", "keyboard_name": "Charybdis Mini (3x6) STeMCell",
"usb": { "usb": {
"device_version": "2.0.0" "device_version": "2.0.0"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis (4x6) Blackpill", "keyboard_name": "Charybdis (4x6) Blackpill",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -31,17 +31,10 @@
#define ROTATIONAL_TRANSFORM_ANGLE -25 #define ROTATIONAL_TRANSFORM_ANGLE -25
/* RGB settings. */ /* RGB settings. */
#define RGBLED_NUM 58
#define RGBLED_SPLIT \
{ 29, 29 }
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR # define RGBLED_NUM 58
# define RGBLED_SPLIT \
{ 29, 29 }
# define DRIVER_LED_TOTAL RGBLED_NUM # define DRIVER_LED_TOTAL RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT # define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
#endif #endif

View File

@ -1,9 +1,9 @@
{ {
"url": "https://bastardkb.com/charybdis",
"manufacturer": "Bastard Keyboards", "manufacturer": "Bastard Keyboards",
"url": "https://bastardkb.com/charybdis",
"usb": { "usb": {
"vid": "0xA8F8",
"pid": "0x1833", "pid": "0x1833",
"vid": "0xA8F8"
}, },
"layouts": { "layouts": {
"LAYOUT_charybdis_4x6": { "LAYOUT_charybdis_4x6": {

View File

@ -1,39 +0,0 @@
/**
* Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -24,17 +24,6 @@
/* Disable unused features. */ /* Disable unused features. */
#define NO_ACTION_ONESHOT #define NO_ACTION_ONESHOT
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/* Charybdis-specific features. */ /* Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE #ifdef POINTING_DEVICE_ENABLE
@ -43,25 +32,3 @@
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD` // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
#endif // POINTING_DEVICE_ENABLE #endif // POINTING_DEVICE_ENABLE
/* RGB Matrix. */
#ifdef RGB_MATRIX_ENABLE
// Limit maximum brightness to keep power consumption reasonable, and avoid
// disconnects.
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
#endif // RGB_MATRIX_ENABLE

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis (4x6) Elite-C", "keyboard_name": "Charybdis (4x6) Elite-C",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis (4x6) Elite-C", "keyboard_name": "Charybdis (4x6) Elite-C",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ GP29, GP26, GP5, GP4, GP9 } { GP29, GP26, GP5, GP4, GP9 }
/* 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.
/* serial.c configuration (for split keyboard). */ /* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1 #define SOFT_SERIAL_PIN GP1

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis (4x6) Splinky", "keyboard_name": "Charybdis (4x6) Splinky",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -25,3 +25,11 @@
#define SPI_SCK_PIN GP18 #define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19 #define SPI_MOSI_PIN GP19
#define POINTING_DEVICE_CS_PIN GP14 #define POINTING_DEVICE_CS_PIN GP14
/* 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.

View File

@ -25,3 +25,11 @@
#define SPI_SCK_PIN GP22 #define SPI_SCK_PIN GP22
#define SPI_MOSI_PIN GP23 #define SPI_MOSI_PIN GP23
#define POINTING_DEVICE_CS_PIN GP16 #define POINTING_DEVICE_CS_PIN GP16
/* 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.

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Charybdis (4x6) STeMCell", "keyboard_name": "Charybdis (4x6) STeMCell",
"usb": { "usb": {
"device_version": "2.0.0" "device_version": "2.0.0"
} }
} }

View File

@ -18,8 +18,6 @@
#pragma once #pragma once
#include "config_common.h"
/* Pointing device configuration. */ /* Pointing device configuration. */
// Enable use of pointing device on slave split. // Enable use of pointing device on slave split.
@ -31,5 +29,75 @@
// Limits the frequency that the sensor is polled for motion. // Limits the frequency that the sensor is polled for motion.
#define POINTING_DEVICE_TASK_THROTTLE_MS 1 #define POINTING_DEVICE_TASK_THROTTLE_MS 1
/** \brief Invert X axis on mouse reports. */ // Invert X axis on mouse reports.
#define POINTING_DEVICE_INVERT_X #define POINTING_DEVICE_INVERT_X
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
// Startup values.
# define RGB_MATRIX_STARTUP_HUE 0
# define RGB_MATRIX_STARTUP_SAT 255
# define RGB_MATRIX_STARTUP_VAL 64
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
// Rainbow swirl as startup mode.
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
// Slow swirl at startup.
# define RGB_MATRIX_STARTUP_SPD 32
# ifndef __arm__
// Disable control of RGB matrix by keycodes (must use firmware implementation
// to control the feature).
# define RGB_MATRIX_DISABLE_KEYCODES
# else // __arm__
// Enable all animations on ARM boards since they have plenty of memory
// available for it.
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_BAND_SAT
# define ENABLE_RGB_MATRIX_BAND_VAL
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
# define ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# define ENABLE_RGB_MATRIX_HUE_BREATHING
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
# define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
# define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif // !__arm__
#endif

View File

@ -1,4 +1,3 @@
{ {
"keyboard_name": "Dilemma (3x5+2) Assembled" "keyboard_name": "Dilemma (3x5+2) Assembled"
} }

View File

@ -6,40 +6,40 @@
"layouts": { "layouts": {
"LAYOUT_split_3x5_2": { "LAYOUT_split_3x5_2": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"L30", "x":4, "y":3}, { "label": "L30", "x": 4, "y": 3 },
{"label":"L32", "x":5, "y":3}, { "label": "L32", "x": 5, "y": 3 },
{"label":"R32", "x":10, "y":3}, { "label": "R32", "x": 10, "y": 3 },
{"label":"R30", "x":11, "y":3} { "label": "R30", "x": 11, "y": 3 }
] ]
} }
} }

View File

@ -21,52 +21,6 @@
# define DYNAMIC_KEYMAP_LAYER_COUNT 6 # define DYNAMIC_KEYMAP_LAYER_COUNT 6
#endif // VIA_ENABLE #endif // VIA_ENABLE
/* Disable unused features. */
#define NO_ACTION_ONESHOT
#ifndef TAPPING_TERM
/**
* \brief Configure the global tapping term (default: 200ms).
*
* If you have a lot of accidental mod activations, crank up the tapping term.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
*/
# define TAPPING_TERM 200
#endif // TAPPING_TERM
/**
* \brief Enable rapid switch from tap to hold.
*
* Note that a side-effect of this setting is to disable auto-repeat when
* pressing key twice, except for one-shot keys.
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
*/
#define TAPPING_FORCE_HOLD
/*
* Tap-or-Hold decision modes.
*
* Note that the following flags behave differently when combined (ie. when 2 or
* more are enabled).
*
* See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
* decision modes.
*/
/**
* \brief Faster tap-hold trigger.
*
* Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ae
* With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 Mod+e
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
*/
#define PERMISSIVE_HOLD
/** /**
* \brief Prevent normal rollover on alphas from accidentally triggering mods. * \brief Prevent normal rollover on alphas from accidentally triggering mods.
* *
@ -76,8 +30,6 @@
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 Mod+e * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 Mod+e
* With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ae * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ae
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
*/ */
#define IGNORE_MOD_TAP_INTERRUPT #define IGNORE_MOD_TAP_INTERRUPT

View File

@ -42,7 +42,7 @@
{ "label": "L34", "x": 6, "y": 3 }, { "label": "L34", "x": 6, "y": 3 },
{ "label": "R32", "x": 11, "y": 3 }, { "label": "R32", "x": 11, "y": 3 },
{ "label": "R33", "x": 10, "y": 3 }, { "label": "R33", "x": 10, "y": 3 },
{ "label": "R34", "x": 9, "y": 3 } { "label": "R34", "x": 9, "y": 3 }
] ]
} }
} }

View File

@ -1,3 +1,3 @@
{ {
"url": "https://bastardkb.com/dilemma", "url": "https://bastardkb.com/dilemma"
} }

View File

@ -1,8 +1,8 @@
{ {
"url": "https://bastardkb.com",
"manufacturer": "Bastard Keyboards", "manufacturer": "Bastard Keyboards",
"maintainer": "Quentin Lebastard", "maintainer": "Quentin Lebastard",
"url": "https://bastardkb.com",
"usb": { "usb": {
"vid": "0xA8F8", "vid": "0xA8F8"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Scylla Blackpill", "keyboard_name": "Scylla Blackpill",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,69 +1,69 @@
{ {
"url": "https://bastardkb.com/scylla", "url": "https://bastardkb.com/scylla",
"usb": { "usb": {
"pid": "0x1829", "pid": "0x1829"
}, },
"layouts": { "layouts": {
"LAYOUT_split_4x6_5": { "LAYOUT_split_4x6_5": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"L05", "x":5, "y":0}, { "label": "L05", "x": 5, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"R05", "x":16, "y":0}, { "label": "R05", "x": 16, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"L15", "x":5, "y":1}, { "label": "L15", "x": 5, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"R15", "x":16, "y":1}, { "label": "R15", "x": 16, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"L25", "x":5, "y":2}, { "label": "L25", "x": 5, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"R25", "x":16, "y":2}, { "label": "R25", "x": 16, "y": 2 },
{"label":"L30", "x":0, "y":3}, { "label": "L30", "x": 0, "y": 3 },
{"label":"L31", "x":1, "y":3}, { "label": "L31", "x": 1, "y": 3 },
{"label":"L32", "x":2, "y":3}, { "label": "L32", "x": 2, "y": 3 },
{"label":"L33", "x":3, "y":3}, { "label": "L33", "x": 3, "y": 3 },
{"label":"L34", "x":4, "y":3}, { "label": "L34", "x": 4, "y": 3 },
{"label":"L35", "x":5, "y":3}, { "label": "L35", "x": 5, "y": 3 },
{"label":"R30", "x":11, "y":3}, { "label": "R30", "x": 11, "y": 3 },
{"label":"R31", "x":12, "y":3}, { "label": "R31", "x": 12, "y": 3 },
{"label":"R32", "x":13, "y":3}, { "label": "R32", "x": 13, "y": 3 },
{"label":"R33", "x":14, "y":3}, { "label": "R33", "x": 14, "y": 3 },
{"label":"R34", "x":15, "y":3}, { "label": "R34", "x": 15, "y": 3 },
{"label":"R35", "x":16, "y":3}, { "label": "R35", "x": 16, "y": 3 },
{"label":"L43", "x":5, "y":4}, { "label": "L43", "x": 5, "y": 4 },
{"label":"L44", "x":6, "y":4}, { "label": "L44", "x": 6, "y": 4 },
{"label":"L45", "x":7, "y":4}, { "label": "L45", "x": 7, "y": 4 },
{"label":"R40", "x":9, "y":4}, { "label": "R40", "x": 9, "y": 4 },
{"label":"R41", "x":10, "y":4}, { "label": "R41", "x": 10, "y": 4 },
{"label":"R40", "x":11, "y":4}, { "label": "R40", "x": 11, "y": 4 },
{"label":"L52", "x":6, "y":5}, { "label": "L52", "x": 6, "y": 5 },
{"label":"L53", "x":7, "y":5}, { "label": "L53", "x": 7, "y": 5 },
{"label":"R52", "x":9, "y":5}, { "label": "R52", "x": 9, "y": 5 },
{"label":"R53", "x":10, "y":5} { "label": "R53", "x": 10, "y": 5 }
] ]
} }
} }

View File

@ -1,4 +1,4 @@
/* /**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -17,6 +17,7 @@
#include "scylla.h" #include "scylla.h"
// clang-format off
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { { led_config_t g_led_config = { {
// left // left
@ -59,3 +60,4 @@ led_config_t g_led_config = { {
2, 2, 2, 2, 2 2, 2, 2, 2, 2
} }; } };
#endif #endif
// clang-format on

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Scylla Elite-C", "keyboard_name": "Scylla Elite-C",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Scylla Elite-C", "keyboard_name": "Scylla Elite-C",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ GP29, GP26, GP5, GP4, GP9 } { GP29, GP26, GP5, GP4, GP9 }
/* 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.
/* serial.c configuration (for split keyboard). */ /* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1 #define SOFT_SERIAL_PIN GP1

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Scylla Splinky", "keyboard_name": "Scylla Splinky",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -20,3 +20,11 @@
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ GP27, GP28, GP15, GP6, GP7, GP8 } { GP27, GP28, GP15, GP6, GP7, GP8 }
/* 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.

View File

@ -20,3 +20,11 @@
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ GP27, GP28, GP21, GP6, GP7, GP8 } { GP27, GP28, GP21, GP6, GP7, GP8 }
/* 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.

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Scylla STeMCell", "keyboard_name": "Scylla STeMCell",
"usb": { "usb": {
"device_version": "2.0.0" "device_version": "2.0.0"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Skeletyl Blackpill", "keyboard_name": "Skeletyl Blackpill",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,47 +1,47 @@
{ {
"url": "https://www.bastardkb.com/skeletyl", "url": "https://www.bastardkb.com/skeletyl",
"usb": { "usb": {
"pid": "0x1830", "pid": "0x1830"
}, },
"layouts": { "layouts": {
"LAYOUT_split_3x5_3": { "LAYOUT_split_3x5_3": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"L33", "x":4, "y":3}, { "label": "L33", "x": 4, "y": 3 },
{"label":"L34", "x":5, "y":3}, { "label": "L34", "x": 5, "y": 3 },
{"label":"L31", "x":6, "y":3}, { "label": "L31", "x": 6, "y": 3 },
{"label":"R33", "x":9, "y":3}, { "label": "R33", "x": 9, "y": 3 },
{"label":"R34", "x":10, "y":3}, { "label": "R34", "x": 10, "y": 3 },
{"label":"R31", "x":11, "y":3} { "label": "R31", "x": 11, "y": 3 }
] ]
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Skeletyl Elite-C", "keyboard_name": "Skeletyl Elite-C",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,5 +1,5 @@
{ {
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Skeletyl Elite-C", "keyboard_name": "Skeletyl Elite-C",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ GP26, GP5, GP4, GP9 } { GP26, GP5, GP4, GP9 }
/* 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.
/* serial.c configuration (for split keyboard). */ /* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1 #define SOFT_SERIAL_PIN GP1

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Skeletyl Splinky", "keyboard_name": "Skeletyl Splinky",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -20,3 +20,11 @@
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ GP28, GP15, GP6, GP7, GP8 } { GP28, GP15, GP6, GP7, GP8 }
/* 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.

View File

@ -20,3 +20,11 @@
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ GP28, GP21, GP6, GP7, GP8 } { GP28, GP21, GP6, GP7, GP8 }
/* 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.

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Skeletyl STeMCell", "keyboard_name": "Skeletyl STeMCell",
"usb": { "usb": {
"device_version": "2.0.0" "device_version": "2.0.0"
} }
} }

View File

@ -1,4 +1,4 @@
/* /**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -16,7 +16,6 @@
*/ */
#pragma once #pragma once
#include "config_common.h"
#define MATRIX_ROWS 10 #define MATRIX_ROWS 10
#define MATRIX_COLS 6 #define MATRIX_COLS 6

View File

@ -2,70 +2,70 @@
"keyboard_name": "The Bastard Keyboard", "keyboard_name": "The Bastard Keyboard",
"url": "https://bastardkb.com/", "url": "https://bastardkb.com/",
"usb": { "usb": {
"pid": "0x1828", "device_version": "0.0.1",
"device_version": "0.0.1" "pid": "0x1828"
}, },
"layouts": { "layouts": {
"LAYOUT_split_4x6_5": { "LAYOUT_split_4x6_5": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"L05", "x":5, "y":0}, { "label": "L05", "x": 5, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"R05", "x":16, "y":0}, { "label": "R05", "x": 16, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"L15", "x":5, "y":1}, { "label": "L15", "x": 5, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"R15", "x":16, "y":1}, { "label": "R15", "x": 16, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"L25", "x":5, "y":2}, { "label": "L25", "x": 5, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"R25", "x":16, "y":2}, { "label": "R25", "x": 16, "y": 2 },
{"label":"L30", "x":0, "y":3}, { "label": "L30", "x": 0, "y": 3 },
{"label":"L31", "x":1, "y":3}, { "label": "L31", "x": 1, "y": 3 },
{"label":"L32", "x":2, "y":3}, { "label": "L32", "x": 2, "y": 3 },
{"label":"L33", "x":3, "y":3}, { "label": "L33", "x": 3, "y": 3 },
{"label":"L34", "x":4, "y":3}, { "label": "L34", "x": 4, "y": 3 },
{"label":"L35", "x":5, "y":3}, { "label": "L35", "x": 5, "y": 3 },
{"label":"R30", "x":11, "y":3}, { "label": "R30", "x": 11, "y": 3 },
{"label":"R31", "x":12, "y":3}, { "label": "R31", "x": 12, "y": 3 },
{"label":"R32", "x":13, "y":3}, { "label": "R32", "x": 13, "y": 3 },
{"label":"R33", "x":14, "y":3}, { "label": "R33", "x": 14, "y": 3 },
{"label":"R34", "x":15, "y":3}, { "label": "R34", "x": 15, "y": 3 },
{"label":"R35", "x":16, "y":3}, { "label": "R35", "x": 16, "y": 3 },
{"label":"L43", "x":5, "y":4}, { "label": "L43", "x": 5, "y": 4 },
{"label":"L44", "x":6, "y":4}, { "label": "L44", "x": 6, "y": 4 },
{"label":"L45", "x":7, "y":4}, { "label": "L45", "x": 7, "y": 4 },
{"label":"R40", "x":9, "y":4}, { "label": "R40", "x": 9, "y": 4 },
{"label":"R41", "x":10, "y":4}, { "label": "R41", "x": 10, "y": 4 },
{"label":"R40", "x":11, "y":4}, { "label": "R40", "x": 11, "y": 4 },
{"label":"L52", "x":6, "y":5}, { "label": "L52", "x": 6, "y": 5 },
{"label":"L53", "x":7, "y":5}, { "label": "L53", "x": 7, "y": 5 },
{"label":"R52", "x":9, "y":5}, { "label": "R52", "x": 9, "y": 5 },
{"label":"R53", "x":10, "y":5} { "label": "R53", "x": 10, "y": 5 }
] ]
} }
} }

View File

@ -1,4 +1,4 @@
/* /**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify

View File

@ -1,4 +1,4 @@
/* /**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -17,26 +17,26 @@
#pragma once #pragma once
#include "quantum.h"
// SWITCHED 91 and 95 - check on left ? // clang-format off
#define LAYOUT_split_4x6_5( \ #define LAYOUT_split_4x6_5( \
k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
k43, k44, k41, k91, k94, k93, \ k43, k44, k41, k91, k94, k93, \
k45, k42, k92, k95 \ k45, k42, k92, k95 \
)\ ) \
{\ { \
{ k00, k01, k02, k03, k04, k05 }, \ { k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \ { k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \ { k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 }, \ { k30, k31, k32, k33, k34, k35 }, \
{ KC_NO, k41, k42, k43, k44, k45 }, \ { KC_NO, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \ { k50, k51, k52, k53, k54, k55 }, \
{ k60, k61, k62, k63, k64, k65 }, \ { k60, k61, k62, k63, k64, k65 }, \
{ k70, k71, k72, k73, k74, k75 }, \ { k70, k71, k72, k73, k74, k75 }, \
{ k80, k81, k82, k83, k84, k85 }, \ { k80, k81, k82, k83, k84, k85 }, \
{ KC_NO, k91, k92, k93, k94, k95 }, \ { KC_NO, k91, k92, k93, k94, k95 }, \
} }
// clang-format on

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "TBK Mini Blackpill", "keyboard_name": "TBK Mini Blackpill",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,53 +1,53 @@
{ {
"url": "https://www.bastardkb.com/tbk-mini", "url": "https://www.bastardkb.com/tbk-mini",
"usb": { "usb": {
"pid": "0x1828", "pid": "0x1828"
}, },
"layouts": { "layouts": {
"LAYOUT_split_3x6_3": { "LAYOUT_split_3x6_3": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, { "label": "L00", "x": 0, "y": 0 },
{"label":"L01", "x":1, "y":0}, { "label": "L01", "x": 1, "y": 0 },
{"label":"L02", "x":2, "y":0}, { "label": "L02", "x": 2, "y": 0 },
{"label":"L03", "x":3, "y":0}, { "label": "L03", "x": 3, "y": 0 },
{"label":"L04", "x":4, "y":0}, { "label": "L04", "x": 4, "y": 0 },
{"label":"L05", "x":5, "y":0}, { "label": "L05", "x": 5, "y": 0 },
{"label":"R00", "x":11, "y":0}, { "label": "R00", "x": 11, "y": 0 },
{"label":"R01", "x":12, "y":0}, { "label": "R01", "x": 12, "y": 0 },
{"label":"R02", "x":13, "y":0}, { "label": "R02", "x": 13, "y": 0 },
{"label":"R03", "x":14, "y":0}, { "label": "R03", "x": 14, "y": 0 },
{"label":"R04", "x":15, "y":0}, { "label": "R04", "x": 15, "y": 0 },
{"label":"R05", "x":16, "y":0}, { "label": "R05", "x": 16, "y": 0 },
{"label":"L10", "x":0, "y":1}, { "label": "L10", "x": 0, "y": 1 },
{"label":"L11", "x":1, "y":1}, { "label": "L11", "x": 1, "y": 1 },
{"label":"L12", "x":2, "y":1}, { "label": "L12", "x": 2, "y": 1 },
{"label":"L13", "x":3, "y":1}, { "label": "L13", "x": 3, "y": 1 },
{"label":"L14", "x":4, "y":1}, { "label": "L14", "x": 4, "y": 1 },
{"label":"L15", "x":5, "y":1}, { "label": "L15", "x": 5, "y": 1 },
{"label":"R10", "x":11, "y":1}, { "label": "R10", "x": 11, "y": 1 },
{"label":"R11", "x":12, "y":1}, { "label": "R11", "x": 12, "y": 1 },
{"label":"R12", "x":13, "y":1}, { "label": "R12", "x": 13, "y": 1 },
{"label":"R13", "x":14, "y":1}, { "label": "R13", "x": 14, "y": 1 },
{"label":"R14", "x":15, "y":1}, { "label": "R14", "x": 15, "y": 1 },
{"label":"R15", "x":16, "y":1}, { "label": "R15", "x": 16, "y": 1 },
{"label":"L20", "x":0, "y":2}, { "label": "L20", "x": 0, "y": 2 },
{"label":"L21", "x":1, "y":2}, { "label": "L21", "x": 1, "y": 2 },
{"label":"L22", "x":2, "y":2}, { "label": "L22", "x": 2, "y": 2 },
{"label":"L23", "x":3, "y":2}, { "label": "L23", "x": 3, "y": 2 },
{"label":"L24", "x":4, "y":2}, { "label": "L24", "x": 4, "y": 2 },
{"label":"L25", "x":5, "y":2}, { "label": "L25", "x": 5, "y": 2 },
{"label":"R20", "x":11, "y":2}, { "label": "R20", "x": 11, "y": 2 },
{"label":"R21", "x":12, "y":2}, { "label": "R21", "x": 12, "y": 2 },
{"label":"R22", "x":13, "y":2}, { "label": "R22", "x": 13, "y": 2 },
{"label":"R23", "x":14, "y":2}, { "label": "R23", "x": 14, "y": 2 },
{"label":"R24", "x":15, "y":2}, { "label": "R24", "x": 15, "y": 2 },
{"label":"R25", "x":16, "y":2}, { "label": "R25", "x": 16, "y": 2 },
{"label":"L33", "x":5, "y":3}, { "label": "L33", "x": 5, "y": 3 },
{"label":"L34", "x":6, "y":3}, { "label": "L34", "x": 6, "y": 3 },
{"label":"L31", "x":7, "y":3}, { "label": "L31", "x": 7, "y": 3 },
{"label":"R33", "x":9, "y":3}, { "label": "R33", "x": 9, "y": 3 },
{"label":"R34", "x":10, "y":3}, { "label": "R34", "x": 10, "y": 3 },
{"label":"R31", "x":11, "y":3} { "label": "R31", "x": 11, "y": 3 }
] ]
} }
} }

View File

@ -1,4 +1,4 @@
/* /**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -17,6 +17,7 @@
#include "tbkmini.h" #include "tbkmini.h"
// clang-format off
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { { led_config_t g_led_config = { {
// left // left
@ -57,3 +58,4 @@ led_config_t g_led_config = { {
2, 2, 2 2, 2, 2
} }; } };
#endif #endif
// clang-format on

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "TBK Mini Elite-C", "keyboard_name": "TBK Mini Elite-C",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0"
}, }
} }

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "TBK Mini Elite-C", "keyboard_name": "TBK Mini Elite-C",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \ #define MATRIX_ROW_PINS \
{ GP26, GP5, GP4, GP9 } { GP26, GP5, GP4, GP9 }
/* 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.
/* serial.c configuration (for split keyboard). */ /* serial.c configuration (for split keyboard). */
#define SOFT_SERIAL_PIN GP1 #define SOFT_SERIAL_PIN GP1

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "TBK Mini Splinky", "keyboard_name": "TBK Mini Splinky",
"usb": { "usb": {
"device_version": "2.0.0", "device_version": "2.0.0"
}, }
} }

View File

@ -20,3 +20,11 @@
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ GP27, GP28, GP15, GP6, GP7, GP8 } { GP27, GP28, GP15, GP6, GP7, GP8 }
/* 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.

View File

@ -20,3 +20,11 @@
/* Key matrix configuration. */ /* Key matrix configuration. */
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ GP27, GP28, GP21, GP6, GP7, GP8 } { GP27, GP28, GP21, GP6, GP7, GP8 }
/* 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.

View File

@ -1,6 +1,6 @@
{ {
"keyboard_name": "TBK Mini STeMCell", "keyboard_name": "TBK Mini STeMCell",
"usb": { "usb": {
"device_version": "2.0.0" "device_version": "2.0.0"
} }
} }