Merge remote-tracking branch 'upstream/develop'

21 files changed, 45 insertions, 78 deletions

diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 8e09212116..a701797dc0 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -2,5 +2,8 @@
     "keyboard_name": "Scylla Blackpill",
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
 }
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index cf2041ea1c..b68437c19e 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 043547be52..0f41dca37e 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -18,17 +18,9 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* Key matrix configuration. */
-#define MATRIX_ROWS 10 // Rows are doubled-up.
-#define MATRIX_COLS 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/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h
index 0990e6d068..967a8c6c53 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v1/elitec/config.h
@@ -27,8 +27,5 @@
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D0
-
 /* RGB settings. */
 #define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index a4949aaf5f..1ed2cee71d 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Scylla Elite-C",
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index 0c131a2eaf..985f9489c2 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
index 698f6e426f..e9691010ed 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v2/elitec/config.h
@@ -26,8 +26,5 @@
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D2
-
 /* RGB settings. */
 #define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 8488a2e337..4674e238a6 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Scylla Elite-C",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index 0c131a2eaf..985f9489c2 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index 5f678fb331..f65dcfb0b3 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
@@ -31,9 +31,6 @@
 // #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
-
 /* RGB settings. */
 #define RGB_DI_PIN GP0
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index e6bcc6ca2f..6d3edbd0ee 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Scylla Splinky",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "split": {
+        "soft_serial_pin": "GP1"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 8dfc0256ab..8e2235ee9f 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # RP2040-specific options
 ALLOW_WARNINGS = yes
 PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index 56020397da..09d5af43c8 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
@@ -31,9 +31,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
 /* RGB settings. */
 #define RGB_DI_PIN GP0
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index e6bcc6ca2f..6d3edbd0ee 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Scylla Splinky",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "split": {
+        "soft_serial_pin": "GP1"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 8dfc0256ab..8e2235ee9f 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # RP2040-specific options
 ALLOW_WARNINGS = yes
 PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 578e23f40a..5528531b91 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h
@@ -32,9 +32,6 @@
 // #define SPLIT_HAND_PIN A0
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D2
-
 /* RGB settings. */
 #define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index 7963834a79..eccfea99f4 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "Scylla STeMCell",
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 39fc183e1d..70f7784de6 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -1,8 +1,3 @@
-# MCU name
-MCU = STM32F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
 CONVERT_TO = stemcell
 
 # Build Options