Fisheye: Tag afe332fec54d9d0432dfc0d54aef1debaa92b066 refers to a dead (removed) revision in file `leahi_dialin/td/constants.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -17,7 +17,7 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -17,7 +17,7 @@
 from logging import Logger
 from enum import unique
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
@@ -67,9 +67,13 @@
         self.upper_level = self.AIR_DETECTED_AT_LEVEL
         self.lower_level_raw = self.AIR_DETECTED_AT_LEVEL
         self.upper_level_raw = self.AIR_DETECTED_AT_LEVEL
+        self.valve_state = 0
+        self.air_control = 0
         self.td_air_trap_timestamp = 0.0
 
-    @publish(["td_air_trap_timestamp", "lower_level", "upper_level", "lower_level_raw", "upper_level_raw"])
+    @publish(["td_air_trap_timestamp", "lower_level", "upper_level",
+              "lower_level_raw", "upper_level_raw",
+              "valve_state","air_control"])
     def _handler_air_trap_sync(self, message, timestamp=0.0):
         """
         Handles published air trap data messages.  Air trap data are captured
@@ -87,11 +91,17 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
         raw_upper = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
+        vlv_st = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
+        controlling = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
 
         self.lower_level = lower[0]
         self.upper_level = upper[0]
         self.lower_level_raw = raw_lower[0]
         self.upper_level_raw = raw_upper[0]
+        self.valve_state = vlv_st[0]
+        self.air_control = controlling[0]
         self.td_air_trap_timestamp = timestamp
 
     def cmd_air_trap_level_sensor_override(self, sensor: int, detected: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -18,7 +18,7 @@
 from enum import unique
 from leahi_dialin.utils.base import DialinEnum
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.td_defs import TDEventDataType
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -16,8 +16,8 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -16,7 +16,7 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -16,7 +16,7 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
Index: leahi_dialin/td/modules/constants.py
===================================================================
diff -u
--- leahi_dialin/td/modules/constants.py	(revision 0)
+++ leahi_dialin/td/modules/constants.py	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -0,0 +1,24 @@
+###########################################################################
+#
+# Copyright (c) 2020-2024 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    constants.py
+#
+# @author  (last)      Michael
+# @date    (last)      14-Nov-2024
+# @author  (original)  Michael
+# @date    (original)  14-Nov-2024
+#
+############################################################################
+
+RESET = 1
+NO_RESET = 0
+
+BUTTON_PRESSED = 1
+BUTTON_RELEASED = 0
+
+PUMP_CONTROL_MODE_CLOSED_LOOP = 0
+PUMP_CONTROL_MODE_OPEN_LOOP = 1
Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -16,7 +16,7 @@
 import struct
 from logging import Logger
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
Index: leahi_dialin/td/modules/switches.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -20,7 +20,7 @@
 
 from leahi_dialin.utils.conversions import integer_to_bytearray
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -19,7 +19,7 @@
 from enum import unique
 from logging import Logger
 
-from leahi_dialin.td.constants import NO_RESET
+from .constants import NO_RESET
 from leahi_dialin.common import MsgIds
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
Index: leahi_dialin/td/modules/voltages.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rafe332fec54d9d0432dfc0d54aef1debaa92b066
--- leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
@@ -17,7 +17,7 @@
 from enum import unique
 from logging import Logger
 
-from leahi_dialin.td.constants import RESET, NO_RESET
+from .constants import RESET, NO_RESET
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray