Index: dialin/common/msg_defs.py =================================================================== diff -u -r9f4b09153b7675bf1e73704710b6967a6101eff3 -r20061fe2205912140dbb711d3b64a3864472c0be --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 9f4b09153b7675bf1e73704710b6967a6101eff3) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 20061fe2205912140dbb711d3b64a3864472c0be) @@ -14,7 +14,6 @@ # ############################################################################ from enum import unique -from ..protocols.CAN import DenaliMessage from ..utils.base import DialinEnum @unique @@ -82,22 +81,24 @@ 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 = 0x003E # HD broadcast of air trap data - MSG_ID_UI_ALARM_USER_ACKNOWLEDGE = 0x3F # UI user has acknowledged alarm + MSG_ID_ALARM_CONDITION_CLEARED = 0x3F # Broadcast that the alarm condition has been cleared 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 UF 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_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C # HD Heparin Pause/Resume Response - MSG_ID_HD_HEPARIN_DATA = 0x4D # HD Broadcast heparin data - MSG_ID_UI_PRE_TREATMENT_UF_REQUEST = 0x4F # UI UF Initialization Request - MSG_ID_HD_PRE_TREATMENT_UF_RESPONSE = 0x50 # HD response to user request to adjust the ultrafiltration in pre-treatment + 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 + MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0x4F # UI request to validate new ultrafiltration volume treatment parameter + MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0x50 # HD response to new treatment parameters set MSG_ID_CAN_ERROR_COUNT = 0x999 # test code in support of EMC testing @@ -115,7 +116,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,6 +211,11 @@ 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 + 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_DG_RO_PUMP_TARGET_FLOW_OVERRIDE = 0xA031 # DG RO pump target flow rate override + MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032 # DG RO pump target pressure override + MSG_ID_DG_SET_CALIBRATION_DATA = 0xA033 # DG set calibration data MSG_ID_HD_DEBUG_EVENT = 0xFFF1 # HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2 # DG debug event text to be logged in event log @@ -247,7 +253,7 @@ class MsgFieldPositions: # Generic response msg field byte positions (where 32-bit data fields are used) - START_POS_FIELD_1 = DenaliMessage.PAYLOAD_START_INDEX + START_POS_FIELD_1 = 6 # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.DenaliMessage class END_POS_FIELD_1 = START_POS_FIELD_1 + 4 START_POS_FIELD_2 = END_POS_FIELD_1 END_POS_FIELD_2 = START_POS_FIELD_2 + 4 @@ -287,3 +293,8 @@ END_POS_FIELD_19 = START_POS_FIELD_19 + 4 START_POS_FIELD_20 = END_POS_FIELD_19 END_POS_FIELD_20 = START_POS_FIELD_20 + 4 + + +ACK_NOT_REQUIRED = [ + MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value +]