Index: AlarmDefs.h =================================================================== diff -u -r7238f72393ddb8dd8bf835d56382060067c45153 -r8b98b48d47ac80c1acb73aa9b8dad45577da1be7 --- AlarmDefs.h (.../AlarmDefs.h) (revision 7238f72393ddb8dd8bf835d56382060067c45153) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 8b98b48d47ac80c1acb73aa9b8dad45577da1be7) @@ -216,10 +216,10 @@ ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT = 184, ///< TD syringe pump prime timeout ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT = 185, ///< FP P9 conductivity sensor fpga fault 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_INVALID_TUBING_SET = 187, ///< TD invalid tubing set ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET = 188, ///< TD install new blood tubing set - ALARM_ID_TD_TUBE_SET_NOT_DETECTED = 189, ///< TD no tubing set detected - ALARM_ID_TD_TUBE_SET_AUTHENTICATION_TIMEOUT = 190, ///< TD tubing set authentication timeout + ALARM_ID_TD_TUBING_SET_NOT_DETECTED = 189, ///< TD no tubing set detected + ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT = 190, ///< TD tubing set authentication timeout ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO = 191, ///< TD pressure too high to zero ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT = 192, ///< TD venous pressurization timeout ALARM_ID_TD_VENOUS_PRESSURE_DECAY = 193, ///< TD venous pressure decay failure @@ -421,10 +421,10 @@ { ALARM_PRIORITY_HIGH, 201, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , ALARM_ID_TD_VENOUS_PRESSURE_HIGH }, { 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, 717, 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, 717, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INVALID_TUBING_SET }, { 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_INSTALL_NEW_BLOOD_TUBING_SET }, - { ALARM_PRIORITY_LOW, 719, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TUBE_SET_NOT_DETECTED }, - { ALARM_PRIORITY_LOW, 720, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TUBE_SET_AUTHENTICATION_TIMEOUT }, + { ALARM_PRIORITY_LOW, 719, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TUBING_SET_NOT_DETECTED }, + { ALARM_PRIORITY_LOW, 720, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT }, { ALARM_PRIORITY_LOW, 721, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO }, { ALARM_PRIORITY_LOW, 722, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT }, { ALARM_PRIORITY_LOW, 723, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_VENOUS_PRESSURE_DECAY }, @@ -748,10 +748,10 @@ { 711, ALARM_ID_TD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 715, ALARM_ID_TD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 716, ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION }, - { 717, ALARM_ID_TD_INVALID_TUBE_SET }, + { 717, ALARM_ID_TD_INVALID_TUBING_SET }, { 718, ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET }, - { 719, ALARM_ID_TD_TUBE_SET_NOT_DETECTED }, - { 720, ALARM_ID_TD_TUBE_SET_AUTHENTICATION_TIMEOUT }, + { 719, ALARM_ID_TD_TUBING_SET_NOT_DETECTED }, + { 720, ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT }, { 721, ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO }, { 722, ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT }, { 723, ALARM_ID_TD_VENOUS_PRESSURE_DECAY }, @@ -997,10 +997,10 @@ { 184 , ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\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. | TD Fault: Pre- Tx Hep. Pump Timeout. | TD syringe pump timeout alarm | If the syringe pump priming > 5 seconds | "}, { 185 , ALARM_ID_FP_P9_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 (P9) located in inlet water path reporting error or not being read successfully | Conductvity Sensor (P9) is reporting an error or FPGA is failing to read sensor. | "}, { 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 Blood Tubing Set | A problem has been detected during self-test.\n- The installed blood tubing set is not valid.\n- Install a valid blood tubing set intended for the selected treatment modality. | Process: Pre-Tx Dry Self-Test | TD detected invalid tubing set during authentication | If authentication response indicates the tubing set is invalid. | "}, + { 187 , ALARM_ID_TD_INVALID_TUBING_SET , "TD | Invalid Blood Tubing Set | A problem has been detected during self-test.\n- The installed blood tubing set is not valid.\n- Install a valid blood tubing set intended for the selected treatment modality. | Process: Pre-Tx Dry Self-Test | TD detected invalid tubing set during authentication | If authentication response indicates the tubing 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 or no valid tubing set installed.\n- Install a new, unused blood tubing set and ensure proper installation. | Process: Pre-Tx Dry Self-Test | TD detected used, wet, or missing blood tubing set | If bubble is detected, air trap levels indicate fluid, or barcode scan fails. | "}, - { 189 , ALARM_ID_TD_TUBE_SET_NOT_DETECTED , "TD | No Blood Tubing Set Detected | A problem has been detected during self-test.\n- No blood tubing set detected in the system.\n- Install a blood tubing set and ensure proper placement. | Process: Pre-Tx Dry Self-Test | TD did not detect tubing set during verification | If no tubing set is detected during tube set loaded check. | "}, - { 190 , ALARM_ID_TD_TUBE_SET_AUTHENTICATION_TIMEOUT , "TD | Tubing Set Authentication Timeout | A problem has been detected during self-test.\n- Authentication response not received.\n- Retry or check system communication. | Process: Pre-Tx Dry Self-Test | TD did not receive authentication response from UI | If no authentication response is received within timeout period. | "}, + { 189 , ALARM_ID_TD_TUBING_SET_NOT_DETECTED , "TD | No Blood Tubing Set Detected | A problem has been detected during self-test.\n- No blood tubing set detected in the system.\n- Install a blood tubing set and ensure proper placement. | Process: Pre-Tx Dry Self-Test | TD did not detect tubing set during verification | If no tubing set is detected during tube set loaded check. | "}, + { 190 , ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT , "TD | Tubing Set Authentication Timeout | A problem has been detected during self-test.\n- Authentication response not received.\n- Retry or check system communication. | Process: Pre-Tx Dry Self-Test | TD did not receive authentication response from UI | If no authentication response is received within timeout period. | "}, { 191 , ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO , "TD | Pressure Too High to Zero | A problem has been detected during self-test.\n- Pressure levels are too high to perform sensor zeroing.\n- Ensure system is open to atmosphere and retry. | Process: Pre-Tx Dry Self-Test | TD detected high pressure during zeroing | If arterial or venous pressure ≥ 15 mmHg during pressure sensor normal setup. | "}, { 192 , ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT , "TD | Venous Pressurization Timeout | A problem has been detected during self-test.\n- Venous pressure did not reach required level.\n- Check tubing connections and system integrity. | Process: Pre-Tx Dry Self-Test | TD failed to reach venous pressure target | If venous pressure does not reach threshold within allowed time. | "}, { 193 , ALARM_ID_TD_VENOUS_PRESSURE_DECAY , "TD | Venous Pressure Decay | A problem has been detected during self-test.\n- Venous pressure dropped more than expected.\n- Check for leaks or loose connections. | Process: Pre-Tx Dry Self-Test | TD detected excessive venous pressure decay | If venous pressure reduction exceeds allowed tolerance during stabilization. | "}, Index: MsgDefs.h =================================================================== diff -u -r7238f72393ddb8dd8bf835d56382060067c45153 -r8b98b48d47ac80c1acb73aa9b8dad45577da1be7 --- MsgDefs.h (.../MsgDefs.h) (revision 7238f72393ddb8dd8bf835d56382060067c45153) +++ MsgDefs.h (.../MsgDefs.h) (revision 8b98b48d47ac80c1acb73aa9b8dad45577da1be7) @@ -203,9 +203,8 @@ MSG_ID_UI_ADJUST_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0xAB, ///< UI adjust patient disconnect confirm request MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0xAC, ///< TD adjust patient disconnect confirm response MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD, ///< TD dry self test progress data - MSG_ID_TD_TUBING_SET_BARCODE_SCAN_REQUEST = 0xAE, ///< TD tube set authentication request - MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF, ///< UI tube set authentication acknowledge request - MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0, ///< TD tube set authentication acknowledge response + MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE, ///< UI tube set authentication acknowledge request + MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF, ///< TD tube set authentication acknowledge response // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID Index: TDDefs.h =================================================================== diff -u -r7238f72393ddb8dd8bf835d56382060067c45153 -r8b98b48d47ac80c1acb73aa9b8dad45577da1be7 --- TDDefs.h (.../TDDefs.h) (revision 7238f72393ddb8dd8bf835d56382060067c45153) +++ TDDefs.h (.../TDDefs.h) (revision 8b98b48d47ac80c1acb73aa9b8dad45577da1be7) @@ -206,11 +206,10 @@ /// Enumeration of dry self-tests sub-mode states. enum TD_Pre_Treatment_Dry_Self_Tests_States { - DRY_SELF_TESTS_START_STATE = 0, ///< Dry self-tests start state DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 0, ///< Wait for door close 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_USED_TUBING_SET_CHECK_STATE, ///< Used tubing set check state + DRY_SELF_TESTS_TUBING_SET_LOADED_CHECK_STATE, ///< Tubing set loaded check state + DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE, ///< Tubing 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 DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE, ///< Pressure venous setup state