Index: dialin/common/msg_defs.py =================================================================== diff -u -r9fd0e3390bdb0e8d7fcce0722d1e94cb029e629c -r3ecee312b820f6e96da728ac2d233539310e856a --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 9fd0e3390bdb0e8d7fcce0722d1e94cb029e629c) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 3ecee312b820f6e96da728ac2d233539310e856a) @@ -92,7 +92,6 @@ 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 Heparin Pause/Resume Response MSG_ID_HD_HEPARIN_DATA = 0x4D # HD Broadcast heparin data @@ -120,8 +119,15 @@ MSG_ID_UI_PATIENT_CONNECTION_CONFIRM = 0x66 # UI user has confirmed patient connection completed MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE = 0x67 # HD response to user confirmation of patient connection + MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM = 0x4A # UI patient disconnection confirm + MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73 # UI user has confirmed disposable removal + MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0x74 # HD response to user confirmation of disposable removal + MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75 # UI request treatment log data message + MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76 # HD response to UI treatment log data request + MSG_ID_CAN_ERROR_COUNT = 0x999 # test code in support of EMC testing + # service/test CAN messages MSG_ID_TESTER_LOGIN_REQUEST = 0x8000 # HD tester log-in MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0x8001 # Dialysate outlet flow set point override request Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r6a0355dab8438b4a3e2c641c91e572ea1fb9d13f -r3ecee312b820f6e96da728ac2d233539310e856a --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 6a0355dab8438b4a3e2c641c91e572ea1fb9d13f) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 3ecee312b820f6e96da728ac2d233539310e856a) @@ -2028,3 +2028,54 @@ payload=payload) self.can_interface.send(message, 0) + + def cmd_send_post_treatment_disposable_removal_confirm_response(self, accepted, reason ): + """ + send post treatment disposable removal confirm response + :param accepted: (U32) accept or reject + :param reason: (U32) rejection reason + :return: None + """ + payload = integer_to_bytearray(accepted) + payload += integer_to_bytearray(reason) + + message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, + message_id=MsgIds.MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + def cmd_send_post_treatment_disposable_removal_confirm_response(self, accepted, reason ): + """ + send post treatment disposable removal confirm response + :param accepted: (U32) accept or reject + :param reason: (U32) rejection reason + :return: None + """ + payload = integer_to_bytearray(accepted) + payload += integer_to_bytearray(reason) + + message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, + message_id=MsgIds.MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + def cmd_send_post_treatment_log_response(self, accepted, reason, parameters): + """ + send post treatment log response + :param accepted: (U32) accept or reject + :param reason: (U32) rejection reason + :param parameters: (array of values) + :return: None + """ + payload = integer_to_bytearray(accepted) + payload += integer_to_bytearray(reason) + for parameter in parameters: + payload += parameter + + message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, + message_id=MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0)