Move machine state constants to Machine.h

3 files changed, 26 insertions, 55 deletions

diff --git a/Arduino/ems-light/Common.h b/Arduino/ems-light/Common.h
index 51e4f40..0ef6dcd 100755
--- a/Arduino/ems-light/Common.h
+++ b/Arduino/ems-light/Common.h
@@ -71,36 +71,3 @@
 
 #define FAKE_A_FLOAT(_f) int((_f)), int(abs((_f) - int(_f))*100)
 
-// This stuff probably belongs in Machine.h
-
-#define STATENAMELEN 25
-
-enum machine_states {
-    STATE_OFF,
-    STATE_SELF_TEST_INIT,
-    STATE_WARM_UP,
-    STATE_RUN_MODE,
-    STATE_SHUTDOWN,
-    STATE_POST_FAILURE,
-    STATE_E_SHUTDOWN,
-    STATE_MANUAL_MODE,
-    STATE_DIAGNOSTICS_MODE,
-    STATE_UNKNOWN_STATE,
-};
-
-#define NSTATES (STATE_UNKNOWN_STATE)
-
-#define STATENAMES \
-"OFF\000              ",\
-"SELF TEST INIT\000   ",\
-"WARMUP\000           ",\
-"NORMAL OPERATION\000 ",\
-"SHUT DOWN\000        ",\
-"POST FAILURE\000     ",\
-"EMERGENCY STOP\000   ",\
-"MANUAL MODE          ",\
-"DIAGNOSTICS MODE\000 ",\
-"UNKNOWN\000          "
-
-#endif  // EMS_COMMON_H
-
diff --git a/ems-light.xcworkspace/contents.xcworkspacedata b/ems-light.xcworkspace/contents.xcworkspacedata
index 2b2b1bd..509c0af 100644
--- a/ems-light.xcworkspace/contents.xcworkspacedata
+++ b/ems-light.xcworkspace/contents.xcworkspacedata
@@ -5,21 +5,8 @@
       location = "group:Arduino"
       name = "Arduino">
       <Group
-         location = "group:bin"
-         name = "bin">
-         <FileRef
-            location = "group:build.sh">
-         </FileRef>
-         <FileRef
-            location = "group:load.sh">
-         </FileRef>
-         <FileRef
-            location = "group:README_Load.txt">
-         </FileRef>
-      </Group>
-      <Group
-         location = "group:ems"
-         name = "ems">
+         location = "group:ems-light"
+         name = "ems-light">
          <FileRef
             location = "group:Clock.cpp">
          </FileRef>
@@ -30,10 +17,7 @@
             location = "group:Common.h">
          </FileRef>
          <FileRef
-            location = "group:ems.ino">
-         </FileRef>
-         <FileRef
-            location = "group:Heater.h">
+            location = "group:ems-light.ino">
          </FileRef>
          <FileRef
             location = "group:keywords.h">
@@ -51,9 +35,6 @@
             location = "group:Monitor.h">
          </FileRef>
          <FileRef
-            location = "group:Pump.h">
-         </FileRef>
-         <FileRef
             location = "group:SafetyThird.cpp">
          </FileRef>
          <FileRef
@@ -62,6 +43,16 @@
          <FileRef
             location = "group:TaskScheduler.h">
          </FileRef>
+      </Group>
+      <Group
+         location = "group:ems-templates"
+         name = "ems-templates">
+         <FileRef
+            location = "group:Heater.h">
+         </FileRef>
+         <FileRef
+            location = "group:Pump.h">
+         </FileRef>
          <FileRef
             location = "group:Thermocouple.cpp">
          </FileRef>
@@ -70,6 +61,19 @@
          </FileRef>
       </Group>
       <Group
+         location = "group:bin"
+         name = "bin">
+         <FileRef
+            location = "group:build.sh">
+         </FileRef>
+         <FileRef
+            location = "group:load.sh">
+         </FileRef>
+         <FileRef
+            location = "group:README_Load.txt">
+         </FileRef>
+      </Group>
+      <Group
          location = "group:libraries"
          name = "libraries">
          <Group
diff --git a/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate b/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate
index 27a09ca..5d7a4ca 100644
--- a/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate