Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -rf43eb1e9e0803776ec7420b16e1db8760b020bd9 -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision f43eb1e9e0803776ec7420b16e1db8760b020bd9)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -8,7 +8,7 @@
  *  @file OperationModes.h
  *
  *  @date 11-Dec-2019
- *  @author L. Baloa
+ *  @author S. Nash
  *
  *  @brief Header file for Operation Modes.
  *
@@ -18,40 +18,25 @@
 #define __OP_MODES_H__
 
 #include "DGCommon.h"
+#include "DGDefs.h"
 
 /**
- *  @defgroup OperationModes OperationModes
+ *  @defgroup DGOperationModes DGOperationModes
  *  @brief Operation Modes module.
  *  Manages the top level operation modes of the DG via a state machine.
  *
- *  @addtogroup OperationModes
+ *  @addtogroup DGOperationModes
  *  @{
  */
 
 // ********** 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_FILL,                ///< Fill mode.
-    MODE_DRAI,                ///< Drain mode.
-    MODE_FLUS,                ///< Flush mode.
-    MODE_DISI,                ///< 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_T newMode );   // request a transition to a new operation mode
+DG_OP_MODE_T getCurrentOperationMode( void );           // get the current operation mode
 
 /**@}*/