summaryrefslogtreecommitdiffstats
path: root/keyboards/bastardkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb')
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/info.json1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/info.json1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk1
-rw-r--r--keyboards/bastardkb/charybdis/4x6/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/config.h1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/info.json1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/config.h4
-rw-r--r--keyboards/bastardkb/scylla/config.h4
-rw-r--r--keyboards/bastardkb/scylla/keymaps/cykedev/config.h9
-rw-r--r--keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c13
-rw-r--r--keyboards/bastardkb/scylla/keymaps/xyverz/config.h2
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/config.h4
-rw-r--r--keyboards/bastardkb/skeletyl/info.json1
-rw-r--r--keyboards/bastardkb/skeletyl/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk1
-rw-r--r--keyboards/bastardkb/tbk/config.h1
-rw-r--r--keyboards/bastardkb/tbk/keymaps/xyverz/config.h2
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/config.h4
-rw-r--r--keyboards/bastardkb/tbkmini/info.json1
-rw-r--r--keyboards/bastardkb/tbkmini/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk1
50 files changed, 22 insertions, 72 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index a21fd9e7ff..72d82bdf50 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index 0849d5968a..e25064a197 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -24,9 +24,6 @@
#define DIODE_DIRECTION ROW2COL
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
index 0c47d1a3ad..a09ef236ba 100644
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -5,6 +5,7 @@
"pid": "0x1832",
"vid": "0xA8F8"
},
+ "community_layouts": ["split_3x5_3"],
"layout_aliases": {
"LAYOUT_charybdis_3x5": "LAYOUT"
},
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
index 3ab7e56ebd..0a2db20561 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
@@ -43,7 +43,7 @@
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
*/
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
/*
* Tap-or-Hold decision modes.
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index 22bd22652a..a40b3a6237 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -26,7 +26,6 @@ RGB_MATRIX_DRIVER = WS2812
# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
# the trackball side).
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index 22bd22652a..a40b3a6237 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -26,7 +26,6 @@ RGB_MATRIX_DRIVER = WS2812
# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
# the trackball side).
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 21a9506077..13c1b39961 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -28,7 +28,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 21a9506077..13c1b39961 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -28,7 +28,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index e4a9ce289c..0847e9ce1f 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index a29e3e433d..72d82bdf50 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 40d933f0b8..b759af6560 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -24,9 +24,6 @@
#define DIODE_DIRECTION ROW2COL
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 92c424788f..1a4d15711f 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -3,6 +3,7 @@
"usb": {
"pid": "0x1834"
},
+ "community_layouts": ["split_3x6_3"],
"layout_aliases": {
"LAYOUT_charybdis_3x6": "LAYOUT"
},
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 54406bcc1d..c3f278c003 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -24,7 +24,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 54406bcc1d..c3f278c003 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -24,7 +24,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 6ab474a76f..13c1b39961 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -28,7 +28,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 6ab474a76f..13c1b39961 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -28,7 +28,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 94cd8a0deb..0847e9ce1f 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 68d4438315..53757a643a 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -24,9 +24,6 @@
#define DIODE_DIRECTION ROW2COL
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
index 0fa403c0f3..ced39ef4a1 100644
--- a/keyboards/bastardkb/charybdis/config.h
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -18,7 +18,6 @@
#pragma once
-#include "config_common.h"
/* Pointing device configuration. */
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index df2f94792d..ac660f9af8 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -28,7 +28,6 @@ POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_2
# RP2040-specific options
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index bbbecd7efa..a758541149 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -3,6 +3,7 @@
"device_version": "1.0.0",
"pid": "0x1835"
},
+ "community_layouts": ["split_3x5_2"],
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
index cbe8e7bba7..2390d10ca5 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
@@ -41,7 +41,7 @@
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
*/
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
/*
* Tap-or-Hold decision modes.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 292b71fe8b..6b41bad272 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -28,7 +28,6 @@ POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_2
# RP2040-specific options
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 777367903d..2dda30b7ca 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,6 +4,7 @@
"device_version": "2.0.0",
"pid": "0x1835"
},
+ "community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
index 139b1f06ea..fce6c3a1f6 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
@@ -37,7 +37,7 @@
* Enable rapid switch from tap to hold. Disable auto-repeat when pressing key
* twice, except for one-shot keys.
*/
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
/*
* Tap-or-Hold decision modes.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
index 461976b276..30fef9bbeb 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
// ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
- KC_A, NAV, CAPSWRD, KC_SPC, SYM, KC_A
+ KC_A, NAV, CW_TOGG, KC_SPC, SYM, KC_A
// ╰───────────────────────────╯ ╰──────────────────────────╯
),
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index 73ee4ab1e0..f50350a869 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -30,7 +30,6 @@ POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
# RP2040-specific options
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index 7f0b5c266f..7043855290 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -18,7 +18,6 @@
#pragma once
-#include "config_common.h"
/* Key matrix configuration. */
@@ -27,9 +26,6 @@
#define DIODE_DIRECTION ROW2COL
-// Set 0 if debouncing isn't needed.
-#define DEBOUNCE 5
-
/* Pointing device configuration. */
// Enable use of pointing device on slave split.
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 043547be52..83ed60345e 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -18,7 +18,6 @@
#pragma once
-#include "config_common.h"
/* Key matrix configuration. */
#define MATRIX_ROWS 10 // Rows are doubled-up.
@@ -26,9 +25,6 @@
#define DIODE_DIRECTION ROW2COL
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
/* RGB settings. */
#define RGBLED_NUM 58
#define RGBLED_SPLIT \
diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h
index 3b2fa15b96..6119f2738b 100644
--- a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h
+++ b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h
@@ -28,15 +28,12 @@
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-// #define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-// #define TAPPING_FORCE_HOLD
+// #define QUICK_TAP_TERM 0
// Apply the modifier on keys that are tapped during a short hold of a modtap
// #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-#define FORCE_NKRO \ No newline at end of file
+#define FORCE_NKRO
diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
index 9f497e2c14..a51f5b9d38 100644
--- a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
@@ -169,12 +169,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case CM_SPAR:
- return true;
- default:
- return false;
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+ if (keycode == CM_SPAR) {
+ return false;
+ } else if (QK_MOD_TAP <= keycode && keycode <= QK_MOD_TAP_MAX) {
+ return true;
+ } else {
+ return false;
}
}
diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
index d7baf99376..335f968e2a 100644
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
+++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
#define EE_HANDS
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define TAPPING_TERM 300
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index 4ecd8c6924..cf2041ea1c 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -25,7 +25,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index 82a07c5921..c221eb24c5 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h