Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst =================================================================== diff -u -rd3596da054513ebf85d4114221eddbe875d1f1a1 -r6e889b9aa03bd24e37b70b51e0d6795b6f58afff --- vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst (.../DIALINFLOW.tst) (revision d3596da054513ebf85d4114221eddbe875d1f1a1) +++ vectorcast/Hercules_RM46_HD_Project/environment/DIALINFLOW/DIALINFLOW.tst (.../DIALINFLOW.tst) (revision 6e889b9aa03bd24e37b70b51e0d6795b6f58afff) @@ -75,6 +75,91 @@ TEST.END_FLOW TEST.END +-- Subprogram: checkDialInPumpFlowAgainstSpeed + +-- Test Case: checkDialInPumpFlowAgainstSpeed_NominalPath +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpFlowAgainstSpeed +TEST.NEW +TEST.NAME:checkDialInPumpFlowAgainstSpeed_NominalPath +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:301.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1600.0 +TEST.VALUE:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:1 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:0 +TEST.END + +-- Test Case: checkDialInPumpFlowAgainstSpeed_NominalPath2 +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpFlowAgainstSpeed +TEST.NEW +TEST.NAME:checkDialInPumpFlowAgainstSpeed_NominalPath2 +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:301.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1300.0 +TEST.VALUE:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:1 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:0 +TEST.END + +-- Test Case: checkDialInPumpFlowAgainstSpeed_NotTreatmentMode +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpFlowAgainstSpeed +TEST.NEW +TEST.NAME:checkDialInPumpFlowAgainstSpeed_NotTreatmentMode +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:301.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1600.0 +TEST.VALUE:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:1 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_PRET +TEST.EXPECTED:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:0 +TEST.END + +-- Test Case: checkDialInPumpFlowAgainstSpeed_OutOfRange_Alarm +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpFlowAgainstSpeed +TEST.NEW +TEST.NAME:checkDialInPumpFlowAgainstSpeed_OutOfRange_Alarm +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:301.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1700.0 +TEST.VALUE:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:499 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:500 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.flt.data:301.0 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.flt.data:353.601 +TEST.END + +-- Test Case: checkDialInPumpFlowAgainstSpeed_OutOfRange_NoPersist +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpFlowAgainstSpeed +TEST.NEW +TEST.NAME:checkDialInPumpFlowAgainstSpeed_OutOfRange_NoPersist +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:301.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1700.0 +TEST.VALUE:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:498 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:499 +TEST.END + +-- Test Case: checkDialInPumpFlowAgainstSpeed_Ramping +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpFlowAgainstSpeed +TEST.NEW +TEST.NAME:checkDialInPumpFlowAgainstSpeed_Ramping +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_RAMPING_UP_STATE +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:301.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1600.0 +TEST.VALUE:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:1 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:DialInFlow.<>.errorDialInFlowVsMotorSpeedPersistTimerCtr:0 +TEST.END + -- Subprogram: checkDialInPumpMCCurrent -- Test Case: checkDialInPumpMCCurrent_OFFOk @@ -174,6 +259,207 @@ TEST.EXPECTED:DialInFlow.<>.dipCurrErrorDurationCtr:2000 TEST.END +-- Subprogram: checkDialInPumpRotor + +-- Test Case: checkDialInPumpRotor_HomingInProgress +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpRotor +TEST.NEW +TEST.NAME:checkDialInPumpRotor_HomingInProgress +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:100 +TEST.VALUE:DialInFlow.<>.dipRotorRevStartTime:109000 +TEST.VALUE:DialInFlow.<>.dipStopAtHomePosition:1 +TEST.VALUE:DialInFlow.<>.dipHomeStartTime:100000 +TEST.VALUE:uut_prototype_stubs.didTimeout.return:(2)0 +TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:100 +TEST.EXPECTED:DialInFlow.<>.dipStopAtHomePosition:1 +TEST.EXPECTED:uut_prototype_stubs.didTimeout.startMSCount:100000,109000 +TEST.EXPECTED:uut_prototype_stubs.didTimeout.timeoutPeriod:10000 +TEST.END + +-- Test Case: checkDialInPumpRotor_HomingTimeout +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpRotor +TEST.NEW +TEST.NAME:checkDialInPumpRotor_HomingTimeout +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:100 +TEST.VALUE:DialInFlow.<>.dipRotorRevStartTime:109000 +TEST.VALUE:DialInFlow.<>.dipStopAtHomePosition:1 +TEST.VALUE:DialInFlow.<>.dipHomeStartTime:100000 +TEST.VALUE:uut_prototype_stubs.didTimeout.return:1,0 +TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:0 +TEST.EXPECTED:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.EXPECTED:uut_prototype_stubs.didTimeout.startMSCount:100000,109000 +TEST.EXPECTED:uut_prototype_stubs.didTimeout.timeoutPeriod:10000 +TEST.END + +-- Test Case: checkDialInPumpRotor_PumpStopped +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpRotor +TEST.NEW +TEST.NAME:checkDialInPumpRotor_PumpStopped +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:100.0 +TEST.VALUE:DialInFlow.<>.dipRotorRevStartTime:100000 +TEST.VALUE:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:0.0 +TEST.EXPECTED:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.EXPECTED:uut_prototype_stubs.didTimeout.startMSCount:100000 +TEST.EXPECTED:uut_prototype_stubs.didTimeout.timeoutPeriod:10000 +TEST.END + +-- Subprogram: checkDialInPumpSpeeds + +-- Test Case: checkDialInPumpSpeeds_PumpOff_NominalPath +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOff_NominalPath +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_OFF_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:0 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:0 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:0.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:0.0 +TEST.VALUE:DialInFlow.<>.errorDialInMotorOffPersistTimerCtr:1 +TEST.EXPECTED:DialInFlow.<>.errorDialInMotorOffPersistTimerCtr:0 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOff_NonZeroRPM_Alarm +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOff_NonZeroRPM_Alarm +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_OFF_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:0 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:0 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:0.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:101.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:0.0 +TEST.VALUE:DialInFlow.<>.errorDialInMotorOffPersistTimerCtr:499 +TEST.EXPECTED:DialInFlow.<>.errorDialInMotorOffPersistTimerCtr:500 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_DIAL_IN_PUMP_OFF_CHECK +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarmData.data.flt.data:101.0 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOff_NonZeroRPM_NoPersist +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOff_NonZeroRPM_NoPersist +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_OFF_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:0 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:0 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:0.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:101.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:0.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:0.0 +TEST.VALUE:DialInFlow.<>.errorDialInMotorOffPersistTimerCtr:498 +TEST.EXPECTED:DialInFlow.<>.errorDialInMotorOffPersistTimerCtr:499 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOn_NominalPath +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOn_NominalPath +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:305.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1650.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1500.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0 +TEST.VALUE:DialInFlow.<>.errorDialInMotorSpeedPersistTimerCtr:1 +TEST.EXPECTED:DialInFlow.<>.errorDialInMotorSpeedPersistTimerCtr:0 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOn_RotorTooFast_NoPersist +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOn_RotorTooFast_NoPersist +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:305.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:56.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1600.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1500.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0 +TEST.VALUE:DialInFlow.<>.errorDialInRotorSpeedPersistTimerCtr:1198 +TEST.EXPECTED:DialInFlow.<>.errorDialInRotorSpeedPersistTimerCtr:1199 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOn_RotorTooSlow_Alarm +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOn_RotorTooSlow_Alarm +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:305.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:44.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1600.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1500.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0 +TEST.VALUE:DialInFlow.<>.errorDialInRotorSpeedPersistTimerCtr:1199 +TEST.EXPECTED:DialInFlow.<>.errorDialInRotorSpeedPersistTimerCtr:1200 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.flt.data:44.0 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.flt.data:1600.0 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOn_TooFast_NoPersist +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOn_TooFast_NoPersist +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:305.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:2000.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1500.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0 +TEST.VALUE:DialInFlow.<>.errorDialInMotorSpeedPersistTimerCtr:498 +TEST.EXPECTED:DialInFlow.<>.errorDialInMotorSpeedPersistTimerCtr:499 +TEST.END + +-- Test Case: checkDialInPumpSpeeds_PumpOn_TooSlow_Alarm +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:checkDialInPumpSpeeds +TEST.NEW +TEST.NAME:checkDialInPumpSpeeds_PumpOn_TooSlow_Alarm +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.measuredDialInFlowRate.data:305.0 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:50.0 +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1100.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCSpeedRPM.data:1500.0 +TEST.VALUE:DialInFlow.<>.adcDialInPumpMCCurrentmA.data:500.0 +TEST.VALUE:DialInFlow.<>.errorDialInMotorSpeedPersistTimerCtr:499 +TEST.EXPECTED:DialInFlow.<>.errorDialInMotorSpeedPersistTimerCtr:500 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.flt.data:300.0 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_F32 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.flt.data:1100.0 +TEST.END + -- Subprogram: execDialInFlowController -- Test Case: execDialInFlowController_ControlToTargetState @@ -250,6 +536,14 @@ 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 @@ -264,7 +558,6 @@ TEST.VALUE:DialInFlow.<>.flowReadingsIdx:999 TEST.VALUE:DialInFlow.<>.flowReadingsTotal:-220.0 TEST.VALUE:DialInFlow.<>.flowReadingsCount:1000 -TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:0 TEST.VALUE:uut_prototype_stubs.getFPGADialysateFlow.return:-100.0 TEST.VALUE:uut_prototype_stubs.getIntADCReading.return:1500,1550 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_INIT @@ -282,7 +575,6 @@ TEST.EXPECTED:DialInFlow.<>.flowReadingsIdx:0 TEST.EXPECTED:DialInFlow.<>.flowReadingsTotal:-320.0 TEST.EXPECTED:DialInFlow.<>.flowReadingsCount:1000 -TEST.EXPECTED:DialInFlow.<>.flowReadingsTmrCtr:0 TEST.EXPECTED:uut_prototype_stubs.getIntADCReading.channel:INT_ADC_DIAL_IN_PUMP_SPEED,INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT TEST.END @@ -291,6 +583,11 @@ 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 @@ -305,7 +602,6 @@ TEST.VALUE:DialInFlow.<>.flowReadingsIdx:2 TEST.VALUE:DialInFlow.<>.flowReadingsTotal:-200.0 TEST.VALUE:DialInFlow.<>.flowReadingsCount:2 -TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:0 TEST.VALUE:uut_prototype_stubs.getFPGADialysateFlow.return:-100.0 TEST.VALUE:uut_prototype_stubs.getIntADCReading.return:1500,1550 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA @@ -801,13 +1097,56 @@ TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:9817 TEST.END +-- Subprogram: homeDialInPump + +-- Test Case: homeDialInPump_NominalPath +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:homeDialInPump +TEST.NEW +TEST.NAME:homeDialInPump_NominalPath +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_OFF_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:0 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:0 +TEST.VALUE:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.VALUE:DialInFlow.<>.dipHomeStartTime:0 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:100000 +TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:100 +TEST.EXPECTED:DialInFlow.<>.dipStopAtHomePosition:1 +TEST.EXPECTED:DialInFlow.<>.dipHomeStartTime:100000 +TEST.EXPECTED:DialInFlow.homeDialInPump.return:1 +TEST.END + +-- Test Case: homeDialInPump_PumpRunning +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:homeDialInPump +TEST.NEW +TEST.NAME:homeDialInPump_PumpRunning +TEST.VALUE:DialInFlow.<>.dialInPumpState:DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialInFlow.<>.isDialInPumpOn:1 +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.VALUE:DialInFlow.<>.dipHomeStartTime:0 +TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.EXPECTED:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.EXPECTED:DialInFlow.<>.dipHomeStartTime:0 +TEST.EXPECTED:DialInFlow.homeDialInPump.return:0 +TEST.END + -- Subprogram: initDialInFlow -- Test Case: initDialInFlow_NominalPath TEST.UNIT:DialInFlow 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 @@ -816,7 +1155,6 @@ TEST.VALUE:DialInFlow.<>.flowReadingsIdx:1 TEST.VALUE:DialInFlow.<>.flowReadingsTotal:1.0 TEST.VALUE:DialInFlow.<>.flowReadingsCount:1 -TEST.VALUE:DialInFlow.<>.flowReadingsTmrCtr:1 TEST.VALUE:uut_prototype_stubs.gioSetBit.value:1 TEST.EXPECTED:DialInFlow.<>.ptr_mibspiREG5[0].PC3:0x100 TEST.EXPECTED:DialInFlow.<>.isDialInPumpOn:0 @@ -825,7 +1163,6 @@ TEST.EXPECTED:DialInFlow.<>.flowReadingsIdx:0 TEST.EXPECTED:DialInFlow.<>.flowReadingsTotal:0.0 TEST.EXPECTED:DialInFlow.<>.flowReadingsCount:0 -TEST.EXPECTED:DialInFlow.<>.flowReadingsTmrCtr:0 TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:0 TEST.EXPECTED:uut_prototype_stubs.gioSetBit.bit:2 TEST.EXPECTED:uut_prototype_stubs.gioSetBit.value:0 @@ -1219,6 +1556,42 @@ TEST.EXPECTED:uut_prototype_stubs.resetPIController.initialControlSignal:0.12 TEST.END +-- Subprogram: signalDialInPumpRotorHallSensor + +-- Test Case: signalDialInPumpRotorHallSensor_Homing +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:signalDialInPumpRotorHallSensor +TEST.NEW +TEST.NAME:signalDialInPumpRotorHallSensor_Homing +TEST.VALUE:DialInFlow.<>.targetDialInFlowRate.data:300 +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:59.0 +TEST.VALUE:DialInFlow.<>.dipRotorRevStartTime:99000 +TEST.VALUE:DialInFlow.<>.dipStopAtHomePosition:1 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:100000 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1000 +TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.data:0 +TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:60.0 +TEST.EXPECTED:DialInFlow.<>.dipRotorRevStartTime:100000 +TEST.EXPECTED:DialInFlow.<>.dipStopAtHomePosition:0 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.startMSCount:99000 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:100000 +TEST.END + +-- Test Case: signalDialInPumpRotorHallSensor_NominalPath +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:signalDialInPumpRotorHallSensor +TEST.NEW +TEST.NAME:signalDialInPumpRotorHallSensor_NominalPath +TEST.VALUE:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:59.0 +TEST.VALUE:DialInFlow.<>.dipRotorRevStartTime:99000 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:100000 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1000 +TEST.EXPECTED:DialInFlow.<>.dialInPumpRotorSpeedRPM.data:60.0 +TEST.EXPECTED:DialInFlow.<>.dipRotorRevStartTime:100000 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.startMSCount:99000 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:100000 +TEST.END + -- Subprogram: stopDialInPump -- Test Case: stopDialInPump_NominalPath @@ -1772,3 +2145,46 @@ TEST.EXPECTED:DialInFlow.<>.targetDialInFlowRate.override:0xCCC33C33 TEST.EXPECTED:DialInFlow.testSetTargetDialInFlowRateOverride.return:1 TEST.END + +-- Subprogram: updateDialInPumpSpeedAndDirectionFromHallSensors + +-- Test Case: updateDialInPumpSpeedAndDirectionFromHallSensors_Fwd +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:updateDialInPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateDialInPumpSpeedAndDirectionFromHallSensors_Fwd +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:1200.0 +TEST.VALUE:DialInFlow.<>.dipLastMotorHallSensorCount:10000 +TEST.VALUE:DialInFlow.<>.dipMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD +TEST.VALUE:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:99 +TEST.VALUE:uut_prototype_stubs.getFPGADialInPumpHallSensorCount.return:11000 +TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.data:1250.0 +TEST.EXPECTED:DialInFlow.<>.dipLastMotorHallSensorCount:11000 +TEST.EXPECTED:DialInFlow.<>.dipMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:0 +TEST.END + +-- Test Case: updateDialInPumpSpeedAndDirectionFromHallSensors_NotTime +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:updateDialInPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateDialInPumpSpeedAndDirectionFromHallSensors_NotTime +TEST.VALUE:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:98 +TEST.EXPECTED:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:99 +TEST.END + +-- Test Case: updateDialInPumpSpeedAndDirectionFromHallSensors_Rev +TEST.UNIT:DialInFlow +TEST.SUBPROGRAM:updateDialInPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateDialInPumpSpeedAndDirectionFromHallSensors_Rev +TEST.VALUE:DialInFlow.<>.dialInPumpSpeedRPM.data:-1200.0 +TEST.VALUE:DialInFlow.<>.dipLastMotorHallSensorCount:12000 +TEST.VALUE:DialInFlow.<>.dipMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE +TEST.VALUE:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:99 +TEST.VALUE:uut_prototype_stubs.getFPGADialInPumpHallSensorCount.return:11000 +TEST.EXPECTED:DialInFlow.<>.dialInPumpSpeedRPM.data:-1250.0 +TEST.EXPECTED:DialInFlow.<>.dipLastMotorHallSensorCount:11000 +TEST.EXPECTED:DialInFlow.<>.dipMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE +TEST.EXPECTED:DialInFlow.<>.dipMotorSpeedCalcTimerCtr:0 +TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst =================================================================== diff -u -rd3ae2d91603ae6d2d25b9abdb220cc144cf90692 -r6e889b9aa03bd24e37b70b51e0d6795b6f58afff --- vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst (.../DIALOUTFLOW.tst) (revision d3ae2d91603ae6d2d25b9abdb220cc144cf90692) +++ vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst (.../DIALOUTFLOW.tst) (revision 6e889b9aa03bd24e37b70b51e0d6795b6f58afff) @@ -57,6 +57,7 @@ TEST.VALUE:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_REVERSE TEST.VALUE:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_REVERSE TEST.VALUE:DialOutFlow.<>.dialOutPumpMCSpeedRPM.data:-200.0 +TEST.VALUE:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE TEST.FLOW DialOutFlow.c.checkDialOutPumpDirection DialOutFlow.c.checkDialOutPumpDirection @@ -523,10 +524,15 @@ TEST.VALUE:DialOutFlow.<>.totalMeasuredUFVolumeInMl.data:504.0 TEST.VALUE:DialOutFlow.<>.dopControlTimerCounter:19 TEST.VALUE:uut_prototype_stubs.runPIController.return:0.736 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.74 +TEST.EXPECTED:DialOutFlow.<>.ptr_pwmREG3[0].TBPRD:25833 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.7367 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.referenceUFVolumeInMl.data:500.0 +TEST.EXPECTED:DialOutFlow.<>.totalMeasuredUFVolumeInMl.data:504.0 TEST.EXPECTED:DialOutFlow.<>.dopControlTimerCounter:0 TEST.EXPECTED:DialOutFlow.handleDialOutPumpControlToTargetState.return:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE -TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:19116 +TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:19031 TEST.EXPECTED:uut_prototype_stubs.runPIController.controllerID:PI_CONTROLLER_ID_ULTRAFILTRATION TEST.EXPECTED:uut_prototype_stubs.runPIController.referenceSignal:500.0 TEST.EXPECTED:uut_prototype_stubs.runPIController.measuredSignal:504.0 @@ -546,11 +552,16 @@ TEST.VALUE:DialOutFlow.<>.referenceUFVolumeInMl.data:500.0 TEST.VALUE:DialOutFlow.<>.totalMeasuredUFVolumeInMl.data:496.0 TEST.VALUE:DialOutFlow.<>.dopControlTimerCounter:19 -TEST.VALUE:uut_prototype_stubs.runPIController.return:0.763 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.76 +TEST.VALUE:uut_prototype_stubs.runPIController.return:0.764 +TEST.EXPECTED:DialOutFlow.<>.ptr_pwmREG3[0].TBPRD:25833 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.7633 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.referenceUFVolumeInMl.data:500.0 +TEST.EXPECTED:DialOutFlow.<>.totalMeasuredUFVolumeInMl.data:496.0 TEST.EXPECTED:DialOutFlow.<>.dopControlTimerCounter:0 TEST.EXPECTED:DialOutFlow.handleDialOutPumpControlToTargetState.return:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE -TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:19633 +TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:19718 TEST.EXPECTED:uut_prototype_stubs.runPIController.controllerID:PI_CONTROLLER_ID_ULTRAFILTRATION TEST.EXPECTED:uut_prototype_stubs.runPIController.referenceSignal:500.0 TEST.EXPECTED:uut_prototype_stubs.runPIController.measuredSignal:496.0 @@ -599,10 +610,16 @@ TEST.VALUE:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_REVERSE TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.VALUE:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.11 +TEST.EXPECTED:DialOutFlow.<>.ptr_pwmREG3[0].TBPRD:25833 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE +TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:400 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.1133 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.handleDialOutPumpOffState.return:DIAL_OUT_PUMP_RAMPING_UP_STATE -TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:2842 +TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:2927 TEST.END -- Test Case: handleDialOutPumpOffState_NoChange @@ -657,9 +674,13 @@ TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.26 TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.VALUE:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.25 +TEST.EXPECTED:DialOutFlow.<>.ptr_pwmREG3[0].TBPRD:25833 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.2 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.24 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.handleDialOutPumpRampingDownState.return:DIAL_OUT_PUMP_RAMPING_DOWN_STATE -TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:6458 +TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:6200 TEST.END -- Test Case: handleDialOutPumpRampingDownState_ToZero @@ -720,9 +741,13 @@ TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.38 TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.VALUE:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.39 +TEST.EXPECTED:DialOutFlow.<>.ptr_pwmREG3[0].TBPRD:25833 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.4 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.3933 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.handleDialOutPumpRampingUpState.return:DIAL_OUT_PUMP_RAMPING_UP_STATE -TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:10075 +TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:10160 TEST.END -- Test Case: handleDialOutPumpRampingUpState_StopRequested @@ -735,11 +760,46 @@ TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.4 TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.VALUE:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.39 +TEST.EXPECTED:DialOutFlow.<>.ptr_pwmREG3[0].TBPRD:25833 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.38 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.handleDialOutPumpRampingUpState.return:DIAL_OUT_PUMP_RAMPING_DOWN_STATE -TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:10075 +TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:9817 TEST.END +-- Subprogram: homeDialOutPump + +-- Test Case: homeDialOutPump_NominalPath +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:homeDialOutPump +TEST.NEW +TEST.NAME:homeDialOutPump_NominalPath +TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE +TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.VALUE:DialOutFlow.<>.dopStopAtHomePosition:0 +TEST.VALUE:DialOutFlow.<>.dopHomeStartTime:0 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:100000 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP +TEST.EXPECTED:DialOutFlow.<>.dopStopAtHomePosition:1 +TEST.EXPECTED:DialOutFlow.<>.dopHomeStartTime:100000 +TEST.END + +-- Test Case: homeDialOutPump_PumpIsRunning +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:homeDialOutPump +TEST.NEW +TEST.NAME:homeDialOutPump_PumpIsRunning +TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.VALUE:DialOutFlow.<>.dopStopAtHomePosition:0 +TEST.VALUE:DialOutFlow.<>.dopHomeStartTime:0 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.<>.dopStopAtHomePosition:0 +TEST.EXPECTED:DialOutFlow.<>.dopHomeStartTime:0 +TEST.END + -- Subprogram: initDialOutFlow -- Test Case: initDialOutFlow_NominalPath @@ -887,8 +947,8 @@ TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:DialOutFlow.<>.isDialOutPumpOn:1 TEST.VALUE:DialOutFlow.<>.lastGivenRate:400 -TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.766624 -TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.766624 +TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.7 +TEST.VALUE:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.7 TEST.VALUE:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD TEST.VALUE:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_FORWARD TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP @@ -898,8 +958,8 @@ TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_RAMPING_UP_STATE TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:450 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.85721 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.766624 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.762558 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.7 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP @@ -938,11 +998,17 @@ TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.dir:MOTOR_DIR_FORWARD TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE +TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:0 TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:400 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.773075 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.688941 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.0 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_REVERSE TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_OPEN_LOOP +TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.flowRate:400 +TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.dir:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.return:1 TEST.END @@ -964,11 +1030,17 @@ TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.dir:MOTOR_DIR_FORWARD TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_RAMPING_DOWN_STATE +TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:1 TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:200 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.436538 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.39447 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.7 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.flowRate:200 +TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.dir:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.return:1 TEST.END @@ -991,7 +1063,7 @@ TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_RAMPING_UP_STATE TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:400 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.773075 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.688941 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP @@ -1017,7 +1089,7 @@ TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_RAMPING_UP_STATE TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:400 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.773075 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.688941 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_OPEN_LOOP @@ -1043,7 +1115,7 @@ TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_RAMPING_DOWN_STATE TEST.EXPECTED:DialOutFlow.<>.lastGivenRate:200 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.436538 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePct:0.39447 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP @@ -1130,6 +1202,51 @@ TEST.EXPECTED:uut_prototype_stubs.resetPIController.initialControlSignal:0.12 TEST.END +-- Subprogram: signalDialOutPumpRotorHallSensor + +-- Test Case: signalDialOutPumpRotorHallSensor_Homing +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:signalDialOutPumpRotorHallSensor +TEST.NEW +TEST.NAME:signalDialOutPumpRotorHallSensor_Homing +TEST.VALUE:DialOutFlow.<>.ptr_mibspiREG1:<> +TEST.VALUE:DialOutFlow.<>.ptr_pwmREG3:<> +TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialOutFlow.<>.isDialOutPumpOn:1 +TEST.VALUE:DialOutFlow.<>.dialOutPumpRotorSpeedRPM.data:50.0 +TEST.VALUE:DialOutFlow.<>.dopRotorRevStartTime:100000 +TEST.VALUE:DialOutFlow.<>.dopStopAtHomePosition:1 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:101000 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1000 +TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:0 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpRotorSpeedRPM.data:60.0 +TEST.EXPECTED:DialOutFlow.<>.dopRotorRevStartTime:101000 +TEST.EXPECTED:DialOutFlow.<>.dopStopAtHomePosition:0 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.startMSCount:100000 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:101000 +TEST.END + +-- Test Case: signalDialOutPumpRotorHallSensor_NotHoming +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:signalDialOutPumpRotorHallSensor +TEST.NEW +TEST.NAME:signalDialOutPumpRotorHallSensor_NotHoming +TEST.VALUE:DialOutFlow.<>.ptr_mibspiREG1:<> +TEST.VALUE:DialOutFlow.<>.ptr_pwmREG3:<> +TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE +TEST.VALUE:DialOutFlow.<>.isDialOutPumpOn:1 +TEST.VALUE:DialOutFlow.<>.dialOutPumpRotorSpeedRPM.data:50.0 +TEST.VALUE:DialOutFlow.<>.dopRotorRevStartTime:100000 +TEST.VALUE:DialOutFlow.<>.dopStopAtHomePosition:0 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:101000 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1000 +TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:1 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpRotorSpeedRPM.data:60.0 +TEST.EXPECTED:DialOutFlow.<>.dopRotorRevStartTime:101000 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.startMSCount:100000 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:101000 +TEST.END + -- Subprogram: stopDialOutPump -- Test Case: stopDialOutPump_NominalPath @@ -1682,3 +1799,48 @@ TEST.EXPECTED:DialOutFlow.<>.dialOutPumpSpeedRPM.override:0x0 TEST.EXPECTED:DialOutFlow.testSetMeasuredDialOutPumpSpeedOverride.return:0 TEST.END + +-- Subprogram: updateDialOutPumpSpeedAndDirectionFromHallSensors + +-- Test Case: updateDialOutPumpSpeedAndDirectionFromHallSensors_NoUpdate +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:updateDialOutPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateDialOutPumpSpeedAndDirectionFromHallSensors_NoUpdate +TEST.VALUE:DialOutFlow.<>.dialOutPumpSpeedRPM.data:300.0 +TEST.VALUE:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:98 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpSpeedRPM.data:300.0 +TEST.EXPECTED:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:99 +TEST.END + +-- Test Case: updateDialOutPumpSpeedAndDirectionFromHallSensors_Update_Fwd +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:updateDialOutPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateDialOutPumpSpeedAndDirectionFromHallSensors_Update_Fwd +TEST.VALUE:DialOutFlow.<>.dialOutPumpSpeedRPM.data:1500.0 +TEST.VALUE:DialOutFlow.<>.dopLastMotorHallSensorCount:2000 +TEST.VALUE:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD +TEST.VALUE:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:99 +TEST.VALUE:uut_prototype_stubs.getFPGADialOutPumpHallSensorCount.return:3400 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpSpeedRPM.data:1750.0 +TEST.EXPECTED:DialOutFlow.<>.dopLastMotorHallSensorCount:3400 +TEST.EXPECTED:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_FORWARD +TEST.EXPECTED:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:0 +TEST.END + +-- Test Case: updateDialOutPumpSpeedAndDirectionFromHallSensors_Update_Rev +TEST.UNIT:DialOutFlow +TEST.SUBPROGRAM:updateDialOutPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateDialOutPumpSpeedAndDirectionFromHallSensors_Update_Rev +TEST.VALUE:DialOutFlow.<>.dialOutPumpSpeedRPM.data:-1500.0 +TEST.VALUE:DialOutFlow.<>.dopLastMotorHallSensorCount:3400 +TEST.VALUE:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE +TEST.VALUE:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:99 +TEST.VALUE:uut_prototype_stubs.getFPGADialOutPumpHallSensorCount.return:2000 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpSpeedRPM.data:-1750.0 +TEST.EXPECTED:DialOutFlow.<>.dopLastMotorHallSensorCount:2000 +TEST.EXPECTED:DialOutFlow.<>.dopMotorDirectionFromHallSensors:MOTOR_DIR_REVERSE +TEST.EXPECTED:DialOutFlow.<>.dopMotorSpeedCalcTimerCtr:0 +TEST.END Index: vectorcast/Hercules_RM46_HD_Project/project.db =================================================================== diff -u -rd3596da054513ebf85d4114221eddbe875d1f1a1 -r6e889b9aa03bd24e37b70b51e0d6795b6f58afff Binary files differ