Skip to content

Support buffered EEPROM emulation #35

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
thinkyhead merged 1 commit into from
Sep 29, 2018
Merged

Support buffered EEPROM emulation #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 23 additions & 13 deletions Marlin/src/HAL/HAL_STM32F7xx/persistent_store_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,33 @@

#if DISABLED(EEPROM_EMULATED_WITH_SRAM)
#include <EEPROM.h>
static bool eeprom_data_written = false;
#endif

bool PersistentStore::access_start() { return true; }
bool PersistentStore::access_finish() { return true; }
bool PersistentStore::access_start() {
#if DISABLED(EEPROM_EMULATED_WITH_SRAM)
eeprom_buffer_fill();
#endif
return true;
}

bool PersistentStore::access_finish() {
#if DISABLED(EEPROM_EMULATED_WITH_SRAM)
if (eeprom_data_written) {
eeprom_buffer_flush();
eeprom_data_written = false;
}
#endif
return true;
}

bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
while (size--) {
uint8_t v = *value;

// Save to either program flash or Backup SRAM
#if DISABLED(EEPROM_EMULATED_WITH_SRAM)
// FLASH has only ~1,000 write cycles,
// so only write bytes that have changed!
if (v != EEPROM.read(pos)) {
EEPROM.write(pos, v);
if (EEPROM.read(pos) != v) {
SERIAL_ECHO_START();
SERIAL_ECHOLNPGM(MSG_ERR_EEPROM_WRITE);
return true;
}
}
eeprom_buffered_write_byte(pos, v);
#else
*(__IO uint8_t *)(BKPSRAM_BASE + (uint8_t * const)pos) = v;
#endif
Expand All @@ -59,6 +65,10 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
pos++;
value++;
};
#if DISABLED(EEPROM_EMULATED_WITH_SRAM)
eeprom_data_written = true;
#endif

return false;
}

Expand All @@ -67,7 +77,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
// Read from either program flash or Backup SRAM
const uint8_t c = (
#if DISABLED(EEPROM_EMULATED_WITH_SRAM)
EEPROM.read(pos)
eeprom_buffered_read_byte(pos)
#else
(*(__IO uint8_t *)(BKPSRAM_BASE + ((unsigned char*)pos)))
#endif
Expand Down