Index: MsgDefs.h =================================================================== diff -u -r913e8199cc8f5ac8d2dbf52884384d50729d40c7 -r4997b2ccddf764b2789e7469685926a1def4195d --- MsgDefs.h (.../MsgDefs.h) (revision 913e8199cc8f5ac8d2dbf52884384d50729d40c7) +++ MsgDefs.h (.../MsgDefs.h) (revision 4997b2ccddf764b2789e7469685926a1def4195d) @@ -31,8 +31,8 @@ MSG_ID_UNUSED = 0, ///< Zero is an undefined (un-used) message ID) MSG_ID_OFF_BUTTON_PRESS = 1, ///< HD/UI off button interactions MSG_ID_ALARM_STATUS = 2, ///< HD broadcast of system alarm state information - MSG_ID_ALARM_TRIGGERED = 3, ///< HD broadcast of a triggered alarm - MSG_ID_ALARM_CLEARED = 4, ///< HD broadcast of a cleared alarm + MSG_ID_ALARM_TRIGGERED = 3, ///< Alarm triggered event + MSG_ID_ALARM_CLEARED = 4, ///< Alarm cleared event MSG_ID_BLOOD_FLOW_DATA = 5, ///< HD broadcast of blood flow/pump data MSG_ID_DG_CHECK_IN = 6, ///< DG check-in with HD MSG_ID_UI_CHECK_IN = 7, ///< UI check-in with HD @@ -91,18 +91,22 @@ MSG_ID_UI_TREATMENT_END_REQUEST = 0x3C, ///< UI user treatment end request MSG_ID_HD_TREATMENT_END_RESPONSE = 0x3D, ///< HD response to user request to end treatment MSG_ID_HD_AIR_TRAP_DATA = 0x3E, ///< HD broadcast of air trap data - MSG_ID_UI_ALARM_USER_ACKNOWLEDGE = 0x3F, ///< UI user has acknowledged alarm + MSG_ID_ALARM_CONDITION_CLEARED = 0x3F, ///< Alarm condition cleared event MSG_ID_UI_ALARM_USER_ACTION = 0x40, ///< UI user has requested an alarm action MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41, ///< HD response to user request to pause or resume ultrafiltration MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42, ///< DG broadcast of concentrate pump data MSG_ID_DG_PRIMING_STATUS_DATA = 0x43, ///< HD priming status during cartridge prime MSG_ID_DG_UV_REACTORS_DATA = 0x44, ///< DG broadcast UV reactors data MSG_ID_DG_THERMISTORS_DATA = 0x45, ///< DG broadcast thermistors data - MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46, ///< DG broadcast thermistors data - MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47, ///< DG broadcast thermistors data + MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46, ///< UI request to change pressure limits + MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47, ///< HD response to change pressure limits request MSG_ID_DG_FANS_DATA = 0x48, ///< DG broadcast fans data MSG_ID_HD_CALIBRATION_DATA = 0x49, ///< HD broadcast calibration data MSG_ID_DG_CALIBRATION_DATA = 0x4A, ///< DG broadcast calibration data + MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B, ///< UI request to pause/resume Heparin delivery + MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C, ///< HD response to pause/resume Heparing delivery request + MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D, ///< HD broadcast of Heparin delivery data + MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0x4E, ///< UI command to set alarm audio volume level #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -123,7 +127,7 @@ MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE = 0x800A, ///< Blood pump motor controller speed override request MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE = 0x800B, ///< Blood pump motor controller current override request MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE = 0x800C, ///< Blood flow broadcast interval override request - MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE = 0x800D, ///< Alarm status broadcast interval override request + MSG_ID___AVAILABLE_1 = 0x800D, ///< This msg ID is available for use MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE = 0x800E, ///< Blood pump measured motor speed override request MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE = 0x800F, ///< Blood pump measured rotor speed override request MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE = 0x8010, ///< Dialysate inlet flow set point override request @@ -210,10 +214,9 @@ MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA025, ///< UV reactors data publish interval override MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST = 0xA026, ///< Concentrate pumps' state change request (on / off) MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0xA027, ///< Concentrate pumps' data publish interval override request - MSG_ID_DG_START_STOP_INLET_UV_REACTOR = 0xA028, ///< DG start/stop inlet UV reactor + MSG_ID_DG_START_STOP_UV_REACTORS = 0xA028, ///< DG start/stop UV reactors MSG_ID_DG_REQUEST_CALIBRATION_DATA = 0xA029, ///< Requests calibration data from DG MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02A, ///< DG fans data publish interval override request - MSG_ID_DG_START_STOP_OUTLET_UV_REACTOR = 0xA02B, ///< DG start/stop outlet UV reactor MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE = 0xA02C, ///< DG UV reactors health override request 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