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

4 files changed, 68 insertions, 8 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c
index b151bea09..3a3aadd3b 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c
@@ -52,7 +52,7 @@ void   progress_request__free_unpacked
   assert(message->base.descriptor == &progress_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor progress_request__field_descriptors[2] =
+static const ProtobufCFieldDescriptor progress_request__field_descriptors[5] =
 {
   {
     "",
@@ -78,15 +78,54 @@ static const ProtobufCFieldDescriptor progress_request__field_descriptors[2] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ProgressRequest, has_param1),
+    offsetof(ProgressRequest, param1),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ProgressRequest, has_param2),
+    offsetof(ProgressRequest, param2),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ProgressRequest, has_param3),
+    offsetof(ProgressRequest, param3),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned progress_request__field_indices_by_name[] = {
   0,   /* field[0] = Amount */
   1,   /* field[1] = Delay */
+  2,   /* field[2] = Param1 */
+  3,   /* field[3] = Param2 */
+  4,   /* field[4] = Param3 */
 };
 static const ProtobufCIntRange progress_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 2 }
+  { 0, 5 }
 };
 const ProtobufCMessageDescriptor progress_request__descriptor =
 {
@@ -96,7 +135,7 @@ const ProtobufCMessageDescriptor progress_request__descriptor =
   "",
   "",
   sizeof(ProgressRequest),
-  2,
+  5,
   progress_request__field_descriptors,
   progress_request__field_indices_by_name,
   1,  progress_request__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h
index 1ce2b6d6b..da8eac4f1 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h
@@ -30,10 +30,16 @@ struct  _ProgressRequest
   int32_t amount;
   protobuf_c_boolean has_delay;
   int32_t delay;
+  protobuf_c_boolean has_param1;
+  uint32_t param1;
+  protobuf_c_boolean has_param2;
+  uint32_t param2;
+  protobuf_c_boolean has_param3;
+  uint32_t param3;
 };
 #define PROGRESS_REQUEST__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&progress_request__descriptor) \
-    , 0, 0, 0, 0 }
+    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* ProgressRequest methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c
index 537f8e763..ff0667e61 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c
@@ -52,7 +52,7 @@ void   progress_response__free_unpacked
   assert(message->base.descriptor == &progress_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor progress_response__field_descriptors[1] =
+static const ProtobufCFieldDescriptor progress_response__field_descriptors[2] =
 {
   {
     "",
@@ -66,14 +66,27 @@ static const ProtobufCFieldDescriptor progress_response__field_descriptors[1] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ProgressResponse, has_info),
+    offsetof(ProgressResponse, info),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned progress_response__field_indices_by_name[] = {
+  1,   /* field[1] = Info */
   0,   /* field[0] = Progress */
 };
 static const ProtobufCIntRange progress_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 1 }
+  { 0, 2 }
 };
 const ProtobufCMessageDescriptor progress_response__descriptor =
 {
@@ -83,7 +96,7 @@ const ProtobufCMessageDescriptor progress_response__descriptor =
   "",
   "",
   sizeof(ProgressResponse),
-  1,
+  2,
   progress_response__field_descriptors,
   progress_response__field_indices_by_name,
   1,  progress_response__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h
index de5201ee5..bd1a3141a 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h
@@ -28,10 +28,12 @@ struct  _ProgressResponse
   ProtobufCMessage base;
   protobuf_c_boolean has_progress;
   double progress;
+  protobuf_c_boolean has_info;
+  uint32_t info;
 };
 #define PROGRESS_RESPONSE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&progress_response__descriptor) \
-    , 0, 0 }
+    , 0, 0, 0, 0 }
 
 
 /* ProgressResponse methods */