Diff: memspcr.pb.c

Revision:

14:39a5eb99fbdb

Parent:

5:702b32ead94e

Child:

22:f65353f6e935

diff -r b2e00297b465 -r 39a5eb99fbdb memspcr.pb.c
--- a/memspcr.pb.c	Wed Sep 18 16:44:04 2019 +0000
+++ b/memspcr.pb.c	Thu Sep 19 16:14:05 2019 +0000
@@ -1,79 +1,86 @@
-/* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.3 at Thu Aug 29 14:10:38 2019. */
-
-#include "memspcr.pb.h"
-
-/* @@protoc_insertion_point(includes) */
-#if PB_PROTO_HEADER_VERSION != 30
-#error Regenerate this file with the current version of nanopb generator.
-#endif
-
-
-
-const pb_field_t memspcr_ThermalStep_fields[4] = {
-    PB_FIELD(  1, INT32   , SINGULAR, STATIC  , FIRST, memspcr_ThermalStep, elapsed_time_ms, elapsed_time_ms, 0),
-    PB_FIELD(  2, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, resistance, elapsed_time_ms, 0),
-    PB_FIELD(  3, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, camera_offset_ms, resistance, 0),
-    PB_LAST_FIELD
-};
-
-const pb_field_t memspcr_ThermalConfiguration_fields[7] = {
-    PB_FIELD(  2, FLOAT   , SINGULAR, STATIC  , FIRST, memspcr_ThermalConfiguration, guard_drive_ratio, guard_drive_ratio, 0),
-    PB_FIELD(  4, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, adc_settling_time_us, guard_drive_ratio, 0),
-    PB_FIELD(  7, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_kp, adc_settling_time_us, 0),
-    PB_FIELD(  8, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_integral_time, pid_kp, 0),
-    PB_FIELD(  9, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_derivative_time, pid_integral_time, 0),
-    PB_FIELD( 10, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, control_loop_interval_ms, pid_derivative_time, 0),
-    PB_LAST_FIELD
-};
-
-const pb_field_t memspcr_OpticsConfiguration_fields[4] = {
-    PB_FIELD(  1, INT32   , SINGULAR, STATIC  , FIRST, memspcr_OpticsConfiguration, pre_trigger_ms, pre_trigger_ms, 0),
-    PB_FIELD(  2, INT32   , SINGULAR, STATIC  , OTHER, memspcr_OpticsConfiguration, on_time_ms, pre_trigger_ms, 0),
-    PB_FIELD(  3, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_OpticsConfiguration, led_pwm, on_time_ms, 0),
-    PB_LAST_FIELD
-};
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.3.9.3 at Thu Sep 19 17:02:51 2019. */
+
+#include "memspcr.pb.h"
+
+/* @@protoc_insertion_point(includes) */
+#if PB_PROTO_HEADER_VERSION != 30
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+
+
+const pb_field_t memspcr_FluidicConfiguration_fields[6] = {
+    PB_FIELD(  1, FLOAT   , SINGULAR, STATIC  , FIRST, memspcr_FluidicConfiguration, pressure_setpoint_bar, pressure_setpoint_bar, 0),
+    PB_FIELD(  2, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_FluidicConfiguration, pressure_hysteresis_bar, pressure_setpoint_bar, 0),
+    PB_FIELD(  3, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_FluidicConfiguration, pressure_sensor_setpoint_adc, pressure_hysteresis_bar, 0),
+    PB_FIELD(  4, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_FluidicConfiguration, pressure_sensor_hysteresis_adc, pressure_sensor_setpoint_adc, 0),
+    PB_FIELD(  5, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_FluidicConfiguration, pressure_control_loop_interval_ms, pressure_sensor_hysteresis_adc, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t memspcr_ThermalConfiguration_fields[10] = {
+    PB_FIELD(  1, FLOAT   , SINGULAR, STATIC  , FIRST, memspcr_ThermalConfiguration, guard_drive_ratio, guard_drive_ratio, 0),
+    PB_FIELD(  2, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, settling_time_us, guard_drive_ratio, 0),
+    PB_FIELD(  3, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_kp_mho, settling_time_us, 0),
+    PB_FIELD(  4, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_integral_time_ms, pid_kp_mho, 0),
+    PB_FIELD(  5, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, control_loop_interval_ms, pid_integral_time_ms, 0),
+    PB_FIELD(  6, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_wind_up_limit_ohm, control_loop_interval_ms, 0),
+    PB_FIELD(  7, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_pwm_limit, pid_wind_up_limit_ohm, 0),
+    PB_FIELD(  8, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, heater_pwm_ticks, pid_pwm_limit, 0),
+    PB_FIELD(  9, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, guard_pwm_ticks, heater_pwm_ticks, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t memspcr_OpticsConfiguration_fields[2] = {
+    PB_FIELD(  1, INT32   , SINGULAR, STATIC  , FIRST, memspcr_OpticsConfiguration, camera_interframe_delay_us, camera_interframe_delay_us, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t memspcr_ThermalStep_fields[6] = {
+    PB_FIELD(  1, INT32   , SINGULAR, STATIC  , FIRST, memspcr_ThermalStep, elapsed_time_ms, elapsed_time_ms, 0),
+    PB_FIELD(  2, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, camera_offset_ms, elapsed_time_ms, 0),
+    PB_FIELD(  3, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, camera_exposure_ms, camera_offset_ms, 0),
+    PB_FIELD(  4, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, temperature_set_point, camera_exposure_ms, 0),
+    PB_FIELD(  5, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, resistance_set_point, temperature_set_point, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t memspcr_ExperimentConfiguration_fields[7] = {
+    PB_FIELD(  1, INT32   , SINGULAR, STATIC  , FIRST, memspcr_ExperimentConfiguration, logging_interval_ms, logging_interval_ms, 0),
+    PB_FIELD(  2, UENUM   , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, selected_heater, logging_interval_ms, 0),
+    PB_FIELD(  3, MESSAGE , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, thermal, selected_heater, &memspcr_ThermalConfiguration_fields),
+    PB_FIELD(  4, MESSAGE , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, fluidics, thermal, &memspcr_FluidicConfiguration_fields),
+    PB_FIELD(  5, MESSAGE , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, optics, fluidics, &memspcr_OpticsConfiguration_fields),
+    PB_FIELD(  6, MESSAGE , REPEATED, CALLBACK, OTHER, memspcr_ExperimentConfiguration, profile, optics, &memspcr_ThermalStep_fields),
+    PB_LAST_FIELD
+};
+
+
+
+/* Check that field information fits in pb_field_t */
+#if !defined(PB_FIELD_32BIT)
+/* If you get an error here, it means that you need to define PB_FIELD_32BIT
+ * compile-time option. You can do that in pb.h or on compiler command line.
+ * 
+ * The reason you need to do this is that some of your messages contain tag
+ * numbers or field sizes that are larger than what can fit in 8 or 16 bit
+ * field descriptors.
+ */
+PB_STATIC_ASSERT((pb_membersize(memspcr_ExperimentConfiguration, thermal) < 65536 && pb_membersize(memspcr_ExperimentConfiguration, fluidics) < 65536 && pb_membersize(memspcr_ExperimentConfiguration, optics) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_memspcr_FluidicConfiguration_memspcr_ThermalConfiguration_memspcr_OpticsConfiguration_memspcr_ThermalStep_memspcr_ExperimentConfiguration)
+#endif
+
+#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
+/* If you get an error here, it means that you need to define PB_FIELD_16BIT
+ * compile-time option. You can do that in pb.h or on compiler command line.
+ * 
+ * The reason you need to do this is that some of your messages contain tag
+ * numbers or field sizes that are larger than what can fit in the default
+ * 8 bit descriptors.
+ */
+PB_STATIC_ASSERT((pb_membersize(memspcr_ExperimentConfiguration, thermal) < 256 && pb_membersize(memspcr_ExperimentConfiguration, fluidics) < 256 && pb_membersize(memspcr_ExperimentConfiguration, optics) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_memspcr_FluidicConfiguration_memspcr_ThermalConfiguration_memspcr_OpticsConfiguration_memspcr_ThermalStep_memspcr_ExperimentConfiguration)
+#endif
+
+
+/* @@protoc_insertion_point(eof) */
 
-const pb_field_t memspcr_FluidicConfiguration_fields[3] = {
-    PB_FIELD(  1, FLOAT   , SINGULAR, STATIC  , FIRST, memspcr_FluidicConfiguration, pressure_setpoint, pressure_setpoint, 0),
-    PB_FIELD(  2, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_FluidicConfiguration, pressure_hysterisis, pressure_setpoint, 0),
-    PB_LAST_FIELD
-};
-
-const pb_field_t memspcr_ExperimentConfiguration_fields[7] = {
-    PB_FIELD(  1, MESSAGE , SINGULAR, STATIC  , FIRST, memspcr_ExperimentConfiguration, thermal, thermal, &memspcr_ThermalConfiguration_fields),
-    PB_FIELD(  3, MESSAGE , REPEATED, CALLBACK, OTHER, memspcr_ExperimentConfiguration, profile, thermal, &memspcr_ThermalStep_fields),
-    PB_FIELD(  4, MESSAGE , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, optics, profile, &memspcr_OpticsConfiguration_fields),
-    PB_FIELD(  5, MESSAGE , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, fluidics, optics, &memspcr_FluidicConfiguration_fields),
-    PB_FIELD(  6, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, logging_interval_ms, fluidics, 0),
-    PB_FIELD(  7, UENUM   , SINGULAR, STATIC  , OTHER, memspcr_ExperimentConfiguration, selected_heater, logging_interval_ms, 0),
-    PB_LAST_FIELD
-};
-
-
-
-/* Check that field information fits in pb_field_t */
-#if !defined(PB_FIELD_32BIT)
-/* If you get an error here, it means that you need to define PB_FIELD_32BIT
- * compile-time option. You can do that in pb.h or on compiler command line.
- * 
- * The reason you need to do this is that some of your messages contain tag
- * numbers or field sizes that are larger than what can fit in 8 or 16 bit
- * field descriptors.
- */
-PB_STATIC_ASSERT((pb_membersize(memspcr_ExperimentConfiguration, thermal) < 65536 && pb_membersize(memspcr_ExperimentConfiguration, optics) < 65536 && pb_membersize(memspcr_ExperimentConfiguration, fluidics) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_memspcr_ThermalStep_memspcr_ThermalConfiguration_memspcr_OpticsConfiguration_memspcr_FluidicConfiguration_memspcr_ExperimentConfiguration)
-#endif
-
-#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
-/* If you get an error here, it means that you need to define PB_FIELD_16BIT
- * compile-time option. You can do that in pb.h or on compiler command line.
- * 
- * The reason you need to do this is that some of your messages contain tag
- * numbers or field sizes that are larger than what can fit in the default
- * 8 bit descriptors.
- */
-PB_STATIC_ASSERT((pb_membersize(memspcr_ExperimentConfiguration, thermal) < 256 && pb_membersize(memspcr_ExperimentConfiguration, optics) < 256 && pb_membersize(memspcr_ExperimentConfiguration, fluidics) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_memspcr_ThermalStep_memspcr_ThermalConfiguration_memspcr_OpticsConfiguration_memspcr_FluidicConfiguration_memspcr_ExperimentConfiguration)
-#endif
-
-
-/* @@protoc_insertion_point(eof) */
\ No newline at end of file