Index: MsgDefs.h =================================================================== diff -u -r7401873476799ef107c104aaf108d508e2b11cc2 -r14886db60fff8e176205f4f7168690b971b5d64c --- MsgDefs.h (.../MsgDefs.h) (revision 7401873476799ef107c104aaf108d508e2b11cc2) +++ MsgDefs.h (.../MsgDefs.h) (revision 14886db60fff8e176205f4f7168690b971b5d64c) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Raghu Kallala -* @date (last) 29-Apr-2026 +* @author (last) Varshini Nagabooshanam +* @date (last) 06-May-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -195,8 +195,19 @@ MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST = 0xA3, ///< UI water sample result request MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST = 0xA4, ///< UI pressure limit widen request. MSG_ID_TD_PRESSURE_LIMIT_WIDEN_RESPONSE = 0xA5, ///< TD pressure limit widen response. - MSG_ID_TD_SYRINGE_PUMP_DATA = 0xA9, ///< TD broadcast of syringe pump data - MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xA10, ///< TD response to pause/resume Heparin delivery request + MSG_ID_UI_RECIRCULATE_REQUEST = 0xA6, ///< UI recirculate request + MSG_ID_TD_RECIRCULATE_RESPONSE = 0xA7, ///< TD recirculate response + MSG_ID_TD_RECIRCULATE_DATA = 0xA8, ///< TD recirculate data + MSG_ID_UI_ADJUST_TREATMENT_LOGS_REQUEST = 0xA9, ///< UI adjust treatment logs request. + MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA, ///< TD adjust treatment logs response + 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_SYRINGE_PUMP_DATA = 0xB1, ///< TD broadcast of syringe pump data + MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2, ///< TD response to pause/resume Heparin delivery request // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -395,6 +406,7 @@ MSG_ID_DD_DIALYSATE_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA069, ///< DD Dialysate delta target conductivity override MSG_ID_DD_BICART_UPPER_PRESSURE_OVERRIDE_REQUEST = 0xA06A, ///< DD bicarb cartridge upper threshold pressure override MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST = 0xA06B, ///< DD bicarb cartridge lower threshold pressure override + MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C, ///< DD override request for D6 floater level override MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000, ///< First FP test message ID MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE, ///< FP tester log-in @@ -413,7 +425,7 @@ MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xB00D, ///< FP pressure sensor filter temperature override request MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E, ///< FP pressures data publish interval override request MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F, ///< FP level data publish interval override request - MSG_ID_FP_LEVEL_OVERRIDE_REQUEST = 0xB010, ///< FP override request for level sensor. + MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xB010, ///< FP override request for P25 floater level sensor. MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011, ///< FP flows data publish interval override request MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST = 0xB012, ///< FP override request for flow rate (mL/min) MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013, ///< FP override request for flow temperature (deg C) @@ -546,6 +558,7 @@ REQUEST_REJECT_REASON_ACID_CONV_FACTOR_MISMATCH = 54, ///< Acid conversion factor from UI mismatch with FW REQUEST_REJECT_REASON_INVALID_PATIENT_WEIGHTS = 55, ///< Patient pre and estimated target weights are invalid REQUEST_REJECT_REASON_UF_VOL_AND_WEIGHTS_INCONSISTENT = 56, ///< UF volume and the patient weights are not consistent + REQUEST_REJECT_REASON_TD_AUTHENTICATION_INVALID = 57, ///< TD authentication invalid NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes }; typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; ///< Type for settings change rejection reason codes enumeration Index: TDDefs.h =================================================================== diff -u -r57be07b7d65de128135bc3ae455d204e1b7c6fa6 -r14886db60fff8e176205f4f7168690b971b5d64c --- TDDefs.h (.../TDDefs.h) (revision 57be07b7d65de128135bc3ae455d204e1b7c6fa6) +++ TDDefs.h (.../TDDefs.h) (revision 14886db60fff8e176205f4f7168690b971b5d64c) @@ -7,8 +7,8 @@ * * @file TDDefs.h * -* @author (last) Raghu Kallala -* @date (last) 28-Apr-2026 +* @author (last) Varshini Nagabooshanam +* @date (last) 07-May-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -206,24 +206,26 @@ /// 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 starting state - DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to close before executing self-tests - DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE, ///< Used cartridge check dry self-test state - DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE, ///< Cartridge loaded check dry self-test state - DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE, ///< Seek syringe pumps state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE, ///< Pressure sensor setup state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE, ///< Venous pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS, ///< Venous pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE, ///< Arterial pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL, ///< Arterial pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE, ///< Pressure sensors verify pressure loss state - DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE, ///< Pressure sensors verify pressure stability state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE, ///< Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE, ///< Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE, ///< Occlusion detection state - DRY_SELF_TESTS_STOPPED_STATE, ///< Dry self-test stopped state - DRY_SELF_TESTS_COMPLETE_STATE, ///< Dry self-test complete state - NUM_OF_DRY_SELF_TESTS_STATES ///< Number of 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_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 + DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE, ///< Venous pressure stabilization state + DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE, ///< Venous pressure leak check state + DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE, ///< Venous pressure relief state + DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE, ///< Pressure arterial setup state + 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_OCCLUSION_CHECK_STATE, ///< Syringe pump occlusion check state + DRY_SELF_TESTS_COMPLETE_STATE, ///< Complete state + DRY_SELF_TESTS_STOPPED_STATE, ///< Stopped state + NUM_OF_DRY_SELF_TESTS_STATES ///< Number of dry self-tests states }; /// Type for dry self-tests enumeration. typedef enum TD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T; @@ -764,7 +766,9 @@ 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 TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, ///< TD wet self test displacement result TD_EVENT_CPU_RAM_ERROR_STATUS, ///< TD CPU RAM error status @@ -781,7 +785,6 @@ TD_EVENT_AIR_TRAP_FILL, ///< TD started/stopped an air trap fill operation. TD_EVENT_AIR_TRAP_LOWER, ///< TD started/stopped an air trap lower level operation. TD_EVENT_AIR_PUMP_ON_OFF, ///< TD turned air pump on/off. - TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD, ///< TD dry self test pressure decay waiting period. TD_EVENT_INSTIT_RECORD_UPDATE, ///< TD new institutional record has been updated. TD_EVENT_VALVE_POS_CHANGE, ///< TD pinch valve position change TD_EVENT_VALVE_HOMED_POS_SETTING, ///< TD pinch valve homed encoder positions for A/B/C.