Diff: memspcr.pb.h

Revision:

2:b46d53a5f931

Parent:

0:388a2a9f5247

--- a/memspcr.pb.h	Tue Aug 27 15:08:49 2019 +0000
+++ b/memspcr.pb.h	Fri Aug 30 14:51:08 2019 +0000
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.3 at Wed Aug 21 21:39:54 2019. */
+/* Generated by nanopb-0.3.9.3 at Thu Aug 29 14:10:38 2019. */
 
 #ifndef PB_MEMSPCR_MEMSPCR_PB_H_INCLUDED
 #define PB_MEMSPCR_MEMSPCR_PB_H_INCLUDED
@@ -15,13 +15,13 @@
 #endif
 
 /* Enum definitions */
-typedef enum _memspcr_ThermalConfiguration_Heater {
-    memspcr_ThermalConfiguration_Heater_MAIN = 0,
-    memspcr_ThermalConfiguration_Heater_LYSIS = 1
-} memspcr_ThermalConfiguration_Heater;
-#define _memspcr_ThermalConfiguration_Heater_MIN memspcr_ThermalConfiguration_Heater_MAIN
-#define _memspcr_ThermalConfiguration_Heater_MAX memspcr_ThermalConfiguration_Heater_LYSIS
-#define _memspcr_ThermalConfiguration_Heater_ARRAYSIZE ((memspcr_ThermalConfiguration_Heater)(memspcr_ThermalConfiguration_Heater_LYSIS+1))
+typedef enum _memspcr_ExperimentConfiguration_Heater {
+    memspcr_ExperimentConfiguration_Heater_MAIN = 0,
+    memspcr_ExperimentConfiguration_Heater_LYSIS = 1
+} memspcr_ExperimentConfiguration_Heater;
+#define _memspcr_ExperimentConfiguration_Heater_MIN memspcr_ExperimentConfiguration_Heater_MAIN
+#define _memspcr_ExperimentConfiguration_Heater_MAX memspcr_ExperimentConfiguration_Heater_LYSIS
+#define _memspcr_ExperimentConfiguration_Heater_ARRAYSIZE ((memspcr_ExperimentConfiguration_Heater)(memspcr_ExperimentConfiguration_Heater_LYSIS+1))
 
 /* Struct definitions */
 typedef struct _memspcr_FluidicConfiguration {
@@ -38,14 +38,12 @@
 } memspcr_OpticsConfiguration;
 
 typedef struct _memspcr_ThermalConfiguration {
-    pb_callback_t profile;
     float guard_drive_ratio;
-    memspcr_ThermalConfiguration_Heater selected_heater;
     int32_t adc_settling_time_us;
     float pid_kp;
     float pid_integral_time;
     float pid_derivative_time;
-    int32_t control_loop_interval;
+    int32_t control_loop_interval_ms;
 /* @@protoc_insertion_point(struct:memspcr_ThermalConfiguration) */
 } memspcr_ThermalConfiguration;
 
@@ -58,9 +56,11 @@
 
 typedef struct _memspcr_ExperimentConfiguration {
     memspcr_ThermalConfiguration thermal;
+    pb_callback_t profile;
     memspcr_OpticsConfiguration optics;
     memspcr_FluidicConfiguration fluidics;
     int32_t logging_interval_ms;
+    memspcr_ExperimentConfiguration_Heater selected_heater;
 /* @@protoc_insertion_point(struct:memspcr_ExperimentConfiguration) */
 } memspcr_ExperimentConfiguration;
 
@@ -68,15 +68,15 @@
 
 /* Initializer values for message structs */
 #define memspcr_ThermalStep_init_default         {0, 0, 0}
-#define memspcr_ThermalConfiguration_init_default {{{NULL}, NULL}, 0, _memspcr_ThermalConfiguration_Heater_MIN, 0, 0, 0, 0, 0}
+#define memspcr_ThermalConfiguration_init_default {0, 0, 0, 0, 0, 0}
 #define memspcr_OpticsConfiguration_init_default {0, 0, 0}
 #define memspcr_FluidicConfiguration_init_default {0, 0}
