Index: tests/data_capture_helpers/fp_helpers.py =================================================================== diff -u -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/data_capture_helpers/fp_helpers.py (.../fp_helpers.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) +++ tests/data_capture_helpers/fp_helpers.py (.../fp_helpers.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -8,7 +8,7 @@ from leahi_dialin import FP -from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensorsEnum +from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensorNames 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 @@ -152,8 +152,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(FPConductivitySensorNames.P9_COND.name) + '{}'.format(fp.conductivity.p9_cond) + \ + ", {}, ".format(FPConductivitySensorNames.P18_COND.name) + '{}'.format(fp.conductivity.p18_cond) + \ ", {}\n".format(fp.conductivity.fp_conductivity_timestamp) f.write(cond)