Skip to content

Commit e67ecf5

Browse files
fpistmfpistm
committed
[WB] Update STM32WBxx HAL Drivers to v1.5.0
Included in STM32CubeWB FW v1.5.0 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 3bcc4f1 commit e67ecf5

Some content is hidden

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

41 files changed

+5521
-1005
lines changed

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

+43-21
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
#define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
242242
#endif
243243

244-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32H7) || defined(STM32F4)
244+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4)
245245
#define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID
246246
#define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID
247247
#endif
@@ -313,8 +313,8 @@
313313
#endif /* STM32L4 */
314314

315315
#if defined(STM32G0)
316-
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317-
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
316+
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317+
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
318318
#endif
319319

320320
#if defined(STM32H7)
@@ -579,8 +579,7 @@
579579
#define GPIO_AF10_SDIO2 GPIO_AF10_SDMMC2
580580
#define GPIO_AF11_SDIO2 GPIO_AF11_SDMMC2
581581

582-
#if defined (STM32H743xx) || defined (STM32H753xx) || defined (STM32H750xx) || defined (STM32H742xx) \
583-
|| defined (STM32H745xx) || defined (STM32H755xx) || defined (STM32H747xx) || defined (STM32H757xx)
582+
#if defined (STM32H743xx) || defined (STM32H753xx) || defined (STM32H750xx) || defined (STM32H742xx) || defined (STM32H745xx) || defined (STM32H755xx) || defined (STM32H747xx) || defined (STM32H757xx)
584583
#define GPIO_AF10_OTG2_HS GPIO_AF10_OTG2_FS
585584
#define GPIO_AF10_OTG1_FS GPIO_AF10_OTG1_HS
586585
#define GPIO_AF12_OTG2_FS GPIO_AF12_OTG1_FS
@@ -955,7 +954,7 @@
955954
#define OPAMP_PGACONNECT_VM0 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0
956955
#define OPAMP_PGACONNECT_VM1 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1
957956

958-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32H7)
957+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4)
959958
#define HAL_OPAMP_MSP_INIT_CB_ID HAL_OPAMP_MSPINIT_CB_ID
960959
#define HAL_OPAMP_MSP_DEINIT_CB_ID HAL_OPAMP_MSPDEINIT_CB_ID
961960
#endif
@@ -1449,6 +1448,30 @@
14491448

14501449
#define HASH_HMACKeyType_ShortKey HASH_HMAC_KEYTYPE_SHORTKEY
14511450
#define HASH_HMACKeyType_LongKey HASH_HMAC_KEYTYPE_LONGKEY
1451+
1452+
#if defined(STM32L4) || defined(STM32L5) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
1453+
1454+
#define HAL_HASH_MD5_Accumulate HAL_HASH_MD5_Accmlt
1455+
#define HAL_HASH_MD5_Accumulate_End HAL_HASH_MD5_Accmlt_End
1456+
#define HAL_HASH_MD5_Accumulate_IT HAL_HASH_MD5_Accmlt_IT
1457+
#define HAL_HASH_MD5_Accumulate_End_IT HAL_HASH_MD5_Accmlt_End_IT
1458+
1459+
#define HAL_HASH_SHA1_Accumulate HAL_HASH_SHA1_Accmlt
1460+
#define HAL_HASH_SHA1_Accumulate_End HAL_HASH_SHA1_Accmlt_End
1461+
#define HAL_HASH_SHA1_Accumulate_IT HAL_HASH_SHA1_Accmlt_IT
1462+
#define HAL_HASH_SHA1_Accumulate_End_IT HAL_HASH_SHA1_Accmlt_End_IT
1463+
1464+
#define HAL_HASHEx_SHA224_Accumulate HAL_HASHEx_SHA224_Accmlt
1465+
#define HAL_HASHEx_SHA224_Accumulate_End HAL_HASHEx_SHA224_Accmlt_End
1466+
#define HAL_HASHEx_SHA224_Accumulate_IT HAL_HASHEx_SHA224_Accmlt_IT
1467+
#define HAL_HASHEx_SHA224_Accumulate_End_IT HAL_HASHEx_SHA224_Accmlt_End_IT
1468+
1469+
#define HAL_HASHEx_SHA256_Accumulate HAL_HASHEx_SHA256_Accmlt
1470+
#define HAL_HASHEx_SHA256_Accumulate_End HAL_HASHEx_SHA256_Accmlt_End
1471+
#define HAL_HASHEx_SHA256_Accumulate_IT HAL_HASHEx_SHA256_Accmlt_IT
1472+
#define HAL_HASHEx_SHA256_Accumulate_End_IT HAL_HASHEx_SHA256_Accmlt_End_IT
1473+
1474+
#endif /* STM32L4 || STM32L5 || STM32F4 || STM32F7 || STM32H7 */
14521475
/**
14531476
* @}
14541477
*/
@@ -1507,13 +1530,13 @@
15071530