-#define memspcr_ExperimentConfiguration_init_default {memspcr_ThermalConfiguration_init_default, memspcr_OpticsConfiguration_init_default, memspcr_FluidicConfiguration_init_default, 0}
+#define memspcr_ExperimentConfiguration_init_default {memspcr_ThermalConfiguration_init_default, {{NULL}, NULL}, memspcr_OpticsConfiguration_init_default, memspcr_FluidicConfiguration_init_default, 0, _memspcr_ExperimentConfiguration_Heater_MIN}
 #define memspcr_ThermalStep_init_zero            {0, 0, 0}
-#define memspcr_ThermalConfiguration_init_zero   {{{NULL}, NULL}, 0, _memspcr_ThermalConfiguration_Heater_MIN, 0, 0, 0, 0, 0}
+#define memspcr_ThermalConfiguration_init_zero   {0, 0, 0, 0, 0, 0}
 #define memspcr_OpticsConfiguration_init_zero    {0, 0, 0}
 #define memspcr_FluidicConfiguration_init_zero   {0, 0}
-#define memspcr_ExperimentConfiguration_init_zero {memspcr_ThermalConfiguration_init_zero, memspcr_OpticsConfiguration_init_zero, memspcr_FluidicConfiguration_init_zero, 0}
+#define memspcr_ExperimentConfiguration_init_zero {memspcr_ThermalConfiguration_init_zero, {{NULL}, NULL}, memspcr_OpticsConfiguration_init_zero, memspcr_FluidicConfiguration_init_zero, 0, _memspcr_ExperimentConfiguration_Heater_MIN}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define memspcr_FluidicConfiguration_pressure_setpoint_tag 1
@@ -84,32 +84,32 @@
 #define memspcr_OpticsConfiguration_pre_trigger_ms_tag 1
 #define memspcr_OpticsConfiguration_on_time_ms_tag 2
 #define memspcr_OpticsConfiguration_led_pwm_tag  3
-#define memspcr_ThermalConfiguration_profile_tag 1
 #define memspcr_ThermalConfiguration_guard_drive_ratio_tag 2
-#define memspcr_ThermalConfiguration_selected_heater_tag 3
 #define memspcr_ThermalConfiguration_adc_settling_time_us_tag 4
 #define memspcr_ThermalConfiguration_pid_kp_tag  7
 #define memspcr_ThermalConfiguration_pid_integral_time_tag 8
 #define memspcr_ThermalConfiguration_pid_derivative_time_tag 9
-#define memspcr_ThermalConfiguration_control_loop_interval_tag 10
+#define memspcr_ThermalConfiguration_control_loop_interval_ms_tag 10
 #define memspcr_ThermalStep_elapsed_time_ms_tag  1
 #define memspcr_ThermalStep_resistance_tag       2
 #define memspcr_ThermalStep_camera_offset_ms_tag 3
 #define memspcr_ExperimentConfiguration_thermal_tag 1
-#define memspcr_ExperimentConfiguration_optics_tag 2
-#define memspcr_ExperimentConfiguration_fluidics_tag 3
-#define memspcr_ExperimentConfiguration_logging_interval_ms_tag 4
+#define memspcr_ExperimentConfiguration_profile_tag 3
+#define memspcr_ExperimentConfiguration_selected_heater_tag 7
+#define memspcr_ExperimentConfiguration_optics_tag 4
+#define memspcr_ExperimentConfiguration_fluidics_tag 5
+#define memspcr_ExperimentConfiguration_logging_interval_ms_tag 6
 
 /* Struct field encoding specification for nanopb */
 extern const pb_field_t memspcr_ThermalStep_fields[4];
-extern const pb_field_t memspcr_ThermalConfiguration_fields[9];
+extern const pb_field_t memspcr_ThermalConfiguration_fields[7];
 extern const pb_field_t memspcr_OpticsConfiguration_fields[4];
 extern const pb_field_t memspcr_FluidicConfiguration_fields[3];
-extern const pb_field_t memspcr_ExperimentConfiguration_fields[5];
+extern const pb_field_t memspcr_ExperimentConfiguration_fields[7];
 
 /* Maximum encoded size of messages (where known) */
 #define memspcr_ThermalStep_size                 27
-/* memspcr_ThermalConfiguration_size depends on runtime parameters */
+#define memspcr_ThermalConfiguration_size        42
 #define memspcr_OpticsConfiguration_size         27
 #define memspcr_FluidicConfiguration_size        10
 /* memspcr_ExperimentConfiguration_size depends on runtime parameters */