3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-20 05:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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;
}