Index: dialin/dg/fluid_leak.py =================================================================== diff -u -r85c142aeaad517874da613710140c6f1c41e4bbe -r2fed6e9ca28bcaac06b764f6b7fcb81fd743986d --- dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 85c142aeaad517874da613710140c6f1c41e4bbe) +++ dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 2fed6e9ca28bcaac06b764f6b7fcb81fd743986d) @@ -1 +1,146 @@ +########################################################################### +# +# Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file fluid_leak.py +# +# @author (last) Peman Montazemi +# @date (last) 11-Mar-2021 +# @author (original) Peman Montazemi +# @date (original) 11-Mar-2021 +# +############################################################################ +import struct +from ..utils.conversions import integer_to_bytearray, float_to_bytearray +from ..common.msg_defs import MsgIds, MsgFieldPositions +from .constants import RESET, NO_RESET +from ..protocols.CAN import (DenaliMessage, DenaliChannels) +from ..utils.base import _AbstractSubSystem, _publish +from logging import Logger + + +class DGFluidLeak(_AbstractSubSystem): + """ + DGFluidLeak + + Dialysate Generator (DG) Dialin API sub-class for fluid leak related commands. + """ + + # Fluid leak detector state + FLUID_LEAK_DETECTED = 0 # Wet + NO_FLUID_LEAK_DETECTED = 1 # Dry + + def __init__(self, can_interface, logger: Logger): + """ + + @param can_interface: Denali Can Messenger object + """ + super().__init__() + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.dg_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_fluid_leak_sync) + + self.fluid_leak_state = self.NO_FLUID_LEAK_DETECTED + + def get_fluid_leak_state(self): + """ + Gets the current fluid leak state + + @return: List containing fluid leak states: [detected, undetected] + """ + return self.fluid_leak_state + + @_publish("fluid_leak_state") + def _handler_fluid_leak_sync(self, message): + """ + Handles published fluid leak state messages. Fluid leak state is captured + for reference. + + @param message: published fluid leak state message + @return: None + """ + + state = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + + self.fluid_leak_state = state[0] + + def cmd_fluid_leak_detector_override(self, detected, reset=NO_RESET): + """ + Constructs and sends the fluid leak detector state override command + Constraints: + Must be logged into DG. + Given detector must be one of the detectors listed below. + + @param detected: unsigned int - detected (0=wet, 1=dry) to override detector with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + det = float_to_bytearray(detected) + payload = rst + det + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_DETECTOR_STATE_OVERRIDE.value, + payload=payload) + + self.logger.debug("Override fluid leak detector state value") + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False + + def cmd_fluid_leak_state_broadcast_interval_override(self, ms, reset=NO_RESET): + """ + Constructs and sends the fluid leak state broadcast interval override command + Constraints: + Must be logged into DG. + Given interval must be non-zero and a multiple of the DG priority task interval (10 ms). + + @param ms: integer - interval (in ms) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + mis = integer_to_bytearray(ms) + payload = rst + mis + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_BROADCAST_INTERVAL_OVERRIDE.value, + payload=payload) + + self.logger.debug("Override HD fluid leak state broadcast interval") + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + if reset == RESET: + str_res = "reset back to normal: " + else: + str_res = str(ms) + " ms: " + self.logger.debug("Fluid leak state broadcast interval overridden to " + str_res + + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False Index: dialin/hd/fluid_leak.py =================================================================== diff -u -r85c142aeaad517874da613710140c6f1c41e4bbe -r2fed6e9ca28bcaac06b764f6b7fcb81fd743986d --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 85c142aeaad517874da613710140c6f1c41e4bbe) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 2fed6e9ca28bcaac06b764f6b7fcb81fd743986d) @@ -108,7 +108,7 @@ def cmd_fluid_leak_state_broadcast_interval_override(self, ms, reset=NO_RESET): """ - Constructs and sends the f;uid leak state broadcast interval override command + Constructs and sends the fluid leak state broadcast interval override command Constraints: Must be logged into HD. Given interval must be non-zero and a multiple of the HD priority task interval (10 ms). Index: tests/dg_fluid_leak_state.py =================================================================== diff -u -rcdd8ff0e1d2fe861e3b7771ead7c02ce1848dc9b -r2fed6e9ca28bcaac06b764f6b7fcb81fd743986d --- tests/dg_fluid_leak_state.py (.../dg_fluid_leak_state.py) (revision cdd8ff0e1d2fe861e3b7771ead7c02ce1848dc9b) +++ tests/dg_fluid_leak_state.py (.../dg_fluid_leak_state.py) (revision 2fed6e9ca28bcaac06b764f6b7fcb81fd743986d) @@ -31,13 +31,9 @@ state = "Dry" while True: - if dg.fluid_leak == dg.fluid_leak.NO_FLUID_LEAK_DETECTED: - state = "Wet" - else: + if dg.fluid_leak.fluid_leak_state == dg.fluid_leak.NO_FLUID_LEAK_DETECTED: state = "Dry" - if dg.fluid_leak.get_fluid_leak_state() == dg.fluid_leak.FLUID_LEAK_DETECTED: - state = "Dry" - else: + else: # FLUID_LEAK_DETECTED state = "Wet" print("State = " + state) sleep(0.1) Index: tests/hd_fluid_leak_state.py =================================================================== diff -u -rfdaca87f21d92c342137133b5fb83ce5c3d0e4dc -r2fed6e9ca28bcaac06b764f6b7fcb81fd743986d --- tests/hd_fluid_leak_state.py (.../hd_fluid_leak_state.py) (revision fdaca87f21d92c342137133b5fb83ce5c3d0e4dc) +++ tests/hd_fluid_leak_state.py (.../hd_fluid_leak_state.py) (revision 2fed6e9ca28bcaac06b764f6b7fcb81fd743986d) @@ -31,13 +31,9 @@ state = "Dry" while True: - if hd.fluid_leak == hd.fluid_leak.NO_FLUID_LEAK_DETECTED: - state = "Wet" - else: + if hd.fluid_leak.fluid_leak_state == hd.fluid_leak.NO_FLUID_LEAK_DETECTED: state = "Dry" - if hd.fluid_leak.get_fluid_leak_state() == hd.fluid_leak.FLUID_LEAK_DETECTED: - state = "Dry" - else: + else: # FLUID_LEAK_DETECTED state = "Wet" print("State = " + state) sleep(0.1)