Index: dialin/common/alarm_defs.py =================================================================== diff -u -r187980e6e0c0c490e6ed0f8c6831c8e44086586f -re485785be0282bc516d09c86f7e90b07c7ca03f1 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 187980e6e0c0c490e6ed0f8c6831c8e44086586f) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision e485785be0282bc516d09c86f7e90b07c7ca03f1) @@ -125,7 +125,24 @@ ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE = 104 # DG drain pump RPM out of range. ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 105 # DG heaters cold junction temperature out of range. ALARM_ID_DG_HEATERS_FAULT = 106 # DG heaters fault. - NUM_OF_ALARM_IDS = 107 # Total number of alarms + ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING = 107 # HD end of treatment warning + ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM = 108 # HD end of treatment alarm (user not acting to end treatment) + ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM_HIGH = 109 # HD end of treatment alarm (high priority - user still not acting to end treatment) + ALARM_ID_DG_HEAT_DISINFECT_CYCLE_FAILED = 110 # DG heat disinfect cycle failed + ALARM_ID_RO_PUMP_RAMP_UP_TO_FLOW_TIMEOUT = 111 # DG RO pump ramp up to target flow time out + ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 112 # DG flow rate out of lower range + ALARM_ID_DRAIN_PUMP_OFF_FAULT = 113 # DG drain pump off fault + ALARM_ID_RO_PUMP_OFF_FAULT = 114 # DG RO pump off fault + ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT = 115 # HD prime dialysate dialyzer time out alarm + ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 116 # HD prime dialysate bypass time out alarm + ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 117 # HD prime completed low priority alarm + ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118 # HD prime completed medium priority alarm + ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119 # HD prime completed high priority alarm + ALARM_ID_PRIME_OUT_OF_TIME = 120 # HD prime out of time alarm + ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 121 # HD requests DG command with invalid parameter fault + ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 122 # HD sees primary load cell for reservoir 1 change too much too fast + ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 123 # HD sees primary load cell for reservoir 1 change too much too fast + NUM_OF_ALARM_IDS = 124 # Total number of alarms @unique class AlarmPriorities(DialinEnum): Index: dialin/common/msg_defs.py =================================================================== diff -u -r18c04cbcd10619250868cec39470a2b29c86121b -re485785be0282bc516d09c86f7e90b07c7ca03f1 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 18c04cbcd10619250868cec39470a2b29c86121b) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision e485785be0282bc516d09c86f7e90b07c7ca03f1) @@ -79,8 +79,8 @@ MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39 # HD response to user request to initiate a treatment MSG_ID_HD_VALVES_DATA = 0x3A # HD broadcast of valves data MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B # UI user confirmation of treatment parameters - 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___AVAILABLE_1 = 0x3C # NOT used - available + MSG_ID___AVAILABLE_2 = 0x3D # NOT used - available MSG_ID_HD_AIR_TRAP_DATA = 0x003E # HD broadcast of air trap data MSG_ID_ALARM_CONDITION_CLEARED = 0x3F # Alarm condition cleared event MSG_ID_UI_ALARM_USER_ACTION = 0x40 # UI user has requested an alarm action @@ -100,6 +100,12 @@ 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_DG_COMMAND_RESPONSE = 0x51 # DG response to command from HD + MSG_ID_UI_RINSEBACK_CMD = 0x52 # UI rinseback request + MSG_ID_HD_RINSEBACK_CMD_RESPONSE = 0x53 # HD rinseback request response + MSG_ID_UI_RECIRC_CMD = 0x54 # UI re-circ request + MSG_ID_HD_RECIRC_CMD_RESPONSE = 0x55 # HD re-circ request response + MSG_ID_HD_RINSEBACK_PROGRESS = 0x56 # HD broadcast of rinseback progress MSG_ID_CAN_ERROR_COUNT = 0x999 # test code in support of EMC testing @@ -117,7 +123,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___AVAILABLE_1 = 0x800D # This msg ID is available for use + MSG_ID___AVAILABLE_3 = 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 Index: dialin/hd/alarms.py =================================================================== diff -u -r18c04cbcd10619250868cec39470a2b29c86121b -re485785be0282bc516d09c86f7e90b07c7ca03f1 --- dialin/hd/alarms.py (.../alarms.py) (revision 18c04cbcd10619250868cec39470a2b29c86121b) +++ dialin/hd/alarms.py (.../alarms.py) (revision e485785be0282bc516d09c86f7e90b07c7ca03f1) @@ -185,14 +185,6 @@ """ return self.alarms_flags - def get_alarm_ids(self): - """ - Returns a dictionary of the alarm short name and the corresponding id - - @return: OrderedDict of the alarm ids - """ - return self.ids - @_publish(["alarms_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) def _handler_alarms_status_sync(self, message): """ Index: dialin/ui/hd_simulator.py =================================================================== diff -u -ra3f3f5ca6fcb24a47bb3056878bb8ff9e3642fd2 -re485785be0282bc516d09c86f7e90b07c7ca03f1 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision a3f3f5ca6fcb24a47bb3056878bb8ff9e3642fd2) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision e485785be0282bc516d09c86f7e90b07c7ca03f1) @@ -185,9 +185,6 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value, self._handler_ui_confirm_treatment) - self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_TREATMENT_END_REQUEST.value, - self._handler_ui_end_treatment) self.alarms_simulator = HDProxyAlarms(self.can_interface, self.logger) self.treatment_parameter_rejections = TreatmentParameterRejections() @@ -473,15 +470,6 @@ self.can_interface.send(message, 0) - def _handler_ui_end_treatment(self, message): - """ - - @param message: - @return: - """ - self.logger.debug("Ending Treatment") - self.cmd_send_end_treatment_response() - def _handler_ui_validate_parameters(self, message): """