Skip to content

EEPROM: dirty flag, reallocate only if necessary, add getConstDataPtr method (#2217) #3849

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 2 commits into from
Nov 20, 2017
Merged

EEPROM: dirty flag, reallocate only if necessary, add getConstDataPtr method (#2217) #3849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d87d1
Clear dirty flag in begin and reallocate only if necessary, add getCo…
devyte Nov 19, 2017
1d7cb0c
Merge branch 'master' into issue2217
devyte Nov 19, 2017
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
13 changes: 11 additions & 2 deletions libraries/EEPROM/EEPROM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,21 @@ void EEPROMClass::begin(size_t size) {

size = (size + 3) & (~3);

if (_data) {
//In case begin() is called a 2nd+ time, don't reallocate if size is the same
if(_data && size != _size) {
delete[] _data;
_data = new uint8_t[size];
} else if(!_data) {
_data = new uint8_t[size];
}

_data = new uint8_t[size];
_size = size;

noInterrupts();
spi_flash_read(_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(_data), _size);
interrupts();

_dirty = false; //make sure dirty is cleared in case begin() is called 2nd+ time
}

void EEPROMClass::end() {
Expand Down Expand Up @@ -131,6 +136,10 @@ uint8_t * EEPROMClass::getDataPtr() {
return &_data[0];
}

uint8_t const * EEPROMClass::getConstDataPtr() {
return &_data[0];
}

#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_EEPROM)
EEPROMClass EEPROM;
#endif
1 change: 1 addition & 0 deletions libraries/EEPROM/EEPROM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class EEPROMClass {
void end();

uint8_t * getDataPtr();
uint8_t const * getConstDataPtr();

template<typename T>
T &get(int address, T &t) {
Expand Down