Skip to content

Eeprom #17

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

Closed
wants to merge 7 commits into from
Closed

Eeprom #17

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91ee6c5
bsp: analog: use register definition instead of serie name
fpistm Sep 14, 2021
7fb0803
bsp: analog: handle ADC_VER_V5_V90
fpistm Sep 14, 2021
5d64997
Merge pull request #1493 from fpistm/ADC
fpistm Sep 14, 2021
03d223f
chore: Enable Swan I2C pull-ups by default
zfields Sep 14, 2021
e506d85
feat: Improve Swan `3V3` pin control/behavior
zfields Sep 15, 2021
6dec3b6
Merge pull request #1494 from zfields/swan_r5
fpistm Sep 15, 2021
5c11191
fix(eeprom): ensure to have the correct FLASH_END
fpistm Sep 21, 2021
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
Prev Previous commit
fix(eeprom): ensure to have the correct FLASH_END 
FLASH_END which is defined in CMSIS file doesn't take
into account the real flash size of a the device,
(it is just the maximum possible within the productline).

Fixes stm32duino#1316, fixes stm32duino#1500

Signed-off-by: Frederic Pillon <[email protected]>
  • Loading branch information
@fpistm
fpistm committed Sep 21, 2021
commit 5c111915f9a74f7d53c34f82135ed4dcc7fb759a
22 changes: 2 additions & 20 deletions libraries/EEPROM/src/utility/stm32_eeprom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,6 @@ extern "C" {
#define FLASH_PAGE_NUMBER ((uint32_t)(((LL_GetFlashSize() * 1024) / FLASH_PAGE_SIZE) - 1))
#endif /* !FLASH_PAGE_NUMBER */

/* Be able to change FLASH_END to use */
#if !defined(FLASH_END)
#if 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
#elif 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)
#define FLASH_END FLASH_BANK1_END
#elif defined(FLASH_BASE) && defined(FLASH_PAGE_NUMBER) && defined (FLASH_PAGE_SIZE)
/* If FLASH_PAGE_NUMBER is defined by user, this is not really end of the flash */
#define FLASH_END ((uint32_t)(FLASH_BASE + (((FLASH_PAGE_NUMBER +1) * FLASH_PAGE_SIZE))-1))
#endif
#ifndef FLASH_END
#error "FLASH_END could not be defined"
#endif
#endif /* FLASH_END */

/* Be able to change FLASH_BASE_ADDRESS to use */
#ifndef FLASH_BASE_ADDRESS
/*
Expand All @@ -81,7 +62,8 @@ extern "C" {
#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))
/* If FLASH_PAGE_NUMBER is defined by user, this is not really end of the flash */
#define FLASH_BASE_ADDRESS ((uint32_t)(FLASH_BASE + (FLASH_PAGE_NUMBER * FLASH_PAGE_SIZE)))
#endif
#ifndef FLASH_BASE_ADDRESS
#error "FLASH_BASE_ADDRESS could not be defined"
Expand Down