Diff: main.cpp

Revision:

14:39a5eb99fbdb

Parent:

13:b2e00297b465

Child:

15:6d22fa5a66ab

--- a/main.cpp	Wed Sep 18 16:44:04 2019 +0000
+++ b/main.cpp	Thu Sep 19 16:14:05 2019 +0000
@@ -10,7 +10,7 @@
 #include <vector>
 #include <iterator>
 
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 8192
 #define LED_PULSE_PERIOD 1000    // ticks, 84kHz when CPU clock is 84MHz
 #define LED_PULSE_WIDTH   100    // ticks, 10% duty cycle
 
@@ -121,7 +121,7 @@
 void decode_message()
 {
     // Create a stream that reads from the buffer.
-
+    pc.printf("# decoding");
     pb_istream_t istream = pb_istream_from_buffer(buffer, message_length);
 
     //Now we are ready to decode the message.
@@ -225,9 +225,9 @@
 
     for (it_prev = profile.begin(); it < profile.end(); it ++, it_prev++){
         triggered_flag = false;
-        r_gradient = (it->resistance - it_prev->resistance)/(it->elapsed_time_ms - it_prev->elapsed_time_ms);
+        r_gradient = (it->resistance_set_point - it_prev->resistance_set_point)/(it->elapsed_time_ms - it_prev->elapsed_time_ms);
         while ((curr_time = timer.read_ms()) <= it->elapsed_time_ms){
-            heater->Set_ref(it_prev->resistance + r_gradient * (curr_time - it_prev->elapsed_time_ms));   
+            heater->Set_ref(it_prev->resistance_set_point + r_gradient * (curr_time - it_prev->elapsed_time_ms));   
                              
             if (!triggered_flag && (it->camera_offset_ms != 0) && (curr_time > it_prev->elapsed_time_ms + it->camera_offset_ms))
             {
@@ -272,10 +272,10 @@
     Heater * heater_lysis = new Heater(i_port_lysis, v_port_lysis, & drive_lysis, & guard_lysis, & adc, adc_busy, exp_config.thermal);
 
     //Select heater. Put control times in us for ticker functions
-    if (exp_config.selected_heater == memspcr_ExperimentConfiguration_Heater_MAIN) {
+    if (exp_config.selected_heater == memspcr_ExperimentConfiguration_Heater_HEATER_1) {
         heater = heater_main;
         heater_ID = heater_ID_main;
-    } else if (exp_config.selected_heater == memspcr_ExperimentConfiguration_Heater_LYSIS) {
+    } else if (exp_config.selected_heater == memspcr_ExperimentConfiguration_Heater_HEATER_2) {
         heater = heater_lysis;
         heater_ID = heater_ID_lysis;
     } else {