MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #662 from tekka007/ESP8266core

Browse Source 
ESP8266: Reorganize EEPROM handling
This commit is contained in:
Henrik Ekblad
2016-11-26 15:30:23 +01:00
committed by GitHub
parent fb872fae67 b16839cc5d
commit 41d818f248
2 changed files with 30 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/MyHwESP8266.cpp
+25 -48
View File
@@ -20,73 +20,50 @@
#include "MyHwESP8266.h" #include "MyHwESP8266.h"
#include <EEPROM.h> #include <EEPROM.h>
/* void hwInit(void)
int8_t pinIntTrigger = 0;
void wakeUp() //place to send the interrupts
{ {
pinIntTrigger = 1; #if !defined(MY_DISABLED_SERIAL)
} MY_SERIALDEVICE.begin(MY_BAUD_RATE, SERIAL_8N1, MY_ESP8266_SERIAL_MODE, 1);
void wakeUp2() //place to send the second interrupts MY_SERIALDEVICE.setDebugOutput(true);
{ #endif
pinIntTrigger = 2; EEPROM.begin(EEPROM_size);
} }
// Watchdog Timer interrupt service routine. This routine is required void hwReadConfigBlock(void* buf, void* addr, size_t length)
// to allow automatic WDIF and WDIE bit clearance in hardware.
ISR (WDT_vect)
{ {
// WDIE & WDIF is cleared in hardware upon entering this ISR
wdt_disable();
}
*/
static void hwInitConfigBlock( size_t length = 1024 /*ATMega328 has 1024 bytes*/ )
{
static bool initDone = false;
if (!initDone)
{
EEPROM.begin(length);
initDone = true;
}
}
void hwReadConfigBlock(void* buf, void* adr, size_t length)
{
hwInitConfigBlock();
uint8_t* dst = static_cast<uint8_t*>(buf); uint8_t* dst = static_cast<uint8_t*>(buf);
int offs = reinterpret_cast<int>(adr); int pos = reinterpret_cast<int>(addr);
while (length-- > 0) while (length-- > 0)
{ {
*dst++ = EEPROM.read(offs++); *dst++ = EEPROM.read(pos++);
} }
} }
void hwWriteConfigBlock(void* buf, void* adr, size_t length) void hwWriteConfigBlock(void* buf, void* addr, size_t length)
{ {
hwInitConfigBlock(); uint8_t* src = static_cast<uint8_t*>(buf);
uint8_t* src = static_cast<uint8_t*>(buf); int pos = reinterpret_cast<int>(addr);
int offs = reinterpret_cast<int>(adr); bool doCommit = false;
while (length-- > 0) while (length-- > 0) {
{ doCommit |= EEPROM.read(pos) != *src;
EEPROM.write(offs++, *src++); EEPROM.write(pos++, *src++);
} }
EEPROM.commit(); // only commit if there are changes
if (doCommit) {
EEPROM.commit();
}
} }
uint8_t hwReadConfig(int adr) uint8_t hwReadConfig(const int addr)
{ {
uint8_t value; uint8_t value;
hwReadConfigBlock(&value, reinterpret_cast<void*>(adr), 1); hwReadConfigBlock(&value, reinterpret_cast<void*>(addr), 1);
return value; return value;
} }
void hwWriteConfig(int adr, uint8_t value) void hwWriteConfig(const int addr, uint8_t value)
{ {
uint8_t curr = hwReadConfig(adr); hwWriteConfigBlock(&value, reinterpret_cast<void*>(addr), 1);
if (curr != value)
{
hwWriteConfigBlock(&value, reinterpret_cast<void*>(adr), 1);
}
} }
core/MyHwESP8266.h
+5 -9
View File
@@ -30,27 +30,23 @@
#define min(a,b) ((a)<(b)?(a):(b)) #define min(a,b) ((a)<(b)?(a):(b))
#define max(a,b) ((a)>(b)?(a):(b)) #define max(a,b) ((a)>(b)?(a):(b))
#define EEPROM_size (1024)
// Define these as macros to save valuable space // Define these as macros to save valuable space
#define hwDigitalWrite(__pin, __value) digitalWrite(__pin, __value) #define hwDigitalWrite(__pin, __value) digitalWrite(__pin, __value)
#define hwDigitalRead(__pin) digitalRead(__pin) #define hwDigitalRead(__pin) digitalRead(__pin)
#define hwPinMode(__pin, __value) pinMode(__pin, __value) #define hwPinMode(__pin, __value) pinMode(__pin, __value)
#if defined(MY_DISABLED_SERIAL)
#define hwInit()
#else
#define hwInit() MY_SERIALDEVICE.begin(MY_BAUD_RATE, SERIAL_8N1, MY_ESP8266_SERIAL_MODE, 1); MY_SERIALDEVICE.setDebugOutput(true)
#endif
#define hwWatchdogReset() wdt_reset() #define hwWatchdogReset() wdt_reset()
#define hwReboot() ESP.restart() #define hwReboot() ESP.restart()
#define hwMillis() millis() #define hwMillis() millis()
#define hwRandomNumberInit() randomSeed(analogRead(MY_SIGNING_SOFT_RANDOMSEED_PIN)) #define hwRandomNumberInit() randomSeed(analogRead(MY_SIGNING_SOFT_RANDOMSEED_PIN))
void hwInit(void);
void hwReadConfigBlock(void* buf, void* adr, size_t length); void hwReadConfigBlock(void* buf, void* adr, size_t length);
void hwWriteConfigBlock(void* buf, void* adr, size_t length); void hwWriteConfigBlock(void* buf, void* adr, size_t length);
void hwWriteConfig(int adr, uint8_t value); void hwWriteConfig(const int addr, uint8_t value);
uint8_t hwReadConfig(int adr); uint8_t hwReadConfig(const int addr);
/** /**
* Restore interrupt state. * Restore interrupt state.