Index: dialin/common/alarm_defs.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rdd35c2e4427612ca17937e04f9f0043e294b827c --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision dd35c2e4427612ca17937e04f9f0043e294b827c) @@ -13,10 +13,10 @@ # @date (original) 07-Aug-2020 # ############################################################################ -import enum +from enum import Enum, unique - -class AlarmList(enum.Enum): +@unique +class AlarmList(Enum): ALARM_ID_NO_ALARM = 0 # Indication for when no alarms is a possible situation ALARM_ID_HD_SOFTWARE_FAULT = 1 # HD Software fault. Software found itself in an unexpected state ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2 # Stuck button POST failure. Stop or Off button detected to be pressed for at least 1 second during test shortly after power up @@ -107,7 +107,8 @@ ALARM_ID_INVALID_VALVE_SELECTED = 87, # HD valve invalid valve selected NUM_OF_ALARM_IDS = 88 # Total number of alarms -class AlarmPriorities: +@unique +class AlarmPriorities(Enum): ALARM_PRIORITY_NONE = 0 # Indicates not an alarm or no alarms active at this time ALARM_PRIORITY_LOW = 1 # Low priority alarm ALARM_PRIORITY_MEDIUM = 2 # Medium priority alarm Index: dialin/common/msg_defs.py =================================================================== diff -u -r70fb122058d520cbbbe922518d8d50b2dec5e2e4 -rdd35c2e4427612ca17937e04f9f0043e294b827c --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 70fb122058d520cbbbe922518d8d50b2dec5e2e4) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision dd35c2e4427612ca17937e04f9f0043e294b827c) @@ -13,10 +13,12 @@ # @date (original) 07-Aug-2020 # ############################################################################ -import enum + from ..protocols.CAN import DenaliMessage +from enum import Enum, unique -class MsgIds(enum.Enum): +@unique +class MsgIds(Enum): MSG_ID_UNUSED = 0 # Zero is an undefined (un-used) message ID) MSG_ID_OFF_BUTTON_PRESS = 1 # HD/UI off button interactions MSG_ID_ALARM_STATUS = 2 # HD broadcast of system alarm state information @@ -194,8 +196,8 @@ return value in cls._value2member_map_ -class RequestRejectReasons(enum.Enum): - +@unique +class RequestRejectReasons(Enum): REQUEST_REJECT_REASON_NONE = 0 REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE = 1 REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM = 2 Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r70fb122058d520cbbbe922518d8d50b2dec5e2e4 -rdd35c2e4427612ca17937e04f9f0043e294b827c --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 70fb122058d520cbbbe922518d8d50b2dec5e2e4) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision dd35c2e4427612ca17937e04f9f0043e294b827c) @@ -218,14 +218,5 @@ self.logger.debug("requesting HD software reset") # Send message - received_message = self.can_interface.send(message) - - if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - self.logger.debug("HD is resetting...") - else: - self.logger.debug("HD reset request failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False + self.can_interface.send(message, 0) + self.logger.debug("Sent request to HD to reset...")