Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
@@ -18,6 +18,7 @@
 #define __OP_MODES_H__
 
 #include "DGCommon.h"
+#include "DGModes.h"
 
 /**
  *  @defgroup OperationModes OperationModes
@@ -30,30 +31,12 @@
 
 // ********** public definitions **********
 
-/// Enumeration of operation modes.  These are in order of priority (highest to lowest).
-typedef enum Op_Modes
-{
-    MODE_FAUL = 0,            ///< Fault mode.
-    MODE_SERV,                ///< Service mode.
-    MODE_INIT,                ///< Initialization & POST mode.
-    MODE_STAN,                ///< Standby mode - connected to HD.
-    MODE_SOLO,                ///< Standby Solo mode - no HD connected.
-    MODE_CIRC,                ///< Re-circulate mode.
-    MODE_FILL,                ///< Fill mode.
-    MODE_DRAI,                ///< Drain mode.
-    MODE_FLUS,                ///< Flush mode.
-    MODE_HEAT,                ///< Heat Disinfect mode.
-    MODE_CHEM,                ///< Chemical Disinfect mode.
-    MODE_NLEG,                ///< Not legal - an illegal mode transition occurred.
-    NUM_OF_MODES
-} OP_MODE;
-
 // ********** public function prototypes **********
 
 void initOperationModes( void );                   // initialize this module
 void execOperationModes( void );                   // execute the operation modes state machine (scheduled periodic call)
-void requestNewOperationMode( OP_MODE newMode );   // request a transition to a new operation mode
-OP_MODE getCurrentOperationMode( void );           // get the current operation mode
+void requestNewOperationMode( DG_OP_MODE newMode );   // request a transition to a new operation mode
+DG_OP_MODE getCurrentOperationMode( void );           // get the current operation mode
 
 /**@}*/