Index: firmware/App/Modes/StatePreTxDrySelfTests.c =================================================================== diff -u -r70f11d49a2d6cd6b20aaf3d4d1fa978f2f58d68a -rf42cda8b2f9a0494dedb2696cb250a5c0567b26e --- firmware/App/Modes/StatePreTxDrySelfTests.c (.../StatePreTxDrySelfTests.c) (revision 70f11d49a2d6cd6b20aaf3d4d1fa978f2f58d68a) +++ firmware/App/Modes/StatePreTxDrySelfTests.c (.../StatePreTxDrySelfTests.c) (revision f42cda8b2f9a0494dedb2696cb250a5c0567b26e) @@ -54,7 +54,7 @@ #define STABILTY_PRESSURE_SELF_TEST_TIME ( 5 * MS_PER_SECOND ) ///< Time allowed for pressure stabilization. #define VENOUS_PRESSURE_LEAK_CHECK_TIME ( 4 * MS_PER_SECOND ) ///< Time to monitor venous pressure decay (leak check). #define ARTERIAL_PRESSURE_LEAK_CHECK_TIME ( 4 * MS_PER_SECOND ) ///< Time to monitor arterial pressure decay (leak check). -#define CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ( 10 * MS_PER_SECOND ) ///< Time required for pressure settling after cartridge insertion. +#define TUBESET_INSERT_PRESSURE_SETTLE_TIME_MS ( 10 * MS_PER_SECOND ) ///< Time required for pressure settling after tube set insertion. //Pressure self-test pump flow #define BLOOD_PUMP_PRESSURE_SELF_TEST_FLOW 100 ///< Blood pump flow rate during arterial pressure self-test (mL/min). @@ -87,18 +87,18 @@ static DRY_SELF_TESTS_STATE_T currentDrySelfTestsState; ///< Current state of Dry Self-Test state machine static U32 selfTestStartTime; ///< Start time of dry self-tests static U32 selfTestPreviousPublishDataTime; ///< Last progress data publish time -static U32 selfTestCartridgeSettleTime; ///< Delay after cartridge insertion +static U32 selfTestTubeSetSettleTime; ///< Delay after tube set insertion static U32 syringeOcclusionDelayStartTime; ///< Delay before syringe occlusion check static BOOL selfTestsResumeRequested; ///< Resume requested from STOPPED state -static BOOL doorStateAfterCartridgeInstall; ///< Tracks door transition after cartridge install +static BOOL doorStateAfterTubeSetInstall; ///< Tracks door transition after tube set install static BOOL useHeparin; ///< Indicates whether heparin is enabled static BOOL barcodeScanResponseReceived; ///< Barcode response received flag static BOOL barcodeScanSuccessful; ///< Barcode scan result static BOOL authResponseReceived; ///< Indicates authentication response received static BOOL authResponseValidTubeSet; ///< Indicates tube set is valid static BOOL authResponseModalityAccepted; ///< Indicates tube set modality is accepted static BOOL dryPressureTestsCompleted; ///< Indicates dry pressure tests completed -static BOOL cartridgeUsedTestRun; ///< Indicates cartridge-used test executed +static BOOL tubeSetUsedTestRun; ///< Indicates tube set used test executed static BOOL occlusionBaselineWasSet; ///< Indicates occlusion baseline established static BOOL heparinOcclusionTestRun; ///< Indicates heparin occlusion test executed static F32 previousNormalArterialPressure; ///< Arterial pressure at baseline @@ -133,8 +133,8 @@ static DRY_SELF_TESTS_STATE_T handleDrySelfTestStartState( void ); static DRY_SELF_TESTS_STATE_T handleDrySelfTestWaitForDoorCloseState( void ); -static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void ); -static DRY_SELF_TESTS_STATE_T handleDrySelfTestCartridgeLoadedCheckState( void ); +static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedTubeSetCheckState( void ); +static DRY_SELF_TESTS_STATE_T handleDrySelfTestTubeSetLoadedCheckState( void ); static DRY_SELF_TESTS_STATE_T handleDrySelfTestTubeSetAuthenticationState( void ); static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpSeekState( void ); static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorNormalSetupState( void ); @@ -162,11 +162,11 @@ currentDrySelfTestsState = DRY_SELF_TESTS_START_STATE; selfTestStartTime = 0; selfTestPreviousPublishDataTime = 0; - selfTestCartridgeSettleTime = 0; + selfTestTubeSetSettleTime = 0; syringeOcclusionDelayStartTime = 0; - doorStateAfterCartridgeInstall = TRUE; + doorStateAfterTubeSetInstall = TRUE; dryPressureTestsCompleted = FALSE; - cartridgeUsedTestRun = FALSE; + tubeSetUsedTestRun = FALSE; occlusionBaselineWasSet = FALSE; heparinOcclusionTestRun = FALSE; authResponseReceived = FALSE; @@ -278,7 +278,7 @@ previousNormalVenousPressure = 0.0F; selfTestStartTime = getMSTimerCount(); selfTestPreviousPublishDataTime = getMSTimerCount(); - selfTestCartridgeSettleTime = getMSTimerCount(); + selfTestTubeSetSettleTime = getMSTimerCount(); doorClosedRequired( TRUE ); setCurrentSubState( (U32)currentDrySelfTestsState ); transitionToDrySelfTestsState( currentDrySelfTestsState ); @@ -324,12 +324,12 @@ currentDrySelfTestsState = handleDrySelfTestWaitForDoorCloseState(); break; - case DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE: - currentDrySelfTestsState = handleDrySelfTestUsedCartridgeCheckState(); + case DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE: + currentDrySelfTestsState = handleDrySelfTestUsedTubeSetCheckState(); break; - case DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE: - currentDrySelfTestsState = handleDrySelfTestCartridgeLoadedCheckState(); + case DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE: + currentDrySelfTestsState = handleDrySelfTestTubeSetLoadedCheckState(); break; case DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE: @@ -392,7 +392,7 @@ break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_INVALID_NO_CARTRIDGE_SELF_TEST_STATE, currentDrySelfTestsState ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_INVALID_DRY_SELF_TEST_STATE, currentDrySelfTestsState ); break; } @@ -443,13 +443,13 @@ DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_START_STATE; OPN_CLS_STATE_T frontDoorSwitch = getSwitchState( H9_SWCH ); - // Want to pinch off saline once door closed after cartridge install - handleDoorCloseAfterCartridgeInsertion(); + // Want to pinch off saline once door closed after tube set install + handleDoorCloseAfterTubeSetInsertion(); if ( STATE_CLOSED == frontDoorSwitch ) { - // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests - if ( TRUE == didTimeout( selfTestCartridgeSettleTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) ) + // Ensure occlusion sensor has time to settle after TubeSet insertion before starting dry self-tests + if ( TRUE == didTimeout( selfTestTubeSetSettleTime, TUBESET_INSERT_PRESSURE_SETTLE_TIME_MS ) ) { doorClosedRequired( TRUE ); state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE; @@ -483,7 +483,7 @@ if ( STATE_CLOSED == frontDoorSwitch ) { - state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE; + state = DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE; } if ( TRUE == doesAlarmStatusIndicateStop() ) @@ -497,43 +497,43 @@ /*********************************************************************//** * @brief -* Verifies that the installed cartridge is unused (dry) by checking -* bubble detectors and air trap levels. +* The handleDrySelfTestUsedTubeSetCheckState Verifies that the installed +* tube set is unused (dry) by checking bubble detectors and air trap levels. * @details \b Inputs: none -* @details \b Outputs: cartridgeUsedTestRun +* @details \b Outputs: tubeSetUsedTestRun * @return the next state of dry self-tests state machine *************************************************************************/ -static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void ) +static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedTubeSetCheckState( void ) { - DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE; + DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE; BUBBLE_STATE_T bubbleStatus = getBubbleDetectedState( H18_BBLD ); AIR_TRAP_LEVELS_T lowerAirTrap = getLevelSensorState( H17_LEVL ); AIR_TRAP_LEVELS_T upperAirTrap = getLevelSensorState( H16_LEVL ); - SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, (U32)bubbleStatus, (U32)BUBBLE_DETECTED ); + SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_DRY_SELF_TEST_TUBESET_RESULT, (U32)bubbleStatus, (U32)BUBBLE_DETECTED ); - // Check if cartridge is dry + // Check if tube set is dry if ( ( BUBBLE_DETECTED == bubbleStatus ) && ( AIR_TRAP_LEVEL_AIR == lowerAirTrap ) && ( AIR_TRAP_LEVEL_AIR == upperAirTrap ) ) { - // If catridge is valid proceed + // If tube set is valid proceed resetArtVenPressureOffsets(); SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST, 0, 0 ); - state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE; + state = DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE; } else { - // Allow wet cartridge only for test configuration - if ( TRUE == getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) ) + // Allow wet tube set only for test configuration + if ( TRUE == getTestConfigStatus( TEST_CONFIG_USE_WET_TUBE_SET ) ) { SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST, 0, 0 ); - cartridgeUsedTestRun = TRUE; - state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE; + tubeSetUsedTestRun = TRUE; + state = DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE; } else { - // If cartridge is invalid it triggers an alarm + // If tube set is invalid it triggers an alarm activateAlarmNoData( ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET ); } } @@ -549,14 +549,14 @@ /*********************************************************************//** * @brief -* Verifies that a cartridge is installed and barcode scan is successful. +* Verifies that a tube set is installed and barcode scan is successful. * @details \b Inputs: barcode scan status * @details \b Outputs: none * @return the next state of dry self-tests state machine *************************************************************************/ -static DRY_SELF_TESTS_STATE_T handleDrySelfTestCartridgeLoadedCheckState( void ) +static DRY_SELF_TESTS_STATE_T handleDrySelfTestTubeSetLoadedCheckState( void ) { - DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE; + DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE; if ( TRUE == barcodeScanResponseReceived ) { @@ -570,13 +570,13 @@ else { // If barcode authentication is failed trigger an alarm - activateAlarmNoData( ALARM_ID_TD_INSTALL_NEW_CARTRIDGE ); + activateAlarmNoData( ALARM_ID_TD_INSTALL_NEW_TUBE_SET ); } } if ( TRUE == doesAlarmStatusIndicateStop() ) { - if ( TRUE == isAlarmActive( ALARM_ID_TD_NO_CARTRIDGE_LOADED ) ) + if ( TRUE == isAlarmActive( ALARM_ID_TD_NO_TUBE_SET_LOADED ) ) { occlusionBaselineWasSet = FALSE; } @@ -1121,8 +1121,8 @@ * The handleDrySelfTestStoppedState function handles the stopped dry self-tests * operation. * @details \b Inputs: selfTestsResumeRequested, occlusionBaselineWasSet, - * dryPressureTestsCompleted, cartridgeUsedTestRun, heparinOcclusionTestRun - * @details \b Outputs: selfTestsResumeRequested, selfTestStartTime, selfTestCartridgeSettleTime + * dryPressureTestsCompleted, tubeSetUsedTestRun, heparinOcclusionTestRun + * @details \b Outputs: selfTestsResumeRequested, selfTestStartTime, selfTestTubeSetSettleTime * @return the next state of dry self-tests state machine *************************************************************************/ static DRY_SELF_TESTS_STATE_T handleDrySelfTestStoppedState( void ) @@ -1173,7 +1173,7 @@ // Restart self-test start time selfTestsResumeRequested = FALSE; selfTestStartTime = getMSTimerCount(); - selfTestCartridgeSettleTime = getMSTimerCount(); + selfTestTubeSetSettleTime = getMSTimerCount(); doorClosedRequired( TRUE ); if ( TRUE == heparinOcclusionTestRun ) { @@ -1186,14 +1186,14 @@ else { setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN ); - if ( TRUE == cartridgeUsedTestRun ) + if ( TRUE == tubeSetUsedTestRun ) { resetArtVenPressureOffsets(); - state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE; + state = DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE; } else if ( TRUE != occlusionBaselineWasSet ) { - selfTestCartridgeSettleTime = getMSTimerCount(); + selfTestTubeSetSettleTime = getMSTimerCount(); state = DRY_SELF_TESTS_START_STATE; } else @@ -1279,7 +1279,7 @@ } break; - case DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE: + case DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE: { U32 targetDialysateFlowMLPM = (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ); @@ -1295,7 +1295,7 @@ } break; - case DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE: + case DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE: { U32 targetDialysateFlowMLPM = (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ); @@ -1539,24 +1539,24 @@ /*********************************************************************//** * @brief - * The handleDoorCloseAfterCartridgeInsertion function handles the check - * for door close after cartridge install so that saline line can be pinched. + * The handleDoorCloseAfterTubeSetInsertion function handles the check + * for door close after tube set install so that saline line can be pinched. * @details Inputs: door states - * @details Outputs: doorStateAfterCartridgeInstall + * @details Outputs: doorStateAfterTubeSetInstall * @return none *************************************************************************/ -void handleDoorCloseAfterCartridgeInsertion( void ) +void handleDoorCloseAfterTubeSetInsertion( void ) { OPN_CLS_STATE_T frontDoorSwitch = getSwitchState( H9_SWCH ); if ( STATE_OPEN == frontDoorSwitch ) { - doorStateAfterCartridgeInstall = FALSE; + doorStateAfterTubeSetInstall = FALSE; } - if ( ( STATE_CLOSED == frontDoorSwitch ) && ( FALSE == doorStateAfterCartridgeInstall ) ) + if ( ( STATE_CLOSED == frontDoorSwitch ) && ( FALSE == doorStateAfterTubeSetInstall ) ) { setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN ); - doorStateAfterCartridgeInstall = TRUE; + doorStateAfterTubeSetInstall = TRUE; } } Index: firmware/App/Modes/StatePreTxDrySelfTests.h =================================================================== diff -u -readc0ae426264da75e00f4137c94821e60ec33da -rf42cda8b2f9a0494dedb2696cb250a5c0567b26e --- firmware/App/Modes/StatePreTxDrySelfTests.h (.../StatePreTxDrySelfTests.h) (revision eadc0ae426264da75e00f4137c94821e60ec33da) +++ firmware/App/Modes/StatePreTxDrySelfTests.h (.../StatePreTxDrySelfTests.h) (revision f42cda8b2f9a0494dedb2696cb250a5c0567b26e) @@ -47,7 +47,7 @@ U32 getDrySelfTestsState( void ); BOOL drySelfTestHandleTubeSetAuthResponse( MESSAGE_T *message ); -void handleDoorCloseAfterCartridgeInsertion( void ); +void handleDoorCloseAfterTubeSetInsertion( void ); /**@}*/ Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -rd7cae63618be45748f93b1576ca49e7825fe0cf8 -rf42cda8b2f9a0494dedb2696cb250a5c0567b26e --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision d7cae63618be45748f93b1576ca49e7825fe0cf8) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision f42cda8b2f9a0494dedb2696cb250a5c0567b26e) @@ -184,8 +184,7 @@ SW_FAULT_ID_BLOOD_PRIME_INVALID_STATE = 153, SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE = 148, SW_FAULT_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 149, - SW_FAULT_ID_TD_INVALID_NO_CARTRIDGE_SELF_TEST_STATE = 150, - SW_FAULT_ID_TD_INVALID_DRY_SELF_TEST_STATE = 151, + SW_FAULT_ID_TD_INVALID_DRY_SELF_TEST_STATE = 150, NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T;