merge

1 files changed, 8 insertions, 74 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginResponse.cs b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginResponse.cs
index 025d75aac..17eb9de93 100644
--- a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginResponse.cs
@@ -23,20 +23,16 @@ namespace Tango.PMR.Integration {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiFFeHRlcm5hbEJyaWRnZUxvZ2luUmVzcG9uc2UucHJvdG8SFVRhbmdvLlBN",
-            "Ui5JbnRlZ3JhdGlvbhoXRGV2aWNlSW5mb3JtYXRpb24ucHJvdG8aHEFwcGxp",
-            "Y2F0aW9uSW5mb3JtYXRpb24ucHJvdG8aElVwZGF0ZVN0YXR1cy5wcm90byKS",
-            "AgobRXh0ZXJuYWxCcmlkZ2VMb2dpblJlc3BvbnNlEhUKDUF1dGhlbnRpY2F0",
-            "ZWQYASABKAgSFAoMU2VyaWFsTnVtYmVyGAIgASgJEkIKEURldmljZUluZm9y",
-            "bWF0aW9uGAMgASgLMicuVGFuZ28uUE1SLkNvbm5lY3Rpb24uRGV2aWNlSW5m",
-            "b3JtYXRpb24STQoWQXBwbGljYXRpb25JbmZvcm1hdGlvbhgEIAEoCzItLlRh",
-            "bmdvLlBNUi5JbnRlZ3JhdGlvbi5BcHBsaWNhdGlvbkluZm9ybWF0aW9uEjMK",
-            "BlN0YXR1cxgFIAEoDjIjLlRhbmdvLlBNUi5JbnRlZ3JhdGlvbi5VcGRhdGVT",
-            "dGF0dXNCIQofY29tLnR3aW5lLnRhbmdvLnBtci5pbnRlZ3JhdGlvbmIGcHJv",
-            "dG8z"));
+            "Ui5JbnRlZ3JhdGlvbhoXRGV2aWNlSW5mb3JtYXRpb24ucHJvdG8ijgEKG0V4",
+            "dGVybmFsQnJpZGdlTG9naW5SZXNwb25zZRIVCg1BdXRoZW50aWNhdGVkGAEg",
+            "ASgIEhQKDFNlcmlhbE51bWJlchgCIAEoCRJCChFEZXZpY2VJbmZvcm1hdGlv",
+            "bhgDIAEoCzInLlRhbmdvLlBNUi5Db25uZWN0aW9uLkRldmljZUluZm9ybWF0",
+            "aW9uQiEKH2NvbS50d2luZS50YW5nby5wbXIuaW50ZWdyYXRpb25iBnByb3Rv",
+            "Mw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.Connection.DeviceInformationReflection.Descriptor, global::Tango.PMR.Integration.ApplicationInformationReflection.Descriptor, global::Tango.PMR.Integration.UpdateStatusReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.Connection.DeviceInformationReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeLoginResponse), global::Tango.PMR.Integration.ExternalBridgeLoginResponse.Parser, new[]{ "Authenticated", "SerialNumber", "DeviceInformation", "ApplicationInformation", "Status" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeLoginResponse), global::Tango.PMR.Integration.ExternalBridgeLoginResponse.Parser, new[]{ "Authenticated", "SerialNumber", "DeviceInformation" }, null, null, null)
           }));
     }
     #endregion
@@ -70,8 +66,6 @@ namespace Tango.PMR.Integration {
       authenticated_ = other.authenticated_;
       serialNumber_ = other.serialNumber_;
       DeviceInformation = other.deviceInformation_ != null ? other.DeviceInformation.Clone() : null;
-      ApplicationInformation = other.applicationInformation_ != null ? other.ApplicationInformation.Clone() : null;
-      status_ = other.status_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -112,28 +106,6 @@ namespace Tango.PMR.Integration {
       }
     }
 
-    /// <summary>Field number for the "ApplicationInformation" field.</summary>
-    public const int ApplicationInformationFieldNumber = 4;
-    private global::Tango.PMR.Integration.ApplicationInformation applicationInformation_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Integration.ApplicationInformation ApplicationInformation {
-      get { return applicationInformation_; }
-      set {
-        applicationInformation_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Status" field.</summary>
-    public const int StatusFieldNumber = 5;
-    private global::Tango.PMR.Integration.UpdateStatus status_ = 0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Integration.UpdateStatus Status {
-      get { return status_; }
-      set {
-        status_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ExternalBridgeLoginResponse);
@@ -150,8 +122,6 @@ namespace Tango.PMR.Integration {
       if (Authenticated != other.Authenticated) return false;
       if (SerialNumber != other.SerialNumber) return false;
       if (!object.Equals(DeviceInformation, other.DeviceInformation)) return false;
-      if (!object.Equals(ApplicationInformation, other.ApplicationInformation)) return false;
-      if (Status != other.Status) return false;
       return true;
     }
 
@@ -161,8 +131,6 @@ namespace Tango.PMR.Integration {
       if (Authenticated != false) hash ^= Authenticated.GetHashCode();
       if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode();
       if (deviceInformation_ != null) hash ^= DeviceInformation.GetHashCode();
-      if (applicationInformation_ != null) hash ^= ApplicationInformation.GetHashCode();
-      if (Status != 0) hash ^= Status.GetHashCode();
       return hash;
     }
 
@@ -185,14 +153,6 @@ namespace Tango.PMR.Integration {
         output.WriteRawTag(26);
         output.WriteMessage(DeviceInformation);
       }
-      if (applicationInformation_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(ApplicationInformation);
-      }
-      if (Status != 0) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) Status);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -207,12 +167,6 @@ namespace Tango.PMR.Integration {
       if (deviceInformation_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(DeviceInformation);
       }
-      if (applicationInformation_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ApplicationInformation);
-      }
-      if (Status != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Status);
-      }
       return size;
     }
 
@@ -233,15 +187,6 @@ namespace Tango.PMR.Integration {
         }
         DeviceInformation.MergeFrom(other.DeviceInformation);
       }
-      if (other.applicationInformation_ != null) {
-        if (applicationInformation_ == null) {
-          applicationInformation_ = new global::Tango.PMR.Integration.ApplicationInformation();
-        }
-        ApplicationInformation.MergeFrom(other.ApplicationInformation);
-      }
-      if (other.Status != 0) {
-        Status = other.Status;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -267,17 +212,6 @@ namespace Tango.PMR.Integration {
             input.ReadMessage(deviceInformation_);
             break;
           }
-          case 34: {
-            if (applicationInformation_ == null) {
-              applicationInformation_ = new global::Tango.PMR.Integration.ApplicationInformation();
-            }
-            input.ReadMessage(applicationInformation_);
-            break;
-          }
-          case 40: {
-            status_ = (global::Tango.PMR.Integration.UpdateStatus) input.ReadEnum();
-            break;
-          }
         }
       }
     }