Index: dialin/dg/load_cells.py
===================================================================
diff -u -rb52b3ab5fc442effe18b0575560080fb39fff5b3 -r959671dcd5f7a31f10cfa4e6dba198f185d4e046
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision b52b3ab5fc442effe18b0575560080fb39fff5b3)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision 959671dcd5f7a31f10cfa4e6dba198f185d4e046)
@@ -58,11 +58,6 @@
         self.load_cell_B1 = 0.0
         self.load_cell_B2 = 0.0
 
-        self.load_cell_A1_raw = 0.0
-        self.load_cell_A2_raw = 0.0
-        self.load_cell_B1_raw = 0.0
-        self.load_cell_B2_raw = 0.0
-
     def get_load_cells(self):
         """
         Gets the current load cell weights
@@ -89,14 +84,6 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         self.load_cell_B2 = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.load_cell_A1_raw = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.load_cell_A2_raw = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.load_cell_B1_raw = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.load_cell_B2_raw = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
 
     def cmd_load_cell_override(self, sensor: int, grams: float, add_reservoir_weight: bool = False, reset: int = NO_RESET) -> int:
         """
Index: tests/dg_tests.py
===================================================================
diff -u -rb52b3ab5fc442effe18b0575560080fb39fff5b3 -r959671dcd5f7a31f10cfa4e6dba198f185d4e046
--- tests/dg_tests.py	(.../dg_tests.py)	(revision b52b3ab5fc442effe18b0575560080fb39fff5b3)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 959671dcd5f7a31f10cfa4e6dba198f185d4e046)
@@ -261,9 +261,10 @@
 
 
 def get_concentrate_pumps_info():
-    info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_speed, {:5.3f}, Acid_speed, {:5.3f}, '
-            'CPi, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, '
-            'CPo_status, {}, CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, '
+    info = ('Bicarb_curr_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_curr_speed, {:5.3f}, Acid_speed, {:5.3f}, '
+            'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, '
+            'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, Acid_tgt_speed, {:5.3f}, '
+            'Bicarb_tgt_speed, {:5.3f}, '
             .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed,
                     dg.concentrate_pumps.concentrate_pump_cp2_measured_speed,
                     dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed,
@@ -275,7 +276,9 @@
                     DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp2_current_state).name,
                     dg.conductivity_sensors.cpi_sensor_status, dg.conductivity_sensors.cpo_sensor_status,
                     dg.conductivity_sensors.cd1_sensor_status, dg.conductivity_sensors.cd2_sensor_status,
-                    dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse))
+                    dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse,
+                    dg.concentrate_pumps.concentrate_pump_cp1_target_speed,
+                    dg.concentrate_pumps.concentrate_pump_cp2_target_speed))
     return info
 
 
@@ -397,6 +400,8 @@
     #dg.heaters.cmd_heaters_broadcast_interval_override(50)
     #sleep(1)
     #dg.voltages.cmd_monitored_voltages_broadcast_interval_override(50)
+    #dg.concentrate_pumps.cmd_concentrate_pump_broadcast_interval_override(50)
+    #sleep(0.5)
 
     try:
         while True:
@@ -674,7 +679,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    #collect_treatment_data()
+    collect_treatment_data()
 
     #collect_hd_treatment()
 
@@ -709,5 +714,5 @@
     #    print(get_heaters_info())
     #    sleep(1)
 
-    dg.ro_pump.cmd_set_ro_flow_rate(0.6)
+    #dg.ro_pump.cmd_set_ro_flow_rate(0.6)