Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stm32: Fix USART3 on stm32f1 and stm32f2 

Commit 6a3c357a incorrectly disabled support for USART3 on stm32f1 and
stm32f2 - restore that support.

Also, add support for USART3 on PD9/PD8 on stm32f103.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-05-25 22:13:09 -04:00
parent 20a6c6b225
commit 12acb99a38
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stm32/Kconfig
View File

@ -247,11 +247,11 @@ choice
select SERIAL select SERIAL
config STM32_SERIAL_USART3 config STM32_SERIAL_USART3
bool "Serial (on USART3 PB11/PB10)" if LOW_LEVEL_OPTIONS bool "Serial (on USART3 PB11/PB10)" if LOW_LEVEL_OPTIONS
depends on MACH_STM32F405 || MACH_STM32F407 || MACH_STM32F446 depends on !MACH_STM32F0 && !MACH_STM32F401
select SERIAL select SERIAL
config STM32_SERIAL_USART3_ALT_PD9_PD8 config STM32_SERIAL_USART3_ALT_PD9_PD8
bool "Serial (on USART3 PD9/PD8)" if LOW_LEVEL_OPTIONS bool "Serial (on USART3 PD9/PD8)" if LOW_LEVEL_OPTIONS
depends on MACH_STM32F405 || MACH_STM32F407 || MACH_STM32F446 depends on !MACH_STM32F0 && !MACH_STM32F401
select SERIAL select SERIAL
config STM32_CANBUS_PA11_PA12 config STM32_CANBUS_PA11_PA12
bool "CAN bus (on PA11/PA12)" if HAVE_STM32_CANBUS bool "CAN bus (on PA11/PA12)" if HAVE_STM32_CANBUS

4
src/stm32/stm32f1.c
View File

@ -160,6 +160,10 @@ gpio_peripheral(uint32_t gpio, uint32_t mode, int pullup)
// TIM3 full remap // TIM3 full remap
stm32f1_alternative_remap(AFIO_MAPR_TIM3_REMAP_FULLREMAP_Msk, stm32f1_alternative_remap(AFIO_MAPR_TIM3_REMAP_FULLREMAP_Msk,
AFIO_MAPR_TIM3_REMAP_FULLREMAP); AFIO_MAPR_TIM3_REMAP_FULLREMAP);
} else if ((gpio == GPIO('D', 8) || gpio == GPIO('D', 9)) && func == 7) {
// USART3 remap
stm32f1_alternative_remap(AFIO_MAPR_USART3_REMAP_FULLREMAP_Msk,
AFIO_MAPR_USART3_REMAP_FULLREMAP);
} else if ((gpio == GPIO('D', 12) } else if ((gpio == GPIO('D', 12)
|| gpio == GPIO('D', 13) || gpio == GPIO('D', 13)
|| gpio == GPIO('D', 14) || gpio == GPIO('D', 14)