Diff: main.cpp

Revision:

4:629ca12c04f4

Parent:

3:3888b5ecad7e

--- a/main.cpp	Thu Sep 05 08:28:26 2019 +0000
+++ b/main.cpp	Fri Sep 20 12:55:49 2019 +0000
@@ -55,20 +55,20 @@
 
 int RT_ramp_time_ms =        1000;
 int RT_hold_time_ms =        4000;
-float RT_resistance =       0.500;
+float RT_resistance =       0.470;
 
 
-int hotstart_ramp_time_ms =  1000;
-int hotstart_hold_time_ms =  4000;
-float hotstart_resistance = 0.550;
+int hotstart_ramp_time_ms =     0;
+int hotstart_hold_time_ms =  5000;
+float hotstart_resistance = 0.470;
 
-int low_ramp_time_ms =       2000;
-int low_hold_time_ms =       3000;
-float low_resistance =      0.520;
+int low_ramp_time_ms =          0;
+int low_hold_time_ms =       2000;
+float low_resistance =      0.400;
 
-int high_ramp_time_ms =      2000;
-int high_hold_time_ms =       500;
-float high_resistance =     0.550;
+int high_ramp_time_ms =         0;
+int high_hold_time_ms =      2000;
+float high_resistance =     0.470;
 
 int n_cycles =                 40;
 int camera_time_ms =         1000;
@@ -150,19 +150,11 @@
 //        camera_offset_ms[i+3] = 10;
 //    }
 //
-//    for (i = 0; i < n_points; i++)
-//    {
-//        memspcr_ThermalStep step = memspcr_ThermalStep_init_zero;
-//        step.resistance = resistance[i];
-//        step.elapsed_time_ms = elapsed_time_ms[i];
-//        step.camera_offset_ms = camera_offset_ms[i];
-//        profile.push_back(step);
-//    }
  
 //Prepare temperature profile for RT-PCR with hotstart and 40 cycles
 
 //RT
-resistance[0] = 0.450;
+resistance[0] = 0.440;
 elapsed_time_ms[0] = 0;
 camera_offset_ms[0] = 0;
 
@@ -204,11 +196,19 @@
     camera_offset_ms[i+7] = low_hold_time_ms - camera_time_ms;
 }   
 
- 
+    for (i = 0; i < n_points; i++)
+    {
+        memspcr_ThermalStep step = memspcr_ThermalStep_init_zero;
+        step.resistance = resistance[i];
+        step.elapsed_time_ms = elapsed_time_ms[i];
+        step.camera_offset_ms = camera_offset_ms[i];
+        profile.push_back(step);
+    }
+
     //Set set points  
     exp_config.profile.arg = &profile;
     exp_config.profile.funcs.encode = encode_callback;
-    exp_config.thermal.guard_drive_ratio = 0.26;
+    //exp_config.thermal.guard_drive_ratio = 0.26;
     exp_config.thermal.adc_settling_time_us = 60;
     exp_config.thermal.pid_kp = 4;
     exp_config.thermal.pid_integral_time = 0.75;