Index: tests/data_capture_helpers/fp_helpers.py
===================================================================
diff -u -red7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5 -r549db6a2f9c36fa5f714a92146b19ca81d6d1900
--- tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision ed7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5)
+++ tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision 549db6a2f9c36fa5f714a92146b19ca81d6d1900)
@@ -8,10 +8,9 @@
 
 
 from leahi_dialin import FP
+from leahi_dialin.common.fp_defs import *
 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
 write_mutex = Lock()
@@ -29,7 +28,7 @@
             df = pd.read_csv(file)
             print("Adding {}".format(file))
             df.to_excel( writer, header = False,index=False,
-                        sheet_name=os.path.split(file)[1], float_format = "%0.1f")
+                        sheet_name=os.path.split(file)[1], float_format = "%0.5f")
         writer.close()
     else:
         print("no files found.")
@@ -66,15 +65,15 @@
             write_mutex.acquire()
             with open(log_path, "a") as f:
                 # collect data and log it
-                press = "{}, ".format(FPPressureSensorNames.M1_PRES.name) + '{}'.format(fp.pressures.m1_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.M3_PRES.name) + '{}'.format(fp.pressures.m3_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.P8_PRES.name) + '{}'.format(fp.pressures.p8_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.P13_PRES.name) + '{}'.format(fp.pressures.p13_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.P17_PRES.name) + '{}'.format(fp.pressures.p17_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.X1_PRES.name) + '{}'.format(fp.pressures.x1_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.X2_PRES.name) + '{}'.format(fp.pressures.x2_pres) + \
-                        ", {}, ".format(FPPressureSensorNames.X3_PRES.name) + '{}'.format(fp.pressures.x3_pres) + \
-                        ", {} ,".format(FPPressureSensorNames.X4_PRES.name) + '{}'.format(fp.pressures.x4_pres) + \
+                press = "{}, ".format(FPPressureSensorNames.M1_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.M1_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.M3_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.M3_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.P8_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.P8_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.P13_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.P13_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.P17_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.P17_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.X1_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.X1_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.X2_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.X2_PRES.name]) + \
+                        ", {}, ".format(FPPressureSensorNames.X3_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.X3_PRES.name]) + \
+                        ", {} ,".format(FPPressureSensorNames.X4_PRES.name) + '{}'.format(fp.pressures.fp_pressures[FPPressureSensorNames.X4_PRES.name]) + \
                         ", {}\n".format(fp.pressures.fp_pressure_timestamp)
 
                 f.write(press)
@@ -123,7 +122,8 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            level = "p25_level, " + '{}'.format(fp.levels.p25_level) + \
+            level = "{}, ".format(FPFloaterLevelSensorNames.P25_LEVEL.name) + \
+                    '{}'.format(fp.levels.fp_levels[FPFloaterLevelSensorNames.P25_LEVEL.name]) + \
                     ", {}\n".format(fp.levels.fp_levels_timestamp)
 
             f.write(level)
@@ -136,8 +136,8 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            flows = "{}, ".format(FPFlowSensorNames.P7_FLOW.name) + '{}'.format(fp.flows.p7_flow) + \
-                    ", {}, ".format(FPFlowSensorNames.P16_FLOW.name) + '{}'.format(fp.flows.p16_flow) + \
+            flows = "{}, ".format(FPFlowSensorNames.P7_FLOW.name) + '{}'.format(fp.flows.fp_flows[FPFlowSensorNames.P7_FLOW.name]["FLOW"]) + \
+                    ", {}, ".format(FPFlowSensorNames.P16_FLOW.name) + '{}'.format(fp.flows.fp_flows[FPFlowSensorNames.P16_FLOW.name]['FLOW']) + \
                     ", {}\n".format(fp.flows.fp_flow_timestamp)
 
             f.write(flows)
