sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
zvecr
2022-11-22 02:48:11 +00:00
parent 08805cada0 06a3801a27
commit ab17d34dbd
100 changed files with 1756 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/bastardkb/charybdis/4x6/blackpill/info.json
View File

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

15
keyboards/bastardkb/charybdis/4x6/config.h
View File

@@ -31,17 +31,8 @@
#define ROTATIONAL_TRANSFORM_ANGLE -25
/* RGB settings. */
#define RGBLED_NUM 58
#define RGBLED_SPLIT \
{ 29, 29 }
/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT 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
# define RGB_MATRIX_LED_COUNT 58
# define RGB_MATRIX_SPLIT \
{ 29, 29 }
#endif

4
keyboards/bastardkb/charybdis/4x6/info.json
View File

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

39
keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
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

33
keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
View File

@@ -24,17 +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
/* Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE
@@ -43,25 +32,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

4
keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
View File

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

4
keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
View File

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

8
keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
View File

@@ -21,14 +21,6 @@
#define MATRIX_ROW_PINS \
{ 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). */
#define SOFT_SERIAL_PIN GP1

4
keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
View File

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

8
keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
View File

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

8
keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
View File

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

2
keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
View File

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