Changeset 59 for ctrl/firmware/Main/CubeMX/Drivers/STM32H7xx_HAL_Driver/Inc
- Timestamp:
- Jan 10, 2025, 4:18:37 PM (6 days ago)
- Location:
- ctrl/firmware/Main/CubeMX/Drivers/STM32H7xx_HAL_Driver/Inc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ctrl/firmware/Main/CubeMX/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_hsem.h
r34 r59 58 58 (HSEM->C2IER |= (__SEM_MASK__))) 59 59 #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__)) 61 61 #endif /* DUAL_CORE */ 62 62 /** … … 70 70 (HSEM->C2IER &= ~(__SEM_MASK__))) 71 71 #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__)) 73 73 #endif /* DUAL_CORE */ 74 74 … … 81 81 #define __HAL_HSEM_GET_IT(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \ 82 82 ((__SEM_MASK__) & HSEM->C1MISR) : \ 83 ((__SEM_MASK__) & HSEM->C2MISR 1))84 #else 85 #define __HAL_HSEM_GET_IT(__SEM_MASK__) ((__SEM_MASK__) & HSEM-> MISR)83 ((__SEM_MASK__) & HSEM->C2MISR)) 84 #else 85 #define __HAL_HSEM_GET_IT(__SEM_MASK__) ((__SEM_MASK__) & HSEM->C1MISR) 86 86 #endif /* DUAL_CORE */ 87 87 … … 96 96 (__SEM_MASK__) & HSEM->C2ISR) 97 97 #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) 99 99 #endif /* DUAL_CORE */ 100 100 … … 109 109 (HSEM->C2ICR |= (__SEM_MASK__))) 110 110 #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__)) 112 112 #endif /* DUAL_CORE */ 113 113 -
ctrl/firmware/Main/CubeMX/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_rtc.h
r40 r59 182 182 183 183 #if (USE_HAL_RTC_REGISTER_CALLBACKS == 1) 184 void (* AlarmAEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm A Event callback */ 185 186 void (* AlarmBEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm B Event callback */ 187 188 void (* TimeStampEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC TimeStamp Event callback */ 189 190 void (* WakeUpTimerEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC WakeUpTimer Event callback */ 191 192 void (* Tamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 1 Event callback */ 193 194 void (* Tamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 2 Event callback */ 195 196 void (* Tamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 3 Event callback */ 197 198 #if defined(TAMP) 199 void (* InternalTamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 1 Event callback */ 200 201 void (* InternalTamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 2 Event callback */ 202 203 void (* InternalTamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 3 Event callback */ 204 205 void (* InternalTamper4EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 4 Event callback */ 206 207 void (* InternalTamper5EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 5 Event callback */ 208 209 void (* InternalTamper6EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 6 Event callback */ 210 211 void (* InternalTamper8EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 8 Event callback */ 212 #endif /* TAMP */ 213 214 void (* MspInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp Init callback */ 215 216 void (* MspDeInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp DeInit callback */ 184 void (* AlarmAEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm A Event callback */ 185 186 void (* AlarmBEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Alarm B Event callback */ 187 188 void (* TimeStampEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC TimeStamp Event callback */ 189 190 void (* WakeUpTimerEventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC WakeUpTimer Event callback */ 191 192 void (* Tamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 1 Event callback */ 193 194 #if defined(RTC_TAMPER2_SUPPORT) 195 void (* Tamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 2 Event callback */ 196 #endif /* RTC_TAMPER2_SUPPORT */ 197 198 void (* Tamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Tamper 3 Event callback */ 199 200 #if defined(TAMP) 201 void (* InternalTamper1EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 1 Event callback */ 202 203 void (* InternalTamper2EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 2 Event callback */ 204 205 void (* InternalTamper3EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 3 Event callback */ 206 207 void (* InternalTamper4EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 4 Event callback */ 208 209 void (* InternalTamper5EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 5 Event callback */ 210 211 void (* InternalTamper6EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 6 Event callback */ 212 213 void (* InternalTamper8EventCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Internal Tamper 8 Event callback */ 214 #endif /* TAMP */ 215 216 void (* MspInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp Init callback */ 217 218 void (* MspDeInitCallback)(struct __RTC_HandleTypeDef *hrtc); /*!< RTC Msp DeInit callback */ 217 219 218 220 #endif /* (USE_HAL_RTC_REGISTER_CALLBACKS == 1) */ … … 231 233 HAL_RTC_WAKEUPTIMER_EVENT_CB_ID = 3u, /*!< RTC WakeUp Timer Event Callback ID */ 232 234 HAL_RTC_TAMPER1_EVENT_CB_ID = 4u, /*!< RTC Tamper 1 Callback ID */ 235 #if defined(RTC_TAMPER2_SUPPORT) 233 236 HAL_RTC_TAMPER2_EVENT_CB_ID = 5u, /*!< RTC Tamper 2 Callback ID */ 237 #endif /* RTC_TAMPER2_SUPPORT */ 234 238 HAL_RTC_TAMPER3_EVENT_CB_ID = 6u, /*!< RTC Tamper 3 Callback ID */ 235 239 #if defined(TAMP) -
ctrl/firmware/Main/CubeMX/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_rtc_ex.h
r41 r59 57 57 58 58 uint32_t NoErase; /*!< Specifies the Tamper no erase mode. 59 This parameter can be a value of @ref RTCEx_Tamper_EraseBackUp_Definitions */ 60 61 uint32_t MaskFlag; /*!< Specifies the Tamper Flag masking. 62 This parameter can be a value of @ref RTCEx_Tamper_MaskFlag_Definitions */ 59 This parameter can be a value of @ref RTCEx_Tamper_EraseBackUp_Definitions 60 This parameter is not applicable to the STM32H723/33, STM32H725/35 and STM32H730 61 devices, and has been kept for backward compatibility */ 62 63 uint32_t MaskFlag; /*!< Specifies the Tamper Flag masking. 64 This parameter can be a value of @ref RTCEx_Tamper_MaskFlag_Definitions 65 This parameter is not applicable to the STM32H723/33, STM32H725/35 and STM32H730 66 devices, and has been kept for backward compatibility */ 63 67 64 68 uint32_t Filter; /*!< Specifies the TAMP Filter Tamper. … … 266 270 #else 267 271 #define RTC_TAMPER_1 RTC_TAMPCR_TAMP1E 272 #if defined(RTC_TAMPER2_SUPPORT) 268 273 #define RTC_TAMPER_2 RTC_TAMPCR_TAMP2E 274 #endif /* RTC_TAMPER2_SUPPORT */ 269 275 #define RTC_TAMPER_3 RTC_TAMPCR_TAMP3E 270 276 #endif /* TAMP */ 271 277 278 #if defined(RTC_TAMPER2_SUPPORT) 272 279 #define RTC_TAMPER_ALL (RTC_TAMPER_1 | RTC_TAMPER_2 | RTC_TAMPER_3) 280 #else 281 #define RTC_TAMPER_ALL (RTC_TAMPER_1 | RTC_TAMPER_3) 282 #endif /* RTC_TAMPER2_SUPPORT */ 273 283 /** 274 284 * @} … … 283 293 #define RTC_IT_TAMP3 TAMP_IER_TAMP3IE /*!< Enable Tamper 3 Interrupt */ 284 294 #else 295 #if defined(RTC_TAMPxIE_SUPPORT) 285 296 #define RTC_IT_TAMP1 RTC_TAMPCR_TAMP1IE /*!< Enable Tamper 1 Interrupt */ 286 297 #define RTC_IT_TAMP2 RTC_TAMPCR_TAMP2IE /*!< Enable Tamper 2 Interrupt */ 287 298 #define RTC_IT_TAMP3 RTC_TAMPCR_TAMP3IE /*!< Enable Tamper 3 Interrupt */ 299 #else 300 #define RTC_IT_TAMP1 RTC_TAFCR_TAMPIE /*!< Enable Tamper Interrupt */ 301 #endif /* RTC_TAMPxIE_SUPPORT */ 288 302 #endif /* TAMP */ 289 303 … … 350 364 #else 351 365 #define RTC_TAMPER_1_TRIGGER RTC_TAMPCR_TAMP1TRG 366 #if defined(RTC_TAMPER2_SUPPORT) 352 367 #define RTC_TAMPER_2_TRIGGER RTC_TAMPCR_TAMP2TRG 368 #endif /* RTC_TAMPER2_SUPPORT */ 353 369 #define RTC_TAMPER_3_TRIGGER RTC_TAMPCR_TAMP3TRG 354 370 #endif /* TAMP */ 355 371 372 #if defined(RTC_TAMPER2_SUPPORT) 356 373 #define RTC_TAMPER_X_TRIGGER (RTC_TAMPER_1_TRIGGER |\ 357 374 RTC_TAMPER_2_TRIGGER |\ 358 375 RTC_TAMPER_3_TRIGGER) 376 #else 377 #define RTC_TAMPER_X_TRIGGER (RTC_TAMPER_1_TRIGGER |\ 378 RTC_TAMPER_3_TRIGGER) 379 #endif /* RTC_TAMPER2_SUPPORT */ 359 380 /** 360 381 * @} … … 368 389 #define RTC_TAMPER_ERASE_BACKUP_DISABLE 0x01u 369 390 #else 370 #define RTC_TAMPER_ERASE_BACKUP_ENABLE 0x00000000u 391 #if defined(RTC_TAMPNOERASE_SUPPORT) 392 #define RTC_TAMPER_ERASE_BACKUP_ENABLE 0x00u 371 393 #define RTC_TAMPER_ERASE_BACKUP_DISABLE RTC_TAMPCR_TAMP1NOERASE 394 #else 395 /*!< These values are not applicable to the STM32H723/33, STM32H725/35 and STM32H730 396 devices, and have been kept for backward compatibility */ 397 #define RTC_TAMPER_ERASE_BACKUP_ENABLE 0x00u 398 #define RTC_TAMPER_ERASE_BACKUP_DISABLE 0x01u 399 #endif /* RTC_TAMPNOERASE_SUPPORT */ 372 400 #endif /* TAMP */ 373 401 … … 377 405 #define RTC_DISABLE_BKP_ERASE_ON_TAMPER_3 TAMP_CR2_TAMP3NOERASE 378 406 #else 407 #if defined(RTC_TAMPNOERASE_SUPPORT) 379 408 #define RTC_DISABLE_BKP_ERASE_ON_TAMPER_1 RTC_TAMPCR_TAMP1NOERASE 380 409 #define RTC_DISABLE_BKP_ERASE_ON_TAMPER_2 RTC_TAMPCR_TAMP2NOERASE 381 410 #define RTC_DISABLE_BKP_ERASE_ON_TAMPER_3 RTC_TAMPCR_TAMP3NOERASE 382 #endif /* TAMP */ 383 411 #endif /* RTC_TAMPNOERASE_SUPPORT */ 412 #endif /* TAMP */ 413 414 #if defined(RTC_TAMPNOERASE_SUPPORT) 384 415 #define RTC_DISABLE_BKP_ERASE_ON_TAMPER_MASK (RTC_DISABLE_BKP_ERASE_ON_TAMPER_1 |\ 385 416 RTC_DISABLE_BKP_ERASE_ON_TAMPER_2 |\ 386 417 RTC_DISABLE_BKP_ERASE_ON_TAMPER_3) 418 #endif /* RTC_TAMPNOERASE_SUPPORT */ 387 419 /** 388 420 * @} … … 396 428 #define RTC_TAMPERMASK_FLAG_ENABLE 0x01u 397 429 #else 398 #define RTC_TAMPERMASK_FLAG_DISABLE 0x00000000u 430 #if defined(RTC_TAMPMASKFLAG_SUPPORT) 431 #define RTC_TAMPERMASK_FLAG_DISABLE 0x00u 399 432 #define RTC_TAMPERMASK_FLAG_ENABLE RTC_TAMPCR_TAMP1MF 433 #else 434 /*!< These values are not applicable to the STM32H723/33, STM32H725/35 and STM32H730 435 devices, and have been kept for backward compatibility */ 436 #define RTC_TAMPERMASK_FLAG_DISABLE 0x00u 437 #define RTC_TAMPERMASK_FLAG_ENABLE 0x01u 438 #endif /* RTC_TAMPMASKFLAG_SUPPORT */ 400 439 #endif /* TAMP */ 401 440 … … 405 444 #define RTC_TAMPER_3_MASK_FLAG TAMP_CR2_TAMP3MSK 406 445 #else 446 #if defined(RTC_TAMPMASKFLAG_SUPPORT) 407 447 #define RTC_TAMPER_1_MASK_FLAG RTC_TAMPCR_TAMP1MF 408 448 #define RTC_TAMPER_2_MASK_FLAG RTC_TAMPCR_TAMP2MF 409 449 #define RTC_TAMPER_3_MASK_FLAG RTC_TAMPCR_TAMP3MF 410 #endif /* TAMP */ 411 450 #endif /* RTC_TAMPMASKFLAG_SUPPORT */ 451 #endif /* TAMP */ 452 453 #if defined(RTC_TAMPMASKFLAG_SUPPORT) 412 454 #define RTC_TAMPER_X_MASK_FLAG (RTC_TAMPER_1_MASK_FLAG |\ 413 455 RTC_TAMPER_2_MASK_FLAG |\ 414 456 RTC_TAMPER_3_MASK_FLAG) 457 #endif /* RTC_TAMPMASKFLAG_SUPPORT */ 415 458 /** 416 459 * @} … … 576 619 #else 577 620 #define RTC_FLAG_TAMP1F RTC_ISR_TAMP1F 621 #if defined(RTC_TAMPER2_SUPPORT) 578 622 #define RTC_FLAG_TAMP2F RTC_ISR_TAMP2F 623 #endif /* RTC_TAMPER2_SUPPORT */ 579 624 #define RTC_FLAG_TAMP3F RTC_ISR_TAMP3F 580 625 #endif /* TAMP */ … … 866 911 #define __HAL_RTC_TAMPER2_ENABLE(__HANDLE__) (((TAMP_TypeDef *)((uint32_t)((__HANDLE__)->Instance) + TAMP_OFFSET))->CR1 |= (TAMP_CR1_TAMP2E)) 867 912 #else 913 #if defined(RTC_TAMPER2_SUPPORT) 868 914 #define __HAL_RTC_TAMPER2_ENABLE(__HANDLE__) ((__HANDLE__)->Instance->TAMPCR |= (RTC_TAMPCR_TAMP2E)) 915 #endif /* RTC_TAMPER2_SUPPORT */ 869 916 #endif /* TAMP */ 870 917 … … 877 924 #define __HAL_RTC_TAMPER2_DISABLE(__HANDLE__) (((TAMP_TypeDef *)((uint32_t)((__HANDLE__)->Instance) + (TAMP_OFFSET))->CR1 &= ~(RTC_TAMPCR_TAMP2E)) 878 925 #else 926 #if defined(RTC_TAMPER2_SUPPORT) 879 927 #define __HAL_RTC_TAMPER2_DISABLE(__HANDLE__) ((__HANDLE__)->Instance->TAMPCR &= ~(RTC_TAMPCR_TAMP2E)) 928 #endif /* RTC_TAMPER2_SUPPORT */ 880 929 #endif /* TAMP */ 881 930 … … 909 958 * @arg RTC_IT_TAMPALL: All tampers interrupts 910 959 * @arg RTC_IT_TAMP1: Tamper1 interrupt 911 * @arg RTC_IT_TAMP2: Tamper2 interrupt 960 * @arg RTC_IT_TAMP2: Tamper2 interrupt (*) 912 961 * @arg RTC_IT_TAMP3: Tamper3 interrupt 962 * (*) Not applicable to all devices. 913 963 * @retval None 914 964 */ … … 926 976 * @arg RTC_IT_TAMP: All tampers interrupts 927 977 * @arg RTC_IT_TAMP1: Tamper1 interrupt 928 * @arg RTC_IT_TAMP2: Tamper2 interrupt 978 * @arg RTC_IT_TAMP2: Tamper2 interrupt (*) 929 979 * @arg RTC_IT_TAMP3: Tamper3 interrupt 980 * (*) Not applicable to all devices. 930 981 * @retval None 931 982 */ … … 943 994 * @arg RTC_IT_TAMPALL: All tampers interrupts 944 995 * @arg RTC_IT_TAMP1: Tamper1 interrupt 945 * @arg RTC_IT_TAMP2: Tamper2 interrupt 996 * @arg RTC_IT_TAMP2: Tamper2 interrupt (*) 946 997 * @arg RTC_IT_TAMP3: Tamper3 interrupt 998 * (*) Not applicable to all devices. 947 999 * @retval Flag status 948 1000 */ … … 959 1011 * This parameter can be: 960 1012 * @arg RTC_FLAG_TAMP1F: Tamper1 flag 961 * @arg RTC_FLAG_TAMP2F: Tamper2 flag 1013 * @arg RTC_FLAG_TAMP2F: Tamper2 flag (*) 962 1014 * @arg RTC_FLAG_TAMP3F: Tamper3 flag 1015 * (*) Not applicable to all devices. 963 1016 * @retval Flag status 964 1017 */ … … 975 1028 * This parameter can be: 976 1029 * @arg RTC_FLAG_TAMP1F: Tamper1 flag 977 * @arg RTC_FLAG_TAMP2F: Tamper2 flag 1030 * @arg RTC_FLAG_TAMP2F: Tamper2 flag (*) 978 1031 * @arg RTC_FLAG_TAMP3F: Tamper3 flag 1032 * (*) Not applicable to all devices. 979 1033 * @retval None 980 1034 */ … … 1663 1717 HAL_StatusTypeDef HAL_RTCEx_DeactivateTamper(RTC_HandleTypeDef *hrtc, uint32_t Tamper); 1664 1718 HAL_StatusTypeDef HAL_RTCEx_PollForTamper1Event(RTC_HandleTypeDef *hrtc, uint32_t Timeout); 1719 #if defined(RTC_TAMPER2_SUPPORT) 1665 1720 HAL_StatusTypeDef HAL_RTCEx_PollForTamper2Event(RTC_HandleTypeDef *hrtc, uint32_t Timeout); 1721 #endif /* RTC_TAMPER2_SUPPORT */ 1666 1722 HAL_StatusTypeDef HAL_RTCEx_PollForTamper3Event(RTC_HandleTypeDef *hrtc, uint32_t Timeout); 1667 1723 void HAL_RTCEx_Tamper1EventCallback(RTC_HandleTypeDef *hrtc); 1724 #if defined(RTC_TAMPER2_SUPPORT) 1668 1725 void HAL_RTCEx_Tamper2EventCallback(RTC_HandleTypeDef *hrtc); 1726 #endif /* RTC_TAMPER2_SUPPORT */ 1669 1727 void HAL_RTCEx_Tamper3EventCallback(RTC_HandleTypeDef *hrtc); 1670 1728 #if defined(TAMP) … … 1775 1833 1776 1834 /* Masks Definition */ 1835 #if defined(RTC_TAMPER2_SUPPORT) 1777 1836 #define RTC_TAMPER_X ((uint32_t) (RTC_TAMPER_1 | RTC_TAMPER_2 | RTC_TAMPER_3)) 1837 #else 1838 #define RTC_TAMPER_X ((uint32_t) (RTC_TAMPER_1 | RTC_TAMPER_3)) 1839 #endif /* RTC_TAMPER2_SUPPORT */ 1840 1841 #if defined(RTC_TAMPxIE_SUPPORT) 1778 1842 #define RTC_TAMPER_X_INTERRUPT ((uint32_t) (RTC_IT_TAMP1 | RTC_IT_TAMP2 | RTC_IT_TAMP3)) 1843 #else 1844 #define RTC_TAMPER_X_INTERRUPT RTC_IT_TAMPALL 1845 #endif /* RTC_TAMPxIE_SUPPORT */ 1779 1846 1780 1847 /** … … 1851 1918 (((__TAMPER__) & ~RTC_TAMPER_X) == 0x00U)) 1852 1919 1853 #define IS_RTC_TAMPER_INTERRUPT(__INTERRUPT__) 1920 #define IS_RTC_TAMPER_INTERRUPT(__INTERRUPT__) \ 1854 1921 ((((__INTERRUPT__) & ( RTC_TAMPER_X_INTERRUPT | RTC_IT_TAMPALL )) != 0x00U) && \ 1855 1922 (((__INTERRUPT__) & (~(RTC_TAMPER_X_INTERRUPT | RTC_IT_TAMPALL))) == 0x00U))
Note: See TracChangeset
for help on using the changeset viewer.