@@ -150,8 +150,8 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            cond = "{}, ".format(FPConductivitySensorsEnum.P9_COND.name) + '{}'.format(fp.conductivity.p9_cond) + \
-                    ", {}, ".format(FPConductivitySensorsEnum.P18_COND.name) + '{}'.format(fp.conductivity.p18_cond) + \
+            cond = "{}, ".format(FPConductivitySensorsEnum.P9_COND.name) + '{}'.format(fp.conductivity.fp_conductivity['P9_COND']) + \
+                    ", {}, ".format(FPConductivitySensorsEnum.P18_COND.name) + '{}'.format(fp.conductivity.fp_conductivity['P18_COND']) + \
                     ", {}\n".format(fp.conductivity.fp_conductivity_timestamp)
 
             f.write(cond)
@@ -188,16 +188,16 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            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) + \
-                     ", 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) + \
-                     ", 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)
+            ro = "{}, ".format(FPPumpAttributes.STATE.name) + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.STATE.name]) + \
+                     ", {}, ".format(FPPumpAttributes.DUTY_CYCLE.name) + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.DUTY_CYCLE.name]) + \
+                     ", {}, ".format(FPPumpAttributes.FB_DUTY_CYCLE.name) + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.FB_DUTY_CYCLE.name]) + \
+                     ", {}, ".format('Ctl_sig_out') + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.SPEED.name]) + \
+                     ", {}, ".format('Ctl_sig_err') + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.TARGET_PRES.name]) + \
+                     ", {}, ".format(FPPumpAttributes.TARGET_FLOW.name) + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.TARGET_FLOW.name]) + \
+                     ", {}, ".format('Kp') + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.TARGET_DUTY_CYCLE.name]) + \
+                     ", {}, ".format('Ki') + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.DUTY_CYCLE_PCT.name]) + \
+                     ", {}, ".format('errsum') + '{}'.format(fp.ro_pump.ro_pump['P12_PUMP'][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name]) + \
+                 ", {}\n".format(fp.ro_pump.ro_pump_timestamp)
 
             f.write(ro)
             f.close()
@@ -209,14 +209,16 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            boost = "p40_pump_state, " + '{}'.format(fp.boost_pump.p40_pump_state) + \
-                     ", p40_pump_duty_cycle, " + '{}'.format(fp.boost_pump.p40_pump_duty_cycle) + \
-                     ", p40_pump_fb_duty_cycle, " + '{}'.format(fp.boost_pump.p40_pump_fb_duty_cycle) + \
-                     ", p40_pump_speed, " + '{}'.format(fp.boost_pump.p40_pump_speed) + \
-                     " p40_target_pressure, " + '{}'.format(fp.boost_pump.p40_target_pressure) + \
-                     ", p40_target_flow, " + '{}'.format(fp.boost_pump.p40_target_flow) + \
-                     ", p40_target_duty_cycle, " + '{}'.format(fp.boost_pump.p40_target_duty_cycle) + \
-                     ", {}\n".format(fp.boost_pump.boost_pump_timestamp)
+            boost = "{}, ".format(FPPumpAttributes.STATE.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.STATE.name]) + \
+                     ", {}, ".format(FPPumpAttributes.DUTY_CYCLE.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.DUTY_CYCLE.name]) + \
+                     ", {}, ".format(FPPumpAttributes.FB_DUTY_CYCLE.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.FB_DUTY_CYCLE.name]) + \
+                     ", {}, ".format(FPPumpAttributes.SPEED.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.SPEED.name]) + \
+                     ", {}, ".format(FPPumpAttributes.TARGET_PRES.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.TARGET_PRES.name]) + \
+                     ", {}, ".format(FPPumpAttributes.TARGET_FLOW.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.TARGET_FLOW.name]) + \
+                     ", {}, ".format(FPPumpAttributes.TARGET_DUTY_CYCLE.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.TARGET_DUTY_CYCLE.name]) + \
+                     ", {}, ".format(FPPumpAttributes.DUTY_CYCLE_PCT.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.DUTY_CYCLE_PCT.name]) + \
+                     ", {}, ".format(FPPumpAttributes.FB_DUTY_CYCLE_PCT.name) + '{}'.format(fp.boost_pump.boost_pump['P40_PUMP'][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name]) + \
+                 ", {}\n".format(fp.boost_pump.boost_pump_timestamp)
 
             f.write(boost)
             f.close()