Index: MsgDefs.h =================================================================== diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -rc467fbedc9f5739b5646ffeae9e45e1ac0ecea00 --- MsgDefs.h (.../MsgDefs.h) (revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3) +++ MsgDefs.h (.../MsgDefs.h) (revision c467fbedc9f5739b5646ffeae9e45e1ac0ecea00) @@ -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_ADJUST_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0x55, ///< UI adjust patient disconnect confirm request + MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0x56, ///< TD adjust patient disconnect confirm response 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,20 +200,25 @@ 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. - MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5, ///< DD substitution pump broadcast data. - MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6, ///< DD conductivity resistance data broadcast. + MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5, ///< TD request UI cancel. + MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI confirmation result response + MSG_ID_AVAILABLE_B7 = 0xB7, ///< Msg ID not used - available for use. MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment 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 // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -312,8 +317,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 @@ -346,7 +351,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 @@ -421,7 +426,7 @@ 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_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 MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001, ///< FP reset request @@ -533,7 +538,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