Index: MsgDefs.h =================================================================== diff -u -rbd82717bc277e77792d259d83ac250c68803bc0a -r0add9fc32d9990da9c06208d3a40445bda885ee9 --- MsgDefs.h (.../MsgDefs.h) (revision bd82717bc277e77792d259d83ac250c68803bc0a) +++ MsgDefs.h (.../MsgDefs.h) (revision 0add9fc32d9990da9c06208d3a40445bda885ee9) @@ -94,8 +94,8 @@ 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 @@ -131,8 +131,8 @@ 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 @@ -559,6 +559,8 @@ 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 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 -rbd82717bc277e77792d259d83ac250c68803bc0a -r0add9fc32d9990da9c06208d3a40445bda885ee9 --- TDDefs.h (.../TDDefs.h) (revision bd82717bc277e77792d259d83ac250c68803bc0a) +++ TDDefs.h (.../TDDefs.h) (revision 0add9fc32d9990da9c06208d3a40445bda885ee9) @@ -640,6 +640,23 @@ }; typedef enum Treatment_Params TREATMENT_PARAM_T; ///< Type for treatment parameters enumeration +/// Enumeration of treatment set point parameter indices. +enum Treatment_SetPoint_Params +{ + TREATMENT_SETPOINT_BLOOD_FLOW = 0, ///< Blood flow rate (in mL/min) + TREATMENT_SETPOINT_DIALYSATE_FLOW, ///< Dialysate flow rate (in mL/min) + TREATMENT_SETPOINT_DIALYSATE_TEMPERATURE, ///< Dialysate temperature (in degC) + TREATMENT_SETPOINT_ACID_CONCENTRATE, ///< Acid concentrate type (enum) + TREATMENT_SETPOINT_ACID_CONVERSION_FACTOR, ///< Acid concentrate conversion factor + TREATMENT_SETPOINT_BICARB_CONCENTRATE, ///< Bicarbonate concentrate type (enum) + TREATMENT_SETPOINT_TREATMENT_MODALITY, ///< Treatment modality type (enum) + TREATMENT_SETPOINT_HEPATITIS_STATUS, ///< Hepatitis B status (enum) + TREATMENT_SETPOINT_SODIUM, ///< Sodium concentration (mEq/L) + TREATMENT_SETPOINT_BICARBONATE, ///< Bicarbonate concentration (mEq/L) + NUM_OF_TREATMENT_SETPOINT_PARAMS ///< Total number of treatment set point parameters +}; +typedef enum Treatment_SetPoint_Params TREATMENT_SETPOINT_PARAM_T; ///< Type for treatment set point parameter indices enumeration + /// Enumeration of system configured treatment parameters. enum System_Config_Treatment_Params {