Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-10-31 10:25:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

stm32: add alternate pinout for USART2

Browse Source 
Added to both generic stm32 and stm32f0

Signed-off-by: Arne Jansen <arne@die-jansens.de>
This commit is contained in:
Arne Jansen
2020-01-01 10:20:50 +00:00
committed by KevinOConnor
parent 5ce86bd005
commit 0cd4d5d5ea
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/stm32/Kconfig
View File

@@ -155,7 +155,9 @@ choice
config STM32_SERIAL_USART1 config STM32_SERIAL_USART1
bool "USART1" bool "USART1"
config STM32_SERIAL_USART2 config STM32_SERIAL_USART2
bool "USART2" bool "USART2 (on PA3/PA2)"
config STM32_SERIAL_USART2_ALT
bool "USART2 (on PA15/PA14)"
config STM32_SERIAL_USART3 config STM32_SERIAL_USART3
bool "USART3" bool "USART3"
config STM32_SERIAL_USART3_ALT config STM32_SERIAL_USART3_ALT
@@ -165,6 +167,7 @@ config SERIAL_PORT
int int
default 103 if STM32_SERIAL_USART3_ALT default 103 if STM32_SERIAL_USART3_ALT
default 3 if STM32_SERIAL_USART3 default 3 if STM32_SERIAL_USART3
default 102 if STM32_SERIAL_USART2_ALT
default 2 if STM32_SERIAL_USART2 default 2 if STM32_SERIAL_USART2
default 1 default 1

6
src/stm32/serial.c
View File

@@ -24,6 +24,12 @@ DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA3,PA2");
#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_SERIAL_PORT == 102
DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA14,PA15");
#define GPIO_Rx GPIO('A', 14)
#define GPIO_Tx GPIO('A', 15)
#define USARTx USART2b
#define USARTx_IRQn USART2_IRQn
#elif CONFIG_SERIAL_PORT == 103 #elif CONFIG_SERIAL_PORT == 103
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)

6
src/stm32/stm32f0_serial.c
View File

@@ -24,6 +24,12 @@ DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA3,PA2");
#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_SERIAL_PORT == 102
DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA15,PA14");
#define GPIO_Rx GPIO('A', 15)
#define GPIO_Tx GPIO('A', 14)
#define USARTx USART2
#define USARTx_IRQn USART2_IRQn
#endif #endif
#define CR1_FLAGS (USART_CR1_UE | USART_CR1_RE | USART_CR1_TE \ #define CR1_FLAGS (USART_CR1_UE | USART_CR1_RE | USART_CR1_TE \