Diff: main.cpp

Revision:

23:d00849a9aa23

Parent:

22:f65353f6e935

Child:

24:f59af7a2effb

diff -r f65353f6e935 -r d00849a9aa23 main.cpp
--- a/main.cpp	Tue Sep 24 15:15:03 2019 +0000
+++ b/main.cpp	Tue Sep 24 15:58:13 2019 +0000
@@ -328,25 +328,22 @@
     pressure_thread.start(& pressure_control);
     pressure_tick.attach_us(& pressure_trigger, exp_config.fluidics.pressure_control_loop_interval_ms * 1000); 
 
-    
     //Start logging
     logging_thread.start(& log_state);
     log_tick.attach_us(& log_trigger,exp_config.logging_interval_ms * 1000);
 
-    pc.printf("# Starting routine\n");
-    pc.printf("#   heater,  time(ms),         r,      rSet,       pIn,      pOut\n");
-    timer.start();
-    
     //Start temperature control
     pc.printf("# Waiting for signal to begin [THERMAL] control (type s or press button 0)\n");
     while (pc.getcNb()!='s' && !user_0);
     pc.printf("# Thermal control start signal received\n");
-    pc.printf("#   heater,  time(ms),         r,      rSet,       pIn,      pOut\n");
 
     heater->Set_ref(0.0);
     heater_control.start(& temp_control);
     heat_tick.attach_us(& temp_trigger,exp_config.thermal.thermal_control_loop_interval_ms * 1000);  
 
+    pc.printf("# Starting routine\n");
+    pc.printf("heater id, time (ms), measured resistance (ohms), resistance setpoint (ohms), pressure in (adc), pressure out (adc)\n");
+    timer.start();
     set_point_routine(profile);
     
     //Turn off