Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplified timer NV store load/save

Browse source
This commit is contained in:
rljonesau 2019-01-12 12:57:32 +11:00
parent 713724eaab
commit 59d24d96b9
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp
View file

@ -211,7 +211,7 @@ CESP32HeaterStorage::load()
DebugPort.println("Reading from NV storage"); DebugPort.println("Reading from NV storage");
loadHeater(); loadHeater();
for(int i=0; i<2; i++) { for(int i=0; i<2; i++) {
loadTimer(i+1, _calValues.timer[i]); loadTimer(i);
} }
loadUI(); loadUI();
} }
@ -222,7 +222,7 @@ CESP32HeaterStorage::save()
DebugPort.println("Saving to NV storage"); DebugPort.println("Saving to NV storage");
saveHeater(); saveHeater();
for(int i=0; i<2; i++) { for(int i=0; i<2; i++) {
saveTimer(i+1, _calValues.timer[i]); saveTimer(i);
} }
saveUI(); saveUI();
} }
@ -262,10 +262,11 @@ CESP32HeaterStorage::saveHeater()
} }
void void
CESP32HeaterStorage::loadTimer(int idx, sTimer& timer) CESP32HeaterStorage::loadTimer(int idx)
{ {
sTimer& timer = _calValues.timer[idx];
char SectionName[16]; char SectionName[16];
sprintf(SectionName, "timer%d", idx); sprintf(SectionName, "timer%d", idx+1);
preferences.begin(SectionName, false); preferences.begin(SectionName, false);
validatedLoad("startHour", timer.start.hour, 0, u8inBounds, 0, 23); validatedLoad("startHour", timer.start.hour, 0, u8inBounds, 0, 23);
validatedLoad("startMin", timer.start.min, 0, u8inBounds, 0, 59); validatedLoad("startMin", timer.start.min, 0, u8inBounds, 0, 59);
@ -277,10 +278,11 @@ CESP32HeaterStorage::loadTimer(int idx, sTimer& timer)
} }
void void
CESP32HeaterStorage::saveTimer(int idx, sTimer& timer) CESP32HeaterStorage::saveTimer(int idx)
{ {
sTimer& timer = _calValues.timer[idx];
char SectionName[16]; char SectionName[16];
sprintf(SectionName, "timer%d", idx); sprintf(SectionName, "timer%d", idx+1);
preferences.begin(SectionName, false); preferences.begin(SectionName, false);
preferences.putUChar("startHour", timer.start.hour); preferences.putUChar("startHour", timer.start.hour);
preferences.putUChar("startMin", timer.start.min); preferences.putUChar("startMin", timer.start.min);

4
Arduino/BTCDieselHeater/src/Utility/NVStorage.h
View file

@ -180,8 +180,8 @@ public:
void save(); void save();
void loadHeater(); void loadHeater();
void saveHeater(); void saveHeater();
void loadTimer(int idx, sTimer& timer); void loadTimer(int idx);
void saveTimer(int idx, sTimer& timer); void saveTimer(int idx);
void loadUI(); void loadUI();
void saveUI(); void saveUI();
bool validatedLoad(const char* key, uint8_t& val, int defVal, std::function<bool(uint8_t, uint8_t, uint8_t)> validator, int min, int max); bool validatedLoad(const char* key, uint8_t& val, int defVal, std::function<bool(uint8_t, uint8_t, uint8_t)> validator, int min, int max);