diff --git a/os/hal/platforms/STM32/hal_lld_f103.h b/os/hal/platforms/STM32/hal_lld_f103.h index 2f234aa83..96e42a123 100644 --- a/os/hal/platforms/STM32/hal_lld_f103.h +++ b/os/hal/platforms/STM32/hal_lld_f103.h @@ -110,8 +110,10 @@ #define DMA1_Ch6_IRQHandler Vector80 /**< DMA1 Channel 6. */ #define DMA1_Ch7_IRQHandler Vector84 /**< DMA1 Channel 7. */ #define ADC1_2_IRQHandler Vector88 /**< ADC1_2. */ -#define USB_HP_CAN1_TX_IRQHandler Vector8C /**< USB High Priority, CAN1 TX.*/ -#define USB_LP_CAN1_RX0_IRQHandler Vector90 /**< USB Low Priority, CAN1 RX0.*/ +#define CAN1_TX_IRQHandler Vector8C /**< CAN1 TX. */ +#define USB_HP_IRQHandler Vector8C /**< USB High Priority, CAN1 TX.*/ +#define CAN1_RX0_IRQHandler Vector90 /**< CAN1 RX0. */ +#define USB_LP_IRQHandler Vector90 /**< USB Low Priority, CAN1 RX0.*/ #define CAN1_RX1_IRQHandler Vector94 /**< CAN1 RX1. */ #define CAN1_SCE_IRQHandler Vector98 /**< CAN1 SCE. */ #define EXTI9_5_IRQHandler Vector9C /**< EXTI Line 9..5. */ @@ -341,8 +343,8 @@ #endif /* AHB frequency check.*/ -#if STM32_HPRE > 72000000 -#error "STM32_HPRE exceeding maximum frequency (72MHz)" +#if STM32_HCLK > 72000000 +#error "STM32_HCLK exceeding maximum frequency (72MHz)" #endif /** diff --git a/os/hal/platforms/STM32/hal_lld_f105_f107.h b/os/hal/platforms/STM32/hal_lld_f105_f107.h index 5f03dbe2c..1450267d0 100644 --- a/os/hal/platforms/STM32/hal_lld_f105_f107.h +++ b/os/hal/platforms/STM32/hal_lld_f105_f107.h @@ -322,7 +322,7 @@ */ #if ((STM32_PLL2MUL_VALUE >= 8) && (STM32_PLL2MUL_VALUE <= 14)) || \ defined(__DOXYGEN__) -#define STM32_PLL2MUL ((STM32_PLLMUL_VALUE - 2) << 8) +#define STM32_PLL2MUL ((STM32_PLL2MUL_VALUE - 2) << 8) #elif (STM32_PLL2MUL_VALUE == 16) #define STM32_PLL2MUL (14 << 8) #elif (STM32_PLL2MUL_VALUE == 20) @@ -436,8 +436,8 @@ #endif /* AHB frequency check.*/ -#if STM32_HPRE > 72000000 -#error "STM32_HPRE exceeding maximum frequency (72MHz)" +#if STM32_HCLK > 72000000 +#error "STM32_HCLK exceeding maximum frequency (72MHz)" #endif /** diff --git a/readme.txt b/readme.txt index 9ecd92a97..69f77545a 100644 --- a/readme.txt +++ b/readme.txt @@ -59,6 +59,12 @@ ***************************************************************************** *** 2.0.3 *** +- FIX: Fixed incorrect PLL2 setting in STM32 HAL (bug 3044770). +- FIX: Fixed wrong check on STM32_HCLK (bug 3044758). +- FIX: Fixed wrong condition check in STM32 PWM driver (bug 3041414). +- FIX: Corrupted IRQ stack in Cortex-Mx port (bug 3041117). +- FIX: Fixed a documentation error regarding the ADC driver function + adcStartConversion() (bug 3039890). - FIX: Fixed insufficient stack size for idle thread (bug 3033624). - FIX: Fixed misspelled word in some chioch.h and chstreams.h macros (bug 3031534).