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

stm32: Add STM32F429 variant (#3926) 

* Add F429 variant; add CAN on PD0,PD1; add 25Mhx clock; move CAN1_RX from PI8 to correct position (PI9)

* Add test for STM32F429

Signed-off-by: Arkadiusz Raj <arek.raj@gmail.com>
This commit is contained in:
Arek 2021-02-19 02:12:32 +01:00 committed by GitHub
parent 03b3cff823
commit e6d1910ef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/stm32/Kconfig
View File

@ -34,6 +34,9 @@ choice
config MACH_STM32F407 config MACH_STM32F407
bool "STM32F407" bool "STM32F407"
select MACH_STM32F4 select MACH_STM32F4
config MACH_STM32F429
bool "STM32F429"
select MACH_STM32F4
config MACH_STM32F446 config MACH_STM32F446
bool "STM32F446" bool "STM32F446"
select MACH_STM32F4 select MACH_STM32F4
@ -75,6 +78,7 @@ config MCU
default "stm32f401xc" if MACH_STM32F401 default "stm32f401xc" if MACH_STM32F401
default "stm32f405xx" if MACH_STM32F405 default "stm32f405xx" if MACH_STM32F405
default "stm32f407xx" if MACH_STM32F407 default "stm32f407xx" if MACH_STM32F407
default "stm32f429xx" if MACH_STM32F429
default "stm32f446xx" if MACH_STM32F446 default "stm32f446xx" if MACH_STM32F446
config CLOCK_FREQ config CLOCK_FREQ
@ -85,7 +89,7 @@ config CLOCK_FREQ
default 120000000 if MACH_STM32F207 default 120000000 if MACH_STM32F207
default 84000000 if MACH_STM32F401 default 84000000 if MACH_STM32F401
default 168000000 if MACH_STM32F405 || MACH_STM32F407 default 168000000 if MACH_STM32F405 || MACH_STM32F407
default 180000000 if MACH_STM32F446 default 180000000 if MACH_STM32F446 || MACH_STM32F429
config FLASH_SIZE config FLASH_SIZE
hex hex
@ -94,7 +98,7 @@ config FLASH_SIZE
default 0x20000 if MACH_STM32F070 default 0x20000 if MACH_STM32F070
default 0x10000 if MACH_STM32F103 # Flash size of stm32f103x8 (64KiB) default 0x10000 if MACH_STM32F103 # Flash size of stm32f103x8 (64KiB)
default 0x40000 if MACH_STM32F2 || MACH_STM32F401 default 0x40000 if MACH_STM32F2 || MACH_STM32F401
default 0x80000 if MACH_STM32F405 || MACH_STM32F407 || MACH_STM32F446 default 0x80000 if MACH_STM32F405 || MACH_STM32F407 || MACH_STM32F429 || MACH_STM32F446
config RAM_START config RAM_START
hex hex
@ -108,8 +112,7 @@ config RAM_SIZE
default 0x5000 if MACH_STM32F103 # Ram size of stm32f103x8 (20KiB) default 0x5000 if MACH_STM32F103 # Ram size of stm32f103x8 (20KiB)
default 0x20000 if MACH_STM32F207 default 0x20000 if MACH_STM32F207
default 0x10000 if MACH_STM32F401 default 0x10000 if MACH_STM32F401
default 0x20000 if MACH_STM32F405 || MACH_STM32F407 || MACH_STM32F446 default 0x20000 if MACH_STM32F405 || MACH_STM32F407 || MACH_STM32F429 || MACH_STM32F446
config STACK_SIZE config STACK_SIZE
int int
@ -163,11 +166,14 @@ choice
bool "12 MHz crystal" bool "12 MHz crystal"
config STM32_CLOCK_REF_16M config STM32_CLOCK_REF_16M
bool "16 MHz crystal" bool "16 MHz crystal"
config STM32_CLOCK_REF_25M
bool "25 MHz crystal"
config STM32_CLOCK_REF_INTERNAL config STM32_CLOCK_REF_INTERNAL
bool "Internal clock" bool "Internal clock"
endchoice endchoice
config CLOCK_REF_FREQ config CLOCK_REF_FREQ
int int
default 25000000 if STM32_CLOCK_REF_25M
default 16000000 if STM32_CLOCK_REF_16M default 16000000 if STM32_CLOCK_REF_16M
default 12000000 if STM32_CLOCK_REF_12M default 12000000 if STM32_CLOCK_REF_12M
default 1 if STM32_CLOCK_REF_INTERNAL default 1 if STM32_CLOCK_REF_INTERNAL
@ -193,11 +199,13 @@ choice
config CAN_PINS_PB8_PB9 config CAN_PINS_PB8_PB9
bool "Pins PB8(rx) and PB9(tx)" bool "Pins PB8(rx) and PB9(tx)"
config CAN_PINS_PI8_PH13 config CAN_PINS_PI8_PH13
bool "Pins PI8(rx) and PH13(tx)" if MACH_STM32F4 bool "Pins PI9(rx) and PH13(tx)" if MACH_STM32F4
config CAN_PINS_PB5_PB6 config CAN_PINS_PB5_PB6
bool "Pins PB5(rx) and PB6(tx)" if MACH_STM32F4 bool "Pins PB5(rx) and PB6(tx)" if MACH_STM32F4
config CAN_PINS_PB12_PB13 config CAN_PINS_PB12_PB13
bool "Pins PB12(rx) and PB13(tx)" if MACH_STM32F405 || MACH_STM32F407 bool "Pins PB12(rx) and PB13(tx)" if MACH_STM32F4
config CAN_PINS_PD0_PD1
bool "Pins PD0(rx) and PD1(tx)" if MACH_STM32F4
endchoice endchoice
config STM32F0_TRIM config STM32F0_TRIM

11
src/stm32/can.c
View File

@ -28,8 +28,8 @@
#define GPIO_Tx GPIO('B', 9) #define GPIO_Tx GPIO('B', 9)
#endif #endif
#if CONFIG_CAN_PINS_PI8_PH13 #if CONFIG_CAN_PINS_PI8_PH13
DECL_CONSTANT_STR("RESERVE_PINS_CAN", "PI8,PH13"); DECL_CONSTANT_STR("RESERVE_PINS_CAN", "PI9,PH13");
#define GPIO_Rx GPIO('I', 8) #define GPIO_Rx GPIO('I', 9)
#define GPIO_Tx GPIO('H', 13) #define GPIO_Tx GPIO('H', 13)
#endif #endif
#if CONFIG_CAN_PINS_PB5_PB6 #if CONFIG_CAN_PINS_PB5_PB6
@ -42,6 +42,11 @@
#define GPIO_Rx GPIO('B', 12) #define GPIO_Rx GPIO('B', 12)
#define GPIO_Tx GPIO('B', 13) #define GPIO_Tx GPIO('B', 13)
#endif #endif
#if CONFIG_CAN_PINS_PD0_PD1
DECL_CONSTANT_STR("RESERVE_PINS_CAN", "PD0,PD1");
#define GPIO_Rx GPIO('D', 0)
#define GPIO_Tx GPIO('D', 1)
#endif
#if CONFIG_MACH_STM32F0 #if CONFIG_MACH_STM32F0
#define SOC_CAN CAN #define SOC_CAN CAN
@ -64,7 +69,7 @@
#if CONFIG_MACH_STM32F4 #if CONFIG_MACH_STM32F4
#warning CAN on STM32F4 is untested #warning CAN on STM32F4 is untested
#if (CONFIG_CAN_PINS_PA11_PA12 || CONFIG_CAN_PINS_PB8_PB9 \ #if (CONFIG_CAN_PINS_PA11_PA12 || CONFIG_CAN_PINS_PB8_PB9 \
|| CONFIG_CAN_PINS_PI8_PH13) || CONFIG_CAN_PINS_PD0_PD1 || CONFIG_CAN_PINS_PI9_PH13)
#define SOC_CAN CAN1 #define SOC_CAN CAN1
#define CAN_RX0_IRQn CAN1_RX0_IRQn #define CAN_RX0_IRQn CAN1_RX0_IRQn
#define CAN_RX1_IRQn CAN1_RX1_IRQn #define CAN_RX1_IRQn CAN1_RX1_IRQn

3
test/configs/stm32f429.config Normal file
View File

@ -0,0 +1,3 @@
# Base config file for STM32F429 ARM processor
CONFIG_MACH_STM32=y
CONFIG_MACH_STM32F429=y