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

stm32: HSI selection fix; Pin swap rename; Add CAN selection 

Signed-off-by: Eug Krashtan <eug.krashtan@gmail.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Eug Krashtan 2019-12-28 13:01:58 +02:00 committed by Kevin O'Connor
parent dd77a2ec16
commit 5238c3f872
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/stm32/Kconfig
View File

@ -131,12 +131,16 @@ config USBSERIAL
bool "Use USB for communication (instead of serial)"
depends on HAVE_STM32_USBFS || HAVE_STM32_USBOTG
default y
config STM32F042_USB_PIN_SWAP
bool "Use PA9/PA10 for USB" if MACH_STM32F042
depends on USBSERIAL && MACH_STM32F042
config CANSERIAL
bool "Use CAN for communication (instead of serial)"
depends on MACH_STM32F042 && !USBSERIAL
default n
config STM32F042_PIN_SWAP
bool "Use PA9/PA10 for USB or CAN" if MACH_STM32F042
depends on (USBSERIAL || CANSERIAL) && MACH_STM32F042
default n
config SERIAL
depends on !USBSERIAL
depends on !USBSERIAL && !CANSERIAL
bool
default y
choice

6
src/stm32/stm32f0.c
View File

@ -192,7 +192,7 @@ armcm_main(void)
FLASH->ACR = (1 << FLASH_ACR_LATENCY_Pos) | FLASH_ACR_PRFTBE;
// Configure main clock
if (CONFIG_MACH_STM32F042 && CONFIG_STM32_CLOCK_REF_INTERNAL)
if (CONFIG_MACH_STM32F042 || CONFIG_STM32_CLOCK_REF_INTERNAL)
hsi48_setup();
else
pll_setup();
@ -200,9 +200,9 @@ armcm_main(void)
// Turn on hsi14 oscillator for ADC
hsi14_setup();
// Support alternate USB pins on stm32f042
// Support alternate USB/CAN pins on stm32f042
#ifdef SYSCFG_CFGR1_PA11_PA12_RMP
if (CONFIG_STM32F042_USB_PIN_SWAP) {
if (CONFIG_STM32F042_PIN_SWAP) {
enable_pclock(SYSCFG_BASE);
SYSCFG->CFGR1 |= SYSCFG_CFGR1_PA11_PA12_RMP;
}