Index: dialin/dg/fluid_leak.py =================================================================== diff -u -r79b47911f0ea424cd8dc10c1e1f150b84d4dfa54 -rb4d197e83a8ef9a32d3011991c263d7c0f2fabc3 --- dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 79b47911f0ea424cd8dc10c1e1f150b84d4dfa54) +++ dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision b4d197e83a8ef9a32d3011991c263d7c0f2fabc3) @@ -30,8 +30,8 @@ """ # Fluid leak detector state - FLUID_LEAK_DETECTED = 0 # Wet - NO_FLUID_LEAK_DETECTED = 1 # Dry + FLUID_LEAK_DETECTED_STATE = 0 # Wet + NO_FLUID_LEAK_DETECTED_STATE = 1 # Dry def __init__(self, can_interface, logger: Logger): """ @@ -48,7 +48,7 @@ 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 + self.fluid_leak_state = self.NO_FLUID_LEAK_DETECTED_STATE def get_fluid_leak_state(self): """ @@ -86,7 +86,7 @@ """ rst = integer_to_bytearray(reset) - det = float_to_bytearray(detected) + det = integer_to_bytearray(detected) payload = rst + det message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, Index: dialin/hd/fluid_leak.py =================================================================== diff -u -rc395352cad31f029410029b2df987fbe21934843 -rb4d197e83a8ef9a32d3011991c263d7c0f2fabc3 --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision c395352cad31f029410029b2df987fbe21934843) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision b4d197e83a8ef9a32d3011991c263d7c0f2fabc3) @@ -30,8 +30,8 @@ """ # Fluid leak detector state - FLUID_LEAK_DETECTED = 0 # Wet - NO_FLUID_LEAK_DETECTED = 1 # Dry + FLUID_LEAK_DETECTED_STATE = 0 # Wet + NO_FLUID_LEAK_DETECTED_STATE = 1 # Dry def __init__(self, can_interface, logger: Logger): """ @@ -48,7 +48,7 @@ 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 + self.fluid_leak_state = self.NO_FLUID_LEAK_DETECTED_STATE def get_fluid_leak_state(self): """ @@ -86,7 +86,7 @@ """ rst = integer_to_bytearray(reset) - det = float_to_bytearray(detected) + det = integer_to_bytearray(detected) payload = rst + det message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: tests/dg_fluid_leak_state.py =================================================================== diff -u -r2fed6e9ca28bcaac06b764f6b7fcb81fd743986d -rb4d197e83a8ef9a32d3011991c263d7c0f2fabc3 --- tests/dg_fluid_leak_state.py (.../dg_fluid_leak_state.py) (revision 2fed6e9ca28bcaac06b764f6b7fcb81fd743986d) +++ tests/dg_fluid_leak_state.py (.../dg_fluid_leak_state.py) (revision b4d197e83a8ef9a32d3011991c263d7c0f2fabc3) @@ -31,7 +31,7 @@ state = "Dry" while True: - if dg.fluid_leak.fluid_leak_state == dg.fluid_leak.NO_FLUID_LEAK_DETECTED: + if dg.fluid_leak.fluid_leak_state == dg.fluid_leak.NO_FLUID_LEAK_DETECTED_STATE: state = "Dry" else: # FLUID_LEAK_DETECTED state = "Wet" Index: tests/hd_fluid_leak_state.py =================================================================== diff -u -r2fed6e9ca28bcaac06b764f6b7fcb81fd743986d -rb4d197e83a8ef9a32d3011991c263d7c0f2fabc3 --- tests/hd_fluid_leak_state.py (.../hd_fluid_leak_state.py) (revision 2fed6e9ca28bcaac06b764f6b7fcb81fd743986d) +++ tests/hd_fluid_leak_state.py (.../hd_fluid_leak_state.py) (revision b4d197e83a8ef9a32d3011991c263d7c0f2fabc3) @@ -31,7 +31,7 @@ state = "Dry" while True: - if hd.fluid_leak.fluid_leak_state == hd.fluid_leak.NO_FLUID_LEAK_DETECTED: + if hd.fluid_leak.fluid_leak_state == hd.fluid_leak.NO_FLUID_LEAK_DETECTED_STATE: state = "Dry" else: # FLUID_LEAK_DETECTED state = "Wet"