summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb
diff options
context:
space:
mode:
authorCharly Delay <0xcharly@users.noreply.github.com>2022-11-21 05:34:42 +0900
committerGitHub <noreply@github.com>2022-11-20 12:34:42 -0800
commit2b0a3cd2f13ca4719cf4bba96ee7ec5ed7c1aabd (patch)
tree677bd625ed00274a742959dd0487289518db9e6e /keyboards/bastardkb
parent127a70b6ca6273257030b581e9f7a9656d7e9e4d (diff)
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>
Diffstat (limited to 'keyboards/bastardkb')
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/config.h13
-rw-r--r--keyboards/bastardkb/charybdis/3x5/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h54
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h67
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h73
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/config.h15
-rw-r--r--keyboards/bastardkb/charybdis/3x6/info.json168
-rw-r--r--keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h54
-rw-r--r--keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h37
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/config.h13
-rw-r--r--keyboards/bastardkb/charybdis/4x6/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h39
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h33
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h8
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json2
-rw-r--r--keyboards/bastardkb/charybdis/config.h74
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/info.json1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json68
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h48
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/info.json2
-rw-r--r--keyboards/bastardkb/dilemma/info.json2
-rw-r--r--keyboards/bastardkb/info.json6
-rw-r--r--keyboards/bastardkb/scylla/blackpill/info.json4
-rw-r--r--keyboards/bastardkb/scylla/info.json118
-rw-r--r--keyboards/bastardkb/scylla/scylla.c4
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/config.h8
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/info.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v2/config.h8
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v3/config.h8
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/info.json2
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/info.json4
-rw-r--r--keyboards/bastardkb/skeletyl/info.json74
-rw-r--r--keyboards/bastardkb/skeletyl/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v1/info.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/config.h8
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/info.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h8
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h8
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/info.json2
-rw-r--r--keyboards/bastardkb/tbk/config.h3
-rw-r--r--keyboards/bastardkb/tbk/info.json120
-rw-r--r--keyboards/bastardkb/tbk/tbk.c2
-rw-r--r--keyboards/bastardkb/tbk/tbk.h42
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/info.json4
-rw-r--r--keyboards/bastardkb/tbkmini/info.json86
-rw-r--r--keyboards/bastardkb/tbkmini/tbkmini.c4
-rw-r--r--keyboards/bastardkb/tbkmini/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/config.h8
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/info.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h8
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h8
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/info.json2
77 files changed, 587 insertions, 889 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index 1e347df9b2..c2ff6d458a 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Nano (3x5) Blackpill",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index 6e3b8a7124..2022b1cee6 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -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
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
index 41c80b457f..efa863ea4b 100644
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -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": {
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
deleted file mode 100644
index f2dd86c653..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
+++ /dev/null
@@ -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
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
index d20131e9cf..5d9d4662f0 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
@@ -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
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index 9071212f33..b83dc6c3f8 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Nano (3x5) Elite-C",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index 7c90e5d5a3..78453c44ff 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Nano (3x5) Elite-C",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
index d4688aef92..8e4a2de892 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
@@ -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
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
index 1aa1e8811d..98f436f52b 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Nano (3x5) Splinky",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
index 70b65a97c7..516f3d9df7 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
@@ -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.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
index d53c5a3c41..09165a8e97 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
@@ -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.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index 2aee1fe40b..b344c1cbfc 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Nano (3x5) STeMCell",
"usb": {
- "device_version": "2.0.0"
+ "device_version": "2.0.0"
}
}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 73a1359e00..54eda1eadf 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Mini (3x6) Blackpill",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 6b31a773fc..647a02d8fa 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -18,8 +18,6 @@
#pragma once
-#include "config_common.h"
-
/* Key matrix configuration. */
#define MATRIX_ROWS 8 // Rows are doubled-up.
#define MATRIX_COLS 6
@@ -33,17 +31,10 @@
#define ROTATIONAL_TRANSFORM_ANGLE -25
/* RGB settings. */
-#define RGBLED_NUM 42
-#define RGBLED_SPLIT \
- { 21, 21 }
-
-/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
-# define SPLIT_TRANSPORT_MIRROR
+# define RGBLED_NUM 42
+# define RGBLED_SPLIT \
+ { 21, 21 }
# 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
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 0b4428cdbe..4851da1d53 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -1,98 +1,98 @@
{
"url": "https://bastardkb.com",
"usb": {
- "pid": "0x1834",
+ "pid": "0x1834"
},
"layouts": {
"LAYOUT_charybdis_3x6": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L33", "x":5, "y":3},
- {"label":"L34", "x":6, "y":3},
- {"label":"L31", "x":7, "y":3},
- {"label":"R31", "x":9, "y":3},
- {"label":"R33", "x":10, "y":3}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "L05", "x": 5, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "R05", "x": 16, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "L15", "x": 5, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "R15", "x": 16, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "L25", "x": 5, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "R25", "x": 16, "y": 2 },
+ { "label": "L33", "x": 5, "y": 3 },
+ { "label": "L34", "x": 6, "y": 3 },
+ { "label": "L31", "x": 7, "y": 3 },
+ { "label": "R31", "x": 9, "y": 3 },
+ { "label": "R33", "x": 10, "y": 3 }
]
},
"LAYOUT_split_3x6_3": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L33", "x":5, "y":3},
- {"label":"L34", "x":6, "y":3},
- {"label":"L31", "x":7, "y":3},
- {"label":"R33", "x":9, "y":3},
- {"label":"R34", "x":10, "y":3},
- {"label":"R31", "x":11, "y":3}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "L05", "x": 5, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "R05", "x": 16, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "L15", "x": 5, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "R15", "x": 16, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "L25", "x": 5, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "R25", "x": 16, "y": 2 },
+ { "label": "L33", "x": 5, "y": 3 },
+ { "label": "L34", "x": 6, "y": 3 },
+ { "label": "L31", "x": 7, "y": 3 },
+ { "label": "R33", "x": 9, "y": 3 },
+ { "label": "R34", "x": 10, "y": 3 },
+ { "label": "R31", "x": 11, "y": 3 }
]
}
}
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
deleted file mode 100644
index 4b1bae3ca0..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
+++ /dev/null
@@ -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
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
index abbf492089..7c850d5e0e 100644
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
@@ -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,29 +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
-// 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
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index bf7f1a35f2..7edaf111a9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 239a10f8a3..02fe2e9ef3 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
index e68bf722e4..8e4a2de892 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
@@ -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
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
index 7f3997158f..64c663c7c9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Mini (3x6) Splinky",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
index 7b7d94b320..f3d3e982e3 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
@@ -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.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
index 0e9f2257f0..5f5476b1f7 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
@@ -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.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 516eb7dde3..8aa7bf24c9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis Mini (3x6) STeMCell",
"usb": {
- "device_version": "2.0.0"
+ "device_version": "2.0.0"
}
}
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index 788783c679..a42035157b 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis (4x6) Blackpill",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index f557089073..aea184d57c 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -31,17 +31,10 @@
#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 RGBLED_NUM 58
+# define RGBLED_SPLIT \
+ { 29, 29 }
# 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
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
index c95bf07516..0b929a2188 100644
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -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": {
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
deleted file mode 100644
index 383b3f9dc3..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
+++ /dev/null
@@ -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
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
index c31e39261e..cb9013dbd1 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
@@ -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
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index 4ea658a7d9..e3924b49b2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis (4x6) Elite-C",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 151c0e1ca3..3acba65a6b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis (4x6) Elite-C",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
index 010de7c480..7d4ed86e84 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
@@ -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
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
index 0004eb81c9..928a850860 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis (4x6) Splinky",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
index 7b7d94b320..f3d3e982e3 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
@@ -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.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
index 0e9f2257f0..5f5476b1f7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
@@ -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.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 7d687319b3..932bf09a32 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Charybdis (4x6) STeMCell",
"usb": {
- "device_version": "2.0.0"
+ "device_version": "2.0.0"
}
}
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
index c88451335e..2d2e09e403 100644
--- a/keyboards/bastardkb/charybdis/config.h
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -18,8 +18,6 @@
#pragma once
-#include "config_common.h"
-
/* Pointing device configuration. */
// Enable use of pointing device on slave split.
@@ -31,5 +29,75 @@
// Limits the frequency that the sensor is polled for motion.
#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
+
+/* 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
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index aae8dfc179..59f3b0d071 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -1,4 +1,3 @@
{
"keyboard_name": "Dilemma (3x5+2) Assembled"
}
-
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index 5aa89bcded..bbbecd7efa 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -6,40 +6,40 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"L30", "x":4, "y":3},
- {"label":"L32", "x":5, "y":3},
- {"label":"R32", "x":10, "y":3},
- {"label":"R30", "x":11, "y":3}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "L30", "x": 4, "y": 3 },
+ { "label": "L32", "x": 5, "y": 3 },
+ { "label": "R32", "x": 10, "y": 3 },
+ { "label": "R30", "x": 11, "y": 3 }
]
}
}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
index fbe61df03b..5bfac4b6c5 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
@@ -21,52 +21,6 @@
# define DYNAMIC_KEYMAP_LAYER_COUNT 6
#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.
*
@@ -76,8 +30,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
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 2c1a68888b..777367903d 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -42,7 +42,7 @@
{ "label": "L34", "x": 6, "y": 3 },
{ "label": "R32", "x": 11, "y": 3 },
{ "label": "R33", "x": 10, "y": 3 },
- { "label": "R34", "x": 9, "y": 3 }
+ { "label": "R34", "x": 9, "y": 3 }
]
}
}
diff --git a/keyboards/bastardkb/dilemma/info.json b/keyboards/bastardkb/dilemma/info.json
index 989d66a177..ef6a5dd42d 100644
--- a/keyboards/bastardkb/dilemma/info.json
+++ b/keyboards/bastardkb/dilemma/info.json
@@ -1,3 +1,3 @@
{
- "url": "https://bastardkb.com/dilemma",
+ "url": "https://bastardkb.com/dilemma"
}
diff --git a/keyboards/bastardkb/info.json b/keyboards/bastardkb/info.json
index 2791a78b77..0a9cb94fef 100644
--- a/keyboards/bastardkb/info.json
+++ b/keyboards/bastardkb/info.json
@@ -1,8 +1,8 @@
{
- "url": "https://bastardkb.com",
"manufacturer": "Bastard Keyboards",
"maintainer": "Quentin Lebastard",
+ "url": "https://bastardkb.com",
"usb": {
- "vid": "0xA8F8",
- },
+ "vid": "0xA8F8"
+ }
}
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 587cc2bc04..8e09212116 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Blackpill",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 026b0f742e..d8120f5070 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,69 +1,69 @@
{
"url": "https://bastardkb.com/scylla",
"usb": {
- "pid": "0x1829",
+ "pid": "0x1829"
},
"layouts": {
"LAYOUT_split_4x6_5": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"R30", "x":11, "y":3},
- {"label":"R31", "x":12, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R33", "x":14, "y":3},
- {"label":"R34", "x":15, "y":3},
- {"label":"R35", "x":16, "y":3},
- {"label":"L43", "x":5, "y":4},
- {"label":"L44", "x":6, "y":4},
- {"label":"L45", "x":7, "y":4},
- {"label":"R40", "x":9, "y":4},
- {"label":"R41", "x":10, "y":4},
- {"label":"R40", "x":11, "y":4},
- {"label":"L52", "x":6, "y":5},
- {"label":"L53", "x":7, "y":5},
- {"label":"R52", "x":9, "y":5},
- {"label":"R53", "x":10, "y":5}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "L05", "x": 5, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "R05", "x": 16, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "L15", "x": 5, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "R15", "x": 16, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "L25", "x": 5, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "R25", "x": 16, "y": 2 },
+ { "label": "L30", "x": 0, "y": 3 },
+ { "label": "L31", "x": 1, "y": 3 },
+ { "label": "L32", "x": 2, "y": 3 },
+ { "label": "L33", "x": 3, "y": 3 },
+ { "label": "L34", "x": 4, "y": 3 },
+ { "label": "L35", "x": 5, "y": 3 },
+ { "label": "R30", "x": 11, "y": 3 },
+ { "label": "R31", "x": 12, "y": 3 },
+ { "label": "R32", "x": 13, "y": 3 },
+ { "label": "R33", "x": 14, "y": 3 },
+ { "label": "R34", "x": 15, "y": 3 },
+ { "label": "R35", "x": 16, "y": 3 },
+ { "label": "L43", "x": 5, "y": 4 },
+ { "label": "L44", "x": 6, "y": 4 },
+ { "label": "L45", "x": 7, "y": 4 },
+ { "label": "R40", "x": 9, "y": 4 },
+ { "label": "R41", "x": 10, "y": 4 },
+ { "label": "R40", "x": 11, "y": 4 },
+ { "label": "L52", "x": 6, "y": 5 },
+ { "label": "L53", "x": 7, "y": 5 },
+ { "label": "R52", "x": 9, "y": 5 },
+ { "label": "R53", "x": 10, "y": 5 }
]
}
}
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c
index b110d7ff5a..504cb0a219 100644
--- a/keyboards/bastardkb/scylla/scylla.c
+++ b/keyboards/bastardkb/scylla/scylla.c
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
#include "scylla.h"
+// clang-format off
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
// left
@@ -59,3 +60,4 @@ led_config_t g_led_config = { {
2, 2, 2, 2, 2
} };
#endif
+// clang-format on
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index 57b36e1e2a..a4949aaf5f 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Elite-C",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 213bb9a79c..8488a2e337 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Elite-C",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/scylla/v2/splinky/config.h b/keyboards/bastardkb/scylla/v2/splinky/config.h
index 8bfd59d28c..1628340822 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/config.h
@@ -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
diff --git a/keyboards/bastardkb/scylla/v2/splinky/info.json b/keyboards/bastardkb/scylla/v2/splinky/info.json
index 614e22eefa..e6bcc6ca2f 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla Splinky",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
index be0e2fb959..8397b931c5 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ 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.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
index 72f5c0ffa8..36b25dffff 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ 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.
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index 46e33a828c..7963834a79 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Scylla STeMCell",
"usb": {
- "device_version": "2.0.0"
+ "device_version": "2.0.0"
}
}
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index 16106f2f82..2e0f758704 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Skeletyl Blackpill",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 55f68dc9b2..799f630124 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,47 +1,47 @@
{
"url": "https://www.bastardkb.com/skeletyl",
"usb": {
- "pid": "0x1830",
+ "pid": "0x1830"
},
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"L33", "x":4, "y":3},
- {"label":"L34", "x":5, "y":3},
- {"label":"L31", "x":6, "y":3},
- {"label":"R33", "x":9, "y":3},
- {"label":"R34", "x":10, "y":3},
- {"label":"R31", "x":11, "y":3}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "L33", "x": 4, "y": 3 },
+ { "label": "L34", "x": 5, "y": 3 },
+ { "label": "L31", "x": 6, "y": 3 },
+ { "label": "R33", "x": 9, "y": 3 },
+ { "label": "R34", "x": 10, "y": 3 },
+ { "label": "R31", "x": 11, "y": 3 }
]
}
}
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index f784c9423d..0d20c14c3d 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Skeletyl Elite-C",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/skeletyl/v1/info.json b/keyboards/bastardkb/skeletyl/v1/info.json
index 2443086ddf..ad889c2304 100644
--- a/keyboards/bastardkb/skeletyl/v1/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/info.json
@@ -1,5 +1,5 @@
{
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index 0b50c1faa1..b339ca877c 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Skeletyl Elite-C",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
index c4e5b3ff90..b5539989b4 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
@@ -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
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/info.json b/keyboards/bastardkb/skeletyl/v2/splinky/info.json
index b90334c78d..cdcf967c35 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Skeletyl Splinky",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
index ac86fa83e6..825370337d 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ 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.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
index d78a36c97f..bb1de74d3c 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ 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.
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index df805a6229..34e40c9b38 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "Skeletyl STeMCell",
"usb": {
- "device_version": "2.0.0"
+ "device_version": "2.0.0"
}
}
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 9ce37939b5..cf420223e1 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,6 @@
*/
#pragma once
-#include "config_common.h"
#define MATRIX_ROWS 10
#define MATRIX_COLS 6
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index d25ccd5cf6..9529c1305b 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -2,70 +2,70 @@
"keyboard_name": "The Bastard Keyboard",
"url": "https://bastardkb.com/",
"usb": {
- "pid": "0x1828",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "pid": "0x1828"
},
"layouts": {
"LAYOUT_split_4x6_5": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"R30", "x":11, "y":3},
- {"label":"R31", "x":12, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R33", "x":14, "y":3},
- {"label":"R34", "x":15, "y":3},
- {"label":"R35", "x":16, "y":3},
- {"label":"L43", "x":5, "y":4},
- {"label":"L44", "x":6, "y":4},
- {"label":"L45", "x":7, "y":4},
- {"label":"R40", "x":9, "y":4},
- {"label":"R41", "x":10, "y":4},
- {"label":"R40", "x":11, "y":4},
- {"label":"L52", "x":6, "y":5},
- {"label":"L53", "x":7, "y":5},
- {"label":"R52", "x":9, "y":5},
- {"label":"R53", "x":10, "y":5}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "L05", "x": 5, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "R05", "x": 16, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "L15", "x": 5, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "R15", "x": 16, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "L25", "x": 5, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "R25", "x": 16, "y": 2 },
+ { "label": "L30", "x": 0, "y": 3 },
+ { "label": "L31", "x": 1, "y": 3 },
+ { "label": "L32", "x": 2, "y": 3 },
+ { "label": "L33", "x": 3, "y": 3 },
+ { "label": "L34", "x": 4, "y": 3 },
+ { "label": "L35", "x": 5, "y": 3 },
+ { "label": "R30", "x": 11, "y": 3 },
+ { "label": "R31", "x": 12, "y": 3 },
+ { "label": "R32", "x": 13, "y": 3 },
+ { "label": "R33", "x": 14, "y": 3 },
+ { "label": "R34", "x": 15, "y": 3 },
+ { "label": "R35", "x": 16, "y": 3 },
+ { "label": "L43", "x": 5, "y": 4 },
+ { "label": "L44", "x": 6, "y": 4 },
+ { "label": "L45", "x": 7, "y": 4 },
+ { "label": "R40", "x": 9, "y": 4 },
+ { "label": "R41", "x": 10, "y": 4 },
+ { "label": "R40", "x": 11, "y": 4 },
+ { "label": "L52", "x": 6, "y": 5 },
+ { "label": "L53", "x": 7, "y": 5 },
+ { "label": "R52", "x": 9, "y": 5 },
+ { "label": "R53", "x": 10, "y": 5 }
]
}
}
diff --git a/keyboards/bastardkb/tbk/tbk.c b/keyboards/bastardkb/tbk/tbk.c
index dabfcf35c7..4cebec2a54 100644
--- a/keyboards/bastardkb/tbk/tbk.c
+++ b/keyboards/bastardkb/tbk/tbk.c
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h
index 196982952f..3f9cd9915d 100644
--- a/keyboards/bastardkb/tbk/tbk.h
+++ b/keyboards/bastardkb/tbk/tbk.h
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,26 +17,26 @@
#pragma once
-#include "quantum.h"
-// SWITCHED 91 and 95 - check on left ?
+// clang-format off
#define LAYOUT_split_4x6_5( \
- k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
- k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
- k43, k44, k41, k91, k94, k93, \
- k45, k42, k92, k95 \
-)\
-{\
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { KC_NO, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, k71, k72, k73, k74, k75 }, \
- { k80, k81, k82, k83, k84, k85 }, \
- { KC_NO, k91, k92, k93, k94, k95 }, \
+ k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
+ k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
+ k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
+ k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
+ k43, k44, k41, k91, k94, k93, \
+ k45, k42, k92, k95 \
+) \
+{ \
+ { k00, k01, k02, k03, k04, k05 }, \
+ { k10, k11, k12, k13, k14, k15 }, \
+ { k20, k21, k22, k23, k24, k25 }, \
+ { k30, k31, k32, k33, k34, k35 }, \
+ { KC_NO, k41, k42, k43, k44, k45 }, \
+ { k50, k51, k52, k53, k54, k55 }, \
+ { k60, k61, k62, k63, k64, k65 }, \
+ { k70, k71, k72, k73, k74, k75 }, \
+ { k80, k81, k82, k83, k84, k85 }, \
+ { KC_NO, k91, k92, k93, k94, k95 }, \
}
+// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index d4f15e44f1..24664f13ef 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "TBK Mini Blackpill",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 4233599432..cb4d3378bc 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,53 +1,53 @@
{
"url": "https://www.bastardkb.com/tbk-mini",
"usb": {
- "pid": "0x1828",
+ "pid": "0x1828"
},
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L33", "x":5, "y":3},
- {"label":"L34", "x":6, "y":3},
- {"label":"L31", "x":7, "y":3},
- {"label":"R33", "x":9, "y":3},
- {"label":"R34", "x":10, "y":3},
- {"label":"R31", "x":11, "y":3}
+ { "label": "L00", "x": 0, "y": 0 },
+ { "label": "L01", "x": 1, "y": 0 },
+ { "label": "L02", "x": 2, "y": 0 },
+ { "label": "L03", "x": 3, "y": 0 },
+ { "label": "L04", "x": 4, "y": 0 },
+ { "label": "L05", "x": 5, "y": 0 },
+ { "label": "R00", "x": 11, "y": 0 },
+ { "label": "R01", "x": 12, "y": 0 },
+ { "label": "R02", "x": 13, "y": 0 },
+ { "label": "R03", "x": 14, "y": 0 },
+ { "label": "R04", "x": 15, "y": 0 },
+ { "label": "R05", "x": 16, "y": 0 },
+ { "label": "L10", "x": 0, "y": 1 },
+ { "label": "L11", "x": 1, "y": 1 },
+ { "label": "L12", "x": 2, "y": 1 },
+ { "label": "L13", "x": 3, "y": 1 },
+ { "label": "L14", "x": 4, "y": 1 },
+ { "label": "L15", "x": 5, "y": 1 },
+ { "label": "R10", "x": 11, "y": 1 },
+ { "label": "R11", "x": 12, "y": 1 },
+ { "label": "R12", "x": 13, "y": 1 },
+ { "label": "R13", "x": 14, "y": 1 },
+ { "label": "R14", "x": 15, "y": 1 },
+ { "label": "R15", "x": 16, "y": 1 },
+ { "label": "L20", "x": 0, "y": 2 },
+ { "label": "L21", "x": 1, "y": 2 },
+ { "label": "L22", "x": 2, "y": 2 },
+ { "label": "L23", "x": 3, "y": 2 },
+ { "label": "L24", "x": 4, "y": 2 },
+ { "label": "L25", "x": 5, "y": 2 },
+ { "label": "R20", "x": 11, "y": 2 },
+ { "label": "R21", "x": 12, "y": 2 },
+ { "label": "R22", "x": 13, "y": 2 },
+ { "label": "R23", "x": 14, "y": 2 },
+ { "label": "R24", "x": 15, "y": 2 },
+ { "label": "R25", "x": 16, "y": 2 },
+ { "label": "L33", "x": 5, "y": 3 },
+ { "label": "L34", "x": 6, "y": 3 },
+ { "label": "L31", "x": 7, "y": 3 },
+ { "label": "R33", "x": 9, "y": 3 },
+ { "label": "R34", "x": 10, "y": 3 },
+ { "label": "R31", "x": 11, "y": 3 }
]
}
}
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c
index 7bbd374c01..34b42951a0 100644
--- a/keyboards/bastardkb/tbkmini/tbkmini.c
+++ b/keyboards/bastardkb/tbkmini/tbkmini.c
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
#include "tbkmini.h"
+// clang-format off
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
// left
@@ -57,3 +58,4 @@ led_config_t g_led_config = { {
2, 2, 2
} };
#endif
+// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index 83a9e799e1..f9ebb18069 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "TBK Mini Elite-C",
"usb": {
- "device_version": "1.0.0",
- },
+ "device_version": "1.0.0"
+ }
}
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index 50cfe860dd..a0ef2767f9 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "TBK Mini Elite-C",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
index c4e5b3ff90..b5539989b4 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
@@ -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
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/info.json b/keyboards/bastardkb/tbkmini/v2/splinky/info.json
index ca66bceeff..b0b05fba8a 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "TBK Mini Splinky",
"usb": {
- "device_version": "2.0.0",
- },
+ "device_version": "2.0.0"
+ }
}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
index be0e2fb959..8397b931c5 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ 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.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
index 72f5c0ffa8..36b25dffff 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
@@ -20,3 +20,11 @@
/* Key matrix configuration. */
#define MATRIX_COL_PINS \
{ 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.
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index b56c455ae3..7595dab436 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "TBK Mini STeMCell",
"usb": {
- "device_version": "2.0.0"
+ "device_version": "2.0.0"
}
}