From c8e96343d0eafd1811fcd6ed5e489169f2cc43c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20St=C3=A4ck?= <stack@spotify.com>
Date: Thu, 25 Jul 2019 11:07:41 +0200
Subject: [PATCH] Move EEPROM read/write functions to settings

---
 NuEVI/menu.cpp     | 24 ------------------------
 NuEVI/menu.h       |  2 --
 NuEVI/settings.cpp | 23 +++++++++++++++++++++++
 NuEVI/settings.h   |  3 ++-
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/NuEVI/menu.cpp b/NuEVI/menu.cpp
index 1f908a8..08c2e60 100644
--- a/NuEVI/menu.cpp
+++ b/NuEVI/menu.cpp
@@ -1,4 +1,3 @@
-#include <EEPROM.h>
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
 #include <Adafruit_MPR121.h>
@@ -365,29 +364,6 @@ void drawMenuCursor(byte itemNo, byte color){
 
 //***********************************************************
 
-// TODO: Move these to a settings.cpp maybe?
-void writeSetting(byte address, unsigned short value){
-  union {
-    byte v[2];
-    unsigned short val;
-  } data;
-  data.val = value;
-  EEPROM.update(address, data.v[0]);
-  EEPROM.update(address+1, data.v[1]);
-}
-
-unsigned short readSetting(byte address){
-  union {
-    byte v[2];
-    unsigned short val;
-  } data;
-  data.v[0] = EEPROM.read(address);
-  data.v[1] = EEPROM.read(address+1);
-  return data.val;
-}
-
-//***********************************************************
-
 static int readTrills() {
   readSwitches();
   return K5+2*K6+4*K7;
diff --git a/NuEVI/menu.h b/NuEVI/menu.h
index 93567a8..20373ab 100644
--- a/NuEVI/menu.h
+++ b/NuEVI/menu.h
@@ -41,8 +41,6 @@ void initDisplay();
 void showVersion();
 void menu();
 void drawSensorPixels();
-unsigned short readSetting(byte address);
-void writeSetting(byte address, unsigned short value);
 
 int updateAdjustMenu(uint32_t timeNow, KeyState &input, bool firstRun, bool drawSensor);
 bool adjustPageUpdate(KeyState &input, uint32_t timeNow);
diff --git a/NuEVI/settings.cpp b/NuEVI/settings.cpp
index 8a0bb66..5858943 100644
--- a/NuEVI/settings.cpp
+++ b/NuEVI/settings.cpp
@@ -1,4 +1,5 @@
 #include <Arduino.h>
+#include <EEPROM.h>
 
 #include "settings.h"
 #include "globals.h"
@@ -171,4 +172,26 @@ bool readEEPROM() {
 //Poke at a certain bit in a bit field
 void setBit(uint16_t &bitfield, const uint8_t pos, const uint16_t value) {
   bitfield = (bitfield & ~(1<<pos)) | ((value?1:0)<<pos);
+}
+
+
+//Read and write EEPROM data
+void writeSetting(uint16_t address, uint16_t value){
+  union {
+    uint8_t v[2];
+    uint16_t val;
+  } data;
+  data.val = value;
+  EEPROM.update(address, data.v[0]);
+  EEPROM.update(address+1, data.v[1]);
+}
+
+uint16_t readSetting(uint16_t address){
+  union {
+    uint8_t v[2];
+    uint16_t val;
+  } data;
+  data.v[0] = EEPROM.read(address);
+  data.v[1] = EEPROM.read(address+1);
+  return data.val;
 }
\ No newline at end of file
diff --git a/NuEVI/settings.h b/NuEVI/settings.h
index 6cfcaa4..bdd9771 100644
--- a/NuEVI/settings.h
+++ b/NuEVI/settings.h
@@ -123,6 +123,7 @@
 
 bool readEEPROM();
 void setBit(uint16_t &bitfield, const uint8_t pos, const uint16_t value);
-
+uint16_t readSetting(uint16_t address);
+void writeSetting(uint16_t address, uint16_t value);
 
 #endif