Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 34 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c
index a47ff627b..53754f409 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c
@@ -52,7 +52,7 @@ void   job_ticket__free_unpacked
   assert(message->base.descriptor == &job_ticket__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor job_ticket__field_descriptors[12] =
+static const ProtobufCFieldDescriptor job_ticket__field_descriptors[14] =
 {
   {
     "Guid",
@@ -198,6 +198,30 @@ static const ProtobufCFieldDescriptor job_ticket__field_descriptors[12] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "units",
+    13,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(JobTicket, has_units),
+    offsetof(JobTicket, units),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "SampleWinding",
+    14,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(JobTicket, has_samplewinding),
+    offsetof(JobTicket, samplewinding),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned job_ticket__field_indices_by_name[] = {
   2,   /* field[2] = EnableInterSegment */
@@ -208,15 +232,17 @@ static const unsigned job_ticket__field_indices_by_name[] = {
   4,   /* field[4] = Length */
   1,   /* field[1] = Name */
   5,   /* field[5] = ProcessParameters */
+  13,   /* field[13] = SampleWinding */
   8,   /* field[8] = Segments */
   7,   /* field[7] = Spool */
   9,   /* field[9] = UploadStrategy */
   6,   /* field[6] = WindingMethod */
+  12,   /* field[12] = units */
 };
 static const ProtobufCIntRange job_ticket__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 12 }
+  { 0, 14 }
 };
 const ProtobufCMessageDescriptor job_ticket__descriptor =
 {
@@ -226,7 +252,7 @@ const ProtobufCMessageDescriptor job_ticket__descriptor =
   "JobTicket",
   "",
   sizeof(JobTicket),
-  12,
+  14,
   job_ticket__field_descriptors,
   job_ticket__field_indices_by_name,
   1,  job_ticket__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h
index bf75643a9..d54a9c32e 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h
@@ -50,10 +50,14 @@ struct  _JobTicket
   char *jobdescriptionfile;
   protobuf_c_boolean has_enablelubrication;
   protobuf_c_boolean enablelubrication;
+  protobuf_c_boolean has_units;
+  uint32_t units;
+  protobuf_c_boolean has_samplewinding;
+  protobuf_c_boolean samplewinding;
 };
 #define JOB_TICKET__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&job_ticket__descriptor) \
-    , NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, JOB_WINDING_METHOD__Embroidery, NULL, 0,NULL, 0, JOB_UPLOAD_STRATEGY__Default, NULL, 0, 0 }
+    , NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, JOB_WINDING_METHOD__Embroidery, NULL, 0,NULL, 0, JOB_UPLOAD_STRATEGY__Default, NULL, 0, 0, 0, 0, 0, 0 }
 
 
 /* JobTicket methods */