15081531
#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
15091532

1510-
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32G4)
1533+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)
15111534
#define HAL_I2C_Master_Sequential_Transmit_IT HAL_I2C_Master_Seq_Transmit_IT
15121535
#define HAL_I2C_Master_Sequential_Receive_IT HAL_I2C_Master_Seq_Receive_IT
15131536
#define HAL_I2C_Slave_Sequential_Transmit_IT HAL_I2C_Slave_Seq_Transmit_IT
15141537
#define HAL_I2C_Slave_Sequential_Receive_IT HAL_I2C_Slave_Seq_Receive_IT
15151538
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */
1516-
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32G4)
1539+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)
15171540
#define HAL_I2C_Master_Sequential_Transmit_DMA HAL_I2C_Master_Seq_Transmit_DMA
15181541
#define HAL_I2C_Master_Sequential_Receive_DMA HAL_I2C_Master_Seq_Receive_DMA
15191542
#define HAL_I2C_Slave_Sequential_Transmit_DMA HAL_I2C_Slave_Seq_Transmit_DMA
@@ -1539,10 +1562,10 @@
15391562
*/
15401563

15411564
#if defined(STM32G0)
1542-
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1543-
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1544-
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1545-
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
1565+
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1566+
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1567+
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1568+
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
15461569
#endif
15471570
#define HAL_PWR_PVDConfig HAL_PWR_ConfigPVD
15481571
#define HAL_PWR_DisableBkUpReg HAL_PWREx_DisableBkUpReg
@@ -3219,9 +3242,8 @@
32193242
#define RCC_MCOSOURCE_PLLCLK_NODIV RCC_MCO1SOURCE_PLLCLK
32203243
#define RCC_MCOSOURCE_PLLCLK_DIV2 RCC_MCO1SOURCE_PLLCLK_DIV2
32213244

3222-
#if defined(STM32L4)
3245+
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || defined(STM32WL)
32233246
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
3224-
#elif defined(STM32WB) || defined(STM32G0) || defined(STM32G4)
32253247
#else
32263248
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
32273249
#endif
@@ -3349,7 +3371,7 @@
33493371
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
33503372
* @{
33513373
*/
3352-
#if defined (STM32G0) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined STM32G4
3374+
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4) || defined STM32WL
33533375
#else
33543376
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
33553377
#endif
@@ -3457,9 +3479,9 @@
34573479
#define __HAL_SD_SDIO_CLEAR_FLAG __HAL_SD_SDMMC_CLEAR_FLAG
34583480
#define __HAL_SD_SDIO_GET_IT __HAL_SD_SDMMC_GET_IT
34593481
#define __HAL_SD_SDIO_CLEAR_IT __HAL_SD_SDMMC_CLEAR_IT
3460-
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3461-
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3462-
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
3482+
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3483+
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3484+
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
34633485
/* alias CMSIS for compatibilities */
34643486
#define SDIO_IRQn SDMMC1_IRQn
34653487
#define SDIO_IRQHandler SDMMC1_IRQHandler
@@ -3472,7 +3494,7 @@
34723494
#define HAL_SD_CardStateTypedef HAL_SD_CardStateTypeDef
34733495
#endif
34743496

