Skip to content

Commit a975ee6

Browse files
djiatsaf-sterwango
djiatsaf-st
authored and
erwango
committed
stm32cube: update stm32h7 to cube version V1.12.1
Update Cube version for STM32H7xx series on https://github.com/STMicroelectronics from version v1.12.0 to version v1.12.1 Signed-off-by: Fabrice DJIATSA <[email protected]>
1 parent 57e4bdb commit a975ee6

37 files changed

+1006
-350
lines changed

‎stm32cube/stm32h7xx/README‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Origin:
66
http://www.st.com/en/embedded-software/stm32cubeh7.html
77

88
Status:
9-
version v1.12.0
9+
version v1.12.1
1010

1111
Purpose:
1212
ST Microelectronics official MCU package for STM32H7 series.
@@ -23,7 +23,7 @@ URL:
2323
https://github.com/STMicroelectronics/STM32CubeH7
2424

2525
Commit:
26-
430c9b3b3676dd71e1ce8ce81e1221d60298beb2
26+
f5c0b7a2b1f6eb26fde150f72edb2d7deb647066
2727

2828
Maintained-by:
2929
External

‎stm32cube/stm32h7xx/drivers/include/stm32h7xx_hal_hsem.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extern "C" {
5757
(HSEM->C1IER |= (__SEM_MASK__)) : \
5858
(HSEM->C2IER |= (__SEM_MASK__)))
5959
#else
60-
#define __HAL_HSEM_ENABLE_IT(__SEM_MASK__) (HSEM->IER |= (__SEM_MASK__))
60+
#define __HAL_HSEM_ENABLE_IT(__SEM_MASK__) (HSEM->C1IER |= (__SEM_MASK__))
6161
#endif /* DUAL_CORE */
6262
/**
6363
* @brief Disables the specified HSEM interrupts.
@@ -69,7 +69,7 @@ extern "C" {
6969
(HSEM->C1IER &= ~(__SEM_MASK__)) : \
7070
(HSEM->C2IER &= ~(__SEM_MASK__)))
7171
#else
72-
#define __HAL_HSEM_DISABLE_IT(__SEM_MASK__) (HSEM->IER &= ~(__SEM_MASK__))
72+
#define __HAL_HSEM_DISABLE_IT(__SEM_MASK__) (HSEM->C1IER &= ~(__SEM_MASK__))
7373
#endif /* DUAL_CORE */
7474

7575
/**
@@ -80,9 +80,9 @@ extern "C" {
8080
#if defined(DUAL_CORE)
8181
#define __HAL_HSEM_GET_IT(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \
8282
((__SEM_MASK__) & HSEM->C1MISR) : \
83-
((__SEM_MASK__) & HSEM->C2MISR1))
83+
((__SEM_MASK__) & HSEM->C2MISR))
8484
#else
85-
#define __HAL_HSEM_GET_IT(__SEM_MASK__) ((__SEM_MASK__) & HSEM->MISR)
85+
#define __HAL_HSEM_GET_IT(__SEM_MASK__) ((__SEM_MASK__) & HSEM->C1MISR)
8686
#endif /* DUAL_CORE */
8787

8888
/**
@@ -95,7 +95,7 @@ extern "C" {
9595
(__SEM_MASK__) & HSEM->C1ISR : \
9696
(__SEM_MASK__) & HSEM->C2ISR)
9797
#else
98-
#define __HAL_HSEM_GET_FLAG(__SEM_MASK__) ((__SEM_MASK__) & HSEM->ISR)
98+
#define __HAL_HSEM_GET_FLAG(__SEM_MASK__) ((__SEM_MASK__) & HSEM->C1ISR)
9999
#endif /* DUAL_CORE */
100100

