Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -ra19a676d1e67bb3e1aca9e9bba49727f9d5f8b38 -r0b87f7e6142dc3710db5c32a0c7c6694343dd717
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision a19a676d1e67bb3e1aca9e9bba49727f9d5f8b38)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 0b87f7e6142dc3710db5c32a0c7c6694343dd717)
@@ -18,6 +18,7 @@
 #define __DG_H__
 
 #include "HDCommon.h"
+#include "DGModes.h"
 
 /**
  *  @defgroup DGInterface DGInterface
@@ -30,24 +31,6 @@
 
 // ********** public definitions **********
 
-/// Enumeration of DG operation modes.
-typedef enum DG_Op_Modes
-{
-    DG_MODE_FAUL = 0,            ///< Fault mode.
-    DG_MODE_SERV,                ///< Service mode.
-    DG_MODE_INIT,                ///< Initialization & POST mode.
-    DG_MODE_STAN,                ///< Standby mode - connected to HD.
-    DG_MODE_SOLO,                ///< Standby Solo mode - no HD connected.
-    DG_MODE_CIRC,                ///< Re-circulate mode.
-    DG_MODE_FILL,                ///< Fill mode.
-    DG_MODE_DRAI,                ///< Drain mode.
-    DG_MODE_FLUS,                ///< Flush mode.
-    DG_MODE_DISI,                ///< Disinfect mode.
-    DG_MODE_CHEM,                ///< Chemical Disinfect mode.
-    DG_MODE_NLEG,                ///< Not legal - an illegal mode transition occurred.
-    NUM_OF_DG_MODES
-} DG_OP_MODE_T;
-
 /// Enumeration of DG reservoirs.
 typedef enum DG_Reservoirs
 {
@@ -69,15 +52,17 @@
 // ********** public function prototypes **********
 
 void initDGInterface( void );
+void execTreatmentReservoirMgmt( void );
 
 DG_OP_MODE_T getDGOpMode( void );
+U32 getDGSubMode( void );
 DG_RESERVOIR_ID_T getDGActiveReservoir( void );
 F32 getDGPressure( DG_PRESSURE_SENSORS_T sensorID );
 U32 getDGROPumpPressureSetPt( void );
 F32 getDGROPumpFlowRateMlMin( void );
 U32 getDGDrainPumpRPMSetPt( void );
 
-void setDGOpMode( U32 opMode );
+void setDGOpMode( U32 opMode, U32 subMode );
 void setDGDialysateTemperatures( F32 primaryHtrTemp, F32 trimmerHtrTemp );
 void setDGReservoirsData( DG_RESERVOIR_ID_T resID, U32 fillVol, U32 drainVol );
 void setDGPressures( F32 roIn, F32 roOut, F32 drainIn, F32 drainOut );