Index: dialin/dg/ro_pump.py
===================================================================
diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r7e81883289d1e8c50bb3ae2d766cdb1daf75cfa5
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 7e81883289d1e8c50bb3ae2d766cdb1daf75cfa5)
@@ -59,7 +59,7 @@
         self.target_pressure_psi = 0.0
         self.measured_flow_rate_lpm = 0.0
         self.pwm_duty_cycle_pct = 0.0
-        self.ro_pump_state = 0.0
+        self.ro_pump_state = 0
         self.target_flow_lpm = 0.0
         self.feedback_duty_cycle_pct = 0.0
 
@@ -106,25 +106,20 @@
 
         @return: None
         """
-        tgt_pres = struct.unpack('f', bytearray(
+        self.target_pressure_psi = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        flow = struct.unpack('f', bytearray(
+        self.measured_flow_rate_lpm = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        pwm = struct.unpack('f', bytearray(
+        self.pwm_duty_cycle_pct = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         ro_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        tgt_flow = struct.unpack('f', bytearray(
+        self.target_flow_lpm = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        feedback_dc = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
+        self.feedback_duty_cycle_pct = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
 
-        self.target_pressure_psi = tgt_pres
-        self.measured_flow_rate_lpm = flow
-        self.pwm_duty_cycle_pct = pwm
-        self.ro_pump_state = ROPumpStates(ro_state).name if ROPumpStates.has_value(ro_state) else 'State Unknown'
-        self.target_flow_lpm = tgt_flow
-        self.feedback_duty_cycle_pct = feedback_dc
+        self.ro_pump_state = ROPumpStates(ro_state).name
 
     def cmd_ro_pump_duty_cycle_pct(self, duty: float) -> int:
         """
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r5400dea744738a3fed51b246038c93ebffcd914a -r7e81883289d1e8c50bb3ae2d766cdb1daf75cfa5
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 5400dea744738a3fed51b246038c93ebffcd914a)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 7e81883289d1e8c50bb3ae2d766cdb1daf75cfa5)
@@ -429,7 +429,7 @@
 def collect_treatment_data():
     f = open("/home/fw/projects/dialin/tests/treatment_run.log", "w")
 
-    dg.cmd_dg_software_reset_request()
+    #dg.cmd_dg_software_reset_request()
 
     try:
         while True:
@@ -575,17 +575,17 @@
 
     # run_chemical_disinfect()
 
-    #run_dg()
+    run_dg()
 
     # run_ro_pump_duty_cycles()
 
     # cmd_set_disinfect_ui_screen()
 
     # cmd_test_heaters()
 
-    # collect_treatment_data()
+    #collect_treatment_data()
 
-    collect_hd_treatment()
+    #collect_hd_treatment()