Skip to content

[WIP] stm32L0xx soc series has an embedded EEPROM #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 24, 2020
Merged

[WIP] stm32L0xx soc series has an embedded EEPROM #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f522e0
stm32L0xx or stm32L1xx soc series has an embedded EEPROM
FRASTM Aug 24, 2020
9a5672f
remove stm32L0x and stm32L1x outside the use of EEPROM
FRASTM Aug 20, 2020
d85772f
remove stm32L0x and stm32L1x EEPROM buffered functions
FRASTM Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions cores/arduino/stm32/stm32_eeprom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,25 @@ extern "C" {
*/
#define FLASH_PAGE_SIZE ((uint32_t)(16*1024)) /* 16kB page */
#endif

#if defined(DATA_EEPROM_BASE) || defined(FLASH_EEPROM_BASE)

#if defined (DATA_EEPROM_END)
#define E2END (DATA_EEPROM_END - DATA_EEPROM_BASE)
#elif defined (DATA_EEPROM_BANK2_END)
/* assuming two contiguous banks */
#define DATA_EEPROM_END DATA_EEPROM_BANK2_END
#define E2END (DATA_EEPROM_BANK2_END - DATA_EEPROM_BASE)
#elif defined (FLASH_EEPROM_END)
#define DATA_EEPROM_BASE FLASH_EEPROM_BASE
#define DATA_EEPROM_END FLASH_EEPROM_END
#define E2END (DATA_EEPROM_END - DATA_EEPROM_BASE)
#endif /* __EEPROM_END */

#else /* _EEPROM_BASE */
#define E2END (FLASH_PAGE_SIZE - 1)
#endif /* _EEPROM_BASE */

#endif

/* Exported macro ------------------------------------------------------------*/
Expand All @@ -89,10 +107,12 @@ extern "C" {
uint8_t eeprom_read_byte(const uint32_t pos);
void eeprom_write_byte(uint32_t pos, uint8_t value);

#if !defined(DATA_EEPROM_BASE)
void eeprom_buffer_fill();
void eeprom_buffer_flush();
uint8_t eeprom_buffered_read_byte(const uint32_t pos);
void eeprom_buffered_write_byte(uint32_t pos, uint8_t value);
#endif /* ! DATA_EEPROM_BASE */

#ifdef __cplusplus
}
Expand Down
67 changes: 37 additions & 30 deletions libraries/SrcWrapper/src/stm32/stm32_eeprom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ extern "C" {
/* Be able to change FLASH_BANK_NUMBER to use if relevant */
#if !defined(FLASH_BANK_NUMBER) &&\
(defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32G4xx) ||\
defined(STM32H7xx) || defined(STM32L1xx) || defined(STM32L4xx))
/* Fo STM32F0xx, FLASH_BANK_1 is not defined only FLASH_BANK1_END is defined */
defined(STM32H7xx) || defined(STM32L4xx))
/* For STM32F0xx, FLASH_BANK_1 is not defined only FLASH_BANK1_END is defined */
#if defined(STM32F0xx)
#define FLASH_BANK_1 1U
#endif
Expand All @@ -58,7 +58,7 @@ extern "C" {
#endif /* !FLASH_BANK_NUMBER */

/* Be able to change FLASH_DATA_SECTOR to use if relevant */
#if defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F7xx) ||\
#if defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F7xx) ||\
defined(STM32H7xx)
#if !defined(FLASH_DATA_SECTOR)
#define FLASH_DATA_SECTOR ((uint32_t)(FLASH_SECTOR_TOTAL - 1))
Expand All @@ -77,8 +77,8 @@ extern "C" {
#endif /* !FLASH_PAGE_NUMBER */

/* Be able to change FLASH_END to use */
#if !defined(FLASH_END) && !defined(STM32L0xx)
#if defined (STM32F0xx) || defined (STM32F1xx) || defined(STM32L1xx)
#if !defined(FLASH_END)
#if defined (STM32F0xx) || defined (STM32F1xx)
#if defined (FLASH_BANK2_END) && (FLASH_BANK_NUMBER == FLASH_BANK_2)
#define FLASH_END FLASH_BANK2_END
#elif defined (FLASH_BANK1_END) && (FLASH_BANK_NUMBER == FLASH_BANK_1)
Expand Down Expand Up @@ -117,6 +117,8 @@ static inline uint32_t get_flash_end(void)
#define FLASH_END ((uint32_t)(FLASH_BASE + (((FLASH_PAGE_NUMBER +1) * FLASH_PAGE_SIZE))-1))
#elif defined(EEPROM_RETRAM_MODE)
#define FLASH_END ((uint32_t)(EEPROM_RETRAM_START_ADDRESS + EEPROM_RETRAM_MODE_SIZE -1))
#elif defined(DATA_EEPROM_END)
#define FLASH_END DATA_EEPROM_END
#endif
#ifndef FLASH_END
#error "FLASH_END could not be defined"
Expand All @@ -130,9 +132,7 @@ static inline uint32_t get_flash_end(void)
* in order to prevent overwritting
* program data
*/
#if defined(STM32L0xx)
#define FLASH_BASE_ADDRESS ((uint32_t)(DATA_EEPROM_BASE))
#elif defined(EEPROM_RETRAM_MODE)
#if defined(EEPROM_RETRAM_MODE)
#define FLASH_BASE_ADDRESS EEPROM_RETRAM_START_ADDRESS
#else
#define FLASH_BASE_ADDRESS ((uint32_t)((FLASH_END + 1) - FLASH_PAGE_SIZE))
Expand All @@ -142,7 +142,9 @@ static inline uint32_t get_flash_end(void)
#endif
#endif /* FLASH_BASE_ADDRESS */

#if !defined(DATA_EEPROM_BASE)
static uint8_t eeprom_buffer[E2END + 1] __attribute__((aligned(8))) = {0};
#endif

/**
* @brief Function reads a byte from emulated eeprom (flash)
Expand All @@ -151,8 +153,17 @@ static uint8_t eeprom_buffer[E2END + 1] __attribute__((aligned(8))) = {0};
*/
uint8_t eeprom_read_byte(const uint32_t pos)
{
#if defined(DATA_EEPROM_BASE)
__IO uint8_t data = 0;
if (pos <= (DATA_EEPROM_END - DATA_EEPROM_BASE)) {
/* with actual EEPROM, pos is a relative address */
data = *(__IO uint8_t *)(DATA_EEPROM_BASE + pos);
}
return (uint8_t)data;
#else
eeprom_buffer_fill();
return eeprom_buffered_read_byte(pos);
#endif /* _EEPROM_BASE */
}

/**
Expand All @@ -163,10 +174,22 @@ uint8_t eeprom_read_byte(const uint32_t pos)
*/
void eeprom_write_byte(uint32_t pos, uint8_t value)
{
#if defined(DATA_EEPROM_BASE)
/* with actual EEPROM, pos is a relative address */
if (pos <= (DATA_EEPROM_END - DATA_EEPROM_BASE)) {
if (HAL_FLASHEx_DATAEEPROM_Unlock() == HAL_OK) {
HAL_FLASHEx_DATAEEPROM_Program(FLASH_TYPEPROGRAMDATA_BYTE, (pos + DATA_EEPROM_BASE), (uint32_t)value);
HAL_FLASHEx_DATAEEPROM_Lock();
}
}
#else
eeprom_buffered_write_byte(pos, value);
eeprom_buffer_flush();
#endif /* _EEPROM_BASE */
}

#if !defined(DATA_EEPROM_BASE)

/**
* @brief Function reads a byte from the eeprom buffer
* @param pos : address to read
Expand Down Expand Up @@ -224,8 +247,8 @@ void eeprom_buffer_flush(void)
uint32_t address = FLASH_BASE_ADDRESS;
uint32_t address_end = FLASH_BASE_ADDRESS + E2END;
#if defined (STM32F0xx) || defined (STM32F1xx) || defined (STM32F3xx) || \
defined (STM32G0xx) || defined (STM32G4xx) || defined (STM32L0xx) || \
defined (STM32L1xx) || defined (STM32L4xx) || defined (STM32WBxx)
defined (STM32G0xx) || defined (STM32G4xx) || \
defined (STM32L4xx) || defined (STM32WBxx)
uint32_t pageError = 0;
uint64_t data = 0;

Expand All @@ -243,38 +266,20 @@ void eeprom_buffer_flush(void)
EraseInitStruct.NbPages = 1;

if (HAL_FLASH_Unlock() == HAL_OK) {
#if defined(STM32L0xx)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | \
FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR | FLASH_FLAG_RDERR | \
FLASH_FLAG_FWWERR | FLASH_FLAG_NOTZEROERR);
#elif defined(STM32L1xx)
#if defined(FLASH_SR_RDERR)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | \
FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR | FLASH_FLAG_RDERR);
#else
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | \
FLASH_FLAG_SIZERR | FLASH_FLAG_OPTVERR);
#endif
#elif defined (STM32G0xx) || defined (STM32G4xx) || defined (STM32L4xx) || \
#if defined (STM32G0xx) || defined (STM32G4xx) || defined (STM32L4xx) || \
defined (STM32WBxx)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
#else
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR);
#endif
if (HAL_FLASHEx_Erase(&EraseInitStruct, &pageError) == HAL_OK) {
while (address <= address_end) {
#if defined(STM32L0xx) || defined(STM32L1xx)
memcpy(&data, eeprom_buffer + offset, sizeof(uint32_t));
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, address, data) == HAL_OK) {
address += 4;
offset += 4;
#else

data = *((uint64_t *)((uint8_t *)eeprom_buffer + offset));

if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data) == HAL_OK) {
address += 8;
offset += 8;
#endif
} else {
address = address_end + 1;
}
Expand Down Expand Up @@ -326,6 +331,8 @@ void eeprom_buffer_flush(void)

#endif /* defined(EEPROM_RETRAM_MODE) */

#endif /* ! DATA_EEPROM_BASE */

#ifdef __cplusplus
}
#endif
Expand Down