Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r3f4937e339925dde0b95f08e49969f8983c5cba4 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
@@ -24,7 +24,7 @@
 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.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, float_to_bytearray
 
@@ -49,8 +49,6 @@
                                                                        function = self._handler_concentrate_pumps_sync)
 
         self.dd_concentrate_pump_timestamp = 0.0                #: The timestamp of the last message
-
-        #: The Concentrate Pumps data in dictionary format
         self.dd_concentrate_pumps = {
             dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name: {
                 dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name: 0,
@@ -88,6 +86,22 @@
         }
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def dd_concentrate_pumps(self) -> dict:
+        """
+        The Concentrate Pumps data
+        """
+        return self._concentrate_pumps
+
+    @dd_concentrate_pumps.setter
+    def dd_concentrate_pumps(self, value):
+        self._concentrate_pumps = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pumps", "dd_concentrate_pump_timestamp"])
     def _handler_concentrate_pumps_sync(self, message, timestamp=0.0):
         """
@@ -97,39 +111,48 @@
         @param message:  published concentrate pumps' data message
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name,        DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name,   DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name,      DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name,      DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name,    DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name,    DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name,  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name,         DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name,       DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name,              DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name,            DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name,          DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name,        DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PARKED.name,                DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PARKED.name,              DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name,            DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name,          DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name,                DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name,           DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name,              DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name,            DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name,          DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name,               DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name,                    DataTypes.F32))
+        d11_state = LocalVars('d11_state')
+        d10_state = LocalVars('d10_state')
+        d76_state = LocalVars('d76_state')
 
-        self.process_into_vars(dict_to_update = self.dd_concentrate_pumps,
-                               decoder_list = sensor_list,
-                               message = message)
+        msg_list =[]
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name,     DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name,        DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name,   DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name,      DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name,      DataTypes.U32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name,    DataTypes.U32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name,    DataTypes.U32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name,  DataTypes.U32))
+        msg_list.append((d11_state,                                                                                                                                                         DataTypes.U32))
+        msg_list.append((d10_state,                                                                                                                                                         DataTypes.U32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name,              DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name,            DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name,          DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name,        DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PARKED.name,                DataTypes.BOOL))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PARKED.name,              DataTypes.BOOL))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name,            DataTypes.BOOL))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name,          DataTypes.BOOL))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name,                DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name,           DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name,              DataTypes.F32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name,            DataTypes.U32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name,          DataTypes.U32))
+        msg_list.append((d76_state,                                                                                                                                                         DataTypes.U32))
+        msg_list.append((self.dd_concentrate_pumps, dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name,                    DataTypes.F32))
+
+        self.process_into_vars(decoder_list = msg_list, message = message)
+
+        # Convert the state to enum
+        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = dd_enum_repository.DDConcentratePumpStates(d11_state.value)
+        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = dd_enum_repository.DDConcentratePumpStates(d10_state.value)
+        self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = dd_enum_repository.DDConcentratePumpStates(d76_state.value)
         self.dd_concentrate_pump_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_concentrate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the concentrate pump data broadcast interval override command