From 3e1a52ba94d170e7f3d2126b4e65033ad22108ae Mon Sep 17 00:00:00 2001 From: Thomas Haukland Date: Sat, 20 Apr 2024 11:33:49 +0200 Subject: [PATCH] Update lars blacktyl to latest --- keyboards/bastardkb/blacktyl_lars/config.h | 42 +++++++++++++++------ keyboards/bastardkb/blacktyl_lars/halconf.h | 8 ++-- keyboards/bastardkb/blacktyl_lars/info.json | 17 +++++++++ keyboards/bastardkb/blacktyl_lars/mcuconf.h | 8 ++-- keyboards/bastardkb/blacktyl_lars/rules.mk | 22 +++++++---- 5 files changed, 71 insertions(+), 26 deletions(-) diff --git a/keyboards/bastardkb/blacktyl_lars/config.h b/keyboards/bastardkb/blacktyl_lars/config.h index a8efff45d9..396efa8004 100644 --- a/keyboards/bastardkb/blacktyl_lars/config.h +++ b/keyboards/bastardkb/blacktyl_lars/config.h @@ -17,7 +17,7 @@ /* RGB CONFIG - WS2812 DRIVER */ #define WS2812_DI_PIN A1 -#define RGBLIGHT_LED_COUNT 36 +#define RGB_MATRIX_LED_COUNT 36 #define RGBLED_SPLIT \ { 18, 18 } #define WS2812_EXTERNAL_PULLUP @@ -29,16 +29,6 @@ // Without the following configurations the WS2812 would not light up #define WS2812_PWM_TARGET_PERIOD 800000 -/* RGB matrix support. */ -#ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR -# 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 /* CRC DRIVER #define CRC8_USE_TABLE @@ -79,3 +69,33 @@ /* Top right key on right half */ #define BOOTMAGIC_LITE_ROW_RIGHT 4 #define BOOTMAGIC_LITE_COLUMN_RIGHT 4 + +#define ENABLE_RGB_MATRIX_ALPHAS_MODS Enables 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_PIXEL_FRACTAL + #define ENABLE_RGB_MATRIX_PIXEL_FLOW + #define ENABLE_RGB_MATRIX_PIXEL_RAIN diff --git a/keyboards/bastardkb/blacktyl_lars/halconf.h b/keyboards/bastardkb/blacktyl_lars/halconf.h index a52da28e54..011715d87c 100644 --- a/keyboards/bastardkb/blacktyl_lars/halconf.h +++ b/keyboards/bastardkb/blacktyl_lars/halconf.h @@ -3,9 +3,9 @@ #define HAL_USE_PWM TRUE #define HAL_USE_SERIAL TRUE //#define HAL_USE_I2C TRUE -#define HAL_USE_SPI TRUE -#define SPI_USE_WAIT TRUE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#define HAL_USE_GPT TRUE +//#define HAL_USE_SPI TRUE +//#define SPI_USE_WAIT TRUE +//#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD +//#define HAL_USE_GPT TRUE #include_next diff --git a/keyboards/bastardkb/blacktyl_lars/info.json b/keyboards/bastardkb/blacktyl_lars/info.json index b62e4afb43..1ad7ffaf94 100644 --- a/keyboards/bastardkb/blacktyl_lars/info.json +++ b/keyboards/bastardkb/blacktyl_lars/info.json @@ -5,6 +5,23 @@ "device_version": "1.0.0" }, "url": "https://www.bastardkb.com", + "rgb_matrix": { + "driver": "ws2812", + "max_brightness": 50, + "sleep": true, + "split_count": [18, 18] + }, + "ws2812": { + "driver": "pwm", + "pin": "A1" + }, + "split": { + "transport": { + "sync": { + "matrix_state": true + } + } + }, "maintainer": "Quentin Lebastard", "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/bastardkb/blacktyl_lars/mcuconf.h b/keyboards/bastardkb/blacktyl_lars/mcuconf.h index 7bae79768a..d8b3de7f00 100644 --- a/keyboards/bastardkb/blacktyl_lars/mcuconf.h +++ b/keyboards/bastardkb/blacktyl_lars/mcuconf.h @@ -2,8 +2,8 @@ #include_next "mcuconf.h" -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 FALSE +//#undef STM32_I2C_USE_I2C1 +//#define STM32_I2C_USE_I2C1 FALSE #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 @@ -11,8 +11,8 @@ #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE +//#undef STM32_SPI_USE_SPI1 +//#define STM32_SPI_USE_SPI1 TRUE #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE diff --git a/keyboards/bastardkb/blacktyl_lars/rules.mk b/keyboards/bastardkb/blacktyl_lars/rules.mk index cdf195b7e4..4a20d4ebc5 100644 --- a/keyboards/bastardkb/blacktyl_lars/rules.mk +++ b/keyboards/bastardkb/blacktyl_lars/rules.mk @@ -1,9 +1,10 @@ # MCU name MCU = STM32F401 +BOARD = BLACKPILL_STM32_F401 # or # MCU = STM32F411 # For newer blackpills -BOOTMAGIC_ENABLE = yes +BOOTMAGIC_ENABLE = yes LAYOUTS = split_3x5_3 # Bootloader selection @@ -14,17 +15,24 @@ DEBOUNCE_TYPE = asym_eager_defer_pk # EEPROM_DRIVER = spi # KEYBOARD_SHARED_EP = yes # POINTING_DEVICE_DRIVER = pmw3360 +CAPS_WORD_ENABLE = yes # POINTING_DEVICE_ENABLE = yes -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -RGB_MATRIX_DRIVER = ws2812 # RGB matrix driver support -WS2812_DRIVER = pwm +# RGBLIGHT_DRIVER = WS2812 +# RGBLIGHT_ENABLE = no # SERIAL_DRIVER = bitbang SERIAL_DRIVER = usart SPLIT_KEYBOARD = yes # VIA_ENABLE = no -MOUSEKEY_ENABLE = yes +MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes +RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default +RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality +RGB_MATRIX_DRIVER = ws2812 + +SPLIT_KEYBOARD = yes + +MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint +KEYBOARD_SHARED_EP = yes