From a9e9c9acc5dfcd5a98ac97e6a41d34cda04e0859 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 20 Mar 2024 19:51:01 +0000 Subject: [PATCH] Fix invalid use of stemcell converter (#23317) --- .../bastardkb/charybdis/3x5/v2/stemcell/config.h | 7 +++---- .../bastardkb/charybdis/3x5/v2/stemcell/info.json | 11 +++++------ .../bastardkb/charybdis/3x5/v2/stemcell/rules.mk | 2 -- .../bastardkb/charybdis/3x6/v2/stemcell/config.h | 7 +++---- .../bastardkb/charybdis/3x6/v2/stemcell/info.json | 11 +++++------ .../bastardkb/charybdis/3x6/v2/stemcell/rules.mk | 2 -- .../bastardkb/charybdis/4x6/v2/stemcell/config.h | 7 +++---- .../bastardkb/charybdis/4x6/v2/stemcell/info.json | 11 +++++------ .../bastardkb/charybdis/4x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/stemcell/info.json | 11 +++++------ keyboards/bastardkb/scylla/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/stemcell/info.json | 11 +++++------ keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/stemcell/info.json | 11 +++++------ keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk | 2 -- 15 files changed, 39 insertions(+), 60 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 6aa20712f67..50fc030402b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h @@ -39,15 +39,14 @@ /* SPI config for pmw3360 sensor. */ #define SPI_DRIVER SPID1 -#define SPI_SCK_PIN B1 +#define SPI_SCK_PIN A5 #define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PIN A7 #define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN B3 +#define SPI_MISO_PIN A6 #define SPI_MISO_PAL_MODE 5 /* PMW3360 settings. */ -#define A1 PAL_LINE(GPIOA, 1) #define POINTING_DEVICE_CS_PIN A1 #define PMW3360_CS_MODE 3 #define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index c119df524c3..af74a299be7 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 4436426f303..4bd570ddd8c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 6aa20712f67..50fc030402b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h @@ -39,15 +39,14 @@ /* SPI config for pmw3360 sensor. */ #define SPI_DRIVER SPID1 -#define SPI_SCK_PIN B1 +#define SPI_SCK_PIN A5 #define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PIN A7 #define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN B3 +#define SPI_MISO_PIN A6 #define SPI_MISO_PAL_MODE 5 /* PMW3360 settings. */ -#define A1 PAL_LINE(GPIOA, 1) #define POINTING_DEVICE_CS_PIN A1 #define PMW3360_CS_MODE 3 #define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 85b66277cf2..4309fd5ee30 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 4436426f303..4bd570ddd8c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index 6aa20712f67..50fc030402b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -39,15 +39,14 @@ /* SPI config for pmw3360 sensor. */ #define SPI_DRIVER SPID1 -#define SPI_SCK_PIN B1 +#define SPI_SCK_PIN A5 #define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PIN A7 #define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN B3 +#define SPI_MISO_PIN A6 #define SPI_MISO_PAL_MODE 5 /* PMW3360 settings. */ -#define A1 PAL_LINE(GPIOA, 1) #define POINTING_DEVICE_CS_PIN A1 #define PMW3360_CS_MODE 3 #define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index cfae56715f1..8060c758b88 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F4", "F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B10", "B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 4436426f303..4bd570ddd8c 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index d463418cf19..598ca9d9ee0 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F4", "F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B10", "B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 8dda103d07a..8256842e21d 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index b44d64a47aa..b384da9dbdc 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index 8dda103d07a..8256842e21d 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index a75db584e79..f62427438b7 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 8dda103d07a..8256842e21d 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable #