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>
This commit is contained in:
Charly Delay
GitHub
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"keyboard_name": "Charybdis Nano (3x5) Blackpill",
|
||||
"usb": {
|
||||
"device_version": "1.0.0",
|
||||
},
|
||||
"device_version": "1.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,17 +31,10 @@
|
||||
#define ROTATIONAL_TRANSFORM_ANGLE -25
|
||||
|
||||
/* RGB settings. */
|
||||
#define RGBLED_NUM 36
|
||||
#define RGBLED_SPLIT \
|
||||
{ 18, 18 }
|
||||
|
||||
/* RGB matrix support. */
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
# define SPLIT_TRANSPORT_MIRROR
|
||||
# define RGBLED_NUM 36
|
||||
# define RGBLED_SPLIT \
|
||||
{ 18, 18 }
|
||||
# define DRIVER_LED_TOTAL RGBLED_NUM
|
||||
# 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
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"url": "https://bastardkb.com/charybdis-nano",
|
||||
"manufacturer": "Bastard Keyboards",
|
||||
"url": "https://bastardkb.com/charybdis-nano",
|
||||
"usb": {
|
||||
"vid": "0xA8F8",
|
||||
"pid": "0x1832",
|
||||
"vid": "0xA8F8"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_charybdis_3x5": {
|
||||
|
||||
@@ -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
|
||||
@@ -24,49 +24,6 @@
|
||||
/* 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.
|
||||
*
|
||||
@@ -76,8 +33,6 @@
|
||||
* Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
|
||||
* With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
|
||||
* 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
|
||||
|
||||
@@ -89,25 +44,3 @@
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
|
||||
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"keyboard_name": "Charybdis Nano (3x5) Elite-C",
|
||||
"usb": {
|
||||
"device_version": "1.0.0",
|
||||
},
|
||||
"device_version": "1.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"keyboard_name": "Charybdis Nano (3x5) Elite-C",
|
||||
"usb": {
|
||||
"device_version": "2.0.0",
|
||||
},
|
||||
"device_version": "2.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,14 +21,6 @@
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ 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). */
|
||||
#define SOFT_SERIAL_PIN GP1
|
||||
|
||||
@@ -43,68 +35,3 @@
|
||||
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
|
||||
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
|
||||
#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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"keyboard_name": "Charybdis Nano (3x5) Splinky",
|
||||
"usb": {
|
||||
"device_version": "2.0.0",
|
||||
},
|
||||
"device_version": "2.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,3 +25,11 @@
|
||||
#define SPI_SCK_PIN GP18
|
||||
#define SPI_MOSI_PIN GP19
|
||||
#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.
|
||||
|
||||
@@ -25,3 +25,11 @@
|
||||
#define SPI_SCK_PIN GP22
|
||||
#define SPI_MOSI_PIN GP23
|
||||
#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.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"keyboard_name": "Charybdis Nano (3x5) STeMCell",
|
||||
"usb": {
|
||||
"device_version": "2.0.0"
|
||||
"device_version": "2.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user