Index: MsgDefs.h =================================================================== diff -u -r26fe07688d657baea9b1781c20561cc9c63aee0d -r74900728e3729be88f2581bb2ff03a978b6a46cb --- MsgDefs.h (.../MsgDefs.h) (revision 26fe07688d657baea9b1781c20561cc9c63aee0d) +++ MsgDefs.h (.../MsgDefs.h) (revision 74900728e3729be88f2581bb2ff03a978b6a46cb) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Praneeth Bunne -* @date (last) 21-May-2026 +* @author (last) Michael Garthwaite +* @date (last) 11-Jun-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -90,12 +90,12 @@ MSG_ID_FP_HEATER_DATA = 0x3A, ///< FP heater data broadcast MSG_ID_TD_TREATMENT_TIME_DATA = 0x3B, ///< TD treatment time data broadcast MSG_ID_TD_TREATMENT_STATE_DATA = 0x3C, ///< TD treatment state data broadcast - MSG_ID_TD_SALINE_BOLUS_DATA = 0x3D, ///< TD saline bolus status data broadcast + MSG_ID_TD_FLUID_BOLUS_DATA = 0x3D, ///< TD fluid bolus status data broadcast MSG_ID_TD_ULTRAFILTRATION_DATA = 0x3E, ///< TD ultrafiltration status data broadcast MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE = 0x3F, ///< UI treatment parameters to be validated by TD MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE = 0x40, ///< TD response to treatment parameter validation request - MSG_ID_AVAILABLE_2 = 0x41, ///< Available message ID 2 - MSG_ID_AVAILABLE_4 = 0x42, ///< Available message ID 3 + MSG_ID_UI_TREATMENT_UF_VOLUME_VALIDATE_REQUEST = 0x41, ///< UI ultrafiltration volume parameter to be validated by TD + MSG_ID_TD_TREATMENT_UF_VOLUME_VALIDATE_RESPONSE = 0x42, ///< TD response to ultrafiltration volume validation request MSG_ID_TD_TREATMENT_PARAM_RANGES = 0x43, ///< TD treatment parameter ranges for UI MSG_ID_TD_VALIDATED_TREATMENT_PARAMS = 0x44, ///< Treatment parameters validated and confirmed from TD MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW = 0x45, ///< UI initiate/cancel treatment workflow request @@ -124,15 +124,15 @@ MSG_ID_DD_UF_DATA = 0x5C, ///< DD ultrafiltration data MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D, ///< FP Permeate tank broadcast data MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E, ///< DD spent chamber fill broadcast data - MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F, ///< UI solution infusion request - MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60, ///< TD solution infusion response + MSG_ID_UI_FLUID_BOLUS_REQUEST = 0x5F, ///< UI Fluid Bolus request + MSG_ID_TD_FLUID_BOLUS_RESPONSE = 0x60, ///< TD Fluid Bolus response MSG_ID_DD_BLOOD_LEAK_DATA = 0x61, ///< DD blood leak data MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62, ///< FP Inlet Pressure Check broadcast data MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63, ///< UI request to initiate a blood pressure reading MSG_ID_TD_BLOOD_PRESSURE_READING = 0x64, ///< TD blood pressure reading to UI MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65, ///< TD blood pressure broadcast data - MSG_ID_UI_ULTRAFILTRATION_CHANGE_VALIDATE_REQUEST = 0x66, ///< UI request to validate ultrafiltration volume change - MSG_ID_TD_ULTRAFILTRATION_CHANGE_VALIDATE_RESPONSE = 0x67, ///< TD response to request to validate ultrafiltration volume change + MSG_ID_UI_ULTRAFILTRATION_CHANGE_CONFIRM_REQUEST = 0x66, ///< UI request to validate ultrafiltration volume change + MSG_ID_TD_ULTRAFILTRATION_CHANGE_CONFIRM_RESPONSE = 0x67, ///< TD response to request to validate ultrafiltration volume change MSG_ID_DD_VOLTAGES_DATA = 0x68, ///< DD voltage broadcast data MSG_ID_DD_RINSE_PUMP_DATA = 0x69, ///< DD rinse pump data MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT = 0x6A, ///< TD treatment log alarm event @@ -157,8 +157,8 @@ MSG_ID_TD_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_RESPONSE = 0x7D, ///< TD treatment set point blood flow change response MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST = 0x7E, ///< UI treatment set point dialysate flow change request MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_RESPONSE = 0x7F, ///< TD treatment set point dialysate flow change response - MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_REQUEST = 0x80, ///< UI treatment set point dialysate temperature change request - MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_RESPONSE = 0x81, ///< TD treatment set point dialysate temperature change response + MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_REQUEST = 0x80, ///< UI treatment set point dialysate temperature change request + MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_RESPONSE = 0x81, ///< TD treatment set point dialysate temperature change response MSG_ID_TD_INSTITUTIONAL_RECORD_REQUEST = 0x82, ///< TD institutional record request MSG_ID_TD_INSTITUTIONAL_RECORD_RESPONSE = 0x83, ///< TD institutional record response MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_REQUEST = 0x84, ///< TD adjust institutional record request @@ -207,6 +207,14 @@ MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF, ///< TD tube set authentication acknowledge response MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB0, ///< TD broadcast of syringe pump data MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB1, ///< TD response to pause/resume Heparin delivery request + 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 + MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3, ///< FFU signal TD update is available. + MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4, ///< FFU signal DD update is available. + MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5, ///< DD substitution pump broadcast data. // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -406,6 +414,9 @@ 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_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D, ///< DD substitution pump start stop override request + MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_INTERVAL_OVERRIDE_REQUEST = 0xA06E, ///< DD substitution pump broadcast override request + MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_RATE_OVERRIDE_REQUEST = 0xA06F, ///< DD substitution pump target speed override request. 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 @@ -516,11 +527,11 @@ REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM = 13, ///< Treatment time change is less than minimum treatment time REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14, ///< Ultrafiltration is not currently in progress REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15, ///< Ultrafiltration is not currently paused - REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16, ///< A saline bolus is in progress + REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS = 16, ///< A fluid bolus is in progress REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED = 18, ///< Filter flush time has been expired REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 19, ///< Saline bolus volume maximum has been reached - no more saline allowed - REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 20, ///< A saline bolus is not in progress + REQUEST_REJECT_REASON_FLUID_BOLUS_NOT_IN_PROGRESS = 20, ///< A fluid bolus is not in progress REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 21, ///< Requested user action is disabled in current state REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 22, ///< Requested user action not allowed while alarm is active REQUEST_REJECT_REASON_INVALID_COMMAND = 23, ///< Requested user action invalid @@ -543,7 +554,7 @@ REQUEST_REJECT_REASON_TD_SERVICE_IS_DUE = 40, ///< TD service is due REQUEST_REJECT_REASON_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 41, ///< RO filter temperature out of range REQUEST_REJECT_REASON_DD_INCOMPATIBLE = 42, ///< DD firmware version is not compatible with TD firmware - REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 43, ///< Saline bolus is not allowed during dialyzer reprime + REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 43, ///< Fluid bolus is not allowed during dialyzer reprime REQUEST_REJECT_REASON_RO_ONLY_MODE_DD_BUSY = 44, ///< RO only mode DD is busy REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER = 45, ///< RO only mode invalid parameter REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46, ///< RO only mode invalid payload length @@ -557,6 +568,10 @@ 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 + REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED = 58, ///< Confirmation received without prior validation + REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH = 59, ///< Confirmed value does not match validated value + REQUEST_REJECT_REASON_INVALID_TREATMENT_SUB_STATE = 60, ///< Request is not allowed in current treatment sub-state 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