Skip to content

Added length and operator[] methods, added some constness, missed dirty clear (#2066) #3855

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

Added length and operator[] methods, added some constness, missed dirty clear (#2066) #3855

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
484c4ba
Added length and operator[] methods, added some constness, missed _di…
devyte Nov 20, 2017
aa34508
Added forgotten const
devyte Nov 20, 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
7 changes: 4 additions & 3 deletions libraries/EEPROM/EEPROM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,11 @@ void EEPROMClass::end() {
}
_data = 0;
_size = 0;
_dirty = false;
}


uint8_t EEPROMClass::read(int address) {
uint8_t EEPROMClass::read(int const address) {
if (address < 0 || (size_t)address >= _size)
return 0;
if(!_data)
Expand All @@ -95,7 +96,7 @@ uint8_t EEPROMClass::read(int address) {
return _data[address];
}

void EEPROMClass::write(int address, uint8_t value) {
void EEPROMClass::write(int const address, uint8_t const value) {
if (address < 0 || (size_t)address >= _size)
return;
if(!_data)
Expand Down Expand Up @@ -136,7 +137,7 @@ uint8_t * EEPROMClass::getDataPtr() {
return &_data[0];
}

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

Expand Down
19 changes: 12 additions & 7 deletions libraries/EEPROM/EEPROM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ class EEPROMClass {
EEPROMClass(void);

void begin(size_t size);
uint8_t read(int address);
void write(int address, uint8_t val);
uint8_t read(int const address);
void write(int const address, uint8_t const val);
bool commit();
void end();

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

template<typename T>
T &get(int address, T &t) {
T &get(int const address, T &t) {
if (address < 0 || address + sizeof(T) > _size)
return t;

Expand All @@ -50,17 +50,22 @@ class EEPROMClass {
}

template<typename T>
const T &put(int address, const T &t) {
const T &put(int const address, const T &t) {
if (address < 0 || address + sizeof(T) > _size)
return t;
if (memcmp(_data + address, (const uint8_t*)&t, sizeof(T)) != 0) {
_dirty = true;
memcpy(_data + address, (const uint8_t*)&t, sizeof(T));
_dirty = true;
memcpy(_data + address, (const uint8_t*)&t, sizeof(T));
}

return t;
}

size_t length() {return _size;}

uint8_t& operator[](int const address) {return getDataPtr()[address];}
uint8_t const & operator[](int const address) const {return getConstDataPtr()[address];}

protected:
uint32_t _sector;
uint8_t* _data;
Expand Down