Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r5072f7dedbe4be9dd9d2bfe9a46f53c1d3f356fc -r8c00197ce69e80f1967aa3f2eb36beb3573f36f3
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 5072f7dedbe4be9dd9d2bfe9a46f53c1d3f356fc)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 8c00197ce69e80f1967aa3f2eb36beb3573f36f3)
@@ -47,7 +47,7 @@
     TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE,              ///< Wait for fill to complete.
     TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE,        ///< Wait a bit for filled reservoir to settle before getting baseline weight (volume).
     TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RES_SWITCH_STATE,         ///< Wait for active reservoir to be consumed and switch cmd given - then back to flush DG lines state.
-    TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE,      ///< Wait for inactive reservoir to settle before getting final weight (volume) before starting to drain.
+    TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE,      ///< Wait for inactive reservoir to settle before getting final weight (volume) before starting to drain.
     NUM_OF_TREATMENT_RESERVOIR_MGMT_STATES                      ///< Number of treatment reservoir mgmt. states.
 } TREATMENT_RESERVOIR_MGMT_STATE_T;
 
@@ -203,6 +203,19 @@
     resMgmtTimer = 0;
     resUseTimer = getMSTimerCount();
     resUseVolumeMl = 0.0;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The dialysisResumed function initializes the reservoir re-use timer
+ * when dialysis is started/resumed so that dialysate usage can be tracked.
+ * @details Inputs: none
+ * @details Outputs: resUseTimer
+ * @return none
+ *************************************************************************/
+void dialysisResumed( void )
+{
+    resUseTimer = getMSTimerCount();
 }
 
 /*********************************************************************//**
@@ -219,22 +232,22 @@
     U32 dgSubMode = getDGSubMode();
     U32 msSinceLastVolumeCalc = calcTimeSince( resUseTimer );
     F32 flowRateMlPerMs = (F32)getTargetDialInFlowRate() / (F32)( MS_PER_SECOND * SEC_PER_MIN );
-
+
     // Calculate volume used from active reservoir - do not accumulate if saline bolus in progress
     if ( SALINE_BOLUS_STATE_IN_PROGRESS != getSalineBolusState() )
     {
         resUseVolumeMl += ( flowRateMlPerMs * msSinceLastVolumeCalc );  // TODO - should this calc be done and kept by Dialysis sub-mode?
     }
-    resUseTimer = getMSTimerCount();
-
+    resUseTimer = getMSTimerCount();
+
     // Treatment reservoir mgmt. state machine
     switch ( currentTrtResMgmtState )
     {
         case TREATMENT_RESERVOIR_MGMT_START_STATE:
             currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE;
             break;
 
-        case TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE:
+        case TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE:
             if ( DG_MODE_CIRC == dgOpMode )
             {
                 if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
@@ -255,7 +268,7 @@
         case TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE:
             if ( DG_MODE_CIRC == dgOpMode )
             {
-                currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE;
+                currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE;
             }
             break;
 
@@ -278,7 +291,7 @@
             if ( DG_MODE_FILL == dgOpMode )
             {
                 currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE;
-            }
+            }
             break;
 
         case TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE:
@@ -326,8 +339,8 @@
                 // Reset to start state to restart drain, fill, switch process.
                 currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_START_STATE;
             }
-            break;
-
+            break;
+
         default:
             // TODO - s/w fault
             currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_START_STATE;