From 7312dd693abbef2aad66ad9fd30412a09baa39c2 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Mon, 10 Jun 2019 15:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91HAL=20CMSIS?= =?UTF-8?q?=20=E5=88=B0=204.3.0=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Device/ST/STM32F1xx/Include/stm32f100xb.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f100xe.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f101x6.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f101xb.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f101xe.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f101xg.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f102x6.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f102xb.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f103x6.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f103xb.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f103xe.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f103xg.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f105xc.h | 2 ++ .../Device/ST/STM32F1xx/Include/stm32f107xc.h | 2 ++ .../Device/ST/STM32F1xx/Release_Notes.html | 24 ++++++++++++++++++- 15 files changed, 51 insertions(+), 1 deletion(-) diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h index fecc192071..96531fcd5b 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h @@ -6124,6 +6124,8 @@ typedef struct ((INSTANCE) == TIM4) || \ ((INSTANCE) == TIM15)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h index 1393aa6e92..17f6aeae62 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h @@ -6689,6 +6689,8 @@ typedef struct ((INSTANCE) == TIM12) || \ ((INSTANCE) == TIM15)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h index 1eebdc1fbc..76ad320340 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h @@ -5576,6 +5576,8 @@ typedef struct (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3)) diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h index 937307cca4..a72384fa34 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h @@ -5685,6 +5685,8 @@ typedef struct ((INSTANCE) == TIM3) || \ ((INSTANCE) == TIM4)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h index f35f46d354..6a42f2a17d 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h @@ -6658,6 +6658,8 @@ typedef struct ((INSTANCE) == TIM4) || \ ((INSTANCE) == TIM5)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h index 98a7d412ca..6deb946a3f 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h @@ -6812,6 +6812,8 @@ typedef struct ((INSTANCE) == TIM5) || \ ((INSTANCE) == TIM12)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h index 1069f2268d..0f46d46aeb 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h @@ -6695,6 +6695,8 @@ typedef struct (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3)) diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h index 493ee2c83a..4c62c4b2c9 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h @@ -6795,6 +6795,8 @@ typedef struct ((INSTANCE) == TIM3) || \ ((INSTANCE) == TIM4)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h index 0a3ae2a30a..fcea7fe624 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h @@ -10318,6 +10318,8 @@ typedef struct ((INSTANCE) == TIM2) || \ ((INSTANCE) == TIM3)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h index 9ff8ad6385..fb6173f6b3 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h @@ -10427,6 +10427,8 @@ typedef struct ((INSTANCE) == TIM3) || \ ((INSTANCE) == TIM4)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h index d48474c437..22c0312229 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h @@ -11500,6 +11500,8 @@ typedef struct ((INSTANCE) == TIM4) || \ ((INSTANCE) == TIM5)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM8) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h index 99d58dbeb8..d9a0bb9c72 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h @@ -11658,6 +11658,8 @@ typedef struct ((INSTANCE) == TIM5) || \ ((INSTANCE) == TIM12)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM8) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h index e57b00b812..8f1fd5ae53 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h @@ -14505,6 +14505,8 @@ typedef struct ((INSTANCE) == TIM4) || \ ((INSTANCE) == TIM5)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h index e902c17951..d1cd4bbd63 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h @@ -15416,6 +15416,8 @@ typedef struct ((INSTANCE) == TIM4) || \ ((INSTANCE) == TIM5)) +#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE) + #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Release_Notes.html b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Release_Notes.html index 8f4d1db80a..f6f3f5c7bd 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Release_Notes.html +++ b/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Release_Notes.html @@ -294,7 +294,29 @@ Notes for STM32F10x CMSIS -

Update History

V4.2.0 / 31-March-2017

+

Update History

V4.3.0 / 09-October-2018

+ + + + + + + + + + + + + + + + + + + + +

Main +Changes

V4.2.0 / 31-March-2017

-- GitLab