Diff: main.cpp

Revision:

29:818c098c9e5a

Parent:

28:b2513f36a50d

Child:

30:b28088f244c2

--- a/main.cpp	Mon Nov 11 08:30:00 2019 +0000
+++ b/main.cpp	Sat Nov 16 06:06:13 2019 +0000
@@ -199,9 +199,9 @@
 {
     while(1){
         flags.wait_any(0x2,osWaitForever,true);
-        //Output time, R_ref, R, error, error_integrated
+        //Output time, R_avg, R_ref, R_var, error, error_integrated, duty cycle, input pressure, output pressure
         pc.printf("%10d,%10d,%10.6f,%10.6f,%10.6f,%10.6f,%10.6f,%10.6f,%10.6f,%10.6f\n", 
-            heater_ID, timer.read_ms(), heater->Get_R_avg(), heater->Get_R_ref(), heater->Get_R(), heater->Get_error(), heater->Get_error_integrated(), heater->Get_D(), pressure_in, pressure_out);
+            heater_ID, timer.read_ms(), heater->Get_R_avg(), heater->Get_R_ref(), heater->Get_R_var(), heater->Get_error(), heater->Get_error_integrated(), heater->Get_D(), pressure_in, pressure_out);
         wait_us(200);//Give other threads time to get selected
    }
 }