101101
/**
@@ -108,7 +108,7 @@ extern "C" {
108108
(HSEM->C1ICR |= (__SEM_MASK__)) : \
109109
(HSEM->C2ICR |= (__SEM_MASK__)))
110110
#else
111-
#define __HAL_HSEM_CLEAR_FLAG(__SEM_MASK__) (HSEM->ICR |= (__SEM_MASK__))
111+
#define __HAL_HSEM_CLEAR_FLAG(__SEM_MASK__) (HSEM->C1ICR |= (__SEM_MASK__))
112112
#endif /* DUAL_CORE */
113113

114114
/**

‎stm32cube/stm32h7xx/drivers/include/stm32h7xx_hal_rtc.h‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -181,39 +181,41 @@ typedef struct
181181
__IO HAL_RTCStateTypeDef State; /*!< Time communication state */
182182

183183
#if (USE_HAL_RTC_REGISTER_CALLBACKS == 1)
184-
void (* AlarmAEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm A Event callback */
184+
void (* AlarmAEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm A Event callback */
185185

186-
void (* AlarmBEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm B Event callback */
186+
void (* AlarmBEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm B Event callback */
187187

188-
void (* TimeStampEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC TimeStamp Event callback */
188+
void (* TimeStampEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC TimeStamp Event callback */
189189

190-
void (* WakeUpTimerEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC WakeUpTimer Event callback */
190+
void (* WakeUpTimerEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC WakeUpTimer Event callback */
191191

192-
void (* Tamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 1 Event callback */
192+
void (* Tamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 1 Event callback */
193193

194-
void (* Tamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 2 Event callback */
194+
#if defined(RTC_TAMPER2_SUPPORT)
195+
void (* Tamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 2 Event callback */
196+
#endif /* RTC_TAMPER2_SUPPORT */
195197

196-
void (* Tamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 3 Event callback */
198+
void (* Tamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 3 Event callback */
197199

198200
#if defined(TAMP)
199-
void (* InternalTamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 1 Event callback */
201+
void (* InternalTamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 1 Event callback */
200202

201-
void (* InternalTamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 2 Event callback */
203+
void (* InternalTamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 2 Event callback */
202204

203-
void (* InternalTamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 3 Event callback */
205+
void (* InternalTamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 3 Event callback */
204206

205-
void (* InternalTamper4EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 4 Event callback */
207+
void (* InternalTamper4EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 4 Event callback */
206208

207-
void (* InternalTamper5EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 5 Event callback */
209+
void (* InternalTamper5EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 5 Event callback */
208210

209-
void (* InternalTamper6EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 6 Event callback */
211+
void (* InternalTamper6EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 6 Event callback */
210212

211-
void (* InternalTamper8EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 8 Event callback */
213+
void (* InternalTamper8EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 8 Event callback */
212214
#endif /* TAMP */
213215

214-
void (* MspInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp Init callback */
216+
void (* MspInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp Init callback */
215217

216-
void (* MspDeInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp DeInit callback */
218+
void (* MspDeInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp DeInit callback */
217219

218220
#endif /* (USE_HAL_RTC_REGISTER_CALLBACKS == 1) */
219221

@@ -230,7 +232,9 @@ typedef enum
230232
HAL_RTC_TIMESTAMP_EVENT_CB_ID = 2u, /*!< RTC TimeStamp Event Callback ID */
231233
HAL_RTC_WAKEUPTIMER_EVENT_CB_ID = 3u, /*!< RTC WakeUp Timer Event Callback ID */
232234
HAL_RTC_TAMPER1_EVENT_CB_ID = 4u, /*!< RTC Tamper 1 Callback ID */
235+
#if defined(RTC_TAMPER2_SUPPORT)
233236
HAL_RTC_TAMPER2_EVENT_CB_ID = 5u, /*!< RTC Tamper 2 Callback ID */
237+
#endif /* RTC_TAMPER2_SUPPORT */
234238
HAL_RTC_TAMPER3_EVENT_CB_ID = 6u, /*!< RTC Tamper 3 Callback ID */
235239
#if defined(TAMP)
236240
HAL_RTC_INTERNAL_TAMPER1_EVENT_CB_ID = 12u, /*!< RTC Internal Tamper 1 Callback ID */

0 commit comments

Comments
 (0)