Index: vectorcast/Hercules_RM46_HD_Project.vcm
===================================================================
diff -u -r8a18b5d1fb4598c6b7facb3e7e233252941eaded -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project.vcm (.../Hercules_RM46_HD_Project.vcm) (revision 8a18b5d1fb4598c6b7facb3e7e233252941eaded)
+++ vectorcast/Hercules_RM46_HD_Project.vcm (.../Hercules_RM46_HD_Project.vcm) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -132,6 +132,13 @@
Hercules_RM46_HD_Project/build/3989498026
+
+ 1
+ 0
+
+ Hercules_RM46_HD_Project/build/3960993444
+
+
1
0
@@ -342,6 +349,7 @@
+
Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst
===================================================================
diff -u -rd3596da054513ebf85d4114221eddbe875d1f1a1 -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst (.../BLOODFLOW.tst) (revision d3596da054513ebf85d4114221eddbe875d1f1a1)
+++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst (.../BLOODFLOW.tst) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -1103,14 +1103,6 @@
TEST.SUBPROGRAM:initBloodFlow
TEST.NEW
TEST.NAME:initBloodFlow_NominalPath
-TEST.IMPORT_FAILURES:
-(E) @LINE: 1288 TEST.VALUE:BloodFlow.<>.flowReadingsTmrCtr:1
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-(E) @LINE: 1297 TEST.EXPECTED:BloodFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-TEST.END_IMPORT_FAILURES:
TEST.VALUE:BloodFlow.<>.ptr_canREG3:<>
TEST.VALUE:BloodFlow.<>.ptr_canREG3[0].TIOC:2
TEST.VALUE:BloodFlow.<>.ptr_canREG3[0].RIOC:0
@@ -1184,14 +1176,6 @@
TEST.SUBPROGRAM:resetBloodFlowMovingAverage
TEST.NEW
TEST.NAME:resetBloodFlowMovingAverage_NominalPath
-TEST.IMPORT_FAILURES:
-(E) @LINE: 1358 TEST.VALUE:BloodFlow.<>.flowReadingsTmrCtr:1
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-(E) @LINE: 1363 TEST.EXPECTED:BloodFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-TEST.END_IMPORT_FAILURES:
TEST.VALUE:BloodFlow.<>.bpControlTimerCounter:1
TEST.VALUE:BloodFlow.<>.flowReadingsIdx:1
TEST.VALUE:BloodFlow.<>.flowReadingsTotal:1.0
Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst
===================================================================
diff -u -r6e889b9aa03bd24e37b70b51e0d6795b6f58afff -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst (.../DIALINFLOW.tst) (revision 6e889b9aa03bd24e37b70b51e0d6795b6f58afff)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst (.../DIALINFLOW.tst) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -536,14 +536,6 @@
TEST.SUBPROGRAM:execDialInFlowMonitor
TEST.NEW
TEST.NAME:execDialInFlowMonitor_InitMode_WrapFlowBuffer
-TEST.IMPORT_FAILURES:
-(E) @LINE: 267 TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-(E) @LINE: 285 TEST.EXPECTED:DialInFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-TEST.END_IMPORT_FAILURES:
TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE
TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1
TEST.VALUE:DialInFlow.<>.dialInPumpDirection:MOTOR_DIR_REVERSE
@@ -583,11 +575,6 @@
TEST.SUBPROGRAM:execDialInFlowMonitor
TEST.NEW
TEST.NAME:execDialInFlowMonitor_NominalPath
-TEST.IMPORT_FAILURES:
-(E) @LINE: 308 TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-TEST.END_IMPORT_FAILURES:
TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE
TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1
TEST.VALUE:DialInFlow.<>.dialInPumpDirection:MOTOR_DIR_REVERSE
@@ -1139,14 +1126,6 @@
TEST.SUBPROGRAM:initDialInFlow
TEST.NEW
TEST.NAME:initDialInFlow_NominalPath
-TEST.IMPORT_FAILURES:
-(E) @LINE: 819 TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:1
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-(E) @LINE: 828 TEST.EXPECTED:DialInFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-TEST.END_IMPORT_FAILURES:
TEST.VALUE:DialInFlow.<>.ptr_mibspiREG5:<>
TEST.VALUE:DialInFlow.<>.ptr_mibspiREG5[0].PC3:0
TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_BLOODFLOW/INT_BLOODFLOW.tst
===================================================================
diff -u -rd53eb45680437d2297464b3638a81ba35c52b1b2 -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_BLOODFLOW/INT_BLOODFLOW.tst (.../INT_BLOODFLOW.tst) (revision d53eb45680437d2297464b3638a81ba35c52b1b2)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_BLOODFLOW/INT_BLOODFLOW.tst (.../INT_BLOODFLOW.tst) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -80,6 +80,33 @@
TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublishInterval.override:0xCCC33C33
TEST.END
+-- Test Case: handleTestBloodFlowBroadcastIntervalOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodFlowBroadcastIntervalOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodFlowBroadcastIntervalOverrideRequest_Reset
+TEST.VALUE:BloodFlow.<>.bloodFlowDataPublishInterval.data:100
+TEST.VALUE:BloodFlow.<>.bloodFlowDataPublishInterval.ovInitData:0
+TEST.VALUE:BloodFlow.<>.bloodFlowDataPublishInterval.ovData:50
+TEST.VALUE:BloodFlow.<>.bloodFlowDataPublishInterval.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].hdr.msgID:0x800C
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[4]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[5]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowBroadcastIntervalOverrideRequest.message[0].payload[7]:0
+TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublishInterval.data:100
+TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublishInterval.ovInitData:0
+TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublishInterval.ovData:0
+TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublishInterval.override:0x0
+TEST.END
+
-- Subprogram: handleTestBloodFlowMeasuredOverrideRequest
-- Test Case: handleTestBloodFlowMeasuredOverrideRequest_Override
@@ -109,6 +136,33 @@
TEST.EXPECTED:BloodFlow.<>.measuredBloodFlowRate.override:0xCCC33C33
TEST.END
+-- Test Case: handleTestBloodFlowMeasuredOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodFlowMeasuredOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodFlowMeasuredOverrideRequest_Reset
+TEST.VALUE:BloodFlow.<>.measuredBloodFlowRate.data:500.0
+TEST.VALUE:BloodFlow.<>.measuredBloodFlowRate.ovInitData:0.0
+TEST.VALUE:BloodFlow.<>.measuredBloodFlowRate.ovData:250.0
+TEST.VALUE:BloodFlow.<>.measuredBloodFlowRate.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].hdr.msgID:0x8009
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:BloodFlow.<>.measuredBloodFlowRate.data:500.0
+TEST.EXPECTED:BloodFlow.<>.measuredBloodFlowRate.ovInitData:0.0
+TEST.EXPECTED:BloodFlow.<>.measuredBloodFlowRate.ovData:0.0
+TEST.EXPECTED:BloodFlow.<>.measuredBloodFlowRate.override:0x0
+TEST.END
+
-- Subprogram: handleTestBloodFlowSetPointOverrideRequest
-- Test Case: handleTestBloodFlowSetPointOverrideRequest_Override
@@ -194,6 +248,33 @@
TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCCurrentmA.override:0xCCC33C33
TEST.END
+-- Test Case: handleTestBloodPumpMCMeasuredCurrentOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodPumpMCMeasuredCurrentOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodPumpMCMeasuredCurrentOverrideRequest_Reset
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:1000.0
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.ovInitData:0.0
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.ovData:1600.0
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].hdr.msgID:0x800B
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredCurrentOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:1000.0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCCurrentmA.ovInitData:0.0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCCurrentmA.ovData:0.0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCCurrentmA.override:0x0
+TEST.END
+
-- Subprogram: handleTestBloodPumpMCMeasuredSpeedOverrideRequest
-- Test Case: handleTestBloodPumpMCMeasuredSpeedOverrideRequest_Override
@@ -227,6 +308,37 @@
TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[7]:INPUT_BASE=16
TEST.END
+-- Test Case: handleTestBloodPumpMCMeasuredSpeedOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodPumpMCMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodPumpMCMeasuredSpeedOverrideRequest_Reset
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.data:2000.0
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.ovInitData:0.0
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.ovData:1600.0
+TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x800A
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMCMeasuredSpeedOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCSpeedRPM.data:2000.0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCSpeedRPM.ovInitData:0.0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCSpeedRPM.ovData:0.0
+TEST.EXPECTED:BloodFlow.<>.adcBloodPumpMCSpeedRPM.override:0x0
+TEST.ATTRIBUTES:BloodFlow.<>.bloodPumpSpeedRPM.override:EXPECTED_BASE=16
+TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].hdr.msgID:INPUT_BASE=16
+TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[6]:INPUT_BASE=16
+TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[7]:INPUT_BASE=16
+TEST.END
+
-- Subprogram: handleTestBloodPumpMeasuredSpeedOverrideRequest
-- Test Case: handleTestBloodPumpMeasuredSpeedOverrideRequest_Override
@@ -256,6 +368,33 @@
TEST.EXPECTED:BloodFlow.<>.bloodPumpSpeedRPM.override:0xCCC33C33
TEST.END
+-- Test Case: handleTestBloodPumpMeasuredSpeedOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodPumpMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodPumpMeasuredSpeedOverrideRequest_Reset
+TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:2000.0
+TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.ovInitData:0.0
+TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.ovData:1600.0
+TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x800E
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpMeasuredSpeedOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpSpeedRPM.data:2000.0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpSpeedRPM.ovInitData:0.0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpSpeedRPM.ovData:0.0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpSpeedRPM.override:0x0
+TEST.END
+
-- Subprogram: handleTestBloodPumpRotorMeasuredSpeedOverrideRequest
-- Test Case: handleTestBloodPumpRotorMeasuredSpeedOverrideRequest_Override
@@ -285,6 +424,33 @@
TEST.EXPECTED:BloodFlow.<>.bloodPumpRotorSpeedRPM.override:0xCCC33C33
TEST.END
+-- Test Case: handleTestBloodPumpRotorMeasuredSpeedOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestBloodPumpRotorMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestBloodPumpRotorMeasuredSpeedOverrideRequest_Reset
+TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.data:40.0
+TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.ovInitData:0.0
+TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.ovData:50.0
+TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x800F
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestBloodPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpRotorSpeedRPM.data:40.0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpRotorSpeedRPM.ovInitData:0.0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpRotorSpeedRPM.ovData:0.0
+TEST.EXPECTED:BloodFlow.<>.bloodPumpRotorSpeedRPM.override:0x0
+TEST.END
+
-- Unit: TaskGeneral
-- Subprogram: taskGeneral
@@ -334,12 +500,13 @@
TEST.NEW
TEST.NAME:initBloodFlow
TEST.IMPORT_FAILURES:
-(E) @LINE: 107 TEST.VALUE:BloodFlow.<>.flowReadingsTmrCtr:1
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
-(E) @LINE: 114 TEST.EXPECTED:BloodFlow.<>.flowReadingsTmrCtr:0
- >>> Unknown parameter/object name flowReadingsTmrCtr
- >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+ >>> (E) @LINE: 107 TEST.VALUE:BloodFlow.<>.flowReadingsTmrCtr:1
+ >>> >>> Unknown parameter/object name flowReadingsTmrCtr
+ >>> >>> Value Line Error - Command Ignored
+ >>> (E) @LINE: 114 TEST.EXPECTED:BloodFlow.<>.flowReadingsTmrCtr:0
+ >>> >>> Unknown parameter/object name flowReadingsTmrCtr
+ >>> >>> Value Line Error - Command Ignored
TEST.END_IMPORT_FAILURES:
TEST.VALUE:BloodFlow.<>.ptr_canREG3:<>
TEST.VALUE:BloodFlow.<>.isBloodPumpOn:1
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.env
===================================================================
diff -u -r94895e32fe18e78b98fe3bb7786838cf00afdbfa -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.env (.../INT_DIALINFLOW.env) (revision 94895e32fe18e78b98fe3bb7786838cf00afdbfa)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.env (.../INT_DIALINFLOW.env) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -3,6 +3,7 @@
ENVIRO.STUB_BY_FUNCTION:DialInFlow
ENVIRO.STUB_BY_FUNCTION:Dialysis
ENVIRO.STUB_BY_FUNCTION:ModeInitPOST
+ENVIRO.STUB_BY_FUNCTION:SystemCommMessages
ENVIRO.STUB_BY_FUNCTION:TaskGeneral
ENVIRO.STUB_BY_FUNCTION:TaskPriority
ENVIRO.STUB_BY_FUNCTION:sys_main
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.tst
===================================================================
diff -u -r51147222d369a3023a11b2ee675178d058ffaf46 -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.tst (.../INT_DIALINFLOW.tst) (revision 51147222d369a3023a11b2ee675178d058ffaf46)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.tst (.../INT_DIALINFLOW.tst) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -2,7 +2,7 @@
-- Test Case Script
--
-- Environment : INT_DIALINFLOW
--- Unit(s) Under Test: DialInFlow Dialysis ModeInitPOST TaskGeneral TaskPriority sys_main
+-- Unit(s) Under Test: DialInFlow Dialysis ModeInitPOST SystemCommMessages TaskGeneral TaskPriority sys_main
--
-- Script Features
TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING
@@ -32,6 +32,375 @@
TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:500
TEST.END
+-- Unit: SystemCommMessages
+
+-- Subprogram: handleTestDialInFlowBroadcastIntervalOverrideRequest
+
+-- Test Case: handleTestDialInFlowBroadcastIntervalOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInFlowBroadcastIntervalOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInFlowBroadcastIntervalOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.dialInFlowDataPublishInterval.data:100
+TEST.VALUE:DialInFlow.<>.dialInFlowDataPublishInterval.ovData:0
+TEST.VALUE:DialInFlow.<>.dialInFlowDataPublishInterval.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].hdr.msgID:0x8014
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[4]:250
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[7]:0
+TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublishInterval.data:100
+TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublishInterval.ovData:25
+TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublishInterval.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInFlowBroadcastIntervalOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInFlowBroadcastIntervalOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInFlowBroadcastIntervalOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.dialInFlowDataPublishInterval.data:100
+TEST.VALUE:DialInFlow.<>.dialInFlowDataPublishInterval.ovData:25
+TEST.VALUE:DialInFlow.<>.dialInFlowDataPublishInterval.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].hdr.msgID:0x8014
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowBroadcastIntervalOverrideRequest.message[0].payload[7]:0
+TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublishInterval.data:100
+TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublishInterval.ovData:100
+TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublishInterval.override:0x0
+TEST.END
+
+-- Subprogram: handleTestDialInFlowMeasuredOverrideRequest
+
+-- Test Case: handleTestDialInFlowMeasuredOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInFlowMeasuredOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInFlowMeasuredOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:500.0
+TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.ovData:0.0
+TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].hdr.msgID:0x8011
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[6]:0x96
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[7]:0x43
+TEST.EXPECTED:DialInFlow.<>.measuredDialInFlowRate.data:500.0
+TEST.EXPECTED:DialInFlow.<>.measuredDialInFlowRate.ovData:300.0
+TEST.EXPECTED:DialInFlow.<>.measuredDialInFlowRate.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInFlowMeasuredOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInFlowMeasuredOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInFlowMeasuredOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:500.0
+TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.ovData:300.0
+TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].hdr.msgID:0x8011
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowMeasuredOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:DialInFlow.<>.measuredDialInFlowRate.data:500.0
+TEST.EXPECTED:DialInFlow.<>.measuredDialInFlowRate.ovData:0.0
+TEST.EXPECTED:DialInFlow.<>.measuredDialInFlowRate.override:0x0
+TEST.END
+
+-- Subprogram: handleTestDialInFlowSetPointOverrideRequest
+
+-- Test Case: handleTestDialInFlowSetPointOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInFlowSetPointOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInFlowSetPointOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:500
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.ovInitData:0
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.ovData:0
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].hdr.msgID:0x8010
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[4]:250
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[7]:0
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:250
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.ovInitData:500
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.ovData:250
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInFlowSetPointOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInFlowSetPointOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInFlowSetPointOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:250
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.ovInitData:500
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.ovData:250
+TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].hdr.msgID:0x8010
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[7]:0
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:500
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.ovInitData:0
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.ovData:0
+TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.override:0x0
+TEST.END
+
+-- Subprogram: handleTestDialInPumpMCMeasuredCurrentOverrideRequest
+
+-- Test Case: handleTestDialInPumpMCMeasuredCurrentOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpMCMeasuredCurrentOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpMCMeasuredCurrentOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.ovData:0.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].hdr.msgID:0x8013
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[6]:0x2F
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[7]:0x44
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCCurrentmA.ovData:700.0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCCurrentmA.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInPumpMCMeasuredCurrentOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpMCMeasuredCurrentOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpMCMeasuredCurrentOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.ovData:700.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].hdr.msgID:0x8013
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredCurrentOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCCurrentmA.ovData:0.0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCCurrentmA.override:0x0
+TEST.END
+
+-- Subprogram: handleTestDialInPumpMCMeasuredSpeedOverrideRequest
+
+-- Test Case: handleTestDialInPumpMCMeasuredSpeedOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpMCMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpMCMeasuredSpeedOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1700.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.ovData:0.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x8012
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[6]:0xC8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[7]:0x44
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1700.0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCSpeedRPM.ovData:1600.0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCSpeedRPM.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInPumpMCMeasuredSpeedOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpMCMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpMCMeasuredSpeedOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1700.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.ovData:1600.0
+TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x8012
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMCMeasuredSpeedOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1700.0
+TEST.ATTRIBUTES:DialInFlow.<>.adcDialInPumpMCSpeedRPM.override:EXPECTED_BASE=16
+TEST.END
+
+-- Subprogram: handleTestDialInPumpMeasuredSpeedOverrideRequest
+
+-- Test Case: handleTestDialInPumpMeasuredSpeedOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpMeasuredSpeedOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1700.0
+TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.ovData:0.0
+TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x8015
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[6]:0xC8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[7]:0x44
+TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.data:1700.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.ovData:1600.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInPumpMeasuredSpeedOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpMeasuredSpeedOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1700.0
+TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.ovData:1600.0
+TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x8015
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpMeasuredSpeedOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.data:1700.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.ovData:0.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.override:0x0
+TEST.END
+
+-- Subprogram: handleTestDialInPumpRotorMeasuredSpeedOverrideRequest
+
+-- Test Case: handleTestDialInPumpRotorMeasuredSpeedOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpRotorMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpRotorMeasuredSpeedOverrideRequest_Override
+TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0
+TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.ovData:0.0
+TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x8016
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[6]:0xF0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[7]:0x41
+TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.ovData:30.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.override:0xCCC33C33
+TEST.END
+
+-- Test Case: handleTestDialInPumpRotorMeasuredSpeedOverrideRequest_Reset
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialInPumpRotorMeasuredSpeedOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialInPumpRotorMeasuredSpeedOverrideRequest_Reset
+TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0
+TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.ovData:30.0
+TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.override:0xCCC33C33
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].hdr.msgID:0x8016
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[0]:1
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[6]:0x0
+TEST.VALUE:SystemCommMessages.handleTestDialInPumpRotorMeasuredSpeedOverrideRequest.message[0].payload[7]:0x0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.ovData:0.0
+TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.override:0x0
+TEST.END
+
-- Unit: TaskGeneral
-- Subprogram: taskGeneral
@@ -70,13 +439,6 @@
TEST.VALUE:uut_prototype_stubs.uiCommunicated.return:1
TEST.EXPECTED:DialInFlow.<>.dialInFlowDataPublicationTimerCounter:0
TEST.EXPECTED:uut_prototype_stubs.getIntADCReading.channel:INT_ADC_DIAL_IN_PUMP_SPEED,INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.flowStPt:500
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.measFlow:200.0
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.measRotorSpd:0.0
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.measSpd:0.0
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.measMCSpd:-253.626
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.measMCCurr:-594.396
-TEST.EXPECTED:uut_prototype_stubs.broadcastDialInFlowData.pwmDC:75.0
TEST.END
-- Unit: sys_main
@@ -95,12 +457,10 @@
TEST.VALUE:DialInFlow.<>.flowReadingsIdx:1
TEST.VALUE:DialInFlow.<>.flowReadingsTotal:1.0
TEST.VALUE:DialInFlow.<>.flowReadingsCount:1
-TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:1
TEST.EXPECTED:DialInFlow.<>.isDialInPumpOn:0
TEST.EXPECTED:DialInFlow.<>.dialInPumpDirectionSet:MOTOR_DIR_FORWARD
TEST.EXPECTED:DialInFlow.<>.dipControlTimerCounter:0
TEST.EXPECTED:DialInFlow.<>.flowReadingsIdx:0
TEST.EXPECTED:DialInFlow.<>.flowReadingsTotal:0.0
TEST.EXPECTED:DialInFlow.<>.flowReadingsCount:0
-TEST.EXPECTED:DialInFlow.<>.flowReadingsTmrCtr:0
TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW_cba.cvr
===================================================================
diff -u -r51147222d369a3023a11b2ee675178d058ffaf46 -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW_cba.cvr (.../INT_DIALINFLOW_cba.cvr) (revision 51147222d369a3023a11b2ee675178d058ffaf46)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW_cba.cvr (.../INT_DIALINFLOW_cba.cvr) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -89,7 +89,7 @@
IMPORT.SOURCE.END
IMPORT.SOURCE.BEGIN
IMPORT.SOURCE.UNIT:13
-IMPORT.SOURCE.ORIG_FILENAME:TaskGeneral.c
+IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
IMPORT.SOURCE.COVERAGE_STATUS:TRUE
IMPORT.SOURCE.COVERAGE_TYPE:Function
IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -111,7 +111,7 @@
IMPORT.SOURCE.END
IMPORT.SOURCE.BEGIN
IMPORT.SOURCE.UNIT:14
-IMPORT.SOURCE.ORIG_FILENAME:TaskPriority.c
+IMPORT.SOURCE.ORIG_FILENAME:TaskGeneral.c
IMPORT.SOURCE.COVERAGE_STATUS:TRUE
IMPORT.SOURCE.COVERAGE_TYPE:Function
IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -133,6 +133,28 @@
IMPORT.SOURCE.END
IMPORT.SOURCE.BEGIN
IMPORT.SOURCE.UNIT:15
+IMPORT.SOURCE.ORIG_FILENAME:TaskPriority.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:16
IMPORT.SOURCE.ORIG_FILENAME:sys_main.c
IMPORT.SOURCE.COVERAGE_STATUS:TRUE
IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -159,7 +181,6 @@
Self tests not yet implemented.
Some functions not yet called.
Coverage for private functions not required.
-Dialin API function coverage not yet done.
RESULT.CBA.NOTES_END
RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Controllers/DialInFlow.c
RESULT.CBA.FUNCTION: execDialInFlowTest
@@ -205,169 +226,37 @@
RESULT.CBA.CONTEXT_AFTER_END
RESULT.CBA.MATCHING_LINE_INDEX: 1
RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: signalDialInPumpHardStop
+RESULT.CBA.FUNCTION: homeDialInPump
RESULT.CBA.LINE.BEGIN
RESULT.CBA.LINE: 0
RESULT.CBA.COVERAGE: FN
RESULT.CBA.CONTEXT: {
RESULT.CBA.CONTEXT_AFTER:
-targetDialInFlowRate.data = 0;
-stopDialInPump();
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetDialInFlowDataPublishIntervalOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
BOOL result =
0
RESULT.CBA.CONTEXT_AFTER_END
RESULT.CBA.MATCHING_LINE_INDEX: 1
RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetMeasuredDialInFlowRateOverride
+RESULT.CBA.FUNCTION: signalDialInPumpHardStop
RESULT.CBA.LINE.BEGIN
RESULT.CBA.LINE: 0
RESULT.CBA.COVERAGE: FN
RESULT.CBA.CONTEXT: {
RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
+targetDialInFlowRate.data = 0;
+stopDialInPump();
RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetMeasuredDialInPumpMCCurrentOverride
+RESULT.CBA.FUNCTION: signalDialInPumpRotorHallSensor
RESULT.CBA.LINE.BEGIN
RESULT.CBA.LINE: 0
RESULT.CBA.COVERAGE: FN
RESULT.CBA.CONTEXT: {
RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
+U32 rotTime = getMSTimerCount();
+U32 deltaTime = calcTimeBetween( dipRotorRevStartTime, rotTime );
RESULT.CBA.CONTEXT_AFTER_END
RESULT.CBA.MATCHING_LINE_INDEX: 1
RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetMeasuredDialInPumpMCSpeedOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetMeasuredDialInPumpRotorSpeedOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetMeasuredDialInPumpSpeedOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testResetTargetDialInFlowRateOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetDialInFlowDataPublishIntervalOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetMeasuredDialInFlowRateOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetMeasuredDialInPumpMCCurrentOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetMeasuredDialInPumpMCSpeedOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetMeasuredDialInPumpRotorSpeedOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetMeasuredDialInPumpSpeedOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: testSetTargetDialInFlowRateOverride
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 0
-RESULT.CBA.COVERAGE: FN
-RESULT.CBA.CONTEXT: {
-RESULT.CBA.CONTEXT_AFTER:
-BOOL result =
-0
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.MATCHING_LINE_INDEX: 1
-RESULT.CBA.LINE.END
RESULT.CBA.END
IMPORT.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALOUTFLOW/INT_DIALOUTFLOW.tst
===================================================================
diff -u -r51147222d369a3023a11b2ee675178d058ffaf46 -rcf49e135dafd0f60c4c4dc7137c28148818411d3
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALOUTFLOW/INT_DIALOUTFLOW.tst (.../INT_DIALOUTFLOW.tst) (revision 51147222d369a3023a11b2ee675178d058ffaf46)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALOUTFLOW/INT_DIALOUTFLOW.tst (.../INT_DIALOUTFLOW.tst) (revision cf49e135dafd0f60c4c4dc7137c28148818411d3)
@@ -22,10 +22,14 @@
TEST.SUBPROGRAM:execDialysis
TEST.NEW
TEST.NAME:getLoadCellWeightInGrams
-TEST.VALUE:DialOutFlow.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].data:10.0
-TEST.VALUE:Dialysis.<>.currentDialysisState:DIALYSIS_START_STATE
-TEST.VALUE:Dialysis.<>.resStartVolume:0.0
-TEST.EXPECTED:Dialysis.<>.resStartVolume:10.0
+TEST.VALUE:DialOutFlow.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].data:1510.0
+TEST.VALUE:uut_prototype_stubs.getDGActiveReservoir.return:DG_RESERVOIR_1
+TEST.VALUE:Dialysis.<>.currentDialysisState:DIALYSIS_UF_STATE
+TEST.VALUE:Dialysis.<>.currentUFState:UF_PAUSED_STATE
+TEST.VALUE:Dialysis.<>.measUFVolume:0.0
+TEST.VALUE:Dialysis.<>.resStartVolume[DG_RESERVOIR_1]:1500.0
+TEST.VALUE:Dialysis.<>.measUFVolumeFromPriorReservoirs:0.0
+TEST.EXPECTED:Dialysis.<>.measUFVolume:10.0
TEST.END
-- Subprogram: startDialysis
@@ -39,7 +43,8 @@
TEST.VALUE:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_REVERSE
TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP
TEST.VALUE:Dialysis.<>.setDialysateFlowRate:500
-TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:300
+TEST.VALUE:Dialysis.<>.setUFRate:10.0
+TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:510
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP
TEST.END
@@ -81,6 +86,462 @@
TEST.EXPECTED:DialOutFlow.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_2_BACKUP].data:0.0
TEST.END
+-- Subprogram: handleTestDialOutFlowBroadcastIntervalOverrideRequest
+
+-- Test Case: handleTestDialOutFlowBroadcastIntervalOverrideRequest_Override
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleTestDialOutFlowBroadcastIntervalOverrideRequest
+TEST.NEW
+TEST.NAME:handleTestDialOutFlowBroadcastIntervalOverrideRequest_Override
+TEST.VALUE:DialOutFlow.<>.dialOutDataPublishInterval.data:100
+TEST.VALUE:DialOutFlow.<>.dialOutDataPublishInterval.ovInitData:0
+TEST.VALUE:DialOutFlow.<>.dialOutDataPublishInterval.ovData:0
+TEST.VALUE:DialOutFlow.<>.dialOutDataPublishInterval.override:0
+TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message:<>
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].hdr.msgID:0x801E
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[4]:250
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleTestDialOutFlowBroadcastIntervalOverrideRequest.message[0].payload[7]:0
+TEST.EXPECTED:DialOutFlow.<