mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-16 04:15:29 -04:00
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
parent
6aa547be53
commit
c5e3fc194d
4 changed files with 0 additions and 185 deletions
|
|
@ -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
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue