diff options
author | QMK Bot <hello@qmk.fm> | 2022-07-03 02:56:16 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-07-03 02:56:16 +0000 |
commit | e8c46fab961059dc6506945f9f0a306596a2ea25 (patch) | |
tree | 6908e51d402f6762677c8abd3b8832b48070d35f /keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h | |
parent | 03909b8a3f6a9065e49d4303561df0e55cb8656f (diff) | |
parent | 1c43410e266429c97786c9f9217ab9708bb2754d (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h')
-rw-r--r-- | keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h index 0f60612d79..5712bb4574 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h @@ -17,19 +17,18 @@ #pragma once #include_next "mcuconf.h" -#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_PWM_USE_ADVANCED +#define STM32_PWM_USE_ADVANCED TRUE + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 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_TIM4 +#define STM32_PWM_USE_TIM4 TRUE #undef STM32_SPI_USE_SPI1 #define STM32_SPI_USE_SPI1 TRUE @@ -37,8 +36,8 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE -#undef STM32_GPT_USE_TIM4 -#define STM32_GPT_USE_TIM4 TRUE +#undef STM32_GPT_USE_TIM3 +#define STM32_GPT_USE_TIM3 TRUE #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 |