Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst
===================================================================
diff -u -rd3142d47c87c30968bda8f2a0a6759b40cc72711 -r1fab5044ef58ce4a8186b24913dc890f564864fe
--- vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst	(.../BLOODFLOW.tst)	(revision d3142d47c87c30968bda8f2a0a6759b40cc72711)
+++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst	(.../BLOODFLOW.tst)	(revision 1fab5044ef58ce4a8186b24913dc890f564864fe)
@@ -1875,42 +1875,6 @@
 TEST.EXPECTED:BloodFlow.testResetMeasuredBloodPumpSpeedOverride.return:0
 TEST.END
 
--- Subprogram: testResetTargetBloodFlowRateOverride
-
--- Test Case: testResetTargetBloodFlowRateOverride_NominalPath
-TEST.UNIT:BloodFlow
-TEST.SUBPROGRAM:testResetTargetBloodFlowRateOverride
-TEST.NEW
-TEST.NAME:testResetTargetBloodFlowRateOverride_NominalPath
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:500
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:200
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:500
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0xCCC33C33
-TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:200
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:0
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:0
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0
-TEST.EXPECTED:BloodFlow.testResetTargetBloodFlowRateOverride.return:1
-TEST.END
-
--- Test Case: testResetTargetBloodFlowRateOverride_NotLoggedIn
-TEST.UNIT:BloodFlow
-TEST.SUBPROGRAM:testResetTargetBloodFlowRateOverride
-TEST.NEW
-TEST.NAME:testResetTargetBloodFlowRateOverride_NotLoggedIn
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:200
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:500
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0xCCC33C33
-TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:200
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:0
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0xCCC33C33
-TEST.EXPECTED:BloodFlow.testResetTargetBloodFlowRateOverride.return:0
-TEST.END
-
 -- Subprogram: testSetBloodFlowDataPublishIntervalOverride
 
 -- Test Case: testSetBloodFlowDataPublishIntervalOverride_NominalPath
@@ -2169,17 +2133,11 @@
 TEST.NAME:testSetTargetBloodFlowRateOverride_NominalPath
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP
 TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:200
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0
 TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.value:500
 TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.ctrlMode:0
 TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:200
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0xCCC33C33
 TEST.EXPECTED:BloodFlow.testSetTargetBloodFlowRateOverride.return:1
 TEST.END
 
@@ -2208,17 +2166,11 @@
 TEST.NAME:testSetTargetBloodFlowRateOverride_OpenLoop
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP
 TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:200
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0
 TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.value:500
 TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.ctrlMode:1
 TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:200
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0xCCC33C33
 TEST.EXPECTED:BloodFlow.testSetTargetBloodFlowRateOverride.return:1
 TEST.END
 
@@ -2231,15 +2183,9 @@
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpDirectionSet:MOTOR_DIR_REVERSE
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP
 TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:-200
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0
 TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.value:-500
 TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.data:-500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovInitData:-200
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.ovData:-500
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.targetBloodFlowRate.override:0xCCC33C33
 TEST.EXPECTED:BloodFlow.testSetTargetBloodFlowRateOverride.return:1
 TEST.END
 
@@ -2251,12 +2197,14 @@
 TEST.NEW
 TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_Forward
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:0.0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:998
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[2]:998
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:1
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:99
 TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorCount.return:1000
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:2.5
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:1000
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[2]:1000
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:2
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:0
 TEST.END
@@ -2267,12 +2215,14 @@
 TEST.NEW
 TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_ForwardWrap
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:0.0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:65535
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[0]:65535
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:24
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:99
 TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorCount.return:1
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:2.5
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:1
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[0]:1
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:0
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:0
 TEST.END
@@ -2282,8 +2232,8 @@
 TEST.SUBPROGRAM:updateBloodPumpSpeedAndDirectionFromHallSensors
 TEST.NEW
 TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_NotTime
-TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:98
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:99
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:2
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:3
 TEST.END
 
 -- Test Case: updateBloodPumpSpeedAndDirectionFromHallSensors_Reverse
@@ -2292,12 +2242,14 @@
 TEST.NEW
 TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_Reverse
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:0.0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:1000
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[2]:1000
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:1
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:99
 TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorCount.return:998
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:-2.5
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:998
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[2]:998
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:2
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:0
 TEST.END
@@ -2308,12 +2260,14 @@
 TEST.NEW
 TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_ReverseWrap
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:0.0
-TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:1
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[2]:1
+TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:1
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD
 TEST.VALUE:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:99
 TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorCount.return:65535
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpSpeedRPM.data:-2.5
-TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCount:65535
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpLastMotorHallSensorCounts[2]:65535
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcIdx:2
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE
 TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bpMotorSpeedCalcTimerCtr:0
 TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_UTILITIES/INT_UTILITIES_cba.cvr
===================================================================
diff -u -r20ecca7d8456efe9fd1b3a75a687f9f00de1a91f -r1fab5044ef58ce4a8186b24913dc890f564864fe
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_UTILITIES/INT_UTILITIES_cba.cvr	(.../INT_UTILITIES_cba.cvr)	(revision 20ecca7d8456efe9fd1b3a75a687f9f00de1a91f)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_UTILITIES/INT_UTILITIES_cba.cvr	(.../INT_UTILITIES_cba.cvr)	(revision 1fab5044ef58ce4a8186b24913dc890f564864fe)
@@ -23,28 +23,6 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:9
-IMPORT.SOURCE.ORIG_FILENAME:Dialysis.c
-IMPORT.SOURCE.COVERAGE_STATUS:TRUE
-IMPORT.SOURCE.COVERAGE_TYPE:Function
-IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
-IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE
-IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE
-IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE
-IMPORT.SOURCE.EDG_COVERAGE:TRUE
-IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:FALSE
-IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE
-IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE
-IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE
-IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE
-IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE
-IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE
-IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS
-IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE
-IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
-IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
-IMPORT.SOURCE.END
-IMPORT.SOURCE.BEGIN
-IMPORT.SOURCE.UNIT:11
 IMPORT.SOURCE.ORIG_FILENAME:ModeTreatmentParams.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -66,7 +44,7 @@
 IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
-IMPORT.SOURCE.UNIT:12
+IMPORT.SOURCE.UNIT:11
 IMPORT.SOURCE.ORIG_FILENAME:FPGA.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -88,7 +66,7 @@
 IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
-IMPORT.SOURCE.UNIT:13
+IMPORT.SOURCE.UNIT:12
 IMPORT.SOURCE.ORIG_FILENAME:SystemComm.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -110,7 +88,7 @@
 IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
-IMPORT.SOURCE.UNIT:14
+IMPORT.SOURCE.UNIT:13
 IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -132,7 +110,7 @@
 IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
-IMPORT.SOURCE.UNIT:15
+IMPORT.SOURCE.UNIT:14
 IMPORT.SOURCE.ORIG_FILENAME:Utilities.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -153,22 +131,4 @@
 IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
 IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
 IMPORT.SOURCE.END
-RESULT.CBA.BEGIN
-RESULT.CBA.RESULT: CBA_Utilities
-RESULT.CBA.NOTES
-Some functions not yet called.
-RESULT.CBA.NOTES_END
-RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/FWCommon/Utilities.c
-RESULT.CBA.FUNCTION: hexStrToDec
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-U08 ii;
-U08 value;
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.END
 IMPORT.END