Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r02d6de097fc53e769c4851a8f1f6438c5ff5e280 -re1b010909170d0656a7b87400f295387423fd383
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 02d6de097fc53e769c4851a8f1f6438c5ff5e280)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision e1b010909170d0656a7b87400f295387423fd383)
@@ -65,9 +65,7 @@
 
 #define DIP_MAX_FLOW_RATE                    1320.0          ///< Maximum measured BP flow rate allowed.
 #define DIP_MIN_FLOW_RATE                   -1320.0          ///< Minimum measured BP flow rate allowed.
-#ifdef USE_FMD_FLOW_SENSOR
 #define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< Maximum difference between measured motor speed and speed implied by measured flow.
-#endif
 #define DIP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0           ///< Maximum motor speed (RPM) while motor is commanded off.
 #define DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0             ///< Maximum difference in speed between motor and rotor (in rotor RPM).
 #define DIP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< Maximum difference in speed between measured and commanded RPM.
@@ -490,7 +488,7 @@
 
     dialInFlowSignalStrength.data = getFPGADialysateFlowSignalStrength();
 #else
-    dipFlow = getDGDialysateFlowRateMlMin();  // get dialysate flow from DG
+    dipFlow = getDGDialysateFlowRateMlMin() * (F32)ML_PER_LITER;  // get dialysate flow from DG
 #endif
 
     adcDialInPumpMCSpeedRPM.data = (F32)(SIGN_FROM_12_BIT_VALUE(dipRPM)) * DIP_SPEED_ADC_TO_RPM_FACTOR;
@@ -1269,11 +1267,10 @@
     }
 #endif
 
-#ifdef USE_FMD_FLOW_SENSOR
     // Check only performed while in treatment mode and while we are in control to target state
     if ( ( MODE_TREA == getCurrentOperationMode() ) && ( DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE == dialInPumpState ) )
     {
-        F32 flow = getMeasuredDialInFlowRate();
+        F32 flow = (F32)targetDialInFlowRate;
         F32 speed = getMeasuredDialInPumpSpeed();
         F32 impliedSpeed = ( flow / (F32)ML_PER_LITER ) * DIP_REV_PER_LITER * DIP_GEAR_RATIO;
         F32 delta = fabs( speed - impliedSpeed );
@@ -1296,7 +1293,6 @@
     {
         errorDialInFlowVsMotorSpeedPersistTimerCtr = 0;
     }
-#endif
 }
 
 /*********************************************************************//**