Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
@@ -98,36 +98,35 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED,      DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED,         DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED,    DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED,       DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT,       DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT,     DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT,     DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT,   DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE,          DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE,        DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US,               DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US,             DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED,           DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED,         DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.PARKED,                 DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.PARKED,               DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT,             DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT,           DataTypes.BOOL))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED,                 DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED,            DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED,               DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT,             DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT,           DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE,                DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US,                     DataTypes.F32))
+        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))
 
         self.process_into_dict(dict_to_update = self.dd_concentrate_pumps,
-                               msg_list = sensor_list,
+                               decoder_list = sensor_list,
                                message = message)
-
         self.dd_concentrate_pump_timestamp = timestamp