Merge

1 files changed, 32 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageContainer.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageContainer.cs
index 701423add..96594ada4 100644
--- a/Software/Visual_Studio/Tango.PMR/Common/MessageContainer.cs
+++ b/Software/Visual_Studio/Tango.PMR/Common/MessageContainer.cs
@@ -23,18 +23,18 @@ namespace Tango.PMR.Common {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChZNZXNzYWdlQ29udGFpbmVyLnByb3RvEhBUYW5nby5QTVIuQ29tbW9uGhFN",
-            "ZXNzYWdlVHlwZS5wcm90bxoPRXJyb3JDb2RlLnByb3RvIv4BChBNZXNzYWdl",
+            "ZXNzYWdlVHlwZS5wcm90bxoPRXJyb3JDb2RlLnByb3RvIpECChBNZXNzYWdl",
             "Q29udGFpbmVyEisKBFR5cGUYASABKA4yHS5UYW5nby5QTVIuQ29tbW9uLk1l",
             "c3NhZ2VUeXBlEg0KBVRva2VuGAIgASgJEg8KB1RpbWVvdXQYAyABKA0SEgoK",
             "Q29udGludW91cxgEIAEoCBIZChFDb250aW51b3VzVGltZW91dBgFIAEoDRIR",
             "CglDb21wbGV0ZWQYBiABKAgSDAoERGF0YRgHIAEoDBILCgNDUkMYCCABKA0S",
             "KgoFRXJyb3IYCSABKA4yGy5UYW5nby5QTVIuQ29tbW9uLkVycm9yQ29kZRIU",
-            "CgxFcnJvck1lc3NhZ2UYCiABKAlCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5j",
-            "b21tb25iBnByb3RvMw=="));
+            "CgxFcnJvck1lc3NhZ2UYCiABKAkSEQoJRXZlbnRDb2RlGAsgASgFQhwKGmNv",
+            "bS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Common.MessageTypeReflection.Descriptor, global::Tango.PMR.Common.ErrorCodeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Common.MessageContainer), global::Tango.PMR.Common.MessageContainer.Parser, new[]{ "Type", "Token", "Timeout", "Continuous", "ContinuousTimeout", "Completed", "Data", "CRC", "Error", "ErrorMessage" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Common.MessageContainer), global::Tango.PMR.Common.MessageContainer.Parser, new[]{ "Type", "Token", "Timeout", "Continuous", "ContinuousTimeout", "Completed", "Data", "CRC", "Error", "ErrorMessage", "EventCode" }, null, null, null)
           }));
     }
     #endregion
@@ -75,6 +75,7 @@ namespace Tango.PMR.Common {
       cRC_ = other.cRC_;
       error_ = other.error_;
       errorMessage_ = other.errorMessage_;
+      eventCode_ = other.eventCode_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -192,6 +193,17 @@ namespace Tango.PMR.Common {
       }
     }
 
+    /// <summary>Field number for the "EventCode" field.</summary>
+    public const int EventCodeFieldNumber = 11;
+    private int eventCode_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int EventCode {
+      get { return eventCode_; }
+      set {
+        eventCode_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as MessageContainer);
@@ -215,6 +227,7 @@ namespace Tango.PMR.Common {
       if (CRC != other.CRC) return false;
       if (Error != other.Error) return false;
       if (ErrorMessage != other.ErrorMessage) return false;
+      if (EventCode != other.EventCode) return false;
       return true;
     }
 
@@ -231,6 +244,7 @@ namespace Tango.PMR.Common {
       if (CRC != 0) hash ^= CRC.GetHashCode();
       if (Error != 0) hash ^= Error.GetHashCode();
       if (ErrorMessage.Length != 0) hash ^= ErrorMessage.GetHashCode();
+      if (EventCode != 0) hash ^= EventCode.GetHashCode();
       return hash;
     }
 
@@ -281,6 +295,10 @@ namespace Tango.PMR.Common {
         output.WriteRawTag(82);
         output.WriteString(ErrorMessage);
       }
+      if (EventCode != 0) {
+        output.WriteRawTag(88);
+        output.WriteInt32(EventCode);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -316,6 +334,9 @@ namespace Tango.PMR.Common {
       if (ErrorMessage.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(ErrorMessage);
       }
+      if (EventCode != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(EventCode);
+      }
       return size;
     }
 
@@ -354,6 +375,9 @@ namespace Tango.PMR.Common {
       if (other.ErrorMessage.Length != 0) {
         ErrorMessage = other.ErrorMessage;
       }
+      if (other.EventCode != 0) {
+        EventCode = other.EventCode;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -404,6 +428,10 @@ namespace Tango.PMR.Common {
             ErrorMessage = input.ReadString();
             break;
           }
+          case 88: {
+            EventCode = input.ReadInt32();
+            break;
+          }
         }
       }
     }