Diff: memspcr.pb.h

Revision:

14:39a5eb99fbdb

Parent:

5:702b32ead94e

Child:

22:f65353f6e935

diff -r b2e00297b465 -r 39a5eb99fbdb memspcr.pb.h
--- a/memspcr.pb.h	Wed Sep 18 16:44:04 2019 +0000
+++ b/memspcr.pb.h	Thu Sep 19 16:14:05 2019 +0000
@@ -1,130 +1,143 @@
-/* Automatically generated nanopb header */
-/* 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
-#include <pb.h>
-
-/* @@protoc_insertion_point(includes) */
-#if PB_PROTO_HEADER_VERSION != 30
-#error Regenerate this file with the current version of nanopb generator.
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Enum definitions */
-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 {
-    float pressure_setpoint;
-    float pressure_hysterisis;
-/* @@protoc_insertion_point(struct:memspcr_FluidicConfiguration) */
-} memspcr_FluidicConfiguration;
-
-typedef struct _memspcr_OpticsConfiguration {
-    int32_t pre_trigger_ms;
-    int32_t on_time_ms;
-    float led_pwm;
-/* @@protoc_insertion_point(struct:memspcr_OpticsConfiguration) */
-} memspcr_OpticsConfiguration;
-
-typedef struct _memspcr_ThermalConfiguration {
-    float guard_drive_ratio;
-    int32_t adc_settling_time_us;
-    float pid_kp;
-    float pid_integral_time;
-    float pid_derivative_time;
-    int32_t control_loop_interval_ms;
-/* @@protoc_insertion_point(struct:memspcr_ThermalConfiguration) */
-} memspcr_ThermalConfiguration;
-
-typedef struct _memspcr_ThermalStep {
-    int32_t elapsed_time_ms;
-    float resistance;
-    int32_t camera_offset_ms;
-/* @@protoc_insertion_point(struct:memspcr_ThermalStep) */
-} memspcr_ThermalStep;
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.3.9.3 at Thu Sep 19 17:02:51 2019. */
+
+#ifndef PB_MEMSPCR_MEMSPCR_PB_H_INCLUDED
+#define PB_MEMSPCR_MEMSPCR_PB_H_INCLUDED
+#include <pb.h>
+
+/* @@protoc_insertion_point(includes) */
+#if PB_PROTO_HEADER_VERSION != 30
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Enum definitions */
+typedef enum _memspcr_ExperimentConfiguration_Heater {
+    memspcr_ExperimentConfiguration_Heater_HEATER_1 = 0,
+    memspcr_ExperimentConfiguration_Heater_HEATER_2 = 1
+} memspcr_ExperimentConfiguration_Heater;
+#define _memspcr_ExperimentConfiguration_Heater_MIN memspcr_ExperimentConfiguration_Heater_HEATER_1
+#define _memspcr_ExperimentConfiguration_Heater_MAX memspcr_ExperimentConfiguration_Heater_HEATER_2
+#define _memspcr_ExperimentConfiguration_Heater_ARRAYSIZE ((memspcr_ExperimentConfiguration_Heater)(memspcr_ExperimentConfiguration_Heater_HEATER_2+1))
+
+/* Struct definitions */
+typedef struct _memspcr_FluidicConfiguration {
+    float pressure_setpoint_bar;
+    float pressure_hysteresis_bar;
+    float pressure_sensor_setpoint_adc;
+    float pressure_sensor_hysteresis_adc;
+    float pressure_control_loop_interval_ms;
+/* @@protoc_insertion_point(struct:memspcr_FluidicConfiguration) */
+} memspcr_FluidicConfiguration;
+
+typedef struct _memspcr_OpticsConfiguration {
+    int32_t camera_interframe_delay_us;
+/* @@protoc_insertion_point(struct:memspcr_OpticsConfiguration) */
+} memspcr_OpticsConfiguration;
+
+typedef struct _memspcr_ThermalConfiguration {
+    float guard_drive_ratio;
+    int32_t settling_time_us;
+    float pid_kp_mho;
+    float pid_integral_time_ms;
+    int32_t control_loop_interval_ms;
+    float pid_wind_up_limit_ohm;
+    float pid_pwm_limit;
+    int32_t heater_pwm_ticks;
+    int32_t guard_pwm_ticks;
+/* @@protoc_insertion_point(struct:memspcr_ThermalConfiguration) */
+} memspcr_ThermalConfiguration;
+
+typedef struct _memspcr_ThermalStep {
+    int32_t elapsed_time_ms;
+    int32_t camera_offset_ms;
+    int32_t camera_exposure_ms;
+    float temperature_set_point;
+    float resistance_set_point;
+/* @@protoc_insertion_point(struct:memspcr_ThermalStep) */
+} memspcr_ThermalStep;
+
+typedef struct _memspcr_ExperimentConfiguration {
+    int32_t logging_interval_ms;
+    memspcr_ExperimentConfiguration_Heater selected_heater;
+    memspcr_ThermalConfiguration thermal;
+    memspcr_FluidicConfiguration fluidics;
+    memspcr_OpticsConfiguration optics;
+    pb_callback_t profile;
+/* @@protoc_insertion_point(struct:memspcr_ExperimentConfiguration) */
+} memspcr_ExperimentConfiguration;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define memspcr_FluidicConfiguration_init_default {0, 0, 0, 0, 0}
+#define memspcr_ThermalConfiguration_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define memspcr_OpticsConfiguration_init_default {0}
+#define memspcr_ThermalStep_init_default         {0, 0, 0, 0, 0}
+#define memspcr_ExperimentConfiguration_init_default {0, _memspcr_ExperimentConfiguration_Heater_MIN, memspcr_ThermalConfiguration_init_default, memspcr_FluidicConfiguration_init_default, memspcr_OpticsConfiguration_init_default, {{NULL}, NULL}}
+#define memspcr_FluidicConfiguration_init_zero   {0, 0, 0, 0, 0}
+#define memspcr_ThermalConfiguration_init_zero   {0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define memspcr_OpticsConfiguration_init_zero    {0}
+#define memspcr_ThermalStep_init_zero            {0, 0, 0, 0, 0}
+#define memspcr_ExperimentConfiguration_init_zero {0, _memspcr_ExperimentConfiguration_Heater_MIN, memspcr_ThermalConfiguration_init_zero, memspcr_FluidicConfiguration_init_zero, memspcr_OpticsConfiguration_init_zero, {{NULL}, NULL}}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define memspcr_FluidicConfiguration_pressure_setpoint_bar_tag 1
+#define memspcr_FluidicConfiguration_pressure_hysteresis_bar_tag 2
+#define memspcr_FluidicConfiguration_pressure_sensor_setpoint_adc_tag 3
+#define memspcr_FluidicConfiguration_pressure_sensor_hysteresis_adc_tag 4
+#define memspcr_FluidicConfiguration_pressure_control_loop_interval_ms_tag 5
+#define memspcr_OpticsConfiguration_camera_interframe_delay_us_tag 1
+#define memspcr_ThermalConfiguration_guard_drive_ratio_tag 1
+#define memspcr_ThermalConfiguration_settling_time_us_tag 2
+#define memspcr_ThermalConfiguration_pid_kp_mho_tag 3
+#define memspcr_ThermalConfiguration_pid_integral_time_ms_tag 4
+#define memspcr_ThermalConfiguration_control_loop_interval_ms_tag 5
+#define memspcr_ThermalConfiguration_pid_wind_up_limit_ohm_tag 6
+#define memspcr_ThermalConfiguration_pid_pwm_limit_tag 7
+#define memspcr_ThermalConfiguration_heater_pwm_ticks_tag 8
+#define memspcr_ThermalConfiguration_guard_pwm_ticks_tag 9
+#define memspcr_ThermalStep_elapsed_time_ms_tag  1
+#define memspcr_ThermalStep_camera_offset_ms_tag 2
+#define memspcr_ThermalStep_camera_exposure_ms_tag 3
+#define memspcr_ThermalStep_temperature_set_point_tag 4
+#define memspcr_ThermalStep_resistance_set_point_tag 5
+#define memspcr_ExperimentConfiguration_logging_interval_ms_tag 1
+#define memspcr_ExperimentConfiguration_selected_heater_tag 2
+#define memspcr_ExperimentConfiguration_thermal_tag 3
+#define memspcr_ExperimentConfiguration_fluidics_tag 4
+#define memspcr_ExperimentConfiguration_optics_tag 5
+#define memspcr_ExperimentConfiguration_profile_tag 6
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t memspcr_FluidicConfiguration_fields[6];
+extern const pb_field_t memspcr_ThermalConfiguration_fields[10];
+extern const pb_field_t memspcr_OpticsConfiguration_fields[2];
+extern const pb_field_t memspcr_ThermalStep_fields[6];
+extern const pb_field_t memspcr_ExperimentConfiguration_fields[7];
+
+/* Maximum encoded size of messages (where known) */
+#define memspcr_FluidicConfiguration_size        25
+#define memspcr_ThermalConfiguration_size        69
+#define memspcr_OpticsConfiguration_size         11
+#define memspcr_ThermalStep_size                 43
+/* memspcr_ExperimentConfiguration_size depends on runtime parameters */
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define MEMSPCR_MESSAGES \
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+/* @@protoc_insertion_point(eof) */
+
+#endif
 
-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;
-
-/* Default values for struct fields */
-
-/* Initializer values for message structs */
-#define memspcr_ThermalStep_init_default         {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, {{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   {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, {{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
-#define memspcr_FluidicConfiguration_pressure_hysterisis_tag 2
-#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_guard_drive_ratio_tag 2
-#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_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_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[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[7];
-
-/* Maximum encoded size of messages (where known) */
-#define memspcr_ThermalStep_size                 27
-#define memspcr_ThermalConfiguration_size        42
-#define memspcr_OpticsConfiguration_size         27
-#define memspcr_FluidicConfiguration_size        10
-/* memspcr_ExperimentConfiguration_size depends on runtime parameters */
-
-/* Message IDs (where set with "msgid" option) */
-#ifdef PB_MSGID
-
-#define MEMSPCR_MESSAGES \
-
-
-#endif
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-/* @@protoc_insertion_point(eof) */
-
-#endif
\ No newline at end of file