3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: Include pin names in STM32_SERIAL_USART?_ALT kconfig symbols 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-05-24 21:06:04 -04:00
parent 338bc82d0b
commit c1e8ee58e7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stm32/Kconfig
View File

@ -230,19 +230,19 @@ choice
config STM32_SERIAL_USART1 config STM32_SERIAL_USART1
bool "Serial (on USART1 PA10/PA9)" bool "Serial (on USART1 PA10/PA9)"
select SERIAL select SERIAL
config STM32_SERIAL_USART1_ALT config STM32_SERIAL_USART1_ALT_PA15_PA14
bool "Serial (on USART1 PA15/PA14)" if LOW_LEVEL_OPTIONS && MACH_STM32F0 bool "Serial (on USART1 PA15/PA14)" if LOW_LEVEL_OPTIONS && MACH_STM32F0
select SERIAL select SERIAL
config STM32_SERIAL_USART2 config STM32_SERIAL_USART2
bool "Serial (on USART2 PA3/PA2)" if LOW_LEVEL_OPTIONS bool "Serial (on USART2 PA3/PA2)" if LOW_LEVEL_OPTIONS
select SERIAL select SERIAL
config STM32_SERIAL_USART2_ALT config STM32_SERIAL_USART2_ALT_PA15_PA14
bool "Serial (on USART2 PA15/PA14)" if LOW_LEVEL_OPTIONS && MACH_STM32F0 bool "Serial (on USART2 PA15/PA14)" if LOW_LEVEL_OPTIONS && MACH_STM32F0
select SERIAL select SERIAL
config STM32_SERIAL_USART3 config STM32_SERIAL_USART3
bool "Serial (on USART3 PB11/PB10)" if LOW_LEVEL_OPTIONS && !MACH_STM32F0 bool "Serial (on USART3 PB11/PB10)" if LOW_LEVEL_OPTIONS && !MACH_STM32F0
select SERIAL select SERIAL
config STM32_SERIAL_USART3_ALT config STM32_SERIAL_USART3_ALT_PD9_PD8
depends on LOW_LEVEL_OPTIONS && (MACH_STM32F405 || MACH_STM32F407) depends on LOW_LEVEL_OPTIONS && (MACH_STM32F405 || MACH_STM32F407)
bool "Serial (on USART3 PD9/PD8)" bool "Serial (on USART3 PD9/PD8)"
select SERIAL select SERIAL

2
src/stm32/serial.c
View File

@ -30,7 +30,7 @@
#define GPIO_Tx GPIO('B', 10) #define GPIO_Tx GPIO('B', 10)
#define USARTx USART3 #define USARTx USART3
#define USARTx_IRQn USART3_IRQn #define USARTx_IRQn USART3_IRQn
#elif CONFIG_STM32_SERIAL_USART3_ALT #elif CONFIG_STM32_SERIAL_USART3_ALT_PD9_PD8
DECL_CONSTANT_STR("RESERVE_PINS_serial", "PD9,PD8"); DECL_CONSTANT_STR("RESERVE_PINS_serial", "PD9,PD8");
#define GPIO_Rx GPIO('D', 9) #define GPIO_Rx GPIO('D', 9)
#define GPIO_Tx GPIO('D', 8) #define GPIO_Tx GPIO('D', 8)

4
src/stm32/stm32f0_serial.c
View File

@ -18,7 +18,7 @@
#define GPIO_Tx GPIO('A', 9) #define GPIO_Tx GPIO('A', 9)
#define USARTx USART1 #define USARTx USART1
#define USARTx_IRQn USART1_IRQn #define USARTx_IRQn USART1_IRQn
#elif CONFIG_STM32_SERIAL_USART1_ALT #elif CONFIG_STM32_SERIAL_USART1_ALT_PA15_PA14
DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14"); DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14");
#define GPIO_Rx GPIO('A', 15) #define GPIO_Rx GPIO('A', 15)
#define GPIO_Tx GPIO('A', 14) #define GPIO_Tx GPIO('A', 14)
@ -30,7 +30,7 @@
#define GPIO_Tx GPIO('A', 2) #define GPIO_Tx GPIO('A', 2)
#define USARTx USART2 #define USARTx USART2
#define USARTx_IRQn USART2_IRQn #define USARTx_IRQn USART2_IRQn
#elif CONFIG_STM32_SERIAL_USART2_ALT #elif CONFIG_STM32_SERIAL_USART2_ALT_PA15_PA14
DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14"); DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14");
#define GPIO_Rx GPIO('A', 15) #define GPIO_Rx GPIO('A', 15)
#define GPIO_Tx GPIO('A', 14) #define GPIO_Tx GPIO('A', 14)