Index: tests/data_capture_helpers/fp_helpers.py
===================================================================
diff -u -r68422d08c4141999a13496343264483a32314d37 -r256ffed682a9c78ee890a3f3132eb6c6518e7ee8
--- tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision 68422d08c4141999a13496343264483a32314d37)
+++ tests/data_capture_helpers/fp_helpers.py	(.../fp_helpers.py)	(revision 256ffed682a9c78ee890a3f3132eb6c6518e7ee8)
@@ -89,38 +89,30 @@
         write_mutex.acquire()
         with open(log_path, "a") as f:
             # collect data and log it
-            temp = "{}_TEMP, ".format(FPFlowSensorNames.P7_FLOW.name)  + \
-                    '{}'.format(fp.flows.p7_temp) + \
-                    ", {}_TEMP, ".format(FPFlowSensorNames.P16_FLOW.name) + \
-                    '{}'.format(fp.flows.p16_temp) + \
-                    ", {}, ".format(FPTemperaturesNames.P23_TEMP.name)  + \
-                    '{}'.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P23_TEMP.name]) + \
-                    ", {}, ".format(FPTemperaturesNames.P22_TEMP.name) + \
-                    '{}'.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P22_TEMP.name]) + \
-                    ", {}, ".format(FPTemperaturesNames.P10_TEMP.name) + \
-                    '{}'.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P10_TEMP.name]) + \
-                    ", {}, ".format(FPTemperaturesNames.P19_TEMP.name) + \
-                    '{}'.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P19_TEMP.name]) + \
-                    ", {}, ".format(FPTemperaturesNames.FP_BOARD_TEMP.name) + \
-                    '{}'.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.FP_BOARD_TEMP.name]) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.M1_PRES.name)  + \
-                    '{}'.format(fp.pressures.m1_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.M3_PRES.name)  + \
-                    '{}'.format(fp.pressures.m3_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.P8_PRES.name)  + \
-                    '{}'.format(fp.pressures.p8_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.P13_PRES.name)  + \
-                    '{}'.format(fp.pressures.p13_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.P17_PRES.name)  + \
-                    '{}'.format(fp.pressures.p17_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.X1_PRES.name)  + \
-                    '{}'.format(fp.pressures.x1_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.X2_PRES.name)  + \
-                    '{}'.format(fp.pressures.x2_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.X3_PRES.name)  + \
-                    '{}'.format(fp.pressures.x3_pres_temp) + \
-                    ", {}_TEMP, ".format(FPPressureSensorNames.X4_PRES.name)  + \
-                    '{}'.format(fp.pressures.x4_pres_temp) + \
+            temp = "{}, ".format(FPTemperaturesNames.P10_TEMP.name)  + \
+                    '{},'.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P10_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.P19_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P19_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.M1_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.M1_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.M3_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.M3_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.P8_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P8_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.P13_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P13_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.X1_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.X1_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.X2_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.X2_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.X3_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.X3_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.X4_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.X4_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.P7_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P7_TEMP.name]) + \
+                    "{}, ".format(FPTemperaturesNames.P16_TEMP.name) + \
+                    '{}, '.format(fp.temperatures.fp_temperatures[FPTemperaturesNames.P16_TEMP.name]) + \
                     ", {}\n".format(fp.temperatures.fp_temperature_sensors_timestamp)
 
             f.write(temp)