diff options
author | QMK Bot <hello@qmk.fm> | 2022-11-29 19:44:26 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-11-29 19:44:26 +0000 |
commit | d648eb42caa633ab411da93d2bbe9c3eacaa8172 (patch) | |
tree | d534ed33cdfac430a19818c514dff90b337b1c8a /keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h | |
parent | c146563f4b12d8ef1446318a65c61dac1b197b23 (diff) | |
parent | 4a87af0e9af046d5fc00d930476920c0c34a57a7 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h')
-rw-r--r-- | keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h index fd71b54b77..9c40967015 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h @@ -18,25 +18,27 @@ #include_next "mcuconf.h" -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE +#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill) +# undef STM32_I2C_USE_I2C1 +# define STM32_I2C_USE_I2C1 TRUE // #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_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_TIM2 +# define STM32_PWM_USE_TIM2 TRUE -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 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_USE_SPI1 +# define STM32_SPI_USE_SPI1 TRUE -#undef STM32_SERIAL_USE_USART2 -#define STM32_SERIAL_USE_USART2 TRUE +# undef STM32_SERIAL_USE_USART2 +# define STM32_SERIAL_USE_USART2 TRUE -#undef STM32_ST_USE_TIMER -#define STM32_ST_USE_TIMER 5 +# undef STM32_ST_USE_TIMER +# define STM32_ST_USE_TIMER 5 +#endif |