Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r3f4937e339925dde0b95f08e49969f8983c5cba4
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
@@ -20,11 +20,11 @@
 # Project imports
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
-from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem, LocalVars
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
@@ -52,11 +52,26 @@
 
         self.td_valves_timestamp = 0.0                      #: The timestamp of the latest message
         
-        # The Valves data in dictionary format
         self.valves_status = {td_enum_repository.TDValveNames.H1_VALV.name: {},
                               td_enum_repository.TDValveNames.H19_VALV.name: {}}
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def valves_status(self) -> dict:
+        """
+        The current Valves data
+        """
+        return self._valves
+
+    @valves_status.setter
+    def valves_status(self, value):
+        self._valves = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_td_valves_data", "valves_status", "td_valves_timestamp"])
     def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None:
         """
@@ -66,32 +81,53 @@
         @param message: published TD valves data message
         @returns none
         """
+        valve_id        = LocalVars('valve_id')
+        state           = LocalVars('state')
+        pos_id          = LocalVars('pos_id')
+        pos_cnt         = LocalVars('pos_cnt')
+        cmd             = LocalVars('cmd')
+        pos_a           = LocalVars('pos_a')
+        pos_b           = LocalVars('pos_b')
+        pos_c           = LocalVars('pos_c')
+        pos_d           = LocalVars('pos_d')
+        max_homing_enc  = LocalVars('max_homing_enc')
+
         msg_list = []
-        msg_list.append(('Valve',           DataTypes.U32))
-        msg_list.append(('State',           DataTypes.U32))
-        msg_list.append(('PosID',           DataTypes.U32))
-        msg_list.append(('PosCnt',          DataTypes.S16))
-        msg_list.append(('Cmd',             DataTypes.S16))
-        msg_list.append(('PosA',            DataTypes.S16))
-        msg_list.append(('PosB',            DataTypes.S16))
-        msg_list.append(('PosC',            DataTypes.S16))
-        msg_list.append(('PosD',            DataTypes.S16))
-        msg_list.append(('Max_homing_enc',  DataTypes.S16))
+        msg_list.append((valve_id,          DataTypes.U32))
+        msg_list.append((state,             DataTypes.U32))
+        msg_list.append((pos_id,            DataTypes.U32))
+        msg_list.append((pos_cnt,           DataTypes.S16))
+        msg_list.append((cmd,               DataTypes.S16))
+        msg_list.append((pos_a,             DataTypes.S16))
+        msg_list.append((pos_b,             DataTypes.S16))
+        msg_list.append((pos_c,             DataTypes.S16))
+        msg_list.append((pos_d,             DataTypes.S16))
+        msg_list.append((max_homing_enc,    DataTypes.S16))
 
-        result = self.process_into_vars(decoder_list = msg_list,
-                                        message = message)
+        result = self.process_into_vars(decoder_list = msg_list, message = message)
 
         # To make sure values of the enums are not out of range
-        if td_enum_repository.TDValveNames.has_value(result['Valve']) and td_enum_repository.TDValvePositions.has_value(result['PosID']) and td_enum_repository.TDValveStates.has_value(result['State']):
+        if td_enum_repository.TDValveNames.has_value(valve_id.value) and td_enum_repository.TDValvePositions.has_value(pos_id.value) and td_enum_repository.TDValveStates.has_value(state.value):
             # Updating fields
-            result['Valve'] = td_enum_repository.TDValveNames(result['Valve']).name
-            result['State'] = td_enum_repository.TDValveStates(result['State']).name
-            result['PosID'] = td_enum_repository.TDValvePositions(result['PosID']).name
+            valve_id = td_enum_repository.TDValveNames(valve_id.value).name
+            state = td_enum_repository.TDValveStates(state.value).name
+            pos_id = td_enum_repository.TDValvePositions(pos_id.value).name
             # Update the valves dictionary
-            self.valves_status[result['Valve']] = result
+            self.valves_status[valve_id.value][td_enum_repository.TDValveNames(valve_id.value).name] = valve_id.value
+            self.valves_status[valve_id.value][td_enum_repository.TDValveStates(state.value).name] = state.value
+            self.valves_status[valve_id.value][td_enum_repository.TDValvePositions(pos_id.value).name] = pos_id.value
+            self.valves_status[valve_id.value]['PosCnt'] = pos_cnt.value
+            self.valves_status[valve_id.value]['Cmd'] = cmd.value
+            self.valves_status[valve_id.value]['PosA'] = pos_a.value
+            self.valves_status[valve_id.value]['PosB'] = pos_b.value
+            self.valves_status[valve_id.value]['PosC'] = pos_c.value
+            self.valves_status[valve_id.value]['PosD'] = pos_d.value
+            self.valves_status[valve_id.value]['MaxHomingEnc'] = max_homing_enc.value
         self.td_valves_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_valves_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends broadcast time interval