3475-
#if defined(STM32H7)
3497+
#if defined(STM32H7) || defined(STM32L5)
34763498
#define HAL_MMCEx_Read_DMADoubleBuffer0CpltCallback HAL_MMCEx_Read_DMADoubleBuf0CpltCallback
34773499
#define HAL_MMCEx_Read_DMADoubleBuffer1CpltCallback HAL_MMCEx_Read_DMADoubleBuf1CpltCallback
34783500
#define HAL_MMCEx_Write_DMADoubleBuffer0CpltCallback HAL_MMCEx_Write_DMADoubleBuf0CpltCallback
@@ -3727,9 +3749,9 @@
37273749
/** @defgroup HAL_QSPI_Aliased_Macros HAL QSPI Aliased Macros maintained for legacy purpose
37283750
* @{
37293751
*/
3730-
#if defined (STM32L4)
3752+
#if defined (STM32L4) || defined (STM32F4) || defined (STM32F7) || defined(STM32H7)
37313753
#define HAL_QPSI_TIMEOUT_DEFAULT_VALUE HAL_QSPI_TIMEOUT_DEFAULT_VALUE
3732-
#endif
3754+
#endif /* STM32L4 || STM32F4 || STM32F7 */
37333755
/**
37343756
* @}
37353757
*/

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h

