fix protobuf broken in process params

3 files changed, 54 insertions, 39 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c
index f9d08833a..7a4d3768d 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c
@@ -52,7 +52,7 @@ void   process_parameters__free_unpacked
   assert(message->base.descriptor == &process_parameters__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19] =
+static const ProtobufCFieldDescriptor process_parameters__field_descriptors[20] =
 {
   {
     "DyeingSpeed",
@@ -79,10 +79,22 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "FeederTension",
+    "MaxInkUptake",
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ProcessParameters, has_maxinkuptake),
+    offsetof(ProcessParameters, maxinkuptake),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "FeederTension",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_feedertension),
     offsetof(ProcessParameters, feedertension),
     NULL,
@@ -92,7 +104,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "PullerTension",
-    4,
+    5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_pullertension),
@@ -104,7 +116,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "WinderTension",
-    5,
+    6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_windertension),
@@ -116,7 +128,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "MixerTemp",
-    6,
+    7,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_mixertemp),
@@ -128,7 +140,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadZone1Temp",
-    7,
+    8,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headzone1temp),
@@ -140,7 +152,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadZone2Temp",
-    8,
+    9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headzone2temp),
@@ -152,7 +164,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadZone3Temp",
-    9,
+    10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headzone3temp),
@@ -164,7 +176,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadZone4Temp",
-    10,
+    11,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headzone4temp),
@@ -176,7 +188,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadZone5Temp",
-    11,
+    12,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headzone5temp),
@@ -188,7 +200,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadZone6Temp",
-    12,
+    13,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headzone6temp),
@@ -200,7 +212,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "DryerAirFlow",
-    13,
+    14,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_dryerairflow),
@@ -212,7 +224,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "DryerZone1Temp",
-    14,
+    15,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_dryerzone1temp),
@@ -224,7 +236,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "DryerZone2Temp",
-    15,
+    16,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_dryerzone2temp),
@@ -236,7 +248,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "DryerZone3Temp",
-    16,
+    17,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_dryerzone3temp),
@@ -248,7 +260,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "DryerBufferLength",
-    17,
+    18,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_dryerbufferlength),
@@ -260,7 +272,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "HeadAirFlow",
-    18,
+    19,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
     offsetof(ProcessParameters, has_headairflow),
@@ -272,7 +284,7 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
   {
     "TableIndex",
-    19,
+    20,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
     offsetof(ProcessParameters, has_tableindex),
@@ -284,30 +296,31 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[19]
   },
 };
 static const unsigned process_parameters__field_indices_by_name[] = {
-  12,   /* field[12] = DryerAirFlow */
-  16,   /* field[16] = DryerBufferLength */
-  13,   /* field[13] = DryerZone1Temp */
-  14,   /* field[14] = DryerZone2Temp */
-  15,   /* field[15] = DryerZone3Temp */
+  13,   /* field[13] = DryerAirFlow */
+  17,   /* field[17] = DryerBufferLength */
+  14,   /* field[14] = DryerZone1Temp */
+  15,   /* field[15] = DryerZone2Temp */
+  16,   /* field[16] = DryerZone3Temp */
   0,   /* field[0] = DyeingSpeed */
-  2,   /* field[2] = FeederTension */
-  17,   /* field[17] = HeadAirFlow */
-  6,   /* field[6] = HeadZone1Temp */
-  7,   /* field[7] = HeadZone2Temp */
-  8,   /* field[8] = HeadZone3Temp */
-  9,   /* field[9] = HeadZone4Temp */
-  10,   /* field[10] = HeadZone5Temp */
-  11,   /* field[11] = HeadZone6Temp */
+  3,   /* field[3] = FeederTension */
+  18,   /* field[18] = HeadAirFlow */
+  7,   /* field[7] = HeadZone1Temp */
+  8,   /* field[8] = HeadZone2Temp */
+  9,   /* field[9] = HeadZone3Temp */
+  10,   /* field[10] = HeadZone4Temp */
+  11,   /* field[11] = HeadZone5Temp */
+  12,   /* field[12] = HeadZone6Temp */
+  2,   /* field[2] = MaxInkUptake */
   1,   /* field[1] = MinInkUptake */
-  5,   /* field[5] = MixerTemp */
-  3,   /* field[3] = PullerTension */
-  18,   /* field[18] = TableIndex */
-  4,   /* field[4] = WinderTension */
+  6,   /* field[6] = MixerTemp */
+  4,   /* field[4] = PullerTension */
+  19,   /* field[19] = TableIndex */
+  5,   /* field[5] = WinderTension */
 };
 static const ProtobufCIntRange process_parameters__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 19 }
+  { 0, 20 }
 };
 const ProtobufCMessageDescriptor process_parameters__descriptor =
 {
@@ -317,7 +330,7 @@ const ProtobufCMessageDescriptor process_parameters__descriptor =
   "ProcessParameters",
   "",
   sizeof(ProcessParameters),
-  19,
+  20,
   process_parameters__field_descriptors,
   process_parameters__field_indices_by_name,
   1,  process_parameters__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h
index 281c939ee..093e64d70 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h
@@ -30,6 +30,8 @@ struct  _ProcessParameters
   double dyeingspeed;
   protobuf_c_boolean has_mininkuptake;
   double mininkuptake;
+  protobuf_c_boolean has_maxinkuptake;
+  double maxinkuptake;
   protobuf_c_boolean has_feedertension;
   double feedertension;
   protobuf_c_boolean has_pullertension;
@@ -67,7 +69,7 @@ struct  _ProcessParameters
 };
 #define PROCESS_PARAMETERS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&process_parameters__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* ProcessParameters methods */
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 2fac46a3c..76783ee92 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -776,7 +776,7 @@ char Endstr[150];
      if (PoolerSpeedControlId != 0xFF)
      {
          if(RemoveControlCallback(PoolerSpeedControlId,PoolerThreadLengthCBFunction)!=OK)
-             LOG_ERROR(Motor_i,"RemoveControl Failed");
+             LOG_ERROR(PoolerSpeedControlId,"RemoveControl Failed");
          PoolerSpeedControlId = 0xFF;
      }