@@ -42,8 +42,8 @@ extern "C" {
42
42
/* Be able to change FLASH_BANK_NUMBER to use if relevant */
43
43
#if !defined(FLASH_BANK_NUMBER ) && \
44
44
(defined(STM32F0xx ) || defined(STM32F1xx ) || defined(STM32G4xx ) || \
45
- defined(STM32H7xx ) || defined(STM32L1xx ) || defined( STM32L4xx ))
46
- /* Fo STM32F0xx, FLASH_BANK_1 is not defined only FLASH_BANK1_END is defined */
45
+ defined(STM32H7xx ) || defined(STM32L4xx ))
46
+ /* For STM32F0xx, FLASH_BANK_1 is not defined only FLASH_BANK1_END is defined */
47
47
#if defined(STM32F0xx )
48
48
#define FLASH_BANK_1 1U
49
49
#endif
@@ -58,7 +58,7 @@ extern "C" {
58
58
#endif /* !FLASH_BANK_NUMBER */
59
59
60
60
/* Be able to change FLASH_DATA_SECTOR to use if relevant */
61
- #if defined(STM32F2xx ) || defined(STM32F4xx ) || defined(STM32F7xx ) || \
61
+ #if defined(STM32F2xx ) || defined(STM32F4xx ) || defined(STM32F7xx ) || \
62
62
defined(STM32H7xx )
63
63
#if !defined(FLASH_DATA_SECTOR )
64
64
#define FLASH_DATA_SECTOR ((uint32_t)(FLASH_SECTOR_TOTAL - 1))
@@ -77,8 +77,8 @@ extern "C" {
77
77
#endif /* !FLASH_PAGE_NUMBER */
78
78
79
79
/* Be able to change FLASH_END to use */
80
- #if !defined(FLASH_END ) && !defined( STM32L0xx )
81
- #if defined (STM32F0xx ) || defined (STM32F1xx ) || defined( STM32L1xx )
80
+ #if !defined(FLASH_END )
81
+ #if defined (STM32F0xx ) || defined (STM32F1xx )
82
82
#if defined (FLASH_BANK2_END ) && (FLASH_BANK_NUMBER == FLASH_BANK_2 )
83
83
#define FLASH_END FLASH_BANK2_END
84
84
#elif defined (FLASH_BANK1_END ) && (FLASH_BANK_NUMBER == FLASH_BANK_1 )
@@ -117,6 +117,8 @@ static inline uint32_t get_flash_end(void)
117
117
#define FLASH_END ((uint32_t)(FLASH_BASE + (((FLASH_PAGE_NUMBER +1) * FLASH_PAGE_SIZE))-1))
118
118
#elif defined(EEPROM_RETRAM_MODE )
119
119
#define FLASH_END ((uint32_t)(EEPROM_RETRAM_START_ADDRESS + EEPROM_RETRAM_MODE_SIZE -1))
120
+ #elif defined(DATA_EEPROM_END )
121
+ #define FLASH_END DATA_EEPROM_END
120
122
#endif
121
123
#ifndef FLASH_END
122
124
#error "FLASH_END could not be defined"
@@ -130,9 +132,7 @@ static inline uint32_t get_flash_end(void)
130
132
* in order to prevent overwritting
131
133
* program data
132
134
*/
133
- #if defined(STM32L0xx )
134
- #define FLASH_BASE_ADDRESS ((uint32_t)(DATA_EEPROM_BASE))
135
- #elif defined(EEPROM_RETRAM_MODE )
135
+ #if defined(EEPROM_RETRAM_MODE )
136
136
#define FLASH_BASE_ADDRESS EEPROM_RETRAM_START_ADDRESS
137
137
#else
138
138
#define FLASH_BASE_ADDRESS ((uint32_t)((FLASH_END + 1) - FLASH_PAGE_SIZE))
@@ -223,7 +223,7 @@ void eeprom_buffer_fill(void)
223
223
memcpy (eeprom_buffer , (uint8_t * )(DATA_EEPROM_BASE ), E2END + 1 );
224
224
#else
225
225
memcpy (eeprom_buffer , (uint8_t * )(FLASH_BASE_ADDRESS ), E2END + 1 );
226
- #endif /* STM32L0xx */
226
+ #endif /* DATA_EEPROM_BASE */
227
227
}
228
228
229
229
#if defined(EEPROM_RETRAM_MODE )
@@ -268,8 +268,8 @@ void eeprom_buffer_flush(void)
268
268
uint32_t address = FLASH_BASE_ADDRESS ;
269
269
uint32_t address_end = FLASH_BASE_ADDRESS + E2END ;
270
270
#if defined (STM32F0xx ) || defined (STM32F1xx ) || defined (STM32F3xx ) || \
271
- defined (STM32G0xx ) || defined (STM32G4xx ) || defined ( STM32L0xx ) || \
272
- defined (STM32L1xx ) || defined ( STM32L4xx ) || defined (STM32WBxx )
271
+ defined (STM32G0xx ) || defined (STM32G4xx ) || \
272
+ defined (STM32L4xx ) || defined (STM32WBxx )
273
273
uint32_t pageError = 0 ;
274
274
uint64_t data = 0 ;
275
275
@@ -287,38 +287,20 @@ void eeprom_buffer_flush(void)
287
287
EraseInitStruct .NbPages = 1 ;
288
288
289
289
if (HAL_FLASH_Unlock () == HAL_OK ) {
290
- #if defined(STM32L0xx )
291
- __HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | \
292
- FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR | FLASH_FLAG_RDERR | \
293
- FLASH_FLAG_FWWERR | FLASH_FLAG_NOTZEROERR );
294
- #elif defined(STM32L1xx )
295
- #if defined(FLASH_SR_RDERR )
296
- __HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | \
297
- FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR | FLASH_FLAG_RDERR );
298
- #else
299
- __HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | \
300
- FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR );
301
- #endif
302
- #elif defined (STM32G0xx ) || defined (STM32G4xx ) || defined (STM32L4xx ) || \
290
+ #if defined (STM32G0xx ) || defined (STM32G4xx ) || defined (STM32L4xx ) || \
303
291
defined (STM32WBxx )
304
292
__HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_ALL_ERRORS );
305
293
#else
306
294
__HAL_FLASH_CLEAR_FLAG (FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR );
307
295
#endif
308
296
if (HAL_FLASHEx_Erase (& EraseInitStruct , & pageError ) == HAL_OK ) {
309
297
while (address <= address_end ) {
310
- #if defined(STM32L0xx ) || defined(STM32L1xx )
311
- memcpy (& data , eeprom_buffer + offset , sizeof (uint32_t ));
312
- if (HAL_FLASH_Program (FLASH_TYPEPROGRAM_WORD , address , data ) == HAL_OK ) {
313
- address += 4 ;
314
- offset += 4 ;
315
- #else
298
+
316
299
data = * ((uint64_t * )((uint8_t * )eeprom_buffer + offset ));
317
300
318
301
if (HAL_FLASH_Program (FLASH_TYPEPROGRAM_DOUBLEWORD , address , data ) == HAL_OK ) {
319
302
address += 8 ;
320
303
offset += 8 ;
321
- #endif
322
304
} else {
323
305
address = address_end + 1 ;
324
306
}
0 commit comments