Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_AIRTRAP/INT_AIRTRAP.tst =================================================================== diff -u -r29ac7317120235a30ffdd294d47529a4e3b4936a -r26bfcff7c27a1748a6d29f0ee32dd59a2a26d417 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_AIRTRAP/INT_AIRTRAP.tst (.../INT_AIRTRAP.tst) (revision 29ac7317120235a30ffdd294d47529a4e3b4936a) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_AIRTRAP/INT_AIRTRAP.tst (.../INT_AIRTRAP.tst) (revision 26bfcff7c27a1748a6d29f0ee32dd59a2a26d417) @@ -186,7 +186,7 @@ TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[4]:1 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[5]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[6]:0 -TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[7]:00 +TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[7]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[8]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[9]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[10]:0 @@ -210,13 +210,64 @@ TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[4]:1 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[5]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[6]:0 -TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[7]:00 +TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[7]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[8]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[9]:0 TEST.VALUE:SystemCommMessages.handleSetAirTrapLevelSensorOverrideRequest.message[0].payload[10]:0 TEST.EXPECTED:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_LOWER].ovData:1 TEST.END +-- Subprogram: handleSetRawAirTrapLevelSensorOverrideRequest + +-- Test Case: handleSetRawAirTrapLevelSensorOverrideRequest_reset +TEST.UNIT:SystemCommMessages +TEST.SUBPROGRAM:handleSetRawAirTrapLevelSensorOverrideRequest +TEST.NEW +TEST.NAME:handleSetRawAirTrapLevelSensorOverrideRequest_reset +TEST.VALUE:AirTrap.<>.rawAirTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].ovInitData:2 +TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message:<> +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].hdr.payloadLen:12 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[0]:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[1]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[2]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[3]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[4]:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[5]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[6]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[7]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[8]:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[9]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[10]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[11]:0 +TEST.EXPECTED:AirTrap.<>.rawAirTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].ovData:2 +TEST.EXPECTED:AirTrap.<>.rawAirTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].override:0x0 +TEST.END + +-- Test Case: handleSetRawAirTrapLevelSensorOverrideRequest_set +TEST.UNIT:SystemCommMessages +TEST.SUBPROGRAM:handleSetRawAirTrapLevelSensorOverrideRequest +TEST.NEW +TEST.NAME:handleSetRawAirTrapLevelSensorOverrideRequest_set +TEST.VALUE:SystemCommMessages.<>.testerLoggedIn:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message:<> +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].hdr.payloadLen:12 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[0]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[1]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[2]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[3]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[4]:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[5]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[6]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[7]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[8]:1 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[9]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[10]:0 +TEST.VALUE:SystemCommMessages.handleSetRawAirTrapLevelSensorOverrideRequest.message[0].payload[11]:0 +TEST.EXPECTED:AirTrap.<>.rawAirTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].ovData:1 +TEST.EXPECTED:AirTrap.<>.rawAirTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].override:0xCCC33C33 +TEST.END + -- Unit: TaskGeneral -- Subprogram: taskGeneral Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_AIRTRAP/INT_AIRTRAP_cba.cvr =================================================================== diff -u -r29ac7317120235a30ffdd294d47529a4e3b4936a -r26bfcff7c27a1748a6d29f0ee32dd59a2a26d417 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_AIRTRAP/INT_AIRTRAP_cba.cvr (.../INT_AIRTRAP_cba.cvr) (revision 29ac7317120235a30ffdd294d47529a4e3b4936a) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_AIRTRAP/INT_AIRTRAP_cba.cvr (.../INT_AIRTRAP_cba.cvr) (revision 26bfcff7c27a1748a6d29f0ee32dd59a2a26d417) @@ -265,7 +265,7 @@ RESULT.CBA.CONTEXT: { RESULT.CBA.CONTEXT_AFTER: AIR_TRAP_STATE_T result = AIR_TRAP_VALVE_CLOSED_STATE; -// Transition to manual valve control state when requested +// Air pump stop time based on the blood flow rate RESULT.CBA.CONTEXT_AFTER_END RESULT.CBA.MATCHING_LINE_INDEX: 1 RESULT.CBA.LINE.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_BATTERY/INT_BATTERY.tst =================================================================== diff -u -re254c20e850be27e0f21c33bed1a80c8f0e62dd5 -r26bfcff7c27a1748a6d29f0ee32dd59a2a26d417 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_BATTERY/INT_BATTERY.tst (.../INT_BATTERY.tst) (revision e254c20e850be27e0f21c33bed1a80c8f0e62dd5) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_BATTERY/INT_BATTERY.tst (.../INT_BATTERY.tst) (revision 26bfcff7c27a1748a6d29f0ee32dd59a2a26d417) @@ -27,7 +27,7 @@ TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:0 TEST.VALUE:uut_prototype_stubs.isDGCommunicating.return:1 TEST.VALUE:uut_prototype_stubs.isPOSTPassed.return:1 -TEST.VALUE:uut_prototype_stubs.getDGVersion.return.compatibilityRev:10 +TEST.VALUE:uut_prototype_stubs.getDGVersion.return.compatibilityRev:11 TEST.VALUE:ModeStandby.<>.currentStandbyState:STANDBY_WAIT_FOR_TREATMENT_STATE TEST.VALUE:ModeStandby.signalUserInitiateTreatment.return:1 TEST.EXPECTED:ModeStandby.signalUserInitiateTreatment.return:0 Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.tst =================================================================== diff -u -r105cc6824fa5e9142bafb27746a2e6f71dbeec98 -r26bfcff7c27a1748a6d29f0ee32dd59a2a26d417 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.tst (.../INT_MODETREATMENTPARAMS.tst) (revision 105cc6824fa5e9142bafb27746a2e6f71dbeec98) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.tst (.../INT_MODETREATMENTPARAMS.tst) (revision 26bfcff7c27a1748a6d29f0ee32dd59a2a26d417) @@ -61,32 +61,37 @@ TEST.EXPECTED:SystemCommMessages.sendPressureLimitsChangeResponse.data[0].venPresLimitAsymmetricmmHg:20 TEST.END --- Unit: NVDataMgmt +-- Unit: ModeTreatment --- Subprogram: isHDInstitutionalRecordValid +-- Subprogram: verifyBloodAndDialysateRateSettingsChange --- Test Case: isHDInstitutionalRecordValid.001 -TEST.UNIT:NVDataMgmt -TEST.SUBPROGRAM:isHDInstitutionalRecordValid +-- Test Case: verifyBloodAndDialysateRateSettingsChange.001 +TEST.UNIT:ModeTreatment +TEST.SUBPROGRAM:verifyBloodAndDialysateRateSettingsChange TEST.NEW -TEST.NAME:isHDInstitutionalRecordValid.001 -TEST.STUB:ModeTreatmentParams.getF32TreatmentParamLowerRangeLimit -TEST.VALUE:NVDataMgmt.<>.hdInstitutionalGroup.hdInstitutionalRecord.crc:0x1110 -TEST.VALUE:uut_prototype_stubs.crc16.return:0x1111 -TEST.EXPECTED:ModeTreatmentParams.getF32TreatmentParamLowerRangeLimit.param:TREATMENT_PARAM_DIALYSATE_TEMPERATURE,TREATMENT_PARAM_UF_VOLUME,TREATMENT_PARAM_HEPARIN_DISPENSE_RATE,TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME +TEST.NAME:verifyBloodAndDialysateRateSettingsChange.001 +TEST.VALUE:uut_prototype_stubs.getCriticalData.return.uInt:18 +TEST.VALUE:ModeTreatment.<>.presTreatmentTimeSecs:60 +TEST.VALUE:ModeTreatment.<>.presUFRate:2.0 +TEST.VALUE:ModeTreatmentParams.<>.treatmentParameters[TREATMENT_PARAM_DIALYSATE_FLOW].data.uInt:18 +TEST.VALUE:OperationModes.<>.currentMode:MODE_TREA +TEST.EXPECTED:ModeTreatment.verifyBloodAndDialysateRateSettingsChange.return:0 TEST.END --- Test Case: isHDInstitutionalRecordValid.002 -TEST.UNIT:NVDataMgmt -TEST.SUBPROGRAM:isHDInstitutionalRecordValid +-- Subprogram: verifyUFSettingsChange + +-- Test Case: verifyUFSettingsChange_F32_lower_range +TEST.UNIT:ModeTreatment +TEST.SUBPROGRAM:verifyUFSettingsChange TEST.NEW -TEST.NAME:isHDInstitutionalRecordValid.002 -TEST.STUB:ModeTreatmentParams.getF32TreatmentParamUpperRangeLimit -TEST.VALUE:NVDataMgmt.<>.hdInstitutionalGroup.hdInstitutionalRecord.crc:0x1110 -TEST.VALUE:uut_prototype_stubs.crc16.return:0x1111 -TEST.EXPECTED:ModeTreatmentParams.getF32TreatmentParamUpperRangeLimit.param:TREATMENT_PARAM_DIALYSATE_TEMPERATURE,TREATMENT_PARAM_UF_VOLUME,TREATMENT_PARAM_HEPARIN_DISPENSE_RATE,TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME +TEST.NAME:verifyUFSettingsChange_F32_lower_range +TEST.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE +TEST.VALUE:OperationModes.<>.currentMode:MODE_TREA +TEST.EXPECTED:ModeTreatment.verifyUFSettingsChange.return:0 TEST.END +-- Unit: NVDataMgmt + -- Subprogram: receiveRecordFromDialin -- Test Case: receiveRecordFromDialin.001 @@ -117,7 +122,7 @@ TEST.VALUE:NVDataMgmt.receiveRecordFromDialin.totalMessages:10 TEST.VALUE:NVDataMgmt.receiveRecordFromDialin.length:0 TEST.VALUE:NVDataMgmt.receiveRecordFromDialin.addressPtr:<> -TEST.VALUE:ModeTreatmentParams.isNVInstitutionalRecordInRange.return:TRUE +TEST.VALUE:ModeTreatmentParams.isNVInstitutionalRecordInRange.return:MACRO=TRUE TEST.EXPECTED:NVDataMgmt.receiveRecordFromDialin.return:1 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS_cba.cvr =================================================================== diff -u -r105cc6824fa5e9142bafb27746a2e6f71dbeec98 -r26bfcff7c27a1748a6d29f0ee32dd59a2a26d417 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS_cba.cvr (.../INT_MODETREATMENTPARAMS_cba.cvr) (revision 105cc6824fa5e9142bafb27746a2e6f71dbeec98) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS_cba.cvr (.../INT_MODETREATMENTPARAMS_cba.cvr) (revision 26bfcff7c27a1748a6d29f0ee32dd59a2a26d417) @@ -240,7 +240,7 @@ Line # 915 RESULT.CBA.NOTES_END -RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Modes/ModeTreatmentParams.c +RESULT.CBA.UNIT: /home/fw/workspace_hd/hdfirmware/firmware/App/Modes/ModeTreatmentParams.c RESULT.CBA.FUNCTION: checkTreatmentParamsDependencies RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 Index: vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENT/MODETREATMENT.tst =================================================================== diff -u -r87d315ee2269056a9ca4a023597e7a8dff7db90b -r26bfcff7c27a1748a6d29f0ee32dd59a2a26d417 --- vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENT/MODETREATMENT.tst (.../MODETREATMENT.tst) (revision 87d315ee2269056a9ca4a023597e7a8dff7db90b) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENT/MODETREATMENT.tst (.../MODETREATMENT.tst) (revision 26bfcff7c27a1748a6d29f0ee32dd59a2a26d417) @@ -3716,11 +3716,11 @@ TEST.EXPECTED:uut_prototype_stubs.sendChangeTreatmentDurationResponse.reason:11 TEST.END --- Test Case: verifyTreatmentDurationSettingChange.10_in_Tx_state_min_Tx_time_valid_uf_valid_dial_flow_valid +-- Test Case: verifyTreatmentDurationSettingChange.11_in_Tx_state_min_Tx_time_valid_uf_valid_dial_flow_valid TEST.UNIT:ModeTreatment TEST.SUBPROGRAM:verifyTreatmentDurationSettingChange TEST.NEW -TEST.NAME:verifyTreatmentDurationSettingChange.10_in_Tx_state_min_Tx_time_valid_uf_valid_dial_flow_valid +TEST.NAME:verifyTreatmentDurationSettingChange.11_in_Tx_state_min_Tx_time_valid_uf_valid_dial_flow_valid TEST.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_BLOOD_PRIME_STATE TEST.VALUE:ModeTreatment.<>.presTreatmentTimeSecs:60 TEST.VALUE:ModeTreatment.<>.presUFRate:2.0