Diff: main.cpp

Revision:

1:fa8f59ecc52a

Parent:

0:388a2a9f5247

Child:

2:b46d53a5f931

--- a/main.cpp	Tue Aug 27 09:24:17 2019 +0000
+++ b/main.cpp	Tue Aug 27 15:08:49 2019 +0000
@@ -7,8 +7,7 @@
 #include <vector>
 #include <iterator>
 
-DigitalOut led1(LED1);
-MODSERIAL pc(USBTX, USBRX, 512);
+MODSERIAL pc(PA_9, PA_10, 512); //mcu TX, RX, 512 byte TX and RX buffers
 
 uint8_t buffer[512];
 size_t message_length;
@@ -23,8 +22,8 @@
 
 
 //Parameters
-float resistance[5] = {0.4,0.5,0.4,0.7,0.5};
-int elapsed_time_ms[5] = {500,1000,1500,2500,3000};
+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};
         
 
@@ -94,13 +93,13 @@
     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 = 3000;
+    exp_config.thermal.control_loop_interval = 3;
     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 = 50;
+    exp_config.logging_interval_ms = 200;
     
     
     encode_message();