Index: AlarmDefs.h =================================================================== diff -u -r8f4c7a14f0ed74c238c7c72a316a026e50dc3cec -r3a7dfff801e256d774db4f61f511995d8ef0233a --- AlarmDefs.h (.../AlarmDefs.h) (revision 8f4c7a14f0ed74c238c7c72a316a026e50dc3cec) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3a7dfff801e256d774db4f61f511995d8ef0233a) @@ -218,8 +218,8 @@ ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT = 186, ///< FP P18 conductivity sensor fpga fault ALARM_ID_TD_INVALID_TUBE_SET = 187, ///< TD invalid tube set ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET = 188, ///< TD install new blood tubing set - ALARM_ID_TD_INSTALL_NEW_CARTRIDGE = 189, ///< TD install new catridge - ALARM_ID_TD_NO_CARTRIDGE_LOADED = 190, ///< TD no catridge loaded + ALARM_ID_TD_INSTALL_NEW_TUBE_SET = 189, ///< TD install new catridge + ALARM_ID_TD_NO_TUBE_SET_LOADED = 190, ///< TD no catridge loaded NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -412,9 +412,9 @@ { ALARM_PRIORITY_HIGH, 10, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_VENOUS_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_LOW, 700, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, { ALARM_PRIORITY_LOW, 712, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET }, - { ALARM_PRIORITY_LOW, 713, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INSTALL_NEW_CARTRIDGE }, - { ALARM_PRIORITY_LOW, 714, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_NO_CARTRIDGE_LOADED }, - { ALARM_PRIORITY_LOW, 718, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INVALID_TUBE_SET }, + { ALARM_PRIORITY_LOW, 713, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INSTALL_NEW_TUBE_SET }, + { ALARM_PRIORITY_LOW, 714, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_NO_TUBE_SET_LOADED }, + { ALARM_PRIORITY_LOW, 718, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INVALID_TUBE_SET }, // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID { ALARM_PRIORITY_LOW, 710, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR }, @@ -728,8 +728,8 @@ { 710, ALARM_ID_TD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE }, { 711, ALARM_ID_TD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 712, ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET }, - { 713, ALARM_ID_TD_INSTALL_NEW_CARTRIDGE }, - { 714, ALARM_ID_TD_NO_CARTRIDGE_LOADED }, + { 713, ALARM_ID_TD_INSTALL_NEW_TUBE_SET }, + { 714, ALARM_ID_TD_NO_TUBE_SET_LOADED }, { 715, ALARM_ID_TD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 716, ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION }, { 718, ALARM_ID_TD_INVALID_TUBE_SET }, @@ -971,8 +971,8 @@ { 186 , ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT , "FP | Service Required: FP Device | A problem was detected with the FP device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Conductivity Sensor Error | FP conductivity sensor (P18) located in inlet water path reporting error or not being read successfully | Conductvity Sensor (P18) is reporting an error or FPGA is failing to read sensor. | "}, { 187 , ALARM_ID_TD_INVALID_TUBE_SET , "TD | Invalid Tube Set Detected | A problem has been detected during self-test.\n- The installed tube set is not valid.\n- Install a compatible blood tubing set and try again. | Process: Pre-Tx Dry Self-Test | Tube set authentication failed due to invalid tubing set | If the tube set authentication response indicates the installed tube set is invalid. | "}, { 188 , ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET , "TD | Install New Blood Tubing Set | A problem has been detected during self-test.\n- Fluid detected in the tubing set.\n- Install a new, unused blood tubing set and ensure proper installation. | Process: Pre-Tx Dry Self-Test | TD detected used or wet blood tubing set during self-test | If bubble is detected or air trap levels indicate fluid presence during cartridge verification. | "}, - { 189 , ALARM_ID_TD_INSTALL_NEW_CARTRIDGE , "TD | Install New Cartridge | A problem has been detected during self-test.\n- Cartridge is invalid or not recognized.\n- Install a new cartridge and ensure proper placement. | Process: Pre-Tx Dry Self-Test | TD detected invalid or unreadable cartridge during barcode verification | If barcode scan fails or cartridge identification is unsuccessful. | "}, - { 190 , ALARM_ID_TD_NO_CARTRIDGE_LOADED , "TD | No Cartridge Loaded | A problem has been detected during self-test.\n- Cartridge is not detected.\n- Confirm cartridge is properly installed. | Process: Pre-Tx Dry Self-Test | TD detected no cartridge present during verification | If cartridge presence check fails or no cartridge is detected by the system | "}, + { 189 , ALARM_ID_TD_INSTALL_NEW_TUBE_SET , "TD | Install New Cartridge | A problem has been detected during self-test.\n- Cartridge is invalid or not recognized.\n- Install a new cartridge and ensure proper placement. | Process: Pre-Tx Dry Self-Test | TD detected invalid or unreadable cartridge during barcode verification | If barcode scan fails or cartridge identification is unsuccessful. | "}, + { 190 , ALARM_ID_TD_NO_TUBE_SET_LOADED , "TD | No Cartridge Loaded | A problem has been detected during self-test.\n- Cartridge is not detected.\n- Confirm cartridge is properly installed. | Process: Pre-Tx Dry Self-Test | TD detected no cartridge present during verification | If cartridge presence check fails or no cartridge is detected by the system | "}, }; #endif // manual alarms Index: TDDefs.h =================================================================== diff -u -r8f4c7a14f0ed74c238c7c72a316a026e50dc3cec -r3a7dfff801e256d774db4f61f511995d8ef0233a --- TDDefs.h (.../TDDefs.h) (revision 8f4c7a14f0ed74c238c7c72a316a026e50dc3cec) +++ TDDefs.h (.../TDDefs.h) (revision 3a7dfff801e256d774db4f61f511995d8ef0233a) @@ -208,8 +208,8 @@ { DRY_SELF_TESTS_START_STATE = 0, ///< Dry self-tests start state DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door close state - DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE, ///< Used cartridge check state - DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE, ///< Cartridge loaded check state + DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE, ///< Used tube set check state + DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE, ///< Tube set loaded check state DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE, ///< Tube set authentication state DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE, ///< Syringe pump seek state DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE, ///< Pressure sensor normal setup state @@ -221,7 +221,7 @@ DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE, ///< Arterial pressure stabilization state DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE, ///< Arterial pressure leak check state DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE, ///< Arterial pressure relief state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE, ///< Syringe prime state + DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE, ///< Syringe prime state DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE, ///< Syringe pump occlusion check state DRY_SELF_TESTS_COMPLETE_STATE, ///< Complete state DRY_SELF_TESTS_STOPPED_STATE, ///< Stopped state @@ -720,7 +720,7 @@ TD_EVENT_STARTUP = 0, ///< TD startup event TD_EVENT_OP_MODE_CHANGE, ///< TD Op mode change event TD_EVENT_SUB_MODE_CHANGE, ///< TD Op sub-mode change event - TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, ///< TD dry self test cartridge result + TD_EVENT_DRY_SELF_TEST_TUBESET_RESULT, ///< TD dry self test cartridge result TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST, ///< TD tubing set barcode scan request TD_EVENT_TUBING_SET_BARCODE_SCAN_AUTHENTICATED, ///< TD tubing set barcode scan authenticated TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT, ///< TD dry self test pressure result