Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS.tst =================================================================== diff -u -r51147222d369a3023a11b2ee675178d058ffaf46 -r448d9b2eba125f5e1d749a6ed588287ec22de9b9 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS.tst (.../INT_DIALYSIS.tst) (revision 51147222d369a3023a11b2ee675178d058ffaf46) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS.tst (.../INT_DIALYSIS.tst) (revision 448d9b2eba125f5e1d749a6ed588287ec22de9b9) @@ -24,7 +24,7 @@ TEST.NAME:getUltrafiltrationVolumeCollected TEST.VALUE:Dialysis.<>.refUFVolume:100.0 TEST.VALUE:Dialysis.<>.measUFVolume:100.0 -TEST.VALUE:Dialysis.<>.resStartVolume:0.0 +TEST.VALUE:Dialysis.<>.resStartVolume[DG_RESERVOIR_1]:0.0 TEST.VALUE:Dialysis.<>.measUFVolumeFromPriorReservoirs:0.0 TEST.VALUE:Dialysis.<>.uFTimeMS:100000 TEST.VALUE:Dialysis.<>.lastUFTimeStamp:99000 @@ -41,7 +41,7 @@ TEST.VALUE:ModeTreatment.<>.treatmentTimeMS:100000 TEST.VALUE:ModeTreatment.<>.lastTreatmentTimeStamp:99000 TEST.VALUE:ModeTreatment.<>.treatmentParamsRangesBroadcastTimerCtr:1199 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minUFVol:100 +TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minUFVol:110.0 TEST.EXPECTED:ModeTreatment.<>.treatmentParamsRangesBroadcastTimerCtr:0 TEST.END @@ -69,20 +69,59 @@ -- Subprogram: handleTreatmentDialysisState --- Test Case: execDialysis +-- Test Case: dialysis TEST.UNIT:ModeTreatment TEST.SUBPROGRAM:handleTreatmentDialysisState TEST.NEW -TEST.NAME:execDialysis +TEST.NAME:dialysis +TEST.VALUE:Dialysis.<>.currentDialysisState:DIALYSIS_UF_STATE +TEST.VALUE:Dialysis.<>.currentUFState:UF_RUNNING_STATE +TEST.VALUE:Dialysis.<>.refUFVolume:40.0 +TEST.VALUE:Dialysis.<>.measUFVolume:40.0 +TEST.VALUE:Dialysis.<>.resStartVolume[DG_RESERVOIR_2]:1700.0 +TEST.VALUE:Dialysis.<>.resFinalVolume[DG_RESERVOIR_2]:1740.0 +TEST.VALUE:Dialysis.<>.measUFVolumeFromPriorReservoirs:0.0 +TEST.VALUE:Dialysis.<>.uFTimeMS:6000 +TEST.VALUE:Dialysis.<>.lastUFTimeStamp:999000 +TEST.VALUE:Dialysis.<>.maxUFVolumeML:600.0 +TEST.VALUE:Dialysis.<>.setUFRate:10.0 +TEST.VALUE:uut_prototype_stubs.getDGActiveReservoir.return:DG_RESERVOIR_2 +TEST.VALUE:uut_prototype_stubs.getLoadCellWeightInGrams.return:1741.0 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:1000000 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1000 +TEST.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE +TEST.VALUE:ModeTreatment.<>.treatmentTimeMS:3000 +TEST.VALUE:ModeTreatment.<>.lastTreatmentTimeStamp:999000 +TEST.EXPECTED:Dialysis.<>.currentDialysisState:DIALYSIS_UF_STATE +TEST.EXPECTED:Dialysis.<>.currentUFState:UF_RUNNING_STATE +TEST.EXPECTED:Dialysis.<>.refUFVolume:40.1667 +TEST.EXPECTED:Dialysis.<>.measUFVolume:41.0 +TEST.EXPECTED:Dialysis.<>.resFinalVolume[DG_RESERVOIR_2]:1741.0 +TEST.EXPECTED:Dialysis.<>.uFTimeMS:7000 +TEST.EXPECTED:Dialysis.<>.lastUFTimeStamp:1000000 +TEST.EXPECTED:uut_prototype_stubs.setDialOutUFVolumes.refVol:40.1667 +TEST.EXPECTED:uut_prototype_stubs.setDialOutUFVolumes.totVol:41.0 +TEST.EXPECTED:uut_prototype_stubs.getLoadCellWeightInGrams.loadCellID:2 +TEST.EXPECTED:ModeTreatment.<>.treatmentTimeMS:4000 +TEST.EXPECTED:ModeTreatment.<>.lastTreatmentTimeStamp:1000000 +TEST.END + +-- Test Case: startDialysis +TEST.UNIT:ModeTreatment +TEST.SUBPROGRAM:handleTreatmentDialysisState +TEST.NEW +TEST.NAME:startDialysis TEST.VALUE:Dialysis.<>.currentDialysisState:DIALYSIS_START_STATE TEST.VALUE:Dialysis.<>.currentUFState:UF_START_STATE -TEST.VALUE:Dialysis.<>.resStartVolume:0.0 -TEST.VALUE:uut_prototype_stubs.getLoadCellWeightInGrams.return:1500.0 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:1000000 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1000 TEST.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE +TEST.VALUE:ModeTreatment.<>.treatmentTimeMS:3000 +TEST.VALUE:ModeTreatment.<>.lastTreatmentTimeStamp:999000 TEST.EXPECTED:Dialysis.<>.currentDialysisState:DIALYSIS_UF_STATE TEST.EXPECTED:Dialysis.<>.currentUFState:UF_START_STATE -TEST.EXPECTED:Dialysis.<>.resStartVolume:1500.0 -TEST.EXPECTED:uut_prototype_stubs.getLoadCellWeightInGrams.loadCellID:0 +TEST.EXPECTED:ModeTreatment.<>.treatmentTimeMS:4000 +TEST.EXPECTED:ModeTreatment.<>.lastTreatmentTimeStamp:1000000 TEST.END -- Subprogram: handleTreatmentStartState @@ -105,13 +144,13 @@ TEST.EXPECTED:Dialysis.<>.lastUFTimeStamp:1000 TEST.EXPECTED:Dialysis.<>.setBloodFlowRate:300 TEST.EXPECTED:Dialysis.<>.setDialysateFlowRate:300 -TEST.EXPECTED:Dialysis.<>.maxUFVolumeML:300.0 +TEST.EXPECTED:Dialysis.<>.maxUFVolumeML:600.0 TEST.EXPECTED:Dialysis.<>.setUFRate:10.0 TEST.EXPECTED:uut_prototype_stubs.setBloodPumpTargetFlowRate.flowRate:300 TEST.EXPECTED:uut_prototype_stubs.setBloodPumpTargetFlowRate.dir:MOTOR_DIR_FORWARD TEST.EXPECTED:uut_prototype_stubs.setDialInPumpTargetFlowRate.flowRate:300 TEST.EXPECTED:uut_prototype_stubs.setDialInPumpTargetFlowRate.dir:MOTOR_DIR_FORWARD -TEST.EXPECTED:uut_prototype_stubs.setDialOutPumpTargetRate.flowRate:190 +TEST.EXPECTED:uut_prototype_stubs.setDialOutPumpTargetRate.flowRate:310 TEST.EXPECTED:uut_prototype_stubs.setDialOutPumpTargetRate.dir:MOTOR_DIR_FORWARD TEST.EXPECTED:uut_prototype_stubs.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:uut_prototype_stubs.setDialOutUFVolumes.refVol:0.0 @@ -132,7 +171,7 @@ TEST.VALUE:Dialysis.<>.currentUFState:NUM_OF_UF_STATES TEST.VALUE:Dialysis.<>.refUFVolume:9.0 TEST.VALUE:Dialysis.<>.measUFVolume:9.0 -TEST.VALUE:Dialysis.<>.resStartVolume:9.0 +TEST.VALUE:Dialysis.<>.resStartVolume[DG_RESERVOIR_1]:0.0 TEST.VALUE:Dialysis.<>.measUFVolumeFromPriorReservoirs:9.0 TEST.VALUE:Dialysis.<>.uFTimeMS:9 TEST.VALUE:Dialysis.<>.lastUFTimeStamp:9 @@ -144,7 +183,7 @@ TEST.EXPECTED:Dialysis.<>.currentUFState:UF_START_STATE TEST.EXPECTED:Dialysis.<>.refUFVolume:0.0 TEST.EXPECTED:Dialysis.<>.measUFVolume:0.0 -TEST.EXPECTED:Dialysis.<>.resStartVolume:0.0 +TEST.EXPECTED:Dialysis.<>.resStartVolume[DG_RESERVOIR_1]:0.0 TEST.EXPECTED:Dialysis.<>.measUFVolumeFromPriorReservoirs:0.0 TEST.EXPECTED:Dialysis.<>.uFTimeMS:0 TEST.EXPECTED:Dialysis.<>.lastUFTimeStamp:0 Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS_cba.cvr =================================================================== diff -u -r51147222d369a3023a11b2ee675178d058ffaf46 -r448d9b2eba125f5e1d749a6ed588287ec22de9b9 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS_cba.cvr (.../INT_DIALYSIS_cba.cvr) (revision 51147222d369a3023a11b2ee675178d058ffaf46) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS_cba.cvr (.../INT_DIALYSIS_cba.cvr) (revision 448d9b2eba125f5e1d749a6ed588287ec22de9b9) @@ -70,6 +70,7 @@ RESULT.CBA.NOTES Coverage for private functions not required. Some functions not yet called. +Some functions not yet fully implemented. RESULT.CBA.NOTES_END RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Modes/Dialysis.c RESULT.CBA.FUNCTION: handleDialysisSolutionInfusionState @@ -146,25 +147,47 @@ RESULT.CBA.CONTEXT_AFTER_END RESULT.CBA.MATCHING_LINE_INDEX: 1 RESULT.CBA.LINE.END -RESULT.CBA.FUNCTION: transitionToDialysis +RESULT.CBA.FUNCTION: setFinalReservoirVolume RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 RESULT.CBA.COVERAGE: FN RESULT.CBA.CONTEXT: { RESULT.CBA.CONTEXT_AFTER: -// TODO - anything needed here? -} +DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir(); +DG_RESERVOIR_ID_T inactiveRes; RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.MATCHING_LINE_INDEX: 1 RESULT.CBA.LINE.END -RESULT.CBA.FUNCTION: updateUFVolumes +RESULT.CBA.FUNCTION: setStartReservoirVolume RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 RESULT.CBA.COVERAGE: FN RESULT.CBA.CONTEXT: { RESULT.CBA.CONTEXT_AFTER: -F32 latestResVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_1_PRIMARY ); // TODO - just res 1 for now - add reservoir switching, mgmt later. -// calculate UF volumes and provide to dialysate outlet pump controller +DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir(); +DG_RESERVOIR_ID_T inactiveRes; RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.MATCHING_LINE_INDEX: 1 RESULT.CBA.LINE.END +RESULT.CBA.FUNCTION: signalReservoirsSwitched +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir(); +DG_RESERVOIR_ID_T inactiveRes = ( activeRes == DG_RESERVOIR_1 ? DG_RESERVOIR_2 : DG_RESERVOIR_1 ); +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END +RESULT.CBA.FUNCTION: transitionToDialysis +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +// TODO - anything needed here? +} +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END RESULT.CBA.END IMPORT.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.env =================================================================== diff -u -r55a6adaf81175d25c1d9cc4c96d7dfda84eede16 -r448d9b2eba125f5e1d749a6ed588287ec22de9b9 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.env (.../INT_FPGA.env) (revision 55a6adaf81175d25c1d9cc4c96d7dfda84eede16) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.env (.../INT_FPGA.env) (revision 448d9b2eba125f5e1d749a6ed588287ec22de9b9) @@ -2,6 +2,7 @@ ENVIRO.NAME:INT_FPGA ENVIRO.STUB_BY_FUNCTION:BloodFlow ENVIRO.STUB_BY_FUNCTION:DialInFlow +ENVIRO.STUB_BY_FUNCTION:DialOutFlow ENVIRO.STUB_BY_FUNCTION:FPGA ENVIRO.STUB_BY_FUNCTION:Interrupts ENVIRO.STUB_BY_FUNCTION:ModeInitPOST @@ -14,8 +15,6 @@ ENVIRO.LIBRARY_STUBS: ENVIRO.UNIT_PREFIX_USER_CODE: ENVIRO.UNIT_PREFIX_USER_CODE_FILE:BloodFlow - - #include "reg_can.h" #include "reg_etpwm.h" canBASE_t* ptr_canREG3; @@ -27,8 +26,6 @@ ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE: ENVIRO.UNIT_PREFIX_USER_CODE_FILE:DialInFlow - - #include "reg_mibspi.h" #include "reg_etpwm.h" mibspiBASE_t* ptr_mibspiREG5; @@ -37,7 +34,40 @@ #undef etpwmREG2 #define mibspiREG5 ptr_mibspiREG5 #define etpwmREG2 ptr_pwmREG2 + ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE: +ENVIRO.UNIT_PREFIX_USER_CODE_FILE:DialOutFlow +#include "reg_mibspi.h" +#include "reg_etpwm.h" +mibspiBASE_t* ptr_mibspiREG1; +etpwmBASE_t* ptr_pwmREG3; +#undef mibspiREG1 +#undef etpwmREG3 +#define mibspiREG1 ptr_mibspiREG1 +#define etpwmREG3 ptr_pwmREG3 + +ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE: + +ENVIRO.UNIT_PREFIX_USER_CODE_FILE:Interrupts +#include "reg_can.h" +#include "reg_sci.h" +#include "reg_lin.h" +#include "reg_het.h" + +canBASE_t* ptr_canREG1; +sciBASE_t* ptr_sciREG; +sciBASE_t* ptr_scilinREG; +hetBASE_t* ptr_hetREG1; +#undef canREG1 +#undef sciREG +#undef scilinREG +#undef hetREG1 +#define canREG1 ptr_canREG1 +#define sciREG ptr_sciREG +#define scilinREG ptr_scilinREG +#define hetREG1 ptr_hetREG1 + +ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE: ENVIRO.END_UNIT_PREFIX_USER_CODE: ENVIRO.COVERAGE_TYPE: FUNCTION ENVIRO.WHITE_BOX: YES @@ -49,4 +79,6 @@ ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Modes/ ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Services/ ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Tasks/ +ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/FWCommon/ +ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/Common/ ENVIRO.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.tst =================================================================== diff -u -r6a6c064bdab77b9b42d25910d94da55812d00ffa -r448d9b2eba125f5e1d749a6ed588287ec22de9b9 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.tst (.../INT_FPGA.tst) (revision 6a6c064bdab77b9b42d25910d94da55812d00ffa) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA.tst (.../INT_FPGA.tst) (revision 448d9b2eba125f5e1d749a6ed588287ec22de9b9) @@ -2,7 +2,7 @@ -- Test Case Script -- -- Environment : INT_FPGA --- Unit(s) Under Test: BloodFlow DialInFlow FPGA Interrupts ModeInitPOST PresOccl TaskPriority sys_main +-- Unit(s) Under Test: BloodFlow DialInFlow DialOutFlow FPGA Interrupts ModeInitPOST PresOccl TaskPriority sys_main -- -- Script Features TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING @@ -116,12 +116,19 @@ TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodOcclusionData:200 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateInOcclusionData:300 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateOutOcclusionData:400 -TEST.VALUE:FPGA.<>.fpgaSensorReadings.venousPressure:100 -TEST.EXPECTED:PresOccl.<>.arterialPressure.data:0.0 -TEST.EXPECTED:PresOccl.<>.venousPressure.data:0.0 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.adc1Channel0:0x800100 +TEST.VALUE:FPGA.<>.fpgaSensorReadings.venousPressure:12000 +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: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.END -- Unit: TaskPriority @@ -147,113 +154,42 @@ TEST.SUBPROGRAM:initSoftware TEST.NEW TEST.NAME:initFPGA -TEST.IMPORT_FAILURES: -(E) Errors from previous script import(s) - >>> (E) @LINE: 92 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterCommStatus:1 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterCommStatus - >>> (E) @LINE: 93 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterFrameCount:1 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterFrameCount - >>> (E) @LINE: 96 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowAvg:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowAvg - >>> (E) @LINE: 97 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterSoundSpeed:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterSoundSpeed - >>> (E) @LINE: 98 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterAccFlowData:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterAccFlowData - >>> (E) @LINE: 99 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterSignalStrength:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterSignalStrength - >>> (E) @LINE: 100 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterSensorID:1 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterSensorID - >>> (E) @LINE: 101 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterCommStatus:1 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterCommStatus - >>> (E) @LINE: 102 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterFrameCount:1 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterFrameCount - >>> (E) @LINE: 105 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowAvg:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowAvg - >>> (E) @LINE: 106 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterSoundSpeed:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterSoundSpeed - >>> (E) @LINE: 107 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterAccFlowData:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterAccFlowData - >>> (E) @LINE: 108 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterSignalStrength:1.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterSignalStrength - >>> (E) @LINE: 109 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterSensorID:1 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterSensorID - >>> (E) @LINE: 115 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterCommStatus:0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterCommStatus - >>> (E) @LINE: 116 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterFrameCount:0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterFrameCount - >>> (E) @LINE: 119 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowAvg:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowAvg - >>> (E) @LINE: 120 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterSoundSpeed:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterSoundSpeed - >>> (E) @LINE: 121 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterAccFlowData:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterAccFlowData - >>> (E) @LINE: 122 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterSignalStrength:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterSignalStrength - >>> (E) @LINE: 123 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterSensorID:0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: bloodFlowMeterSensorID - >>> (E) @LINE: 124 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterCommStatus:0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterCommStatus - >>> (E) @LINE: 125 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterFrameCount:0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterFrameCount - >>> (E) @LINE: 128 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowAvg:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowAvg - >>> (E) @LINE: 129 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterSoundSpeed:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterSoundSpeed - >>> (E) @LINE: 130 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterAccFlowData:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterAccFlowData - >>> (E) @LINE: 131 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterSignalStrength:0.0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterSignalStrength - >>> (E) @LINE: 132 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterSensorID:0 - >>> >>> Expected a field name from the record type FPGA_SENSORS_T - >>> >>> Read: dialysateFlowMeterSensorID -TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.ptr_canREG3:<> TEST.VALUE:BloodFlow.<>.ptr_pwmREG1:<> TEST.VALUE:DialInFlow.<>.ptr_mibspiREG5:<> TEST.VALUE:DialInFlow.<>.ptr_pwmREG2:<> +TEST.VALUE:DialOutFlow.<>.ptr_mibspiREG1:<> +TEST.VALUE:DialOutFlow.<>.ptr_pwmREG3:<> TEST.VALUE:FPGA.<>.fpgaHeader.fpgaId:1 TEST.VALUE:FPGA.<>.fpgaHeader.fpgaRev:1 -TEST.VALUE:FPGA.<>.fpgaHeader.fpgaControl:1 TEST.VALUE:FPGA.<>.fpgaHeader.fpgaStatus:1 +TEST.VALUE:FPGA.<>.fpgaHeader.fpgaDiag:1 +TEST.VALUE:FPGA.<>.fpgaHeader.adc1Control:1 +TEST.VALUE:FPGA.<>.fpgaHeader.flowDAQ1Cmd:1 +TEST.VALUE:FPGA.<>.fpgaHeader.flowDAQ2Cmd:1 +TEST.VALUE:FPGA.<>.fpgaHeader.accelCmd:1 +TEST.VALUE:FPGA.<>.fpgaHeader.fpgaRevMajor:1 +TEST.VALUE:FPGA.<>.fpgaHeader.fpgaRevLab:1 +TEST.VALUE:FPGA.<>.fpgaHeader.fpgaSensorTest:1 +TEST.VALUE:FPGA.<>.fpgaHeader.fpgaPIDControl:1 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowLast:1.0 TEST.VALUE:FPGA.<>.fpgaSensorReadings.bloodFlowMeterDeviceStatus:1 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowLast:1.0 TEST.VALUE:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterDeviceStatus:1 -TEST.VALUE:FPGA.<>.fpgaActuatorSetPoints.bloodValveSetState:1 TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaId:0 TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaRev:0 -TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaControl:0 TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaStatus:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaDiag:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.adc1Control:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.flowDAQ1Cmd:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.flowDAQ2Cmd:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.accelCmd:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaRevMajor:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaRevLab:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaSensorTest:0 +TEST.EXPECTED:FPGA.<>.fpgaHeader.fpgaPIDControl:0 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowLast:0.0 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.bloodFlowMeterDeviceStatus:0 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowLast:0.0 TEST.EXPECTED:FPGA.<>.fpgaSensorReadings.dialysateFlowMeterDeviceStatus:0 -TEST.EXPECTED:FPGA.<>.fpgaActuatorSetPoints.bloodValveSetState:0 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA_cba.cvr =================================================================== diff -u -r51147222d369a3023a11b2ee675178d058ffaf46 -r448d9b2eba125f5e1d749a6ed588287ec22de9b9 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA_cba.cvr (.../INT_FPGA_cba.cvr) (revision 51147222d369a3023a11b2ee675178d058ffaf46) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_FPGA/INT_FPGA_cba.cvr (.../INT_FPGA_cba.cvr) (revision 448d9b2eba125f5e1d749a6ed588287ec22de9b9) @@ -67,7 +67,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:12 -IMPORT.SOURCE.ORIG_FILENAME:PresOccl.c +IMPORT.SOURCE.ORIG_FILENAME:DialOutFlow.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -89,7 +89,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:13 -IMPORT.SOURCE.ORIG_FILENAME:ModeInitPOST.c +IMPORT.SOURCE.ORIG_FILENAME:PresOccl.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:FPGA.c +IMPORT.SOURCE.ORIG_FILENAME:ModeInitPOST.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -133,7 +133,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:15 -IMPORT.SOURCE.ORIG_FILENAME:Interrupts.c +IMPORT.SOURCE.ORIG_FILENAME:FPGA.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -155,7 +155,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:16 -IMPORT.SOURCE.ORIG_FILENAME:TaskPriority.c +IMPORT.SOURCE.ORIG_FILENAME:Interrupts.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -177,6 +177,28 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:17 +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:18 IMPORT.SOURCE.ORIG_FILENAME:sys_main.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function @@ -204,6 +226,56 @@ Some functions not yet called. RESULT.CBA.NOTES_END RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Services/FPGA.c +RESULT.CBA.FUNCTION: getFPGABloodFlowSignalStrength +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +return fpgaSensorReadings.bloodFlowSignalStrength; +} +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END +RESULT.CBA.FUNCTION: getFPGABloodPumpHallSensorStatus +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +return fpgaSensorReadings.bloodPumpHallSensorStatus; +} +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END +RESULT.CBA.FUNCTION: getFPGADialInPumpHallSensorStatus +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +return fpgaSensorReadings.dialInPumpHallSensorStatus; +} +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END +RESULT.CBA.FUNCTION: getFPGADialOutPumpHallSensorStatus +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +return fpgaSensorReadings.dialOutPumpSensorStatus; +} +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END +RESULT.CBA.FUNCTION: getFPGADialysateFlowSignalStrength +RESULT.CBA.LINE.BEGIN +RESULT.CBA.LINE: 0 +RESULT.CBA.COVERAGE: FN +RESULT.CBA.CONTEXT: { +RESULT.CBA.CONTEXT_AFTER: +return fpgaSensorReadings.dialysateFlowSignalStrength; +} +RESULT.CBA.CONTEXT_AFTER_END +RESULT.CBA.LINE.END RESULT.CBA.FUNCTION: getFPGAStatus RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 @@ -246,16 +318,6 @@ U16 crc; RESULT.CBA.CONTEXT_AFTER_END RESULT.CBA.LINE.END -RESULT.CBA.FUNCTION: setFPGAControl -RESULT.CBA.LINE.BEGIN -RESULT.CBA.LINE: 0 -RESULT.CBA.COVERAGE: FN -RESULT.CBA.CONTEXT: { -RESULT.CBA.CONTEXT_AFTER: -fpgaHeader.fpgaControl = ctrl; -} -RESULT.CBA.CONTEXT_AFTER_END -RESULT.CBA.LINE.END RESULT.CBA.FUNCTION: setupDMAForWriteCmd RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.tst =================================================================== diff -u -r03470d87fbf22b8c94ce6018533d6ed2b03f0500 -r448d9b2eba125f5e1d749a6ed588287ec22de9b9 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.tst (.../INT_MODETREATMENT.tst) (revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.tst (.../INT_MODETREATMENT.tst) (revision 448d9b2eba125f5e1d749a6ed588287ec22de9b9) @@ -42,11 +42,11 @@ TEST.NAME:transitionToTreatmentModeAndexecTreatmentMode TEST.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_RECIRC_SETUP_STATE TEST.VALUE:ModeTreatment.<>.treatmentParamsRangesBroadcastTimerCtr:9 -TEST.VALUE:OperationModes.<>.modeRequest[7]:1 +TEST.VALUE:OperationModes.<>.modeRequest[6]:1 TEST.VALUE:OperationModes.<>.currentMode:MODE_PRET TEST.EXPECTED:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE TEST.EXPECTED:ModeTreatment.<>.treatmentParamsRangesBroadcastTimerCtr:0 -TEST.EXPECTED:OperationModes.<>.modeRequest[7]:0 +TEST.EXPECTED:OperationModes.<>.modeRequest[6]:0 TEST.EXPECTED:OperationModes.<>.currentMode:MODE_TREA TEST.END