From d79f346747af7ad927ad7ef4e1a9c563ae02cead Mon Sep 17 00:00:00 2001 From: Roger Clark Date: Fri, 4 Sep 2015 10:30:41 +1000 Subject: [PATCH] GD32 changed calculation for delay() loop to use F_CPU --- .../libmaple/stm32f1/include/series/stm32.h | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/GD32F1/system/libmaple/stm32f1/include/series/stm32.h b/GD32F1/system/libmaple/stm32f1/include/series/stm32.h index d10be34..8f78925 100644 --- a/GD32F1/system/libmaple/stm32f1/include/series/stm32.h +++ b/GD32F1/system/libmaple/stm32f1/include/series/stm32.h @@ -227,27 +227,8 @@ extern "C" { # define STM32_PCLK2 F_CPU # endif # ifndef STM32_DELAY_US_MULT -#if F_CPU == 120000000 - #define STM32_DELAY_US_MULT 40 /* FIXME: value is incorrect. */ -#elif F_CPU == 96000000 - #define STM32_DELAY_US_MULT 32 /* FIXME: value is incorrect. */ -#elif F_CPU == 72000000 - #define STM32_DELAY_US_MULT 24 /* FIXME: value is incorrect. */ -#endif +# define STM32_DELAY_US_MULT (F_CPU / 3000000L) # endif -#elif STM32_F1_LINE == STM32_F1_LINE_VALUE /* TODO */ -# ifndef STM32_PCLK1 -# define STM32_PCLK1 12000000U -# endif -# ifndef STM32_PCLK2 -# define STM32_PCLK2 24000000U -# endif -# ifndef STM32_DELAY_US_MULT -# define STM32_DELAY_US_MULT 8 /* FIXME: value is incorrect. */ -# endif -#elif STM32_F1_LINE == STM32_F1_LINE_ACCESS /* TODO */ -#elif STM32_F1_LINE == STM32_F1_LINE_USB_ACCESS /* TODO */ -#elif STM32_F1_LINE == STM32_F1_LINE_CONNECTIVITY /* TODO */ #endif /*