merge

1 files changed, 66 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs
index ac541e47d..881f4ec4f 100644
--- a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs
@@ -23,13 +23,13 @@ namespace Tango.PMR.Stubs {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiBTdHViQ2FydHJpZGdlV3JpdGVSZXNwb25zZS5wcm90bxIPVGFuZ28uUE1S",
-            "LlN0dWJzIjEKGlN0dWJDYXJ0cmlkZ2VXcml0ZVJlc3BvbnNlEhMKC0NhcnRy",
-            "aWRnZUlkGAEgASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIuc3R1YnNiBnBy",
-            "b3RvMw=="));
+            "LlN0dWJzIlUKGlN0dWJDYXJ0cmlkZ2VXcml0ZVJlc3BvbnNlEhMKC0NhcnRy",
+            "aWRnZUlkGAEgASgNEg4KBlN0YXR1cxgCIAEoCRISCgpTdGF0dXNXb3JkGAMg",
+            "ASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIuc3R1YnNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteResponse), global::Tango.PMR.Stubs.StubCartridgeWriteResponse.Parser, new[]{ "CartridgeId" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteResponse), global::Tango.PMR.Stubs.StubCartridgeWriteResponse.Parser, new[]{ "CartridgeId", "Status", "StatusWord" }, null, null, null)
           }));
     }
     #endregion
@@ -61,6 +61,8 @@ namespace Tango.PMR.Stubs {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public StubCartridgeWriteResponse(StubCartridgeWriteResponse other) : this() {
       cartridgeId_ = other.cartridgeId_;
+      status_ = other.status_;
+      statusWord_ = other.statusWord_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -79,6 +81,34 @@ namespace Tango.PMR.Stubs {
       }
     }
 
+    /// <summary>Field number for the "Status" field.</summary>
+    public const int StatusFieldNumber = 2;
+    private string status_ = "";
+    /// <summary>
+    /// Passed/Failed
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public string Status {
+      get { return status_; }
+      set {
+        status_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "StatusWord" field.</summary>
+    public const int StatusWordFieldNumber = 3;
+    private uint statusWord_;
+    /// <summary>
+    /// Error number/bit when the status is Failed
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public uint StatusWord {
+      get { return statusWord_; }
+      set {
+        statusWord_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as StubCartridgeWriteResponse);
@@ -93,6 +123,8 @@ namespace Tango.PMR.Stubs {
         return true;
       }
       if (CartridgeId != other.CartridgeId) return false;
+      if (Status != other.Status) return false;
+      if (StatusWord != other.StatusWord) return false;
       return true;
     }
 
@@ -100,6 +132,8 @@ namespace Tango.PMR.Stubs {
     public override int GetHashCode() {
       int hash = 1;
       if (CartridgeId != 0) hash ^= CartridgeId.GetHashCode();
+      if (Status.Length != 0) hash ^= Status.GetHashCode();
+      if (StatusWord != 0) hash ^= StatusWord.GetHashCode();
       return hash;
     }
 
@@ -114,6 +148,14 @@ namespace Tango.PMR.Stubs {
         output.WriteRawTag(8);
         output.WriteUInt32(CartridgeId);
       }
+      if (Status.Length != 0) {
+        output.WriteRawTag(18);
+        output.WriteString(Status);
+      }
+      if (StatusWord != 0) {
+        output.WriteRawTag(24);
+        output.WriteUInt32(StatusWord);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -122,6 +164,12 @@ namespace Tango.PMR.Stubs {
       if (CartridgeId != 0) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeId);
       }
+      if (Status.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(Status);
+      }
+      if (StatusWord != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StatusWord);
+      }
       return size;
     }
 
@@ -133,6 +181,12 @@ namespace Tango.PMR.Stubs {
       if (other.CartridgeId != 0) {
         CartridgeId = other.CartridgeId;
       }
+      if (other.Status.Length != 0) {
+        Status = other.Status;
+      }
+      if (other.StatusWord != 0) {
+        StatusWord = other.StatusWord;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -147,6 +201,14 @@ namespace Tango.PMR.Stubs {
             CartridgeId = input.ReadUInt32();
             break;
           }
+          case 18: {
+            Status = input.ReadString();
+            break;
+          }
+          case 24: {
+            StatusWord = input.ReadUInt32();
+            break;
+          }
         }
       }
     }