Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit895ed47

Browse files
authored
Merge pull request#2487 from fpistm/STM32CubeF2_update
chore(f2): update to latest STM32CubeF2 v1.9.5
2 parentsd3f7a0a +250d239 commit895ed47

File tree

72 files changed

+1756
-1292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1756
-1292
lines changed

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 68 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,12 @@ extern "C" {
3737
#defineAES_CLEARFLAG_CCF CRYP_CLEARFLAG_CCF
3838
#defineAES_CLEARFLAG_RDERR CRYP_CLEARFLAG_RDERR
3939
#defineAES_CLEARFLAG_WRERR CRYP_CLEARFLAG_WRERR
40-
#if defined(STM32U5)|| defined(STM32H7)|| defined(STM32MP1)
40+
#if defined(STM32H7)|| defined(STM32MP1)
4141
#defineCRYP_DATATYPE_32B CRYP_NO_SWAP
4242
#defineCRYP_DATATYPE_16B CRYP_HALFWORD_SWAP
4343
#defineCRYP_DATATYPE_8B CRYP_BYTE_SWAP
4444
#defineCRYP_DATATYPE_1B CRYP_BIT_SWAP
45-
#if defined(STM32U5)
46-
#defineCRYP_CCF_CLEAR CRYP_CLEAR_CCF
47-
#defineCRYP_ERR_CLEAR CRYP_CLEAR_RWEIF
48-
#endif/* STM32U5 */
49-
#endif/* STM32U5 || STM32H7 || STM32MP1 */
45+
#endif/* STM32H7 || STM32MP1 */
5046
/**
5147
* @}
5248
*/
@@ -279,7 +275,7 @@ extern "C" {
279275
#defineDAC_WAVEGENERATION_NOISE DAC_WAVE_NOISE
280276
#defineDAC_WAVEGENERATION_TRIANGLE DAC_WAVE_TRIANGLE
281277

282-
#if defined(STM32G4)|| defined(STM32L5)|| defined(STM32H7)|| defined (STM32U5)
278+
#if defined(STM32G4)|| defined(STM32H7)|| defined (STM32U5)
283279
#defineDAC_CHIPCONNECT_DISABLE DAC_CHIPCONNECT_EXTERNAL
284280
#defineDAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
285281
#endif
@@ -476,7 +472,9 @@ extern "C" {
476472
#defineTYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
477473
#defineTYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
478474
#defineTYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475+
#if !defined(STM32F2)&& !defined(STM32F4)&& !defined(STM32F7)&& !defined(STM32H7)
479476
#definePAGESIZE FLASH_PAGE_SIZE
477+
#endif/* STM32F2 && STM32F4 && STM32F7 && STM32H7 */
480478
#defineTYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
481479
#defineTYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
482480
#defineTYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
@@ -552,6 +550,16 @@ extern "C" {
552550
#defineOB_SRAM134_RST_ERASE OB_SRAM_RST_ERASE
553551
#defineOB_SRAM134_RST_NOT_ERASE OB_SRAM_RST_NOT_ERASE
554552
#endif/* STM32U5 */
553+
#if defined(STM32U0)
554+
#defineOB_USER_nRST_STOP OB_USER_NRST_STOP
555+
#defineOB_USER_nRST_STDBY OB_USER_NRST_STDBY
556+
#defineOB_USER_nRST_SHDW OB_USER_NRST_SHDW
557+
#defineOB_USER_nBOOT_SEL OB_USER_NBOOT_SEL
558+
#defineOB_USER_nBOOT0 OB_USER_NBOOT0
559+
#defineOB_USER_nBOOT1 OB_USER_NBOOT1
560+
#defineOB_nBOOT0_RESET OB_NBOOT0_RESET
561+
#defineOB_nBOOT0_SET OB_NBOOT0_SET
562+
#endif/* STM32U0 */
555563

556564
/**
557565
* @}
@@ -800,6 +808,21 @@ extern "C" {
800808
#defineGPIO_AF0_S2DSTOP GPIO_AF0_SRDSTOP
801809
#defineGPIO_AF11_LPGPIO GPIO_AF11_LPGPIO1
802810
#endif/* STM32U5 */
811+
812+
#if defined(STM32WBA)
813+
#defineGPIO_AF11_RF_ANTSW0 GPIO_AF11_RF
814+
#defineGPIO_AF11_RF_ANTSW1 GPIO_AF11_RF
815+
#defineGPIO_AF11_RF_ANTSW2 GPIO_AF11_RF
816+
#defineGPIO_AF11_RF_IO1 GPIO_AF11_RF
817+
#defineGPIO_AF11_RF_IO2 GPIO_AF11_RF
818+
#defineGPIO_AF11_RF_IO3 GPIO_AF11_RF
819+
#defineGPIO_AF11_RF_IO4 GPIO_AF11_RF
820+
#defineGPIO_AF11_RF_IO5 GPIO_AF11_RF
821+
#defineGPIO_AF11_RF_IO6 GPIO_AF11_RF
822+
#defineGPIO_AF11_RF_IO7 GPIO_AF11_RF
823+
#defineGPIO_AF11_RF_IO8 GPIO_AF11_RF
824+
#defineGPIO_AF11_RF_IO9 GPIO_AF11_RF
825+
#endif/* STM32WBA */
803826
/**
804827
* @}
805828
*/
@@ -1243,10 +1266,10 @@ extern "C" {
12431266
#defineRTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12441267
#defineRTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12451268

1246-
#if defined(STM32H5)
1269+
#if defined(STM32H5)|| defined(STM32H7RS)
12471270
#defineTAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12481271
#defineTAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
1249-
#endif/* STM32H5 */
1272+
#endif/* STM32H5|| STM32H7RS*/
12501273

12511274
#if defined(STM32WBA)
12521275
#defineTAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1258,10 +1281,10 @@ extern "C" {
12581281
#defineTAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12591282
#endif/* STM32WBA */
12601283

1261-
#if defined(STM32H5)|| defined(STM32WBA)
1284+
#if defined(STM32H5)|| defined(STM32WBA)|| defined(STM32H7RS)
12621285
#defineTAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
12631286
#defineTAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
1264-
#endif/* STM32H5 || STM32WBA */
1287+
#endif/* STM32H5 || STM32WBA|| STM32H7RS*/
12651288

12661289
#if defined(STM32F7)
12671290
#defineRTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
@@ -1599,6 +1622,8 @@ extern "C" {
15991622
#defineETH_MAC_SMALL_FIFO_RW_ACTIVE 0x00000006U/* MAC small FIFO read / write controllers active */
16001623
#defineETH_MAC_MII_RECEIVE_PROTOCOL_ACTIVE 0x00000001U/* MAC MII receive protocol engine active */
16011624

1625+
#defineETH_TxPacketConfig ETH_TxPacketConfigTypeDef/* Transmit Packet Configuration structure definition */
1626+
16021627
/**
16031628
* @}
16041629
*/
@@ -1809,7 +1834,7 @@ extern "C" {
18091834
#defineHAL_FMPI2CEx_AnalogFilter_Config HAL_FMPI2CEx_ConfigAnalogFilter
18101835
#defineHAL_FMPI2CEx_DigitalFilter_Config HAL_FMPI2CEx_ConfigDigitalFilter
18111836

1812-
#defineHAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus,cmd) ((cmd == ENABLE)? \
1837+
#defineHAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus,cmd) (((cmd) == ENABLE)? \
18131838
HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): \
18141839
HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
18151840

@@ -1991,12 +2016,12 @@ extern "C" {
19912016
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose
19922017
* @{
19932018
*/
1994-
#if defined(STM32H5)|| defined(STM32WBA)
2019+
#if defined(STM32H5)|| defined(STM32WBA)|| defined(STM32H7RS)
19952020
#defineHAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
19962021
#defineHAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
19972022
#defineHAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
19982023
#defineHAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
1999-
#endif/* STM32H5 || STM32WBA */
2024+
#endif/* STM32H5 || STM32WBA|| STM32H7RS*/
20002025

20012026
/**
20022027
* @}
@@ -2311,8 +2336,8 @@ extern "C" {
23112336
#define__HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__) (((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() : \
23122337
((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() : \
23132338
__HAL_COMP_COMP6_EXTI_CLEAR_FLAG())
2314-
#endif
2315-
#if defined(STM32F302xE)|| defined(STM32F302xC)
2339+
#endif
2340+
#if defined(STM32F302xE)|| defined(STM32F302xC)
23162341
#define__HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__) (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() : \
23172342
((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() : \
23182343
((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : \
@@ -2345,8 +2370,8 @@ extern "C" {
23452370
((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() : \
23462371
((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() : \
23472372
__HAL_COMP_COMP6_EXTI_CLEAR_FLAG())
2348-
#endif
2349-
#if defined(STM32F303xE)|| defined(STM32F398xx)|| defined(STM32F303xC)|| defined(STM32F358xx)
2373+
#endif
2374+
#if defined(STM32F303xE)|| defined(STM32F398xx)|| defined(STM32F303xC)|| defined(STM32F358xx)
23502375
#define__HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__) (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() : \
23512376
((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() : \
23522377
((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE() : \
@@ -2403,8 +2428,8 @@ extern "C" {
24032428
((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_CLEAR_FLAG() : \
24042429
((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() : \
24052430
__HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
2406-
#endif
2407-
#if defined(STM32F373xC)||defined(STM32F378xx)
2431+
#endif
2432+
#if defined(STM32F373xC)||defined(STM32F378xx)
24082433
#define__HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__) (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() : \
24092434
__HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE())
24102435
#define__HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__) (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() : \
@@ -2421,7 +2446,7 @@ extern "C" {
24212446
__HAL_COMP_COMP2_EXTI_GET_FLAG())
24222447
#define__HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__) (((__FLAG__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() : \
24232448
__HAL_COMP_COMP2_EXTI_CLEAR_FLAG())
2424-
#endif
2449+
#endif
24252450
#else
24262451
#define__HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__) (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() : \
24272452
__HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE())
@@ -2723,6 +2748,12 @@ extern "C" {
27232748
#define__APB1_RELEASE_RESET __HAL_RCC_APB1_RELEASE_RESET
27242749
#define__APB2_FORCE_RESET __HAL_RCC_APB2_FORCE_RESET
27252750
#define__APB2_RELEASE_RESET __HAL_RCC_APB2_RELEASE_RESET
2751+
#if defined(STM32C0)
2752+
#define__HAL_RCC_APB1_FORCE_RESET __HAL_RCC_APB1_GRP1_FORCE_RESET
2753+
#define__HAL_RCC_APB1_RELEASE_RESET __HAL_RCC_APB1_GRP1_RELEASE_RESET
2754+
#define__HAL_RCC_APB2_FORCE_RESET __HAL_RCC_APB1_GRP2_FORCE_RESET
2755+
#define__HAL_RCC_APB2_RELEASE_RESET __HAL_RCC_APB1_GRP2_RELEASE_RESET
2756+
#endif/* STM32C0 */
27262757
#define__BKP_CLK_DISABLE __HAL_RCC_BKP_CLK_DISABLE
27272758
#define__BKP_CLK_ENABLE __HAL_RCC_BKP_CLK_ENABLE
27282759
#define__BKP_FORCE_RESET __HAL_RCC_BKP_FORCE_RESET
@@ -3646,8 +3677,12 @@ extern "C" {
36463677
#defineRCC_MCOSOURCE_PLLCLK_NODIV RCC_MCO1SOURCE_PLLCLK
36473678
#defineRCC_MCOSOURCE_PLLCLK_DIV2 RCC_MCO1SOURCE_PLLCLK_DIV2
36483679

3680+
#if defined(STM32U0)
3681+
#defineRCC_SYSCLKSOURCE_STATUS_PLLR RCC_SYSCLKSOURCE_STATUS_PLLCLK
3682+
#endif
3683+
36493684
#if defined(STM32L4)|| defined(STM32WB)|| defined(STM32G0)|| defined(STM32G4)|| defined(STM32L5)|| \
3650-
defined(STM32WL)|| defined(STM32C0)
3685+
defined(STM32WL)|| defined(STM32C0)|| defined(STM32H7RS)|| defined(STM32U0)
36513686
#defineRCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
36523687
#else
36533688
#defineRCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3749,8 +3784,10 @@ extern "C" {
37493784
#define__HAL_RCC_GET_DFSDM_SOURCE __HAL_RCC_GET_DFSDM1_SOURCE
37503785
#defineRCC_DFSDM1CLKSOURCE_PCLK RCC_DFSDM1CLKSOURCE_PCLK2
37513786
#defineRCC_SWPMI1CLKSOURCE_PCLK RCC_SWPMI1CLKSOURCE_PCLK1
3787+
#if !defined(STM32U0)
37523788
#defineRCC_LPTIM1CLKSOURCE_PCLK RCC_LPTIM1CLKSOURCE_PCLK1
37533789
#defineRCC_LPTIM2CLKSOURCE_PCLK RCC_LPTIM2CLKSOURCE_PCLK1
3790+
#endif
37543791

37553792
#defineRCC_DFSDM1AUDIOCLKSOURCE_I2SAPB1 RCC_DFSDM1AUDIOCLKSOURCE_I2S1
37563793
#defineRCC_DFSDM1AUDIOCLKSOURCE_I2SAPB2 RCC_DFSDM1AUDIOCLKSOURCE_I2S2
@@ -3894,9 +3931,9 @@ extern "C" {
38943931
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
38953932
* @{
38963933
*/
3897-
#if defined (STM32G0)|| defined (STM32L5)|| defined (STM32L412xx)|| defined (STM32L422xx)|| \
3898-
defined (STM32L4P5xx)|| defined (STM32L4Q5xx)|| defined (STM32G4)|| defined (STM32WL)|| defined (STM32U5)|| \
3899-
defined (STM32WBA)|| defined (STM32H5)|| defined (STM32C0)
3934+
#if defined (STM32G0)|| defined (STM32L5)|| defined (STM32L412xx)|| defined (STM32L422xx)||defined (STM32L4P5xx)||\
3935+
defined (STM32L4Q5xx)|| defined (STM32G4)|| defined (STM32WL)|| defined (STM32U5)|| defined (STM32WBA)|| \
3936+
defined (STM32H5)|| defined (STM32C0)|| defined (STM32H7RS)|| defined (STM32U0)
39003937
#else
39013938
#define__HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39023939
#endif
@@ -3932,7 +3969,9 @@ extern "C" {
39323969
#endif/* STM32F1 */
39333970

39343971
#if defined (STM32F0)|| defined (STM32F2)|| defined (STM32F3)|| defined (STM32F4)|| defined (STM32F7)|| \
3935-
defined (STM32L0)|| defined (STM32L1)
3972+
defined (STM32H7)|| \
3973+
defined (STM32L0)|| defined (STM32L1)|| \
3974+
defined (STM32WB)
39363975
#define__HAL_RTC_TAMPER_GET_IT __HAL_RTC_TAMPER_GET_FLAG
39373976
#endif
39383977

@@ -4217,6 +4256,9 @@ extern "C" {
42174256
#define__HAL_TIM_GetCompare __HAL_TIM_GET_COMPARE
42184257

42194258
#defineTIM_BREAKINPUTSOURCE_DFSDM TIM_BREAKINPUTSOURCE_DFSDM1
4259+
4260+
#defineTIM_OCMODE_ASSYMETRIC_PWM1 TIM_OCMODE_ASYMMETRIC_PWM1
4261+
#defineTIM_OCMODE_ASSYMETRIC_PWM2 TIM_OCMODE_ASYMMETRIC_PWM2
42204262
/**
42214263
* @}
42224264
*/

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
184184
*/
185185
/* Peripheral Control functions ************************************************/
186186
voidHAL_IncTick(void);
187-
voidHAL_Delay(__IOuint32_tDelay);
187+
voidHAL_Delay(uint32_tDelay);
188188
uint32_tHAL_GetTick(void);
189189
uint32_tHAL_GetTickPrio(void);
190190
HAL_StatusTypeDefHAL_SetTickFreq(HAL_TickFreqTypeDefFreq);

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_can.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@ typedef struct
209209
/**
210210
* @brief CAN handle Structure definition
211211
*/
212+
#ifUSE_HAL_CAN_REGISTER_CALLBACKS==1
212213
typedefstruct__CAN_HandleTypeDef
214+
#else
215+
typedefstruct
216+
#endif/* USE_HAL_CAN_REGISTER_CALLBACKS */
213217
{
214218
CAN_TypeDef*Instance;/*!< Register base address */
215219

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_cortex.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Copyright (c) 2017 STMicroelectronics.
1010
* All rights reserved.
1111
*
12-
* This software is licensed under terms that can be found in the LICENSE file
13-
*inthe root directory of this software component.
12+
* This software is licensed under terms that can be found in the LICENSE file in
13+
* the root directory of this software component.
1414
* If no LICENSE file comes with this software, it is provided AS-IS.
1515
*
1616
******************************************************************************
@@ -285,6 +285,8 @@ void HAL_SYSTICK_Callback(void);
285285
#if (__MPU_PRESENT==1U)
286286
voidHAL_MPU_Enable(uint32_tMPU_Control);
287287
voidHAL_MPU_Disable(void);
288+
voidHAL_MPU_EnableRegion(uint32_tRegionNumber);
289+
voidHAL_MPU_DisableRegion(uint32_tRegionNumber);
288290
voidHAL_MPU_ConfigRegion(MPU_Region_InitTypeDef*MPU_Init);
289291
#endif/* __MPU_PRESENT */
290292
/**
@@ -404,5 +406,4 @@ void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init);
404406
#endif
405407

406408
#endif/* __STM32F2xx_HAL_CORTEX_H */
407-
408409

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp