File tree Expand file tree Collapse file tree 2 files changed +20
-5
lines changed
libraries/EEPROM/src/utility Expand file tree Collapse file tree 2 files changed +20
-5
lines changed Original file line number Diff line number Diff line change @@ -267,12 +267,7 @@ void eeprom_buffer_flush(void)
267267 EraseInitStruct .NbPages = 1 ;
268268
269269 if (HAL_FLASH_Unlock () == HAL_OK ) {
270- #if defined (STM32G0xx ) || defined (STM32G4xx ) || defined (STM32L4xx ) || \
271- defined (STM32L5xx ) || defined (STM32WBxx )
272270 __HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_ALL_ERRORS );
273- #else
274- __HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR );
275- #endif
276271 if (HAL_FLASHEx_Erase (& EraseInitStruct , & pageError ) == HAL_OK ) {
277272 while (address <= address_end ) {
278273
Original file line number Diff line number Diff line change @@ -70,6 +70,26 @@ extern "C" {
7070#endif
7171#define E2END (EEPROM_RETRAM_MODE_SIZE - 1)
7272#else
73+ #ifndef FLASH_FLAG_ALL_ERRORS
74+ #if defined(STM32F0xx ) || defined(STM32F3xx )
75+ #define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR)
76+ #elif defined(STM32F1xx )
77+ #define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR | FLASH_FLAG_OPTVERR)
78+ #elif defined (STM32G0xx )
79+ #if defined(FLASH_PCROP_SUPPORT )
80+ #define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_OPERR | FLASH_FLAG_PROGERR | FLASH_FLAG_WRPERR | \
81+ FLASH_FLAG_PGAERR | FLASH_FLAG_SIZERR | FLASH_FLAG_PGSERR | \
82+ FLASH_FLAG_MISERR | FLASH_FLAG_FASTERR | FLASH_FLAG_RDERR | \
83+ FLASH_FLAG_OPTVERR | FLASH_FLAG_ECCC | FLASH_FLAG_ECCD)
84+ #else
85+ #define FLASH_FLAG_ALL_ERRORS (FLASH_FLAG_OPERR | FLASH_FLAG_PROGERR | FLASH_FLAG_WRPERR | \
86+ FLASH_FLAG_PGAERR | FLASH_FLAG_SIZERR | FLASH_FLAG_PGSERR | \
87+ FLASH_FLAG_MISERR | FLASH_FLAG_FASTERR | \
88+ FLASH_FLAG_OPTVERR | FLASH_FLAG_ECCC | FLASH_FLAG_ECCD)
89+ #endif /* FLASH_PCROP_SUPPORT */
90+ #endif
91+ #endif
92+
7393#ifndef FLASH_PAGE_SIZE
7494/*
7595 * FLASH_PAGE_SIZE is not defined for STM32F2xx, STM32F4xx and STM32F7xx
You can’t perform that action at this time.
0 commit comments