Index: dialin/dg/fluid_leak.py =================================================================== diff -u --- dialin/dg/fluid_leak.py (revision 0) +++ dialin/dg/fluid_leak.py (revision 85c142aeaad517874da613710140c6f1c41e4bbe) @@ -0,0 +1 @@ \ No newline at end of file Index: dialin/hd/fluid_leak.py =================================================================== diff -u -r4b2e494d11cc081ac3724276be7178820004bd83 -r85c142aeaad517874da613710140c6f1c41e4bbe --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 4b2e494d11cc081ac3724276be7178820004bd83) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 85c142aeaad517874da613710140c6f1c41e4bbe) @@ -15,8 +15,8 @@ ############################################################################ 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 ..common.msg_defs import MsgIds from ..protocols.CAN import (DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish from logging import Logger @@ -29,10 +29,6 @@ Hemodialysis Delivery (HD) Dialin API sub-class for fluid leak related commands. """ - # Fluid leak broadcast message field positions - START_POS_FLUID_LEAK_STATE = DenaliMessage.PAYLOAD_START_INDEX - END_POS_FLUID_LEAK_STATE = START_POS_FLUID_LEAK_STATE + 4 - # Fluid leak detector state FLUID_LEAK_DETECTED = 0 # Wet NO_FLUID_LEAK_DETECTED = 1 # Dry @@ -72,8 +68,8 @@ @return: None """ - state = struct.unpack('i', bytearray( - message['message'][self.START_POS_FLUID_LEAK_STATE:self.END_POS_FLUID_LEAK_STATE])) + state = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) self.fluid_leak_state = state[0]