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>miryoku-merge-master
Charly Delay
3 years ago
committed by
GitHub
parent
127a70b6ca
commit
2b0a3cd2f1
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"url": "https://bastardkb.com/dilemma",
|
"url": "https://bastardkb.com/dilemma"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"keyboard_name": "Scylla Blackpill",
|
"keyboard_name": "Scylla Blackpill",
|
||||||
"usb": {
|
"usb": {
|
||||||
"device_version": "1.0.0",
|
"device_version": "1.0.0"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"keyboard_name": "Scylla Splinky",
|
"keyboard_name": "Scylla Splinky",
|
||||||
"usb": {
|
"usb": {
|
||||||
"device_version": "2.0.0",
|
"device_version": "2.0.0"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"keyboard_name": "Skeletyl Blackpill",
|
"keyboard_name": "Skeletyl Blackpill",
|
||||||
"usb": {
|
"usb": {
|
||||||
"device_version": "1.0.0",
|
"device_version": "1.0.0"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"usb": {
|
"usb": {
|
||||||
"device_version": "1.0.0",
|
"device_version": "1.0.0"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"keyboard_name": "Skeletyl Splinky",
|
"keyboard_name": "Skeletyl Splinky",
|
||||||
"usb": {
|
"usb": {
|
||||||
"device_version": "2.0.0",
|
"device_version": "2.0.0"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue