Index: dialin/common/alarm_defs.py =================================================================== diff -u -r1fd5bc0ed97d0d90223fa78ec195dd7636712c5b -r27392693a089c6c7a10b5026d3b2727552847b55 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 1fd5bc0ed97d0d90223fa78ec195dd7636712c5b) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 27392693a089c6c7a10b5026d3b2727552847b55) @@ -8,9 +8,9 @@ # @file alarm_defs.py # # @author (last) Peter Lucia -# @date (last) 11-May-2021 +# @date (last) 12-May-2021 # @author (original) Peter Lucia -# @date (original) 11-May-2021 +# @date (original) 12-May-2021 # ############################################################################ from enum import unique @@ -239,5 +239,10 @@ ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 216 ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 217 ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 218 - ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 219 - ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 220 + ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED = 219 + ALARM_ID_HD_VENOUS_BUBBLE_DETECTED = 220 + ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 221 + ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 222 + ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 223 + ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 224 + ALARM_ID_HD_BATTERY_COMM_FAULT = 225 Index: dialin/common/msg_ids.py =================================================================== diff -u -r24e107b2ac852390b49583c5390860aadde6244a -r27392693a089c6c7a10b5026d3b2727552847b55 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 24e107b2ac852390b49583c5390860aadde6244a) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 27392693a089c6c7a10b5026d3b2727552847b55) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 11-May-2021 +# @date (last) 12-May-2021 # @author (original) Peter Lucia -# @date (original) 11-May-2021 +# @date (original) 12-May-2021 # ############################################################################ from enum import unique @@ -138,8 +138,6 @@ MSG_ID_HD_VOLTAGES_DATA = 0X7B MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0X7C MSG_ID_HD_ALARM_INFORMATION = 0X7D - MSG_ID_DG_VOLTAGES_DATA = 0X86 - MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 MSG_ID_DIALYSATE_FLOW_DATA = 0X8 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 Index: tests/unit_tests/test_imports.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -r27392693a089c6c7a10b5026d3b2727552847b55 --- tests/unit_tests/test_imports.py (.../test_imports.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ tests/unit_tests/test_imports.py (.../test_imports.py) (revision 27392693a089c6c7a10b5026d3b2727552847b55) @@ -89,7 +89,7 @@ from dialin.dg import TemperatureSensors from dialin.dg import DGValves - from dialin.ui import HDSimulator, HDAlarmsSimulator + from dialin.ui import HDSimulator def test_common(self): from dialin.common import (AlarmList, Index: tests/unit_tests/test_ui_proxy.py =================================================================== diff -u -r5f420f989a3b1652faef66c99777233f152954a1 -r27392693a089c6c7a10b5026d3b2727552847b55 --- tests/unit_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 5f420f989a3b1652faef66c99777233f152954a1) +++ tests/unit_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 27392693a089c6c7a10b5026d3b2727552847b55) @@ -18,13 +18,13 @@ import struct sys.path.append("../../") from dialin import HD -from dialin.utils.base import setup_virtual_can_interface +from dialin.utils import setup_virtual_can_interface from collections import OrderedDict from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray from dialin.protocols.CAN import (DenaliMessage, DenaliChannels) from dialin.common import MsgIds -from dialin.utils.base import is_interface_up, is_interface_present +from dialin.utils import is_interface_up, is_interface_present class Test(unittest.TestCase):