Index: tests/data_capture_helpers/fp_helpers.py
===================================================================
diff -u -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 -red7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5
--- tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215)
+++ tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision ed7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5)
@@ -8,11 +8,9 @@
 
 
 from leahi_dialin import FP
-from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensorsEnum
-from leahi_dialin.fp.modules.flow_sensors import FPFlowSensorNames
-from leahi_dialin.fp.modules.pressure_sensors import FPPressureSensorNames
-from leahi_dialin.fp.modules.levels import FPFloaterLevels
-from leahi_dialin.fp.modules.valves import FPValveNames, FPValveStates
+from leahi_dialin import DD
+from leahi_dialin.dd.modules.valves import DDValves, DDValveNames
+from leahi_dialin.common.fp_defs import *
 from leahi_dialin.fp.modules.temperatures import FPTemperaturesNames
 
 excel.ExcelFormatter.header_style = None
@@ -161,11 +159,12 @@
         write_mutex.release()
         sleep(interval)
 
-def fp_valve_recorder(fp:FP, interval: float = 1.0, log_path : str = "{}FP_test_valve.log".format(DEFAULT_LOG_DIR) ):
+def fp_valve_recorder(fp:FP, dd:DD, interval: float = 1.0, log_path : str = "{}FP_test_valve.log".format(DEFAULT_LOG_DIR) ):
     while True:
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
+            ddvalve = dd.valves.d3_valv.get("state", None)
             list_of_states = fp.valves.get_valve_states()
             valves = "{}, ".format(FPValveNames.M4_VALV.name) + '{}'.format(list_of_states[0]) + \
                      ", {}, ".format(FPValveNames.P39_VALV.name) + '{}'.format(list_of_states[1]) + \
@@ -176,6 +175,7 @@
                      ", {}, ".format(FPValveNames.P37_VALV.name) + '{}'.format(list_of_states[6]) + \
                      ", {}, ".format(FPValveNames.M7_VALV.name) + '{}'.format(list_of_states[7]) + \
                      ", {}, ".format(FPValveNames.P20_VALV.name) + '{}'.format(list_of_states[8]) + \
+                     ", {}, ".format(DDValveNames.D3_VALV.name) + '{}'.format(ddvalve) + \
                      ", {}\n".format(fp.valves.fp_valves_states_timestamp)
 
             f.write(valves)
@@ -191,10 +191,12 @@
             ro = "p12_pump_state, ".format(FPValveNames.M4_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_state) + \
                      ", p12_pump_duty_cycle, ".format(FPValveNames.P39_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_duty_cycle) + \
                      ", p12_pump_fb_duty_cycle, ".format(FPValveNames.P6_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_fb_duty_cycle) + \
-                     ", p12_pump_speed, ".format(FPValveNames.P11_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_speed) + \
-                     ", p12_target_pressure, ".format(FPValveNames.P33_VALV.name) + '{}'.format(fp.ro_pump.p12_target_pressure) + \
+                     ", control_signal_output, ".format(FPValveNames.P11_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_speed) + \
+                     ", signal_error, ".format(FPValveNames.P33_VALV.name) + '{}'.format(fp.ro_pump.p12_target_pressure) + \
                      ", p12_target_flow, ".format(FPValveNames.P34_VALV.name) + '{}'.format(fp.ro_pump.p12_target_flow) + \
-                     ", p12_target_duty_cycle, ".format(FPValveNames.P37_VALV.name) + '{}'.format(fp.ro_pump.p12_target_duty_cycle) + \
+                     ", kp_output, ".format(FPValveNames.P37_VALV.name) + '{}'.format(fp.ro_pump.p12_target_duty_cycle) + \
+                     ", ki_output, ".format(FPValveNames.P37_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_duty_cycle_pct) + \
+                     ", errorsum, ".format(FPValveNames.P37_VALV.name) + '{}'.format(fp.ro_pump.p12_pump_fb_duty_cycle_pct) + \
                      ", {}\n".format(fp.ro_pump.ro_pump_timestamp)
 
             f.write(ro)