Diff: main.cpp

Revision:

2:b46d53a5f931

Parent:

1:fa8f59ecc52a

Child:

3:3888b5ecad7e

diff -r fa8f59ecc52a -r b46d53a5f931 main.cpp
--- a/main.cpp	Tue Aug 27 15:08:49 2019 +0000
+++ b/main.cpp	Fri Aug 30 14:51:08 2019 +0000
@@ -22,9 +22,9 @@
 
 
 //Parameters
-float resistance[5] = {0.53,0.53,0.53,0.53,0.53};
-int elapsed_time_ms[5] = {50,10000,15000,25000,30000};
-int camera_offset_ms[5] = {50,250,0,100,100};
+float resistance[9] = {0.45,0.525,0.525,0.555,0.555,0.525,0.525,0.555};
+int elapsed_time_ms[9] = {0,5000,10000,10001,15000,15001,20000};
+int camera_offset_ms[9] = {0,0,250,0,100,100,100,200};
         
 
 void write_message()
@@ -86,20 +86,21 @@
         profile.push_back(step);
     }
     //Set set points  
-    exp_config.thermal.profile.arg = &profile;
-    exp_config.thermal.profile.funcs.encode = encode_callback;
+    exp_config.profile.arg = &profile;
+    exp_config.profile.funcs.encode = encode_callback;
     exp_config.thermal.guard_drive_ratio = 0.26;
-    exp_config.thermal.selected_heater = memspcr_ThermalConfiguration_Heater_MAIN;
     exp_config.thermal.adc_settling_time_us = 60;
-    exp_config.thermal.pid_kp = 6.0;
-    exp_config.thermal.pid_integral_time = 0.5;
-    exp_config.thermal.control_loop_interval = 3;
+    exp_config.thermal.pid_kp = 4;
+    exp_config.thermal.pid_integral_time = 0.75;
+    exp_config.thermal.control_loop_interval_ms = 4;
     exp_config.optics.pre_trigger_ms = 1;
     exp_config.optics.on_time_ms = 1;
     exp_config.optics.led_pwm = 0.5;
     exp_config.fluidics.pressure_setpoint = 0.4;
     exp_config.fluidics.pressure_hysterisis = 0.01;
-    exp_config.logging_interval_ms = 200;
+    exp_config.logging_interval_ms = 100;
+    exp_config.selected_heater = memspcr_ExperimentConfiguration_Heater_MAIN;
+
     
     
     encode_message();