Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -red7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 77740bc2ccace473a471515cadd4bc1353360cd6)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision ed7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5)
@@ -174,7 +174,7 @@
                                                   message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value,
                                                   payload=payload)
 
-        self.logger.debug("Setting sensor {} to {} C".format(FPTemperaturesNames[str(sensor_index)].name, sensor_value))
+        self.logger.debug("Setting sensor {} to {} C".format(list(self.fp_temperatures.keys())[sensor_index], sensor_value))
 
         # Send message
         received_message = self.can_interface.send(message)
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)
Index: tests/fp_dianogistic_logger.py
===================================================================
diff -u -r9ccbc0c7610d431e94566f93014f3a9663c4488c -red7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5
--- tests/fp_dianogistic_logger.py	(.../fp_dianogistic_logger.py)	(revision 9ccbc0c7610d431e94566f93014f3a9663c4488c)
+++ tests/fp_dianogistic_logger.py	(.../fp_dianogistic_logger.py)	(revision ed7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5)
@@ -22,6 +22,7 @@
 fp_level_recorder, fp_flow_recorder, fp_conductivity_recorder, fp_valve_recorder, fp_ro_pump_recorder, fp_boost_pump_recorder, \
 fp_op_mode_recorder, fp_combine_logs, fp_log_setup
 from leahi_dialin.fp.filtration_purification import FP
+from leahi_dialin.dd.dialysate_delivery import DD
 
 RECORDING_INTERVAL = 0.25
 RECORDING_INTERVAL_IN_MS = int(RECORDING_INTERVAL * 1000)
@@ -53,6 +54,7 @@
     try:
         # create a FP object called fp
         fp = FP(log_level="DEBUG")
+        dd = DD()
 
         # log in to fp as a tester
         if fp.cmd_log_in_to_fp() == 0:
@@ -71,7 +73,7 @@
         level_log_writer_thread = threading.Thread(target=fp_level_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)
         flows_log_writer_thread = threading.Thread(target=fp_flow_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)
         conductivity_log_writer_thread = threading.Thread(target=fp_conductivity_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)
-        valve_log_writer_thread = threading.Thread(target=fp_valve_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)
+        valve_log_writer_thread = threading.Thread(target=fp_valve_recorder, args=(fp, dd, RECORDING_INTERVAL), daemon=True)
         ro_log_writer_thread = threading.Thread(target=fp_ro_pump_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)
         boost_log_writer_thread = threading.Thread(target=fp_boost_pump_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)
         opmode_log_writer_thread = threading.Thread(target=fp_op_mode_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)