Index: MsgDefs.h =================================================================== diff -u -rc1ec243860b447dd9d9677acbc1e9ab3a8296761 -rc3457d2ed3af323dd8be52b8737144baef50c11b --- MsgDefs.h (.../MsgDefs.h) (revision c1ec243860b447dd9d9677acbc1e9ab3a8296761) +++ MsgDefs.h (.../MsgDefs.h) (revision c3457d2ed3af323dd8be52b8737144baef50c11b) @@ -168,9 +168,9 @@ MSG_ID_DG_SERIAL_NUMBER = 0x88, ///< DG serial number MSG_ID_UI_REQUEST_SERVICE_INFO = 0x89, ///< UI request for service schedule information MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A, ///< HD service schedule data - MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data TODO is this needed? + MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C, ///< DG service schedule data - MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data TODO is this needed? + MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E, ///< HD POST single test result MSG_ID_HD_POST_FINAL_TEST_RESULT = 0x8F, ///< HD POST final test result MSG_ID_DG_POST_SINGLE_TEST_RESULT = 0x90, ///< DG POST single test result @@ -195,7 +195,7 @@ MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish MSG_ID_HD_EVENT = 0xA4, ///< HD general event MSG_ID_DG_EVENT = 0xA5, ///< DG general event - MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, // TODO remove when DEN-13460 merged ///< DG dialysate flow meter data (liter/minute) + MSG_ID____AVAILABLE_4 = 0xA6, ///< This message is available for use MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios @@ -214,6 +214,7 @@ MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6, ///< HD request for DG to to go to service mode MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8, ///< HD request DG usage info + MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9, ///< HD request DG service record #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -366,7 +367,7 @@ MSG_ID_PRESSURE_OVERRIDE = 0xA006, ///< Pressure sensor override request MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007, ///< Pressure data broadcast interval override request MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA008, ///< DG HD Communication Status override - MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009, ///< RO measured flow rate override request + MSG_ID____AVAILABLE_6 = 0xA009, ///< Unused - this message ID is available for use MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A, ///< RO pump data broadcast interval override request MSG_ID_DRAIN_PUMP_SET_RPM = 0xA00B, ///< Drain pump set RPM override request MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request @@ -390,7 +391,7 @@ MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0xA01E, ///< DG switches data publish interval override MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0xA01F, ///< DG operation mode publish interval override MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION = 0xA020, ///< HD prevent transmission of given message(s) - MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE = 0xA021, ///< DG dialysate measured flow rate override request + MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE = 0xA021, ///< DG measured flow rate override request MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022, ///< DG reset request MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023, ///< DG concentrate pump measured speed override request MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024, ///< Concentrate pumps' target speed override request @@ -404,7 +405,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D, ///< DG thermistors data publish interval override MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E, ///< DG thermistors value override MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F, ///< DG RO pump duty cycle override - MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030, ///< DG RO flow rate override + MSG_ID____AVAILABLE_5 = 0xA030, ///< Message available for use MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031, ///< DG set RO pump target flow rate MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032, ///< DG RO pump target pressure override MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033, ///< DG set calibration record that is received from Dialin @@ -424,7 +425,7 @@ MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041, ///< DG flush mode data publish interval override MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042, ///< DG filter flush time period override MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043, ///< DG fans RPM override - MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044, ///< Dialysate flow data broadcast interval override request + MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044, ///< Flow data broadcast interval override request MSG_ID_DG_STOP_RTC_CLOCK = 0xA045, ///< DG stop RTC clock MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046, ///< DG drain pump measured RPM override MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047, ///< Clears all DG alarms (even if non-recoverable or fault) @@ -503,6 +504,9 @@ REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT = 43, ///< Syringe is not present REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN = 44, ///< Dialysate cap open REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN = 45, ///< Concentrate cap open + REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED = 46, ///< DG disinfect has been expired + REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE = 47, ///< DG service is due + REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48, ///< HD service is due 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