+15-12
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,26 @@
3838
* @{
3939
*/
4040

41-
/* Exported constants --------------------------------------------------------*/
42-
/** @defgroup HAL_Exported_Constants HAL Exported Constants
43-
* @{
44-
*/
45-
4641
/** @defgroup HAL_TICK_FREQ Tick Frequency
4742
* @{
4843
*/
49-
#define HAL_TICK_FREQ_10HZ 100U
50-
#define HAL_TICK_FREQ_100HZ 10U
51-
#define HAL_TICK_FREQ_1KHZ 1U
52-
#define HAL_TICK_FREQ_DEFAULT HAL_TICK_FREQ_1KHZ
44+
typedef enum
45+
{
46+
HAL_TICK_FREQ_10HZ = 100U,
47+
HAL_TICK_FREQ_100HZ = 10U,
48+
HAL_TICK_FREQ_1KHZ = 1U,
49+
HAL_TICK_FREQ_DEFAULT = HAL_TICK_FREQ_1KHZ
50+
} HAL_TickFreqTypeDef;
5351

5452
/**
5553
* @}
5654
*/
5755

56+
/* Exported constants --------------------------------------------------------*/
57+
/** @defgroup HAL_Exported_Constants HAL Exported Constants
58+
* @{
59+
*/
60+
5861
/** @defgroup SYSCFG_Exported_Constants SYSCFG Exported Constants
5962
* @{
6063
*/
@@ -594,8 +597,8 @@ void HAL_IncTick(void);
594597
void HAL_Delay(uint32_t Delay);
595598
uint32_t HAL_GetTick(void);
596599
uint32_t HAL_GetTickPrio(void);
597-
HAL_StatusTypeDef HAL_SetTickFreq(uint32_t Freq);
598-
uint32_t HAL_GetTickFreq(void);
600+
HAL_StatusTypeDef HAL_SetTickFreq(HAL_TickFreqTypeDef Freq);
601+
HAL_TickFreqTypeDef HAL_GetTickFreq(void);
599602
void HAL_SuspendTick(void);
600603
void HAL_ResumeTick(void);
601604
uint32_t HAL_GetHalVersion(void);
@@ -630,7 +633,7 @@ void HAL_DBGMCU_DisableDBGStandbyMode(void);
630633
*/
631634
extern __IO uint32_t uwTick;
632635
extern uint32_t uwTickPrio;
633-
extern uint32_t uwTickFreq;
636+
extern HAL_TickFreqTypeDef uwTickFreq;
634637
/**
635638
* @}
636639
*/

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ typedef struct
125125
This feature automatically adapts the frequency of ADC conversions triggers to the speed of the system that reads the data. Moreover, this avoids risk of overrun
126126
for low frequency applications.
127127
This parameter can be set to ENABLE or DISABLE.
128-
Note: Do not use with interruption or DMA (HAL_ADC_Start_IT(), HAL_ADC_Start_DMA()) since they clear immediately the EOC flag
129-
to free the IRQ vector sequencer.
128+
Note: It is not recommended to use with interruption or DMA (HAL_ADC_Start_IT(), HAL_ADC_Start_DMA()) since these modes have to clear immediately the EOC flag (by CPU to free the IRQ pending event or by DMA).
129+
Auto wait will work but fort a very short time, discarding its intended benefit (except specific case of high load of CPU or DMA transfers which can justify usage of auto wait).
130130
Do use with polling: 1. Start conversion with HAL_ADC_Start(), 2. Later on, when ADC conversion data is needed:
131131
use HAL_ADC_PollForConversion() to ensure that conversion is completed and HAL_ADC_GetValue() to retrieve conversion result and trig another conversion start.
132132
(in case of usage of ADC group injected, use the equivalent functions HAL_ADCExInjected_Start(), HAL_ADCEx_InjectedGetValue(), ...). */

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h

+24-3
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,39 @@ typedef struct
105105
#define EXTI_LINE_17 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x11u)
106106
#define EXTI_LINE_18 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x12u)
107107
#define EXTI_LINE_19 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x13u)
108+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx) || defined (STM32WB35xx)
108109
#define EXTI_LINE_20 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x14u)
109110
#define EXTI_LINE_21 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x15u)
111+
#else
112+
#define EXTI_LINE_20 (EXTI_RESERVED | EXTI_REG1 | 0x14u)
113+
#define EXTI_LINE_21 (EXTI_RESERVED | EXTI_REG1 | 0x15u)
114+
#endif
110115
#define EXTI_LINE_22 (EXTI_DIRECT | EXTI_REG1 | 0x16u)
116+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx) || defined (STM32WB35xx)
111117
#define EXTI_LINE_23 (EXTI_DIRECT | EXTI_REG1 | 0x17u)
118+
#else
119+
#define EXTI_LINE_23 (EXTI_RESERVED | EXTI_REG1 | 0x17u)
120+
#endif
112121
#define EXTI_LINE_24 (EXTI_DIRECT | EXTI_REG1 | 0x18u)
122+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx) || defined (STM32WB35xx)
113123
#define EXTI_LINE_25 (EXTI_DIRECT | EXTI_REG1 | 0x19u)
124+
#else
125+
#define EXTI_LINE_25 (EXTI_RESERVED | EXTI_REG1 | 0x19u)
126+
#endif
114127
#define EXTI_LINE_26 (EXTI_RESERVED | EXTI_REG1 | 0x1Au)
115128
#define EXTI_LINE_27 (EXTI_RESERVED | EXTI_REG1 | 0x1Bu)
129+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx) || defined (STM32WB35xx)
116130
#define EXTI_LINE_28 (EXTI_DIRECT | EXTI_REG1 | 0x1Cu)
131+
#else
132+
#define EXTI_LINE_28 (EXTI_RESERVED | EXTI_REG1 | 0x1Cu)
133+
#endif
117134
#define EXTI_LINE_29 (EXTI_DIRECT | EXTI_REG1 | 0x1Du)
118135
#define EXTI_LINE_30 (EXTI_DIRECT | EXTI_REG1 | 0x1Eu)
136+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx) || defined (STM32WB35xx)
119137
#define EXTI_LINE_31 (EXTI_CONFIG | EXTI_REG1 | 0x1Fu)
138+
#else
139+
#define EXTI_LINE_31 (EXTI_RESERVED | EXTI_REG1 | 0x1Fu)
140+
#endif
120141
#define EXTI_LINE_32 (EXTI_RESERVED | EXTI_REG2 | 0x00u)
121142
#define EXTI_LINE_33 (EXTI_CONFIG | EXTI_REG2 | 0x01u)
122143
#define EXTI_LINE_34 (EXTI_RESERVED | EXTI_REG2 | 0x02u)
@@ -128,7 +149,7 @@ typedef struct
128149
#define EXTI_LINE_40 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG2 | 0x08u)
129150
#define EXTI_LINE_41 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG2 | 0x09u)
130151
#define EXTI_LINE_42 (EXTI_DIRECT | EXTI_REG2 | 0x0Au)
131-
#if defined (STM32WB55xx)
152+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx)
132153
#define EXTI_LINE_43 (EXTI_DIRECT | EXTI_REG2 | 0x0Bu)
133154
#else
134155
#define EXTI_LINE_43 (EXTI_RESERVED | EXTI_REG2 | 0x0Bu)
@@ -170,7 +191,7 @@ typedef struct
170191
#define EXTI_GPIOA 0x00000000u
171192
#define EXTI_GPIOB 0x00000001u
172193
#define EXTI_GPIOC 0x00000002u
173-
#if defined (STM32WB55xx)
194+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx)
174195
#define EXTI_GPIOD 0x00000003u
175196
#endif
176197
#define EXTI_GPIOE 0x00000004u
@@ -261,7 +282,7 @@ typedef struct
261282

