Index: firmware/App/Modes/ModeRecirculate.h
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca
--- firmware/App/Modes/ModeRecirculate.h	(.../ModeRecirculate.h)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Modes/ModeRecirculate.h	(.../ModeRecirculate.h)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
@@ -18,6 +18,7 @@
 #define __MODE_RECIRCULATION_H__
 
 #include "DGCommon.h"
+#include "DGModes.h"
 
 /**
  *  @defgroup RecirculateMode RecirculateMode
@@ -30,24 +31,15 @@
 
 // ********** public definitions **********
 
-/// Enumeration of re-circulation mode states.
-typedef enum Recirculate_Mode_States
-{
-    RECIRCULATE_MODE_STATE_START = 0,                          ///< Start re-circulation mode state.
-    RECIRCULATE_MODE_STATE_FLUSH_LINES,                        ///< Flush lines state.
-    RECIRCULATE_MODE_STATE_RECIRC_WATER,                       ///< Re-circulate water state.
-    RECIRCULATE_MODE_STATE_PAUSE,                              ///< Pause state (pumps, heaters, lamps off).
-    NUM_OF_RECIRCULATE_MODE_STATES                             ///< Number of fill mode states.
-} RECIRCULATE_MODE_STATE_T;
-
 // ********** private function prototypes **********
 
 void initRecirculateMode( void );          // initialize this module
 void transitionToRecirculateMode( void );  // prepares for transition to Recirculate mode
-void execRecirculateMode( void );          // execute the Recirculate mode state machine (call from OperationModes)
+U32  execRecirculateMode( void );          // execute the Recirculate mode state machine (call from OperationModes)
 
+DG_RECIRCULATE_MODE_STATE_T getCurrentRecirculateState( void );    // get the current state of re-circulate mode
+
 BOOL requestDGStop( void );                // HD requests DG stop (go back to standby mode)
-RECIRCULATE_MODE_STATE_T getRecirculateModeState( void );    // get the current state of re-circulate mode
 
 /**@}*/