Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst
===================================================================
diff -u -r94cde4c740f642ff7ec71ae98711af7b7abe4f58 -r0f5a070198f677671379d007cc6ef5ca3d280b2e
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst	(.../DIALINFLOW.tst)	(revision 94cde4c740f642ff7ec71ae98711af7b7abe4f58)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst	(.../DIALINFLOW.tst)	(revision 0f5a070198f677671379d007cc6ef5ca3d280b2e)
@@ -1506,6 +1506,25 @@
 TEST.EXPECTED:DialInFlow.<<GLOBAL>>.errorDialInRotorSpeedPersistTimerCtr:0
 TEST.END
 
+-- Test Case: checkDialInPumpSpeeds_motor_speed_pct_in_range
+TEST.UNIT:DialInFlow
+TEST.SUBPROGRAM:checkDialInPumpSpeeds
+TEST.NEW
+TEST.NAME:checkDialInPumpSpeeds_motor_speed_pct_in_range
+TEST.STUB:DialInFlow.getMeasuredDialInPumpRotorSpeed
+TEST.STUB:DialInFlow.getMeasuredDialInPumpSpeed
+TEST.STUB:DialInFlow.getMeasuredDialInPumpMCSpeed
+TEST.VALUE:DialInFlow.<<GLOBAL>>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE
+TEST.VALUE:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePctSet:0.1
+TEST.VALUE:DialInFlow.<<GLOBAL>>.errorDialInRotorSpeedPersistTimerCtr:1
+TEST.VALUE:DialInFlow.getMeasuredDialInPumpRotorSpeed.return:62.0
+TEST.VALUE:DialInFlow.getMeasuredDialInPumpSpeed.return:1800.0
+TEST.VALUE:DialInFlow.getMeasuredDialInPumpMCSpeed.return:100.0
+TEST.EXPECTED:DialInFlow.<<GLOBAL>>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE
+TEST.EXPECTED:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePctSet:0.1
+TEST.EXPECTED:DialInFlow.<<GLOBAL>>.errorDialInRotorSpeedPersistTimerCtr:0
+TEST.END
+
 -- Subprogram: dialysateInPumpPWMFromTargetFlowRate
 
 -- Test Case: dialysateInPumpPWMFromTargetFlowRate.001
@@ -2352,76 +2371,38 @@
 
 -- Subprogram: getPumpRotorErrorPersistTime
 
--- Test Case: getPumpRotorErrorPersistTime.001
+-- Test Case: getPumpRotorErrorPersistTime_false
 TEST.UNIT:DialInFlow
 TEST.SUBPROGRAM:getPumpRotorErrorPersistTime
 TEST.NEW
-TEST.NAME:getPumpRotorErrorPersistTime.001
-TEST.BASIS_PATH:1 of 2
-TEST.NOTES:
-This is an automatically generated test case.
-Test Path 1
-(1) if (mtr_rpm > (0)) ==> FALSE
-Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:<<MIN>>
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:<<MIN>>
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:-3.40282E+38
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:-3.40282E+38
+TEST.NAME:getPumpRotorErrorPersistTime_false
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:0.000
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.return:1
+TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.return:0xFFFFFFFF
 TEST.END
 
--- Test Case: getPumpRotorErrorPersistTime.002
+-- Test Case: getPumpRotorErrorPersistTime_min_persistent_time
 TEST.UNIT:DialInFlow
 TEST.SUBPROGRAM:getPumpRotorErrorPersistTime
 TEST.NEW
-TEST.NAME:getPumpRotorErrorPersistTime.002
-TEST.BASIS_PATH:2 of 2
-TEST.NOTES:
-This is an automatically generated test case.
-Test Path 2
-(1) if (mtr_rpm > (0)) ==> TRUE
-Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:<<MAX>>
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:<<MIN>>
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:3.40282E+38
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:-3.40282E+38
+TEST.NAME:getPumpRotorErrorPersistTime_min_persistent_time
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:50.0
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:0.2
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.return:1
+TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.return:10000
 TEST.END
 
--- Test Case: getPumpRotorErrorPersistTime.003
+-- Test Case: getPumpRotorErrorPersistTime_persistent_time
 TEST.UNIT:DialInFlow
 TEST.SUBPROGRAM:getPumpRotorErrorPersistTime
 TEST.NEW
-TEST.NAME:getPumpRotorErrorPersistTime.003
-TEST.NOTES:
-This is an automatically generated test case.
-Test Path 2
-(1) if (mtr_rpm > (0)) ==> TRUE
-Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:0.0
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:0.0
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:0.0
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:0.0
+TEST.NAME:getPumpRotorErrorPersistTime_persistent_time
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:50.0
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:15.0
+TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.return:1
+TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.return:180000
 TEST.END
 
--- Test Case: getPumpRotorErrorPersistTime.004
-TEST.UNIT:DialInFlow
-TEST.SUBPROGRAM:getPumpRotorErrorPersistTime
-TEST.NEW
-TEST.NAME:getPumpRotorErrorPersistTime.004
-TEST.NOTES:
-This is an automatically generated test case.
-Test Path 2
-(1) if (mtr_rpm > (0)) ==> TRUE
-Test Case Generation Notes:
-TEST.END_NOTES:
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:<<MAX>>
-TEST.VALUE:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:<<MIN>>
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.mtr_rpm:<<MAX>>
-TEST.EXPECTED:DialInFlow.getPumpRotorErrorPersistTime.gear_ratio:<<MIN>>
-TEST.END
-
 -- Subprogram: getTargetDialInFlowRate
 
 -- Test Case: getTargetDialInFlowRate
@@ -2578,10 +2559,13 @@
       (2) if (dialInPumpPWMDutyCyclePctSet <= dialInPumpPWMDutyCyclePct) ==> TRUE
    Test Case Generation Notes:
 TEST.END_NOTES:
-TEST.VALUE:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePct:<<MAX>>
-TEST.VALUE:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePctSet:0.12
-TEST.EXPECTED:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePct:0.1
-TEST.EXPECTED:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePctSet:0.1
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_pwmREG2:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePct:20.0
+TEST.VALUE:DialInFlow.<<GLOBAL>>.dialInPumpPWMDutyCyclePctSet:12.0
+TEST.VALUE:DialInFlow.<<GLOBAL>>.dipControlTimerCounter:1
+TEST.VALUE:DialInFlow.handleDialInPumpRampingDownState.return:DIAL_IN_PUMP_OFF_STATE
+TEST.EXPECTED:DialInFlow.<<GLOBAL>>.dipControlTimerCounter:0
+TEST.EXPECTED:DialInFlow.handleDialInPumpRampingDownState.return:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE
 TEST.END
 
 -- Test Case: handleDialInPumpRampingDownState.003