From a0a25f05e218116013123ffe5c0f78ff8aab9165 Mon Sep 17 00:00:00 2001
From: Chris Giacofei <c.giacofei@gmail.com>
Date: Mon, 24 Jan 2022 10:57:09 -0500
Subject: [PATCH] Put more conplex datatype definitions in separate file.

---
 boil_kettle/boil_kettle.ino |  5 +++--
 boil_kettle/globals.h       | 35 ++---------------------------------
 boil_kettle/src/datatypes.h | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 35 deletions(-)
 create mode 100644 boil_kettle/src/datatypes.h

diff --git a/boil_kettle/boil_kettle.ino b/boil_kettle/boil_kettle.ino
index cd339a0..3585559 100644
--- a/boil_kettle/boil_kettle.ino
+++ b/boil_kettle/boil_kettle.ino
@@ -3,10 +3,10 @@
 #include <SPI.h>
 #include <Ethernet.h>
 #include <EEPROM.h>
-#include <PubSubClient.h>
-#include <cJSON.h>
 
 // Additoinal Libraries
+#include <PubSubClient.h>
+#include <cJSON.h>
 #include <LiquidCrystal_I2C.h>
 #include <LiquidMenu.h> // LiquidMenu_config.h needs to be modified to use I2C.
 #include <MD_REncoder.h>
@@ -14,6 +14,7 @@
 // My Includes
 #include "config.h"
 #include "globals.h"
+#include "src/datatypes.h"
 #include "src/button.h"
 #include "src/slowPWM.h"
 #include "src/thermoControl.h"
diff --git a/boil_kettle/globals.h b/boil_kettle/globals.h
index 1102ff0..006f270 100644
--- a/boil_kettle/globals.h
+++ b/boil_kettle/globals.h
@@ -4,9 +4,9 @@
 #include "src/button.h"
 #include "src/slowPWM.h"
 #include "src/thermoControl.h"
+#include "src/datatypes.h"
 
-const uint8_t CompileTimeP[] PROGMEM = __DATE__ " " __TIME__;
-const size_t ConfAddress = sizeof(CompileTimeP);
+const byte ConfAddress = 0;
 
 void ConnectMQTT();
 static void SendSensorData();
@@ -17,37 +17,6 @@ char* ShowKettleSetting();
 void doEncoder();
 void UpdateBoilKettle();
 
-struct Vessel {
-  char name[16];
-  char setpoint[20];
-  char sensor[20];
-  double Rref;
-  double RNominal;
-};
-
-struct Topic {
-  char root[10];
-  Vessel mash;
-  Vessel boil;
-};
-
-struct Mqtt {
-  IPAddress broker;
-  char user[10];
-  char password[21];
-  Topic topic;
-};
-
-struct ConfigData {
-  Mqtt mqtt;
-  byte mac[6];
-  IPAddress ip;
-  int interval;
-  int period;
-  double threshold;
-  double hysteresis;
-};
-
 uint8_t KettleDuty = 0;
 bool SettingChanged = false;
 const int UpdateInterval = 5000;
diff --git a/boil_kettle/src/datatypes.h b/boil_kettle/src/datatypes.h
new file mode 100644
index 0000000..06baf7b
--- /dev/null
+++ b/boil_kettle/src/datatypes.h
@@ -0,0 +1,35 @@
+#ifndef DATATYPES_h
+#define DATATYPES_h
+
+struct Vessel {
+  char name[16];
+  char setpoint[20];
+  char sensor[20];
+  double Rref;
+  double RNominal;
+};
+
+struct Topic {
+  char root[10];
+  Vessel mash;
+  Vessel boil;
+};
+
+struct Mqtt {
+  IPAddress broker;
+  char user[10];
+  char password[21];
+  Topic topic;
+};
+
+struct ConfigData {
+  Mqtt mqtt;
+  byte mac[6];
+  IPAddress ip;
+  int interval;
+  int period;
+  double threshold;
+  double hysteresis;
+};
+
+#endif