262283
#define IS_EXTI_CONFIG_LINE(__LINE__) (((__LINE__) & EXTI_CONFIG) != 0x00u)
263284

264-
#if defined (STM32WB55xx)
285+
#if defined (STM32WB55xx) || defined (STM32WB5Mxx)
265286
#define IS_EXTI_GPIO_PORT(__PORT__) (((__PORT__) == EXTI_GPIOA) || \
266287
((__PORT__) == EXTI_GPIOB) || \
267288
((__PORT__) == EXTI_GPIOC) || \

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern "C" {
4646
*/
4747
typedef struct
4848
{
49-
uint32_t TypeErase; /*!< Mass erase or page erase.
49+
uint32_t TypeErase; /*!< Page erase.
5050
This parameter can be a value of @ref FLASH_TYPE_ERASE */
5151
uint32_t Page; /*!< Initial Flash page to erase when page erase is enabled
5252
This parameter must be a value between 0 and (FLASH_PAGE_NB - 1) */
@@ -222,7 +222,6 @@ typedef struct
222222
* @{
223223
*/
224224
#define FLASH_TYPEERASE_PAGES FLASH_CR_PER /*!< Pages erase only*/
225-
#define FLASH_TYPEERASE_MASSERASE FLASH_CR_MER /*!< Flash mass erase activation*/
226225
/**
227226
* @}
228227
*/
@@ -853,8 +852,7 @@ HAL_StatusTypeDef FLASH_WaitForLastOperation(uint32_t Timeout);
853852

854853
#define IS_ADDR_ALIGNED_64BITS(__VALUE__) (((__VALUE__) & 0x7U) == (0x00UL))
855854

856-
#define IS_FLASH_TYPEERASE(__VALUE__) (((__VALUE__) == FLASH_TYPEERASE_PAGES) || \
857-
((__VALUE__) == FLASH_TYPEERASE_MASSERASE))
855+
#define IS_FLASH_TYPEERASE(__VALUE__) ((__VALUE__) == FLASH_TYPEERASE_PAGES)
858856

859857
#define IS_FLASH_TYPEPROGRAM(__VALUE__) (((__VALUE__) == FLASH_TYPEPROGRAM_DOUBLEWORD) || \
860858
((__VALUE__) == FLASH_TYPEPROGRAM_FAST))

0 commit comments

Comments
 (0)