Index: dialin/common/msg_ids.py =================================================================== diff -u -r5aea950f649f72211632cbb17be314f3b4c24f10 -r91993c31b1fb88a3937ea9ae4b549d357b53e14e --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 91993c31b1fb88a3937ea9ae4b549d357b53e14e) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 18-May-2021 +# @date (last) 24-May-2021 # @author (original) Peter Lucia -# @date (original) 18-May-2021 +# @date (original) 24-May-2021 # ############################################################################ from enum import unique @@ -146,9 +146,31 @@ MSG_ID_HD_VOLTAGES_DATA = 0X7B MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0X7C MSG_ID_HD_ALARM_INFORMATION = 0X7D + MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0X81 + MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE = 0X82 + MSG_ID_DG_FLUSH_TIME_DATA = 0X83 + MSG_ID_DG_HEAT_DISINFECT_TIME_DATA = 0X84 + MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0X85 MSG_ID_DG_VOLTAGES_DATA = 0X86 MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 + MSG_ID_DG_SERIAL_NUMBER = 0X88 + MSG_ID_UI_REQUEST_SYSTEM_USAGE_INFO = 0X89 + MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0X8A + MSG_ID_HD_USAGE_DATA = 0X8B + MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0X8C + MSG_ID_DG_USAGE_DATA = 0X8D + MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0X8E + MSG_ID_HD_POST_FINAL_TEST_RESULT = 0X8F + MSG_ID_DG_POST_SINGLE_TEST_RESULT = 0X90 + MSG_ID_DG_POST_FINAL_TEST_RESULT = 0X91 + MSG_ID_UI_POST_FINAL_TEST_RESULT = 0X92 MSG_ID_HD_BUBBLES_DATA = 0X93 + MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA = 0X94 + MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT = 0X95 + MSG_ID_HD_TREATMENT_LOG_EVENT = 0X96 + MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0X97 + MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0X98 + MSG_ID_HD_SERIAL_NUMBER = 0X99 MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r5aea950f649f72211632cbb17be314f3b4c24f10 -r91993c31b1fb88a3937ea9ae4b549d357b53e14e --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 91993c31b1fb88a3937ea9ae4b549d357b53e14e) @@ -47,6 +47,7 @@ from ..common.msg_defs import MsgIds, MsgFieldPositions from .flush import FlushMode from .chemical_disinfect import ChemicalDisinfect +from .rtc import DGRTC from enum import unique @unique @@ -176,6 +177,7 @@ self.voltages = DGVoltages(self.can_interface, self.logger) self.flush = FlushMode(self.can_interface, self.logger) self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger) + self.rtc = DGRTC(self.can_interface, self.logger) def get_version(self): """ Index: dialin/dg/fluid_leak.py =================================================================== diff -u -r5aea950f649f72211632cbb17be314f3b4c24f10 -r91993c31b1fb88a3937ea9ae4b549d357b53e14e --- dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) +++ dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 91993c31b1fb88a3937ea9ae4b549d357b53e14e) @@ -59,7 +59,7 @@ return self.fluid_leak_state @_publish(["fluid_leak_state"]) - def _handler_fluid_leak_sync(self, message): + def _handler_fluid_leak_sync(self, message: dict) -> None: """ Handles published fluid leak state messages. Fluid leak state is captured for reference. @@ -143,4 +143,4 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") - return False + return False \ No newline at end of file Index: dialin/hd/fluid_leak.py =================================================================== diff -u -r5aea950f649f72211632cbb17be314f3b4c24f10 -r91993c31b1fb88a3937ea9ae4b549d357b53e14e --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 91993c31b1fb88a3937ea9ae4b549d357b53e14e) @@ -143,4 +143,4 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") - return False + return False \ No newline at end of file Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r5aea950f649f72211632cbb17be314f3b4c24f10 -r91993c31b1fb88a3937ea9ae4b549d357b53e14e --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 91993c31b1fb88a3937ea9ae4b549d357b53e14e) @@ -1019,11 +1019,11 @@ if RequestRejectReasons.has_value(rea[0]): self.treatment_end_cmd_reject_reason = RequestRejectReasons(rea[0]) - def cmd_ui_checkin_with_hd(self) -> int: + def cmd_ui_checkin_with_hd(self) -> None: """ Constructs and sends the ui check-in message - @return: 0 + @return: None """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -1033,8 +1033,6 @@ self.can_interface.send(message, 0) - return 0 - def cmd_ui_request_hd_version(self) -> None: """ Constructs and sends the ui request for version message @@ -1591,7 +1589,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value) + message_id=MsgIds.MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST.value) self.logger.debug("Sending user continue to treatment request to HD.") self.can_interface.send(message, 0) Index: tests/peter/test_calibration.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r91993c31b1fb88a3937ea9ae4b549d357b53e14e --- tests/peter/test_calibration.py (.../test_calibration.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ tests/peter/test_calibration.py (.../test_calibration.py) (revision 91993c31b1fb88a3937ea9ae4b549d357b53e14e) @@ -6,7 +6,7 @@ from dialin import HD, AbstractObserver -sys.path.append("../") +sys.path.append("../../") from dialin.dg.dialysate_generator import DG from dialin.utils.nv_ops_utils import NVOpsUtils from time import sleep @@ -291,4 +291,4 @@ # test_hd_calibration_record() # test_hd_service_record() - # test_hd_system_record() \ No newline at end of file + # test_hd_system_record()