Index: MsgDefs.h =================================================================== diff -u -r7fd5b417a72b738bfccf9bb2222b1f668e4661fc -r62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d --- MsgDefs.h (.../MsgDefs.h) (revision 7fd5b417a72b738bfccf9bb2222b1f668e4661fc) +++ MsgDefs.h (.../MsgDefs.h) (revision 62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Vijay Pamula -* @date (last) 12-Jun-2026 +* @author (last) Arpita Srivastava +* @date (last) 30-Jul-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -114,8 +114,8 @@ MSG_ID_DD_SERIAL_RESPONSE = 0x52, ///< DD response to UI serial request MSG_ID_TD_TEMPERATURE_DATA = 0x53, ///< TD Temperature broadcast data MSG_ID_TD_BATTERY_DATA = 0x54, ///< TD Battery broadcast data - MSG_ID_FP_FILTER_FLUSH_DATA = 0x55, ///< FP Filter Flush broadcast data - MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56, ///< FP Permeate Flush broadcast data + MSG_ID_UI_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0x55, ///< UI requests patient disconnect confirmation. + MSG_ID_TD_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0x56, ///< TD response to patient disconnect confirmation request. MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57, ///< FP Concentrate Flush broadcast data MSG_ID_FP_GENP_DEF_DATA = 0x58, ///< FP Generate Permeate Defeatured broadcast data MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59, ///< FP Pre Generate Permeate Defeatured broadcast data @@ -200,21 +200,74 @@ 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_WATER_SAMPLE_RESULT_RESPONSE = 0xAB, ///< UI water sample result response + MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC, ///< TD broadcast water sample data + MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD, ///< TD broadcast of treatment log average data + MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE, ///< TD dry self test progress data 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. +<<<<<<< HEAD //MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5, ///< DD substitution pump broadcast data. MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5, ///< TD request for genric ui confirmation MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI generic confirmation result to TD +======= + MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5, ///< TD request for generic UI confirmation. + MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI generic confirmation result to TD. + MSG_ID_AVAILABLE_B7 = 0xB7, ///< Msg ID not used - available for use. +>>>>>>> staging MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response + MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6, ///< UI setup connection confirmation request + MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7, ///< TD setup connection confirmation response + MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB, ///< DD substitution pump broadcast data. + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC, ///< DD conductivity resistance data broadcast. + MSG_ID_FP_FILTER_FLUSH_DATA = 0xDD, ///< FP Filter Flush broadcast data + MSG_ID_FP_PERMEATE_FLUSH_DATA = 0xDE, ///< FP Permeate Flush broadcast data + MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST = 0x100, ///< DD NVM Get NVM Record Request + MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE = 0x101, ///< DD NVM Get System Record Response + MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST = 0x102, ///< DD NVM Set System Record Request + MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0x103, ///< DD NVM Get Service Record Response + MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST = 0x104, ///< DD NVM Set Service Record Request + MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0x105, ///< DD NVM Get Institutional Record Response + MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST = 0x106, ///< DD NVM Set Institutional Record Request + MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0x107, ///< DD NVM Get Usage Info Record Response + MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST = 0x108, ///< DD NVM Set Usage Info Record Request + MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0x109, ///< DD NVM Get Pressure Sensor Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST = 0x10A, ///< DD NVM Set Pressure Sensor Calibration Record Request + MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0x10B, ///< DD NVM Get Temperature Sensor Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST = 0x10C, ///< DD NVM Set Temperature Sensor Calibration Record Request + MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0x10D, ///< DD NVM Get Concentrate Pump Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST = 0x10E, ///< DD NVM Set Concentrate Pump Calibration Record Request + MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0x10F, ///< DD NVM Get D12 Dialysate Pump Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST = 0x110, ///< DD NVM Set D12 Dialysate Pump Calibration Record Request + MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0x111, ///< DD NVM Get D48 Dialysate Pump Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST = 0x112, ///< DD NVM Set D48 Dialysate Pump Calibration Record Request + MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0x113, ///< DD NVM Get Acid Concentrate Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST = 0x114, ///< DD NVM Set Acid Concentrate Calibration Record Request + MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0x115, ///< DD NVM Get Bicarbonate Concentrate Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST = 0x116, ///< DD NVM Set Bicarbonate Concentrate Calibration Record Request + MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0x117, ///< DD NVM Get Accelerometer Sensor Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST = 0x118, ///< DD NVM Set Accelerometer Sensor Calibration Record Request + MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0x119, ///< DD NVM Get Blood Leak Sensor Calibration Record Response + MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST = 0x11A, ///< DD NVM Set Blood Leak Sensor Calibration Record Request + MSG_ID_DD_NVM_GET_RECORD_RESPONSE = 0x11B, ///< DD NVM Get Calibration Response + MSG_ID_DD_NVM_SET_SYSTEM_RECORD_RESPONSE = 0x11C, ///< DD NVM Set System Record Response + MSG_ID_DD_NVM_SET_SERVICE_RECORD_RESPONSE = 0x11D, ///< DD NVM Set Service Record Response + MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD_RESPONSE = 0x11E, ///< DD NVM Set Institutional Record Response + MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD_RESPONSE = 0x11F, ///< DD NVM Set Usage Info Record Response + MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR_RESPONSE = 0x120, ///< DD NVM Set Pressure Sensor Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR_RESPONSE = 0x121, ///< DD NVM Set Temperature Sensor Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_CONC_PUMP_RESPONSE = 0x122, ///< DD NVM Set Concentrate Pump Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_D12_PUMP_RESPONSE = 0x123, ///< DD NVM Set D12 Dialysate Pump Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_D48_PUMP_RESPONSE = 0x124, ///< DD NVM Set D48 Dialysate Pump Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE_RESPONSE = 0x125, ///< DD NVM Set Acid Concentrate Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE_RESPONSE = 0x126, ///< DD NVM Set Bicarbonate Concentrate Calibration Record Response + MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR_RESPONSE = 0x127, ///< DD NVM Set Accelerometer Sensor Calibration Record Response. + MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0x128, ///< DD NVM Set Blood Leak Sensor Calibration Record Response. // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -303,6 +356,8 @@ MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058, ///< TD syringe pump ADC read counter override request MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059, ///< TD heparin bolus target rate override request MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060, ///< TD set syringe pump force sensor DAC calibration request + MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061, ///< TD send alarm table properties request + MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062, ///< TD send alarm table properties response to Dialin MSG_ID_TD_RINSEBACK_VOLUME_OVERRIDE = 0x8065, ///< TD rinseback volume override MSG_ID_TD_RINSEBACK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8066, ///< TD rinseback publish interval broadcast override. @@ -315,8 +370,8 @@ MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005, ///< DD valve sensed state override request MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006, ///< DD pressure sensor override request MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007, ///< DD pressure sensor temperature override request - MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008, ///< DD Treatment parameters override request - MSG_ID_AVAILABLE_3 = 0xA009, ///< DD Msg ID not used - available for use. + MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008, ///< DD pressure sensor read counter override request + MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009, ///< DD pressure sensor error counter override request MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A, ///< DD pressure sensor publish interval override request MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B, ///< DD pressure sensor filter readings override request MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xA00C, ///< DD pressure sensor filter temperature override request @@ -349,7 +404,7 @@ MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027, ///< DD TD CAN Communication status override request MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028, ///< DD operation mode status override request MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029, ///< DD set new operation mode override request - MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD ultrafiltration data publish interval override request + MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02A, ///< DD ultrafiltration data publish interval override request MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B, ///< DD dialysate pumps start/stop override request MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C, ///< DD generate dialysate mode data publish interval override request MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D, ///< DD Concentrate pumps start/stop override request @@ -403,10 +458,10 @@ MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D, ///< DD conductivity sensor resistance override request MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xA05E, ///< DD conductivity sensor version request MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xA05F, ///< DD conductivity sensor version response - MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060, ///< DD bicarb mix volume control kp gain - MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061, ///< DD bicarb mix volume control ki gain - MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062, ///< DD acid mix volume control kp gain - MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063, ///< DD acid mix volume control kp gain + MSG_ID_DD_BICARB_MIX_VOL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060, ///< DD bicarb mix volume control kp gain + MSG_ID_DD_BICARB_MIX_VOL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061, ///< DD bicarb mix volume control ki gain + MSG_ID_DD_ACID_MIX_VOL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062, ///< DD acid mix volume control kp gain + MSG_ID_DD_ACID_MIX_VOL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063, ///< DD acid mix volume control kp gain MSG_ID_DD_ACID_MIX_VOL_OVERRIDE_REQUEST = 0xA064, ///< DD acid mix volume override MSG_ID_DD_BICARB_MIX_VOL_OVERRIDE_REQUEST = 0xA065, ///< DD bicarb mix volume override MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA066, ///< DD bicarb target conductivity override @@ -419,6 +474,13 @@ 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_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070, ///< DD conductivity sensor cal request + MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071, ///< DD conductivity sensor cal response + MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072, ///< DD mixing control publish data + MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA073, ///< DD DD mixing control broadcast data overrride request + MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST = 0xA074, ///< DD dry bicart depressurise overrride request + MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA075, ///< DD Treatment parameters override request + MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xA076, ///< DD NVM Record CRC 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 @@ -498,6 +560,8 @@ MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A, ///< FP response for boost pump installation status to Dialin MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B, ///< FP conductivity sensor version request MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C, ///< FP conductivity sensor version response + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D, ///< FP conductivity sensor cal request + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E, ///< FP conductivity sensor cal response MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log @@ -529,7 +593,7 @@ 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_FLUID_BOLUS_IN_PROGRESS = 16, ///< A fluid 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 @@ -574,6 +638,10 @@ 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 + REQUEST_REJECT_REASON_MODALITY_MISMATCH = 61, ///< Mismatched modality (Rx entered vs reatment initiation modality ) + REQUEST_REJECT_REASON_NVM_JOB_QUEUE_BUSY = 62, ///< NVM Job queue is busy sending other records. + REQUEST_REJECT_REASON_NVM_INVALID_CRC = 63, ///< NVM received CRC of the record is invalid + REQUEST_REJECT_REASON_NVM_INVALID_OPERATION_MODE = 64, ///< NVM Operation Mode is not Service mode. 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