Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r1507b3d6f58c87107d96a9da744423d06a70057c -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 1507b3d6f58c87107d96a9da744423d06a70057c)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
@@ -25,6 +25,7 @@
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "ModeTreatment.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PIControllers.h"
 #include "SafetyShutdown.h"
@@ -185,7 +186,8 @@
 static U32 errorDialOutRotorSpeedPersistTimerCtr = 0;                                       ///< Persistence timer counter for rotor speed error condition.
 static U32 errorDialOutPumpDirectionPersistTimerCtr = 0;                                    ///< Persistence timer counter for pump direction error condition.
 
-static U08 lastDialOutPumpDirectionCount = 0;                                               ///< Previous pump direction error count reported by FPGA
+static U08 lastDialOutPumpDirectionCount = 0;                                               ///< Previous pump direction error count reported by FPGA.
+static HD_PUMPS_CAL_RECORD_T dialOutPumpCalRecord;                                          ///< Dialysate outlet calibration record.
 
 // ********** private function prototypes **********
 
@@ -461,6 +463,48 @@
 
 /*********************************************************************//**
  * @brief
+ * The isDialOutPumpRampComplete function returns whether the dialysate outlet pump has
+ * completed its ramp up and entered control state (closed or open loop).
+ * @details Inputs: dialOutPumpState
+ * @details Outputs: none
+ * @return TRUE if pump is in control state, FALSE if not
+ *************************************************************************/
+BOOL isDialOutPumpRampComplete( void )
+{
+    BOOL result = ( DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE == dialOutPumpState ? TRUE : FALSE );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The execDialOutFlowTest function executes the state machine for the
+ * DialOutFlow self-test.
+ * @details Inputs: none
+ * @details Outputs: dialOutPumpCalRecord
+ * @return the current state of the DialOutFlow self-test.
+ *************************************************************************/
+SELF_TEST_STATUS_T execDialOutFlowTest( void )
+{
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
+
+    BOOL calStatus = getNVRecord2Driver( GET_CAL_PUMPS, (U08*)&dialOutPumpCalRecord, sizeof( HD_PUMPS_CAL_RECORD_T ),
+                                         NUM_OF_CAL_DATA_HD_PUMPS, ALARM_ID_NO_ALARM );
+
+    if ( TRUE == calStatus )
+    {
+        result = SELF_TEST_STATUS_PASSED;
+    }
+    else
+    {
+        result = SELF_TEST_STATUS_FAILED;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The execDialOutFlowMonitor function executes the dialysate outlet pump
  * and load cell sensor monitor.  Checks are performed.  Data is published
  * at appropriate interval.
@@ -876,7 +920,9 @@
         if ( lastDialOutPumpDirectionCount != dirErrorCnt )
         {
             lastDialOutPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_OUTLET_PUMP )
+#endif
         }
 
         dopMCDir = ( getMeasuredDialOutPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );