Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r88a641b7b0185e0bad77e21e6d438e1d7283fd28 -r5dc6f629ae40d8939fd3bd7c4e3dffb04fa137e7
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 5dc6f629ae40d8939fd3bd7c4e3dffb04fa137e7)
@@ -101,6 +101,8 @@
 #define FLOW_SIG_STRGTH_ALARM_PERSIST        ( 5 * MS_PER_SECOND )
 #define MIN_FLOW_SIG_STRENGTH                0.9             ///< Minimum flow sensor signal strength (90%).
 
+#define DFM_SENSOR_CONNECTED_STATUS          2               ///< Dialysate flow meter connected status.
+
 /// Enumeration of dialysate inlet pump states.
 typedef enum DialInPump_States
 {
@@ -176,9 +178,6 @@
 
 static U32 dipCurrErrorDurationCtr = 0;                                             ///< Used for tracking persistence of dip current errors
 
-static DIAL_IN_FLOW_SELF_TEST_STATE_T dialInPumpSelfTestState = DIAL_IN_FLOW_SELF_TEST_STATE_START;  ///< Current dialIn pump self-test state
-static U32 dialInPumpSelfTestTimerCount = 0;                                        ///< Timer counter for dialIn pump self-test
-
 // ********** private function prototypes **********
 
 static DIAL_IN_PUMP_STATE_T handleDialInPumpOffState( void );
@@ -1223,28 +1222,12 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
     CALIBRATION_DATA_T cal;
 
-    switch ( dialInPumpSelfTestState )
+    // Retrieve dialysate flow sensor calibration data
+    if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_CONNECTED_STATUS == getFPGADialysateFlowMeterStatus() ) )
     {
-        case DIAL_IN_FLOW_SELF_TEST_STATE_START:
-            // Retrieve blood flow sensor calibration data
-            if ( TRUE == getCalibrationData( &cal ) )
-            {
-                dialInFlowCalGain = cal.dialysateFlowGain;
-                dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;
-                dialInPumpSelfTestState = DIAL_IN_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self-test(s)
-                result = SELF_TEST_STATUS_PASSED;
-            }
-            break;
-
-        case DIAL_IN_FLOW_TEST_STATE_IN_PROGRESS:
-            break;
-
-        case DIAL_IN_FLOW_TEST_STATE_COMPLETE:
-            break;
-
-        default:
-            // TODO - s/w fault
-            break;
+        dialInFlowCalGain = cal.dialysateFlowGain;
+        dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;
+        result = SELF_TEST_STATUS_PASSED;
     }
 
     return result;