Index: firmware/App/Controllers/BloodLeak.c =================================================================== diff -u -ra49d4033363206fc3ae86d8648eb5b9cc91e8dca -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 --- firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision a49d4033363206fc3ae86d8648eb5b9cc91e8dca) +++ firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) @@ -101,8 +101,8 @@ enum EmbCommands { - NU = 0, ///< Null command. - CS, ///< Control S command to switch to embedded mode. + NU_EMB_MODE_CMD = 0, ///< Null command. + CS_EMB_MODE_CMD, ///< Control S command to switch to embedded mode. SP, ///< Set point command to set the set point. T, ///< Self test command. G, ///< Get self test command. @@ -225,7 +225,7 @@ bloodLeakPrevFPGARegisterCount = 0; bloodLeakPersistenceCtr = 0; bloodLeakSignalEmbModeReq = FALSE; - bloodLeakEmbModeRqstedCmd = NU; + bloodLeakEmbModeRqstedCmd = NU_EMB_MODE_CMD; bloodLeakEmbModeSubstate = BLOOD_LEAK_CAL_WAIT_FOR_COMAND_STATE; bloodLeakEmbModeOpsStartTime = 0; bloodLeakEmbModeRespIndex = 0; @@ -852,11 +852,11 @@ switch( bloodLeakEmbModeRqstedCmd ) { - case NU: + case NU_EMB_MODE_CMD: // Null command do nothing break; - case CS: + case CS_EMB_MODE_CMD: case T: case G: case I: @@ -903,7 +903,7 @@ switch ( bloodLeakEmbModeRqstedCmd ) { - case CS: + case CS_EMB_MODE_CMD: case T: case G: case I: @@ -992,7 +992,7 @@ U08 expChar2 = bloodLeakEmbModeCmd[ bloodLeakEmbModeRqstedCmd ].expChar2; U08 command = bloodLeakEmbModeCmd[ bloodLeakEmbModeRqstedCmd ].commandASCII; - if ( ( expChar1 != NU ) && ( NU == expChar2 ) ) + if ( ( expChar1 != NU_EMB_MODE_CMD ) && ( NU_EMB_MODE_CMD == expChar2 ) ) { // This is the case that there is a start character. If current character buffer index is less than the // length of the expected response of the command. @@ -1016,7 +1016,7 @@ } } } - else if ( ( expChar1 != NU ) && ( expChar2 != NU ) ) + else if ( ( expChar1 != NU_EMB_MODE_CMD ) && ( expChar2 != NU_EMB_MODE_CMD ) ) { // This is the case that both expected chars are not null. Either of the chars are accepted like P or F if ( bloodLeakEmbModeRespIndex < length ) @@ -1055,7 +1055,7 @@ } } } - else if ( ( NU == expChar1 ) && ( NU == expChar2 ) ) + else if ( ( NU_EMB_MODE_CMD == expChar1 ) && ( NU_EMB_MODE_CMD == expChar2 ) ) { // This is the case that there are no expected characters and the received value are numbers if ( bloodLeakEmbModeRespIndex < length ) @@ -1076,7 +1076,7 @@ { // Check if the first element of the response buffer is null and the number of tries has not exceeded. When the response buffer is // null but it is the end of the receive buffer it means no response has been received back - if ( ( NU == bloodLeakEmbModeRespBuffer[ 0 ] ) && ( ++bloodLeakEmbModeNumOfCmdTries < BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES ) ) + if ( ( NU_EMB_MODE_CMD == bloodLeakEmbModeRespBuffer[ 0 ] ) && ( ++bloodLeakEmbModeNumOfCmdTries < BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES ) ) { state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; } @@ -1090,20 +1090,20 @@ { // Loop through the elements of the buffer and make sure none of the elements are not NULL. // The elements are checked until the specified length that is expected for a command - isNull |= ( bloodLeakEmbModeRespBuffer[ i ] != NU ? FALSE : TRUE ); + isNull |= ( bloodLeakEmbModeRespBuffer[ i ] != NU_EMB_MODE_CMD ? FALSE : TRUE ); } // Check if the failed command is Control S which is switch to embedded mode and if // it failed set the embedded mode request to false so the other commands cannot be sent again - bloodLeakSignalEmbModeReq = ( ( CS == bloodLeakEmbModeRqstedCmd ) && ( NU == bloodLeakEmbModeRespBuffer[ 0 ] ) ? FALSE : TRUE ); + bloodLeakSignalEmbModeReq = ( ( CS_EMB_MODE_CMD == bloodLeakEmbModeRqstedCmd ) && ( NU_EMB_MODE_CMD == bloodLeakEmbModeRespBuffer[ 0 ] ) ? FALSE : TRUE ); if ( ( TRUE == isNull ) && ( ++bloodLeakEmbModeNumOfCmdTries < BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES ) ) { state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; } else { - bloodLeakEmbModeRqstedCmd = NU; + bloodLeakEmbModeRqstedCmd = NU_EMB_MODE_CMD; state = BLOOD_LEAK_CAL_WAIT_FOR_COMAND_STATE; handleSendBloodLeakEmbeddedModeCommandResponse( length, bloodLeakEmbModeRespBuffer ); @@ -1216,16 +1216,16 @@ static void initEmbModeSpecs( void ) { // Null command - bloodLeakEmbModeCmd[ NU ].commandASCII = NU; - bloodLeakEmbModeCmd[ NU ].expChar1 = NU; - bloodLeakEmbModeCmd[ NU ].expChar2 = NU; - bloodLeakEmbModeCmd[ NU ].length = 0; + bloodLeakEmbModeCmd[ NU_EMB_MODE_CMD ].commandASCII = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ NU_EMB_MODE_CMD ].expChar1 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ NU_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ NU_EMB_MODE_CMD ].length = 0; // Control S command - bloodLeakEmbModeCmd[ CS ].commandASCII = 19; // ASCII for Control S - bloodLeakEmbModeCmd[ CS ].expChar1 = 69; // ASCII for E (Embedded ...) - bloodLeakEmbModeCmd[ CS ].expChar2 = NU; - bloodLeakEmbModeCmd[ CS ].length = 5; + bloodLeakEmbModeCmd[ CS_EMB_MODE_CMD ].commandASCII = 19; // ASCII for Control S + bloodLeakEmbModeCmd[ CS_EMB_MODE_CMD ].expChar1 = 69; // ASCII for E (Embedded ...) + bloodLeakEmbModeCmd[ CS_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ CS_EMB_MODE_CMD ].length = 5; // Set point command bloodLeakEmbModeCmd[ SP ].commandASCII = 83; // ASCII for S @@ -1242,25 +1242,25 @@ // Get self test command bloodLeakEmbModeCmd[ G ].commandASCII = 71; // ASCII for G bloodLeakEmbModeCmd[ G ].expChar1 = 71; - bloodLeakEmbModeCmd[ G ].expChar2 = NU; + bloodLeakEmbModeCmd[ G ].expChar2 = NU_EMB_MODE_CMD; bloodLeakEmbModeCmd[ G ].length = 5; // Intensity command bloodLeakEmbModeCmd[ I ].commandASCII = 73; // ASCII for I bloodLeakEmbModeCmd[ I ].expChar1 = 73; - bloodLeakEmbModeCmd[ I ].expChar2 = NU; + bloodLeakEmbModeCmd[ I ].expChar2 = NU_EMB_MODE_CMD; bloodLeakEmbModeCmd[ I ].length = 5; // Blood detection command bloodLeakEmbModeCmd[ V ].commandASCII = 86; // ASCII for V bloodLeakEmbModeCmd[ V ].expChar1 = 86; - bloodLeakEmbModeCmd[ V ].expChar2 = NU; + bloodLeakEmbModeCmd[ V ].expChar2 = NU_EMB_MODE_CMD; bloodLeakEmbModeCmd[ V ].length = 5; // Zero sensor command bloodLeakEmbModeCmd[ Z ].commandASCII = 90; // ASCII for Z bloodLeakEmbModeCmd[ Z ].expChar1 = 89; // ASCII for Y - bloodLeakEmbModeCmd[ Z ].expChar2 = NU; + bloodLeakEmbModeCmd[ Z ].expChar2 = NU_EMB_MODE_CMD; bloodLeakEmbModeCmd[ Z ].length = 1; // Zero confirm command @@ -1272,13 +1272,13 @@ // Display blood detection command bloodLeakEmbModeCmd[ D ].commandASCII = 68; bloodLeakEmbModeCmd[ D ].expChar1 = 68; // ASCII for D - bloodLeakEmbModeCmd[ D ].expChar2 = NU; + bloodLeakEmbModeCmd[ D ].expChar2 = NU_EMB_MODE_CMD; bloodLeakEmbModeCmd[ D ].length = 5; // Calibrate command bloodLeakEmbModeCmd[ C ].commandASCII = 67; bloodLeakEmbModeCmd[ C ].expChar1 = 67; // ASCII for C - bloodLeakEmbModeCmd[ C ].expChar2 = NU; + bloodLeakEmbModeCmd[ C ].expChar2 = NU_EMB_MODE_CMD; bloodLeakEmbModeCmd[ C ].length = 4; } @@ -1406,7 +1406,7 @@ if ( ( MODE_FAUL == mode ) || ( MODE_SERV == mode ) || ( MODE_STAN == mode ) ) { bloodLeakSignalEmbModeReq = TRUE; - bloodLeakEmbModeRqstedCmd = CS; + bloodLeakEmbModeRqstedCmd = CS_EMB_MODE_CMD; result = TRUE; } } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r9944e4f766d9eb4cdf7a5ca7587e3ceca556e106 -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 9944e4f766d9eb4cdf7a5ca7587e3ceca556e106) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) @@ -3066,7 +3066,7 @@ HD_VERSIONS_T payload; U08 *payloadPtr = msg.payload; - if ( message->hdr.payloadLen == sizeof( U08 ) + sizeof( U08 ) + sizeof( U08 ) + sizeof( U16 ) + sizeof( U32 ) ) + if ( message->hdr.payloadLen == sizeof( UI_VERSIONS_T ) ) { // Get UI version data from this request msg and have it recorded handleUIVersionResponse( message ); Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODLEAK/BLOODLEAK.tst =================================================================== diff -u -rd40825a3f9a6e9a246f79233c6734d935711fcbf -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 --- vectorcast/Hercules_RM46_HD_Project/environment/BLOODLEAK/BLOODLEAK.tst (.../BLOODLEAK.tst) (revision d40825a3f9a6e9a246f79233c6734d935711fcbf) +++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODLEAK/BLOODLEAK.tst (.../BLOODLEAK.tst) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) @@ -248,7 +248,7 @@ TEST.SUBPROGRAM:handleBloodLeakCheckSetPointState TEST.NEW TEST.NAME:handleBloodLeakCheckSetPointState.002 -TEST.VALUE:BloodLeak.<>.bloodLeakCommandWriteTryCount:4 +TEST.VALUE:BloodLeak.<>.bloodLeakCurrentSetPointWriteTry:4 TEST.VALUE:BloodLeak.<>.bloodLeakCalRecord.setPoint:0 TEST.VALUE:BloodLeak.<>.bloodLeakGetCalStartTime:1 TEST.VALUE:uut_prototype_stubs.getFPGABloodLeakDetectSetPoint.return:1 @@ -548,7 +548,7 @@ TEST.NAME:handleBloodLeakSetSetPointState.003 TEST.VALUE:BloodLeak.<>.bloodLeakUARTCmdIndex:4 TEST.VALUE:BloodLeak.<>.bloodLeakSetPointSeqLength:3 -TEST.VALUE:BloodLeak.<>.bloodLeakWait2ReadResponseCounter:100 +TEST.VALUE:BloodLeak.<>.bloodLeakWait2ReadSetPointCounter:100 TEST.EXPECTED:BloodLeak.handleBloodLeakSetSetPointState.return:BLOOD_LEAK_CHECK_SET_POINT_STATE TEST.END @@ -650,17 +650,17 @@ TEST.EXPECTED:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS TEST.END --- Subprogram: initEmbModeSpecs +-- Subprogram: prepareSetPointSeq -- Test Case: prepareSetPointSeq.001 TEST.UNIT:BloodLeak -TEST.SUBPROGRAM:initEmbModeSpecs +TEST.SUBPROGRAM:prepareSetPointSeq TEST.NEW TEST.NAME:prepareSetPointSeq.001 TEST.VALUE:BloodLeak.<>.bloodLeakUARTCmdIndex:0 TEST.VALUE:BloodLeak.<>.bloodLeakSetPointSeqLength:6 TEST.VALUE:BloodLeak.<>.bloodLeakSetPointSequence:<> -TEST.VALUE:BloodLeak.<>.bloodLeakSetPointSequence:"83","13","0","1","0"" +TEST.VALUE:BloodLeak.<>.bloodLeakSetPointSequence:""83","13","0","1","0"" TEST.EXPECTED:BloodLeak.<>.bloodLeakUARTCmdIndex:0 TEST.EXPECTED:BloodLeak.<>.bloodLeakSetPointSeqLength:6 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/MODEINITPOST/MODEINITPOST.tst =================================================================== diff -u -rd40825a3f9a6e9a246f79233c6734d935711fcbf -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 --- vectorcast/Hercules_RM46_HD_Project/environment/MODEINITPOST/MODEINITPOST.tst (.../MODEINITPOST.tst) (revision d40825a3f9a6e9a246f79233c6734d935711fcbf) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODEINITPOST/MODEINITPOST.tst (.../MODEINITPOST.tst) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) @@ -115,7 +115,7 @@ TEST.SUBPROGRAM:execInitAndPOSTMode TEST.NEW TEST.NAME:execInitAndPOSTMode.007 -TEST.VALUE:ModeInitPOST.<>.postState:POST_STATE_DIALYSATE_INLET_FLOW +TEST.VALUE:ModeInitPOST.<>.postState:POST_STATE_DIALYSATE_FLOW TEST.EXPECTED:ModeInitPOST.execInitAndPOSTMode.return:8 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/MODEPRETREAT/MODEPRETREAT.tst =================================================================== diff -u -rd40825a3f9a6e9a246f79233c6734d935711fcbf -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 --- vectorcast/Hercules_RM46_HD_Project/environment/MODEPRETREAT/MODEPRETREAT.tst (.../MODEPRETREAT.tst) (revision d40825a3f9a6e9a246f79233c6734d935711fcbf) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODEPRETREAT/MODEPRETREAT.tst (.../MODEPRETREAT.tst) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) @@ -1007,7 +1007,7 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_OPEN +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_OPEN TEST.EXPECTED:ModePreTreat.<>.alarmActionResumeReceived:0 TEST.EXPECTED:ModePreTreat.handlePrimeState.return:HD_PRE_TREATMENT_PRIME_STATE TEST.END @@ -1026,7 +1026,7 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.<>.alarmActionResumeReceived:0 TEST.EXPECTED:ModePreTreat.handlePrimeState.return:HD_PRE_TREATMENT_PRIME_STATE TEST.END @@ -1047,7 +1047,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:1 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handlePrimeState.return:HD_PRE_TREATMENT_PRIME_STATE TEST.END @@ -1066,8 +1066,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:1 +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.VALUE:uut_prototype_stubs.getPrimeState.return:13 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handlePrimeState.return:HD_PRE_TREATMENT_PRIME_STATE TEST.END @@ -1106,7 +1106,7 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_OPEN +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_OPEN TEST.EXPECTED:ModePreTreat.<>.alarmActionResumeReceived:0 TEST.EXPECTED:ModePreTreat.handleRecirculateState.return:HD_PRE_TREATMENT_RECIRCULATE_STATE TEST.END @@ -1127,7 +1127,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:1 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleRecirculateState.return:HD_PRE_TREATMENT_RECIRCULATE_STATE TEST.END @@ -1149,7 +1149,7 @@ TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.continueToTreatmentRequested:1 TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:<> -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleRecirculateState.return:HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE TEST.END @@ -1227,7 +1227,7 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_OPEN +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_OPEN TEST.EXPECTED:ModePreTreat.handleSelfTestDryState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE TEST.END @@ -1247,7 +1247,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:1 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.<>.alarmActionResumeReceived:0 TEST.EXPECTED:ModePreTreat.handleSelfTestDryState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE TEST.END @@ -1269,8 +1269,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:<> +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.VALUE:uut_prototype_stubs.getDrySelfTestsState.return:9 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleSelfTestDryState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE TEST.END @@ -1293,8 +1293,8 @@ TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:<> TEST.VALUE:ModePreTreat.<>.submodeCompleteTransitionTimeCounter:<> +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.VALUE:uut_prototype_stubs.getDrySelfTestsState.return:9 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleSelfTestDryState.return:HD_PRE_TREATMENT_PRIME_STATE TEST.END @@ -1314,7 +1314,7 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_OPEN +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_OPEN TEST.EXPECTED:ModePreTreat.handleSelfTestNoCartState.return:HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE TEST.END @@ -1334,7 +1334,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:1 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleSelfTestNoCartState.return:HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE TEST.END @@ -1355,8 +1355,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:<> +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.VALUE:uut_prototype_stubs.getNoCartSelfTestsState.return:11 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleSelfTestNoCartState.return:HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE TEST.END @@ -1379,8 +1379,8 @@ TEST.END_NOTES: TEST.VALUE:ModePreTreat.<>.alarmActionResumeReceived:<> TEST.VALUE:ModePreTreat.<>.submodeCompleteTransitionTimeCounter:<> +TEST.VALUE:uut_prototype_stubs.getFPGADoorState.return:STATE_CLOSED TEST.VALUE:uut_prototype_stubs.getNoCartSelfTestsState.return:11 -TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED TEST.EXPECTED:ModePreTreat.handleSelfTestNoCartState.return:HD_PRE_TREATMENT_CART_INSTALL_STATE TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/TEMPERATURES/TEMPERATURES.tst =================================================================== diff -u -rd40825a3f9a6e9a246f79233c6734d935711fcbf -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 --- vectorcast/Hercules_RM46_HD_Project/environment/TEMPERATURES/TEMPERATURES.tst (.../TEMPERATURES.tst) (revision d40825a3f9a6e9a246f79233c6734d935711fcbf) +++ vectorcast/Hercules_RM46_HD_Project/environment/TEMPERATURES/TEMPERATURES.tst (.../TEMPERATURES.tst) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) @@ -54,8 +54,8 @@ TEST.SUBPROGRAM:execTemperatures TEST.NEW TEST.NAME:execTemperatures.001 -TEST.VALUE:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_WAIT_FOR_POST_STATE -TEST.EXPECTED:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_WAIT_FOR_POST_STATE +TEST.VALUE:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_START_STATE +TEST.EXPECTED:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_START_STATE TEST.END -- Test Case: execTemperatures.002 @@ -207,7 +207,7 @@ TEST.NEW TEST.NAME:handleExecGetADCValues.001 TEST.VALUE:Temperatures.<>.adcReadCounter:10 -TEST.VALUE:Temperatures.handleExecGetADCValues.return:TEMPERATURES_EXEC_STATE_WAIT_FOR_POST_STATE +TEST.VALUE:Temperatures.handleExecGetADCValues.return:TEMPERATURES_EXEC_STATE_START_STATE TEST.EXPECTED:Temperatures.<>.adcReadCounter:0 TEST.EXPECTED:Temperatures.handleExecGetADCValues.return:TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE TEST.END @@ -233,22 +233,22 @@ TEST.EXPECTED:Temperatures.handleExecGetADCValues.return:TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE TEST.END --- Subprogram: handleExecWaitForPOST +-- Subprogram: handleExecStart -- Test Case: handleExecStart.001 TEST.UNIT:Temperatures -TEST.SUBPROGRAM:handleExecWaitForPOST +TEST.SUBPROGRAM:handleExecStart TEST.NEW TEST.NAME:handleExecStart.001 TEST.VALUE:Temperatures.<>.adcReadCounter:1 -TEST.VALUE:Temperatures.handleExecWaitForPOST.return:TEMPERATURES_EXEC_STATE_WAIT_FOR_POST_STATE +TEST.VALUE:Temperatures.handleExecStart.return:TEMPERATURES_EXEC_STATE_START_STATE TEST.EXPECTED:Temperatures.<>.adcReadCounter:0 -TEST.EXPECTED:Temperatures.handleExecWaitForPOST.return:TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE +TEST.EXPECTED:Temperatures.handleExecStart.return:TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE TEST.END -- Test Case: handleExecStart.002 TEST.UNIT:Temperatures -TEST.SUBPROGRAM:handleExecWaitForPOST +TEST.SUBPROGRAM:handleExecStart TEST.NEW TEST.NAME:handleExecStart.002 TEST.MCDC_BASIS_PATH:2 of 2 @@ -263,7 +263,7 @@ TEST.END_NOTES: TEST.VALUE:Temperatures.<>.adcReadCounter:12 TEST.EXPECTED:Temperatures.<>.adcReadCounter:0 -TEST.EXPECTED:Temperatures.handleExecWaitForPOST.return:TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE +TEST.EXPECTED:Temperatures.handleExecStart.return:TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE TEST.END -- Subprogram: initTemperatures @@ -283,11 +283,11 @@ Test Case Generation Notes: Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: -TEST.VALUE:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_WAIT_FOR_POST_STATE +TEST.VALUE:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_START_STATE TEST.VALUE:uut_prototype_stubs.initPersistentAlarm.alarmIndex:ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE TEST.VALUE:uut_prototype_stubs.initPersistentAlarm.persistentClearPeriod:5000 TEST.VALUE:uut_prototype_stubs.initPersistentAlarm.persistentTriggerPeriod:5000 -TEST.EXPECTED:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_WAIT_FOR_POST_STATE +TEST.EXPECTED:Temperatures.<>.temperaturesExecState:TEMPERATURES_EXEC_STATE_START_STATE TEST.EXPECTED:uut_prototype_stubs.initPersistentAlarm.alarmIndex:ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE TEST.EXPECTED:uut_prototype_stubs.initPersistentAlarm.persistentClearPeriod:5000 TEST.EXPECTED:uut_prototype_stubs.initPersistentAlarm.persistentTriggerPeriod:5000