Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -ra01dcb7ce7e9f929e5e5f41414ace01ce69ad051 -r9466b5c6b5867f392104a42608aa9542a7ff0358
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision a01dcb7ce7e9f929e5e5f41414ace01ce69ad051)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 9466b5c6b5867f392104a42608aa9542a7ff0358)
@@ -65,12 +65,12 @@
         self.d10_cp2_current_set_speed = 0.0
         self.d10_cp2_measured_speed = 0.0
         self.d10_cp2_target_speed = 0.0
-        self.d11_cp1_current_state = 0.0
-        self.d10_cp2_current_state = 0.0
-        self.d11_cp1_target_rev_count = 0.0
-        self.d10_cp2_target_rev_count = 0.0
-        self.d11_cp1_measured_rev_count = 0.0
-        self.d10_cp2_measured_rev_count = 0.0
+        self.d11_cp1_current_state = 0
+        self.d10_cp2_current_state = 0
+        self.d11_cp1_target_rev_count = 0
+        self.d10_cp2_target_rev_count = 0
+        self.d11_cp1_measured_rev_count = 0
+        self.d10_cp2_measured_rev_count = 0
         self.d11_cp1_parked = False
         self.d10_cp2_parked = False
         self.d11_cp1_park_fault = False
@@ -81,7 +81,7 @@
 
     @publish(["dd_concentrate_pump_timestamp",
               "d11_cp1_current_set_speed", "d11_cp1_measured_speed", "d11_cp1_target_speed",
-              "cp2_current_set_speed", "d10_cp2_measured_speed", "d10_cp2_target_speed",
+              "d10_cp2_current_set_speed", "d10_cp2_measured_speed", "d10_cp2_target_speed",
               "d11_cp1_current_state", "d10_cp2_current_state",
               "d11_cp1_target_rev_count", "d10_cp2_target_rev_count",
               "d11_cp1_measured_rev_count", "d10_cp2_measured_rev_count",
@@ -152,6 +152,7 @@
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
+
         """
 
         if not check_broadcast_interval_override_ms(ms):
@@ -186,9 +187,6 @@
         @param speed:  float - target speed value to override concentrate pump with
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = D11_CP1_ACID \n
-            1 = D10_CP2_BICARB \n
         """
 
         reset_byte_array = integer_to_bytearray(reset)
@@ -222,9 +220,6 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = D11_CP1_ACID \n
-            1 = D10_CP2_BICARB \n
         """
 
         reset_byte_array = integer_to_bytearray(reset)
@@ -261,9 +256,6 @@
         @param reset: integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = D11_CP1_ACID \n
-            1 = D10_CP2_BICARB \n
         """
 
         reset_byte_array = integer_to_bytearray(reset)
@@ -300,9 +292,6 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = D11_CP1_ACID \n
-            1 = D10_CP2_BICARB \n
         """
 
         reset_byte_array = integer_to_bytearray(reset)
@@ -337,9 +326,6 @@
         @param pump_id: unsigned int - concentrate pump ID
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = D11_CP1_ACID \n
-            1 = D10_CP2_BICARB \n
         """
 
         payload = integer_to_bytearray(pump_id)