Diff: memspcr.pb.c

Revision:

22:f65353f6e935

Parent:

14:39a5eb99fbdb

diff -r ccbe2a03893d -r f65353f6e935 memspcr.pb.c
--- a/memspcr.pb.c	Tue Sep 24 08:38:40 2019 +0000
+++ b/memspcr.pb.c	Tue Sep 24 15:15:03 2019 +0000
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.3 at Thu Sep 19 17:02:51 2019. */
+/* Generated by nanopb-0.3.9.3 at Tue Sep 24 09:50:11 2019. */
 
 #include "memspcr.pb.h"
 
@@ -10,25 +10,22 @@
 
 
 
-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),
+const pb_field_t memspcr_FluidicConfiguration_fields[4] = {
+    PB_FIELD(  1, FLOAT   , SINGULAR, STATIC  , FIRST, memspcr_FluidicConfiguration, pressure_sensor_setpoint_adc, pressure_sensor_setpoint_adc, 0),
+    PB_FIELD(  2, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_FluidicConfiguration, pressure_sensor_hysteresis_adc, pressure_sensor_setpoint_adc, 0),
+    PB_FIELD(  3, INT32   , 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] = {
+const pb_field_t memspcr_ThermalConfiguration_fields[9] = {
     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(  5, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, thermal_control_loop_interval_ms, pid_integral_time_ms, 0),
+    PB_FIELD(  6, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, pid_wind_up_limit_ohm, thermal_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_FIELD(  8, INT32   , SINGULAR, STATIC  , OTHER, memspcr_ThermalConfiguration, heater_pwm_period_ticks, pid_pwm_limit, 0),
     PB_LAST_FIELD
 };
 
@@ -37,12 +34,11 @@
     PB_LAST_FIELD
 };
 
-const pb_field_t memspcr_ThermalStep_fields[6] = {
+const pb_field_t memspcr_ThermalStep_fields[5] = {
     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_FIELD(  4, FLOAT   , SINGULAR, STATIC  , OTHER, memspcr_ThermalStep, resistance_set_point, camera_exposure_ms, 0),
     PB_LAST_FIELD
 };