Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r4add9605a250a0b953217c8673204b705128561b
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 4add9605a250a0b953217c8673204b705128561b)
@@ -45,36 +45,37 @@
 
 /// Interval (ms/task time) at which the post-treatment state data is published on the CAN bus.
 #define POST_TREATMENT_DATA_PUB_INTERVAL        ( 250 / TASK_GENERAL_INTERVAL )
-#define DIP_DRAIN_DG_FLOW_RATE_ML_MIN           60                  ///< DG drain inlet pump flow rate in mL/min.
-#define DIP_DRAIN_DG_RUNTIME_MS                 30000               ///< DG drain inlet pump run time in ms.
+#define DIP_DRAIN_DG_FLOW_RATE_ML_MIN           60                              ///< DG drain inlet pump flow rate in mL/min.
+#define DIP_DRAIN_DG_RUNTIME_MS                 ( 40 * MS_PER_SECOND )          ///< DG drain inlet pump run time in ms.
 
 /// Post-Treatment drain reservoirs state machine.
 typedef enum Drain_States
 {
-    DRAIN_DG_DEPRIME_STATE = 0,                                     ///< Drain DG De-prime dialysate lines of excess fluid state.
-    DRAIN_RESERVOIR_SWITCH_STATE,                                   ///< Switch reservoir state.
-    DRAIN_RESERVOIR_START_DRAIN_STATE,                              ///< Drain reservoir start drain state.
-    DRAIN_RESERVOIR_DRAIN_STATE,                                    ///< Drain first reservoir state.
-    DRAIN_RESERVOIR_COMPLETE_STATE,                                 ///< Drain complete state.
-    NUM_OF_DRAIN_STATES                                             ///< Number of drain states.
+    DRAIN_DG_DEPRIME_STATE = 0,                                                 ///< Drain DG De-prime dialysate lines of excess fluid state.
+    DRAIN_RESERVOIR_SWITCH_STATE,                                               ///< Switch reservoir state.
+    DRAIN_RESERVOIR_START_DRAIN_STATE,                                          ///< Drain reservoir start drain state.
+    DRAIN_RESERVOIR_DRAIN_STATE,                                                ///< Drain first reservoir state.
+    DRAIN_RESERVOIR_COMPLETE_STATE,                                             ///< Drain complete state.
+    NUM_OF_DRAIN_STATES                                                         ///< Number of drain states.
 } DRAIN_STATE_T;
 
 // ********** private data **********
 
-static BOOL patientDisconnectionConfirmed;                          ///< Flag indicates user confirms patient disconnection.
-static BOOL disposableRemovalConfirmed;                             ///< Flag indicates user confirms disposable removal.
-static BOOL rinseConcentrateLines;                                  ///< FLag indicates to rinse concentrate lines.
-static BOOL isThisFirstDrain;                                       ///< Flag to indicate whether this is the first time the reservoir is drained.
-static BOOL drainDGDePrimeActive;                                   ///< FLag to indicate DePrime DG Dialysate lines active
-static U32  drainDGDePrimeStarttime;                                ///< DG DePrime start time
-static BOOL dgCommandSent;                                          ///< Flag indicates whether a DG command has been already sent.
-static HD_POST_TREATMENT_STATE_T currentPostTreatmentState;         ///< Current state of post-treatment mode state machine.
-static DRAIN_STATE_T currentDrainReservoirState;                    ///< Current drain reservoir state.
-static U32 postTreatmentPublishTimerCounter;                        ///< Timer counter used to schedule post-treatment data broadcast.
+static BOOL patientDisconnectionConfirmed;                                      ///< Flag indicates user confirms patient disconnection.
+static BOOL disposableRemovalConfirmed;                                         ///< Flag indicates user confirms disposable removal.
+static BOOL rinseConcentrateLines;                                              ///< FLag indicates to rinse concentrate lines.
+static BOOL isThisFirstDrain;                                                   ///< Flag to indicate whether this is the first time the reservoir is drained.
+static BOOL drainDGDePrimeActive;                                               ///< FLag to indicate DePrime DG Dialysate lines active
+static U32  drainDGDePrimeStarttime;                                            ///< DG DePrime start time
+static BOOL dgCommandSent;                                                      ///< Flag indicates whether a DG command has been already sent.
+static HD_POST_TREATMENT_STATE_T currentPostTreatmentState;                     ///< Current state of post-treatment mode state machine.
+static DRAIN_STATE_T currentDrainReservoirState;                                ///< Current drain reservoir state.
+static U32 postTreatmentPublishTimerCounter;                                    ///< Timer counter used to schedule post-treatment data broadcast.
+
 /// Interval (in task intervals) at which to publish post-treatment mode data to CAN bus.
 static OVERRIDE_U32_T postTreatmentModePublishInterval = { POST_TREATMENT_DATA_PUB_INTERVAL, POST_TREATMENT_DATA_PUB_INTERVAL, POST_TREATMENT_DATA_PUB_INTERVAL, 0 };
 
-static TREATMENT_LOG_DATA_PAYLOAD_T treatmentLogData;               ///< Treatment parameters record for logging.
+static TREATMENT_LOG_DATA_PAYLOAD_T treatmentLogData;                           ///< Treatment parameters record for logging.
 
 // ********** private function prototypes **********