Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_BLOODFLOW/INT_BLOODFLOW.tst =================================================================== diff -u -re003dea1ff697744317ca7ee8397a57d6aeaf8fc -r2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_BLOODFLOW/INT_BLOODFLOW.tst (.../INT_BLOODFLOW.tst) (revision e003dea1ff697744317ca7ee8397a57d6aeaf8fc) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_BLOODFLOW/INT_BLOODFLOW.tst (.../INT_BLOODFLOW.tst) (revision 2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792) @@ -200,9 +200,6 @@ TEST.NAME:handleTestBloodFlowSetPointOverrideRequest_Override TEST.VALUE:BloodFlow.<>.bloodPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.data:500 -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.ovInitData:0 -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.ovData:0 -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.override:0 TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1 TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message:<> TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].hdr.msgID:0x8008 @@ -221,42 +218,8 @@ TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[11]:0 TEST.EXPECTED:BloodFlow.<>.bloodPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.data:250 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.ovInitData:500 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.ovData:250 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.override:0xCCC33C33 TEST.END --- Test Case: handleTestBloodFlowSetPointOverrideRequest_Reset -TEST.UNIT:SystemCommMessages -TEST.SUBPROGRAM:handleTestBloodFlowSetPointOverrideRequest -TEST.NEW -TEST.NAME:handleTestBloodFlowSetPointOverrideRequest_Reset -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.data:500 -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.ovInitData:500 -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.ovData:250 -TEST.VALUE:BloodFlow.<>.targetBloodFlowRate.override:0xCCC33C33 -TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message:<> -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].hdr.msgID:0x8008 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].hdr.payloadLen:12 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[0]:1 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[1]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[2]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[3]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[4]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[5]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[6]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[7]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[8]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[9]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[10]:0 -TEST.VALUE:SystemCommMessages.handleTestBloodFlowSetPointOverrideRequest.message[0].payload[11]:0 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.data:500 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.ovInitData:0 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.ovData:0 -TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate.override:0x0 -TEST.END - -- Subprogram: handleTestBloodPumpMCMeasuredCurrentOverrideRequest -- Test Case: handleTestBloodPumpMCMeasuredCurrentOverrideRequest_Override Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.tst =================================================================== diff -u -re003dea1ff697744317ca7ee8397a57d6aeaf8fc -r2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.tst (.../INT_DIALINFLOW.tst) (revision e003dea1ff697744317ca7ee8397a57d6aeaf8fc) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALINFLOW/INT_DIALINFLOW.tst (.../INT_DIALINFLOW.tst) (revision 2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792) @@ -174,9 +174,6 @@ 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 @@ -194,42 +191,8 @@ TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[10]:0 TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[11]: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:12 -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.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[8]:0 -TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[9]:0 -TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[10]:0 -TEST.VALUE:SystemCommMessages.handleTestDialInFlowSetPointOverrideRequest.message[0].payload[11]: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 Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALOUTFLOW/INT_DIALOUTFLOW.tst =================================================================== diff -u -re003dea1ff697744317ca7ee8397a57d6aeaf8fc -r2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALOUTFLOW/INT_DIALOUTFLOW.tst (.../INT_DIALOUTFLOW.tst) (revision e003dea1ff697744317ca7ee8397a57d6aeaf8fc) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALOUTFLOW/INT_DIALOUTFLOW.tst (.../INT_DIALOUTFLOW.tst) (revision 2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792) @@ -144,36 +144,6 @@ -- Subprogram: handleTestDialOutFlowSetPointOverrideRequest --- Test Case: testResetTargetDialOutFlowRateOverride -TEST.UNIT:SystemCommMessages -TEST.SUBPROGRAM:handleTestDialOutFlowSetPointOverrideRequest -TEST.NEW -TEST.NAME:testResetTargetDialOutFlowRateOverride -TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE -TEST.VALUE:DialOutFlow.<>.isDialOutPumpOn:1 -TEST.VALUE:DialOutFlow.<>.lastGivenRate:200 -TEST.VALUE:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_REVERSE -TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP -TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message:<> -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].hdr.payloadLen:12 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[0]:1 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[1]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[2]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[3]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[4]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[5]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[6]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[7]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[8]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[9]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[10]:0 -TEST.VALUE:SystemCommMessages.handleTestDialOutFlowSetPointOverrideRequest.message[0].payload[11]:0 -TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:0 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_REVERSE -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP -TEST.END - -- Test Case: testSetTargetDialOutFlowRateOverride TEST.UNIT:SystemCommMessages TEST.SUBPROGRAM:handleTestDialOutFlowSetPointOverrideRequest @@ -696,20 +666,50 @@ TEST.SUBPROGRAM:initSoftware TEST.NEW TEST.NAME:initDialOutFlow +TEST.IMPORT_FAILURES: +(E) @LINE: 701 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.refUFVolMl:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 702 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measUFVolMl:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 703 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measRotSpdRPM:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 704 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measSpdRPM:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 705 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measMCSpdRPM:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 706 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measMCCurrmA:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 707 TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.setPWMpct:9.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 708 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.refUFVolMl:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 709 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measUFVolMl:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 710 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measRotSpdRPM:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 711 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measSpdRPM:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 712 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measMCSpdRPM:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 713 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measMCCurrmA:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +(E) @LINE: 714 TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.setPWMpct:0.0 + >>> Unknown parameter/object name dialOutBroadCastVariables + >>> Value Line Error - Command Ignored +TEST.END_IMPORT_FAILURES: TEST.VALUE:DialOutFlow.<>.ptr_mibspiREG1:<> TEST.VALUE:DialOutFlow.<>.ptr_pwmREG3:<> -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.refUFVolMl:9.0 -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measUFVolMl:9.0 -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measRotSpdRPM:9.0 -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measSpdRPM:9.0 -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measMCSpdRPM:9.0 -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.measMCCurrmA:9.0 -TEST.VALUE:DialOutFlow.<>.dialOutBroadCastVariables.setPWMpct:9.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.refUFVolMl:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measUFVolMl:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measRotSpdRPM:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measSpdRPM:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measMCSpdRPM:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.measMCCurrmA:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutBroadCastVariables.setPWMpct:0.0 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.tst =================================================================== diff -u -r9a20996b770f446b8c669cba7a49668c1fdadd67 -r2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.tst (.../INT_FPGA.tst) (revision 9a20996b770f446b8c669cba7a49668c1fdadd67) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.tst (.../INT_FPGA.tst) (revision 2ad8a3caf791b5ee9e311f3f0fedd7e9ea1ac792) @@ -67,6 +67,26 @@ TEST.EXPECTED:BloodFlow.<>.flowReadingsCount:1 TEST.END +-- Subprogram: updateBloodPumpSpeedAndDirectionFromHallSensors + +-- Test Case: getFPGABloodPumpHallSensorCount +TEST.UNIT:BloodFlow +TEST.SUBPROGRAM:updateBloodPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:getFPGABloodPumpHallSensorCount +TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:0.0 +TEST.VALUE:BloodFlow.<>.bpLastMotorHallSensorCounts[1]:980 +TEST.VALUE:BloodFlow.<>.bpMotorSpeedCalcIdx:0 +TEST.VALUE:BloodFlow.<>.bpMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE +TEST.VALUE:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:3 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodPumpHallSensorCount:1000 +TEST.EXPECTED:BloodFlow.<>.bloodPumpSpeedRPM.data:25.0 +TEST.EXPECTED:BloodFlow.<>.bpLastMotorHallSensorCounts[1]:1000 +TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcIdx:1 +TEST.EXPECTED:BloodFlow.<>.bpMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD +TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:0 +TEST.END + -- Unit: DialInFlow -- Subprogram: execDialInFlowMonitor @@ -85,6 +105,46 @@ TEST.EXPECTED:DialInFlow.<>.flowReadingsCount:1 TEST.END +-- Subprogram: updateDialInPumpSpeedAndDirectionFromHallSensors + +-- Test Case: getFPGADialInPumpHallSensorCount +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:updateDialInPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:getFPGADialInPumpHallSensorCount +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.dipLastMotorHallSensorCounts[1]:980 +TEST.VALUE:DialInFlow.<>.dipMotorSpeedCalcIdx:0 +TEST.VALUE:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:3 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialInPumpHallSensorCount:1000 +TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.data:25.0 +TEST.EXPECTED:DialInFlow.<>.dipLastMotorHallSensorCounts[1]:1000 +TEST.EXPECTED:DialInFlow.<>.dipMotorSpeedCalcIdx:1 +TEST.EXPECTED:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:0 +TEST.END + +-- Unit: DialOutFlow + +-- Subprogram: updateDialOutPumpSpeedAndDirectionFromHallSensors + +-- Test Case: getFPGADialOutPumpHallSensorCount +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:updateDialOutPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:getFPGADialOutPumpHallSensorCount +TEST.VALUE:DialOutFlow.<>.dialOutPumpSpeedRPM.data:0.0 +TEST.VALUE:DialOutFlow.<>.dopLastMotorHallSensorCounts[1]:980 +TEST.VALUE:DialOutFlow.<>.dopMotorSpeedCalcIdx:0 +TEST.VALUE:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE +TEST.VALUE:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:3 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialOutPumpHallSensorCount:1000 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpSpeedRPM.data:25.0 +TEST.EXPECTED:DialOutFlow.<>.dopLastMotorHallSensorCounts[1]:1000 +TEST.EXPECTED:DialOutFlow.<>.dopMotorSpeedCalcIdx:1 +TEST.EXPECTED:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:0 +TEST.END + -- Unit: Interrupts -- Subprogram: dmaGroupANotification @@ -146,25 +206,25 @@ TEST.VALUE:PresOccl.<>.presOcclState:PRESSURE_CONTINUOUS_READ_STATE TEST.VALUE:PresOccl.<>.arterialPressure.data:0.0 TEST.VALUE:PresOccl.<>.venousPressure.data:0.0 -TEST.VALUE:PresOccl.<>.bloodPumpOcclusion.data:0.0 -TEST.VALUE:PresOccl.<>.dialInPumpOcclusion.data:0.0 -TEST.VALUE:PresOccl.<>.dialOutPumpOcclusion.data:0.0 +TEST.VALUE:PresOccl.<>.bloodPumpOcclusion.data:0 +TEST.VALUE:PresOccl.<>.dialInPumpOcclusion.data:0 +TEST.VALUE:PresOccl.<>.dialOutPumpOcclusion.data:0 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodOcclusionData:200 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateInOcclusionData:300 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateOutOcclusionData:400 -TEST.VALUE:FPGA.<>.fpgaSensorReadings.adc1Channel0:0x800100 -TEST.VALUE:FPGA.<>.fpgaSensorReadings.venousPressure:12000 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.adc1Channel0:0x801000 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.venousPressure:9000 TEST.EXPECTED:PresOccl.<>.presOcclState:PRESSURE_CONTINUOUS_READ_STATE -TEST.EXPECTED:PresOccl.<>.arterialPressure.data:54.9316 -TEST.EXPECTED:PresOccl.<>.venousPressure.data:17.4342 -TEST.EXPECTED:PresOccl.<>.bloodPumpOcclusion.data:200.0 -TEST.EXPECTED:PresOccl.<>.dialInPumpOcclusion.data:300.0 -TEST.EXPECTED:PresOccl.<>.dialOutPumpOcclusion.data:400.0 +TEST.EXPECTED:PresOccl.<>.arterialPressure.data:97.6562 +TEST.EXPECTED:PresOccl.<>.venousPressure.data:191.401 +TEST.EXPECTED:PresOccl.<>.bloodPumpOcclusion.data:200 +TEST.EXPECTED:PresOccl.<>.dialInPumpOcclusion.data:300 +TEST.EXPECTED:PresOccl.<>.dialOutPumpOcclusion.data:400 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodOcclusionData:200 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateInOcclusionData:300 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateOutOcclusionData:400 -TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.adc1Channel0:8388864 -TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.venousPressure:12000 +TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.adc1Channel0:0x801000 +TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.venousPressure:9000 TEST.END -- Unit: SystemCommMessages