Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r03936b9327b52b7ea33aecb5aa2129f33583bc35 -r2d5b191186134e69ad5110ba3901490be12f99d7
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 03936b9327b52b7ea33aecb5aa2129f33583bc35)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 2d5b191186134e69ad5110ba3901490be12f99d7)
@@ -73,6 +73,8 @@
         self.concentrate_pump_cp2_parked = False
         self.concentrate_pump_cp1_park_fault = False
         self.concentrate_pump_cp2_park_fault = False
+        self.concentrate_pump_cp1_pulse_us = 0.0
+        self.concentrate_pump_cp2_pulse_us = 0.0
         self.dd_concentrate_pump_timestamp = 0.0
 
     @publish(["dd_concentrate_pump_timestamp",
@@ -94,27 +96,26 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
         self.concentrate_pump_cp1_measured_speed = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.concentrate_pump_cp1_target_speed = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-
         self.concentrate_pump_cp2_current_set_speed = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         self.concentrate_pump_cp2_measured_speed = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.concentrate_pump_cp2_target_speed = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
         self.concentrate_pump_cp1_current_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_6]))[0]
         self.concentrate_pump_cp2_current_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
 
         self.cp1_pulse_us = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
         self.cp2_pulse_us = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
+
+        self.concentrate_pump_cp1_target_speed = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+        self.concentrate_pump_cp2_target_speed = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
 
-
         self.concentrate_pump_cp1_parked = True if struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] == 1 else False
         self.concentrate_pump_cp2_parked = True if struct.unpack('I', bytearray(
@@ -125,7 +126,7 @@
         self.concentrate_pump_cp2_park_fault = True if struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] == 1 else False
 
-        self.dg_concentrate_pump_timestamp = timestamp
+        self.dd_concentrate_pump_timestamp = timestamp
 
     def cmd_concentrate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
@@ -163,7 +164,7 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_concentrate_pump_target_speed_override(self, pump_id: int, speed: float) -> int:
+    def cmd_concentrate_pump_target_speed_override(self, pump_id: int, speed: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the concentrate pump target speed override command
 
@@ -176,7 +177,7 @@
             1 = CP2 \n
         """
 
-        reset_byte_array = integer_to_bytearray(NO_RESET)
+        reset_byte_array = integer_to_bytearray(reset)
         speed_byte_array = float_to_bytearray(speed)
         pump_id_byte_array = integer_to_bytearray(pump_id)
         payload = reset_byte_array + speed_byte_array + pump_id_byte_array