Index: firmware/App/Services/StateServices/DrySelfTests.c =================================================================== diff -u -rbfb859737f3d221f08c0f43d1bd4ba7b7680911f -r670dfc46c1e73d6f403fa1af6963d6700592c6aa --- firmware/App/Services/StateServices/DrySelfTests.c (.../DrySelfTests.c) (revision bfb859737f3d221f08c0f43d1bd4ba7b7680911f) +++ firmware/App/Services/StateServices/DrySelfTests.c (.../DrySelfTests.c) (revision 670dfc46c1e73d6f403fa1af6963d6700592c6aa) @@ -402,10 +402,10 @@ /*********************************************************************//** * @brief -* The handleDrySelfTestUsedTubingSetCheckState function verify no fluid is -* detected by bubble detectors to ensure the tubing set is new. +* The handleDrySelfTestUsedTubingSetCheckState function verifies that +* no fluid is detected in the tubing set before continuing dry self-tests. * @details \b Inputs: none -* @details \b Outputs: +* @details \b Outputs: none * @return the next state of dry self-tests state machine *************************************************************************/ static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedTubingSetCheckState( void ) @@ -414,6 +414,8 @@ BUBBLE_STATE_T bubble = getBubbleDetectedState( H18_BBLD ); AIR_TRAP_LEVELS_T lower = getLevelSensorState( H17_LEVL ); AIR_TRAP_LEVELS_T upper = getLevelSensorState( H16_LEVL ); + U32 bubbleState = (U32)bubble; + U32 lowerLevelState = (U32)lower; if ( ( BUBBLE_DETECTED == bubble ) && ( AIR_TRAP_LEVEL_AIR == lower ) && ( AIR_TRAP_LEVEL_AIR == upper ) ) { @@ -432,7 +434,7 @@ else { // If tubing set is invalid it triggers an alarm - //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET, (U32)bubble, (U32)lower, (U32)upper ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET, bubbleState, lowerLevelState ); PreTxRequestTubeSetInstall(); } }