From 59d24d96b93c222e7e29a81117a3a40fa36c4fc1 Mon Sep 17 00:00:00 2001
From: rljonesau <ray@mrjones.id.au>
Date: Sat, 12 Jan 2019 12:57:32 +1100
Subject: [PATCH] Simplified timer NV store load/save

---
 Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp | 14 ++++++++------
 Arduino/BTCDieselHeater/src/Utility/NVStorage.h   |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp b/Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp
index e72c1fb..5e1c41d 100644
--- a/Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp
+++ b/Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp
@@ -211,7 +211,7 @@ CESP32HeaterStorage::load()
   DebugPort.println("Reading from NV storage");
   loadHeater();
   for(int i=0; i<2; i++) {
-    loadTimer(i+1, _calValues.timer[i]);
+    loadTimer(i);
   }
   loadUI();
 }
@@ -222,7 +222,7 @@ CESP32HeaterStorage::save()
   DebugPort.println("Saving to NV storage");
   saveHeater();
   for(int i=0; i<2; i++) {
-    saveTimer(i+1, _calValues.timer[i]);
+    saveTimer(i);
   }
   saveUI();
 }
@@ -262,10 +262,11 @@ CESP32HeaterStorage::saveHeater()
 }
 
 void 
-CESP32HeaterStorage::loadTimer(int idx, sTimer& timer) 
+CESP32HeaterStorage::loadTimer(int idx) 
 {
+  sTimer& timer = _calValues.timer[idx];
   char SectionName[16];
-  sprintf(SectionName, "timer%d", idx);
+  sprintf(SectionName, "timer%d", idx+1);
   preferences.begin(SectionName, false);
   validatedLoad("startHour", timer.start.hour, 0, u8inBounds, 0, 23);
   validatedLoad("startMin", timer.start.min, 0, u8inBounds, 0, 59);
@@ -277,10 +278,11 @@ CESP32HeaterStorage::loadTimer(int idx, sTimer& timer)
 }
 
 void 
-CESP32HeaterStorage::saveTimer(int idx, sTimer& timer) 
+CESP32HeaterStorage::saveTimer(int idx) 
 {
+  sTimer& timer = _calValues.timer[idx];
   char SectionName[16];
-  sprintf(SectionName, "timer%d", idx);
+  sprintf(SectionName, "timer%d", idx+1);
   preferences.begin(SectionName, false);
   preferences.putUChar("startHour", timer.start.hour);
   preferences.putUChar("startMin", timer.start.min);
diff --git a/Arduino/BTCDieselHeater/src/Utility/NVStorage.h b/Arduino/BTCDieselHeater/src/Utility/NVStorage.h
index af7da14..6c654e9 100644
--- a/Arduino/BTCDieselHeater/src/Utility/NVStorage.h
+++ b/Arduino/BTCDieselHeater/src/Utility/NVStorage.h
@@ -180,8 +180,8 @@ public:
   void save();
   void loadHeater();
   void saveHeater();
-  void loadTimer(int idx, sTimer& timer);
-  void saveTimer(int idx, sTimer& timer);
+  void loadTimer(int idx);
+  void saveTimer(int idx);
   void loadUI();
   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);