arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

EEPROM: fix incorrect start address, support multiple instances

Browse Source 
related to #279, #240
This commit is contained in:
Ivan Grokhotkov
2015-05-21 10:22:45 +03:00
parent 6e14666d2f
commit b1f2fdb9cc
3 changed files with 104 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
libraries/EEPROM/EEPROM.h
View File

@ -26,43 +26,42 @@
#include <stdint.h>
#include <string.h>
class EEPROMClass
{
public:
EEPROMClass();
void begin(size_t size);
uint8_t read(int address);
void write(int address, uint8_t val);
bool commit();
void end();
class EEPROMClass {
public:
EEPROMClass(uint32_t sector);
uint8_t * getDataPtr();
void begin(size_t size);
uint8_t read(int address);
void write(int address, uint8_t val);
bool commit();
void end();
template<typename T> T &get(int address, T &t)
{
if (address < 0 || address + sizeof(T) > _size)
return t;
uint8_t * getDataPtr();
uint8_t *ptr = (uint8_t*) &t;
memcpy(ptr, _data + address, sizeof(T));
return t;
}
template<typename T>
T &get(int address, T &t) {
if (address < 0 || address + sizeof(T) > _size)
return t;
template<typename T> const T &put(int address, const T &t)
{
if (address < 0 || address + sizeof(T) > _size)
return t;
memcpy((uint8_t*) &t, _data + address, sizeof(T));
return t;
}
const uint8_t *ptr = (const uint8_t*) &t;
memcpy(_data + address, ptr, sizeof(T));
_dirty = true;
return t;
}
template<typename T>
const T &put(int address, const T &t) {
if (address < 0 || address + sizeof(T) > _size)
return t;
protected:
uint8_t* _data;
size_t _size;
bool _dirty;
memcpy(_data + address, (const uint8_t*) &t, sizeof(T));
_dirty = true;
return t;
}
protected:
uint32_t _sector;
uint8_t* _data;
size_t _size;
bool _dirty;
};
extern EEPROMClass EEPROM;