diff options
| author | Charly Delay <0xcharly@users.noreply.github.com> | 2022-11-15 17:51:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 08:51:44 +0000 |
| commit | 30b2dbe369b3a61d1d6681b0a689dbcdd41fc221 (patch) | |
| tree | cddf4e7318c2b06d33d4b3750d2e4eb15f1d2333 /keyboards/bastardkb/scylla/blackpill | |
| parent | ee7426e7b19c25ddfc53d0b50db68a457d8f992b (diff) | |
Bastard Keyboards: upstream recent changes (#18903)
* bastardkb: cleanup blackpill configuration
Fixes #17
* bastardkb: fix splinky configuration
The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.
Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.
Fixes #15
* bastardkb: add support for STeMCell
* Update scylla/tbkmini/skeletyl outdated readmes
* bastardkb/dilemma: enable circular scroll
* bastardkb/dilemma: add initial version of the `via` keymap
* bastardkb/dilemma/assembled: add new keyboard
Fixes #20
* bastardkb/dilemma: remove elite-c
* Initial support for the Dilemma 3x5+3 Assembled RGB
* Address code review comments
* Address more comments
* Address review comments
* Address more nits
* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
Diffstat (limited to 'keyboards/bastardkb/scylla/blackpill')
| -rw-r--r-- | keyboards/bastardkb/scylla/blackpill/halconf.h | 4 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/blackpill/mcuconf.h | 28 |
2 files changed, 3 insertions, 29 deletions
diff --git a/keyboards/bastardkb/scylla/blackpill/halconf.h b/keyboards/bastardkb/scylla/blackpill/halconf.h index 0d4b7b5dc5..1ba700a80f 100644 --- a/keyboards/bastardkb/scylla/blackpill/halconf.h +++ b/keyboards/bastardkb/scylla/blackpill/halconf.h @@ -1,4 +1,4 @@ -/* +/** * Copyright 2020 Nick Brassel (tzarc) * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) * @@ -20,10 +20,8 @@ #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 #include_next <halconf.h> diff --git a/keyboards/bastardkb/scylla/blackpill/mcuconf.h b/keyboards/bastardkb/scylla/blackpill/mcuconf.h index e7cf3681fd..2b3f30cbfe 100644 --- a/keyboards/bastardkb/scylla/blackpill/mcuconf.h +++ b/keyboards/bastardkb/scylla/blackpill/mcuconf.h @@ -21,39 +21,15 @@ #include_next <mcuconf.h> -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 FALSE - -//#undef STM32_I2C_I2C1_RX_DMA_STREAM -//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) -//#undef STM32_I2C_I2C1_TX_DMA_STREAM -//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1) - -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE - -//#undef STM32_PWM_USE_TIM3 -//#define STM32_PWM_USE_TIM3 TRUE - #undef STM32_SPI_USE_SPI1 #define STM32_SPI_USE_SPI1 TRUE -//#undef STM32_SPI_SPI1_RX_DMA_STREAM -//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0) -//#undef STM32_SPI_SPI1_TX_DMA_STREAM -//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3) +#undef STM32_PWM_USE_TIM2 +#define STM32_PWM_USE_TIM2 TRUE #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE -//#undef STM32_SERIAL_USE_USART2 -//#define STM32_SERIAL_USE_USART2 TRUE - -//#undef STM32_UART_USART2_RX_DMA_STREAM -//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5) -//#undef STM32_UART_USART2_TX_DMA_STREAM -//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) - #undef STM32_GPT_USE_TIM3 #define STM32_GPT_USE_TIM3 TRUE |