merge

9 files changed, 26 insertions, 1131 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ApplicationInformation.cs b/Software/Visual_Studio/Tango.PMR/Integration/ApplicationInformation.cs
deleted file mode 100644
index d637539f5..000000000
--- a/Software/Visual_Studio/Tango.PMR/Integration/ApplicationInformation.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ApplicationInformation.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Integration {
-
-  /// <summary>Holder for reflection information generated from ApplicationInformation.proto</summary>
-  public static partial class ApplicationInformationReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for ApplicationInformation.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static ApplicationInformationReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChxBcHBsaWNhdGlvbkluZm9ybWF0aW9uLnByb3RvEhVUYW5nby5QTVIuSW50",
-            "ZWdyYXRpb24iPgoWQXBwbGljYXRpb25JbmZvcm1hdGlvbhIPCgdWZXJzaW9u",
-            "GAEgASgJEhMKC1N0YXJ0dXBEYXRlGAIgASgJQiEKH2NvbS50d2luZS50YW5n",
-            "by5wbXIuaW50ZWdyYXRpb25iBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ApplicationInformation), global::Tango.PMR.Integration.ApplicationInformation.Parser, new[]{ "Version", "StartupDate" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class ApplicationInformation : pb::IMessage<ApplicationInformation> {
-    private static readonly pb::MessageParser<ApplicationInformation> _parser = new pb::MessageParser<ApplicationInformation>(() => new ApplicationInformation());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<ApplicationInformation> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Integration.ApplicationInformationReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ApplicationInformation() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ApplicationInformation(ApplicationInformation other) : this() {
-      version_ = other.version_;
-      startupDate_ = other.startupDate_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ApplicationInformation Clone() {
-      return new ApplicationInformation(this);
-    }
-
-    /// <summary>Field number for the "Version" field.</summary>
-    public const int VersionFieldNumber = 1;
-    private string version_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Version {
-      get { return version_; }
-      set {
-        version_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "StartupDate" field.</summary>
-    public const int StartupDateFieldNumber = 2;
-    private string startupDate_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string StartupDate {
-      get { return startupDate_; }
-      set {
-        startupDate_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as ApplicationInformation);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(ApplicationInformation other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Version != other.Version) return false;
-      if (StartupDate != other.StartupDate) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Version.Length != 0) hash ^= Version.GetHashCode();
-      if (StartupDate.Length != 0) hash ^= StartupDate.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Version.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Version);
-      }
-      if (StartupDate.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(StartupDate);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Version.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Version);
-      }
-      if (StartupDate.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StartupDate);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(ApplicationInformation other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Version.Length != 0) {
-        Version = other.Version;
-      }
-      if (other.StartupDate.Length != 0) {
-        StartupDate = other.StartupDate;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Version = input.ReadString();
-            break;
-          }
-          case 18: {
-            StartupDate = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ConfigureProtocolRequest.cs b/Software/Visual_Studio/Tango.PMR/Integration/ConfigureProtocolRequest.cs
deleted file mode 100644
index 7cb3ffefe..000000000
--- a/Software/Visual_Studio/Tango.PMR/Integration/ConfigureProtocolRequest.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ConfigureProtocolRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Integration {
-
-  /// <summary>Holder for reflection information generated from ConfigureProtocolRequest.proto</summary>
-  public static partial class ConfigureProtocolRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for ConfigureProtocolRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static ConfigureProtocolRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch5Db25maWd1cmVQcm90b2NvbFJlcXVlc3QucHJvdG8SFVRhbmdvLlBNUi5J",
-            "bnRlZ3JhdGlvbhocR2VuZXJpY01lc3NhZ2VQcm90b2NvbC5wcm90byJ9ChhD",
-            "b25maWd1cmVQcm90b2NvbFJlcXVlc3QSGQoRRW5hYmxlQ29tcHJlc3Npb24Y",
-            "ASABKAgSRgoPR2VuZXJpY1Byb3RvY29sGAIgASgOMi0uVGFuZ28uUE1SLklu",
-            "dGVncmF0aW9uLkdlbmVyaWNNZXNzYWdlUHJvdG9jb2xCIQofY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5pbnRlZ3JhdGlvbmIGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.Integration.GenericMessageProtocolReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ConfigureProtocolRequest), global::Tango.PMR.Integration.ConfigureProtocolRequest.Parser, new[]{ "EnableCompression", "GenericProtocol" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class ConfigureProtocolRequest : pb::IMessage<ConfigureProtocolRequest> {
-    private static readonly pb::MessageParser<ConfigureProtocolRequest> _parser = new pb::MessageParser<ConfigureProtocolRequest>(() => new ConfigureProtocolRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<ConfigureProtocolRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Integration.ConfigureProtocolRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ConfigureProtocolRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ConfigureProtocolRequest(ConfigureProtocolRequest other) : this() {
-      enableCompression_ = other.enableCompression_;
-      genericProtocol_ = other.genericProtocol_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ConfigureProtocolRequest Clone() {
-      return new ConfigureProtocolRequest(this);
-    }
-
-    /// <summary>Field number for the "EnableCompression" field.</summary>
-    public const int EnableCompressionFieldNumber = 1;
-    private bool enableCompression_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool EnableCompression {
-      get { return enableCompression_; }
-      set {
-        enableCompression_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "GenericProtocol" field.</summary>
-    public const int GenericProtocolFieldNumber = 2;
-    private global::Tango.PMR.Integration.GenericMessageProtocol genericProtocol_ = 0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Integration.GenericMessageProtocol GenericProtocol {
-      get { return genericProtocol_; }
-      set {
-        genericProtocol_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as ConfigureProtocolRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(ConfigureProtocolRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (EnableCompression != other.EnableCompression) return false;
-      if (GenericProtocol != other.GenericProtocol) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (EnableCompression != false) hash ^= EnableCompression.GetHashCode();
-      if (GenericProtocol != 0) hash ^= GenericProtocol.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (EnableCompression != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(EnableCompression);
-      }
-      if (GenericProtocol != 0) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) GenericProtocol);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (EnableCompression != false) {
-        size += 1 + 1;
-      }
-      if (GenericProtocol != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) GenericProtocol);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(ConfigureProtocolRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.EnableCompression != false) {
-        EnableCompression = other.EnableCompression;
-      }
-      if (other.GenericProtocol != 0) {
-        GenericProtocol = other.GenericProtocol;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 8: {
-            EnableCompression = input.ReadBool();
-            break;
-          }
-          case 16: {
-            genericProtocol_ = (global::Tango.PMR.Integration.GenericMessageProtocol) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ConfigureProtocolResponse.cs b/Software/Visual_Studio/Tango.PMR/Integration/ConfigureProtocolResponse.cs
deleted file mode 100644
index 750430f32..000000000
--- a/Software/Visual_Studio/Tango.PMR/Integration/ConfigureProtocolResponse.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ConfigureProtocolResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Integration {
-
-  /// <summary>Holder for reflection information generated from ConfigureProtocolResponse.proto</summary>
-  public static partial class ConfigureProtocolResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for ConfigureProtocolResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static ConfigureProtocolResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch9Db25maWd1cmVQcm90b2NvbFJlc3BvbnNlLnByb3RvEhVUYW5nby5QTVIu",
-            "SW50ZWdyYXRpb24iLgoZQ29uZmlndXJlUHJvdG9jb2xSZXNwb25zZRIRCglD",
-            "b25maXJtZWQYASABKAhCIQofY29tLnR3aW5lLnRhbmdvLnBtci5pbnRlZ3Jh",
-            "dGlvbmIGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ConfigureProtocolResponse), global::Tango.PMR.Integration.ConfigureProtocolResponse.Parser, new[]{ "Confirmed" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class ConfigureProtocolResponse : pb::IMessage<ConfigureProtocolResponse> {
-    private static readonly pb::MessageParser<ConfigureProtocolResponse> _parser = new pb::MessageParser<ConfigureProtocolResponse>(() => new ConfigureProtocolResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<ConfigureProtocolResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Integration.ConfigureProtocolResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ConfigureProtocolResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ConfigureProtocolResponse(ConfigureProtocolResponse other) : this() {
-      confirmed_ = other.confirmed_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ConfigureProtocolResponse Clone() {
-      return new ConfigureProtocolResponse(this);
-    }
-
-    /// <summary>Field number for the "Confirmed" field.</summary>
-    public const int ConfirmedFieldNumber = 1;
-    private bool confirmed_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Confirmed {
-      get { return confirmed_; }
-      set {
-        confirmed_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as ConfigureProtocolResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(ConfigureProtocolResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Confirmed != other.Confirmed) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Confirmed != false) hash ^= Confirmed.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Confirmed != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(Confirmed);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Confirmed != false) {
-        size += 1 + 1;
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(ConfigureProtocolResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Confirmed != false) {
-        Confirmed = other.Confirmed;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 8: {
-            Confirmed = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginRequest.cs b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginRequest.cs
index 21e4ecd30..85b18e9b2 100644
--- a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeLoginRequest.cs
@@ -24,17 +24,15 @@ namespace Tango.PMR.Integration {
           string.Concat(
             "CiBFeHRlcm5hbEJyaWRnZUxvZ2luUmVxdWVzdC5wcm90bxIVVGFuZ28uUE1S",
             "LkludGVncmF0aW9uGh9FeHRlcm5hbEJyaWRnZUxvZ2luSW50ZW50LnByb3Rv",
-            "IvABChpFeHRlcm5hbEJyaWRnZUxvZ2luUmVxdWVzdBINCgVBcHBJRBgBIAEo",
+            "IqMBChpFeHRlcm5hbEJyaWRnZUxvZ2luUmVxdWVzdBINCgVBcHBJRBgBIAEo",
             "CRIQCghVc2VyR3VpZBgCIAEoCRIQCghIb3N0TmFtZRgDIAEoCRIQCghQYXNz",
             "d29yZBgEIAEoCRJACgZJbnRlbnQYBSABKA4yMC5UYW5nby5QTVIuSW50ZWdy",
-            "YXRpb24uRXh0ZXJuYWxCcmlkZ2VMb2dpbkludGVudBIkChxSZXF1aXJlU2Fm",
-            "ZXR5TGV2ZWxPcGVyYXRpb25zGAYgASgIEhAKCFVzZXJOYW1lGAcgASgJEhMK",
-            "C1Blcm1pc3Npb25zGAggAygJQiEKH2NvbS50d2luZS50YW5nby5wbXIuaW50",
-            "ZWdyYXRpb25iBnByb3RvMw=="));
+            "YXRpb24uRXh0ZXJuYWxCcmlkZ2VMb2dpbkludGVudEIhCh9jb20udHdpbmUu",
+            "dGFuZ28ucG1yLmludGVncmF0aW9uYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Integration.ExternalBridgeLoginIntentReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeLoginRequest), global::Tango.PMR.Integration.ExternalBridgeLoginRequest.Parser, new[]{ "AppID", "UserGuid", "HostName", "Password", "Intent", "RequireSafetyLevelOperations", "UserName", "Permissions" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeLoginRequest), global::Tango.PMR.Integration.ExternalBridgeLoginRequest.Parser, new[]{ "AppID", "UserGuid", "HostName", "Password", "Intent" }, null, null, null)
           }));
     }
     #endregion
@@ -70,9 +68,6 @@ namespace Tango.PMR.Integration {
       hostName_ = other.hostName_;
       password_ = other.password_;
       intent_ = other.intent_;
-      requireSafetyLevelOperations_ = other.requireSafetyLevelOperations_;
-      userName_ = other.userName_;
-      permissions_ = other.permissions_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -135,38 +130,6 @@ namespace Tango.PMR.Integration {
       }
     }
 
-    /// <summary>Field number for the "RequireSafetyLevelOperations" field.</summary>
-    public const int RequireSafetyLevelOperationsFieldNumber = 6;
-    private bool requireSafetyLevelOperations_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool RequireSafetyLevelOperations {
-      get { return requireSafetyLevelOperations_; }
-      set {
-        requireSafetyLevelOperations_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "UserName" field.</summary>
-    public const int UserNameFieldNumber = 7;
-    private string userName_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string UserName {
-      get { return userName_; }
-      set {
-        userName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Permissions" field.</summary>
-    public const int PermissionsFieldNumber = 8;
-    private static readonly pb::FieldCodec<string> _repeated_permissions_codec
-        = pb::FieldCodec.ForString(66);
-    private readonly pbc::RepeatedField<string> permissions_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<string> Permissions {
-      get { return permissions_; }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ExternalBridgeLoginRequest);
@@ -185,9 +148,6 @@ namespace Tango.PMR.Integration {
       if (HostName != other.HostName) return false;
       if (Password != other.Password) return false;
       if (Intent != other.Intent) return false;
-      if (RequireSafetyLevelOperations != other.RequireSafetyLevelOperations) return false;
-      if (UserName != other.UserName) return false;
-      if(!permissions_.Equals(other.permissions_)) return false;
       return true;
     }
 
@@ -199,9 +159,6 @@ namespace Tango.PMR.Integration {
       if (HostName.Length != 0) hash ^= HostName.GetHashCode();
       if (Password.Length != 0) hash ^= Password.GetHashCode();
       if (Intent != 0) hash ^= Intent.GetHashCode();
-      if (RequireSafetyLevelOperations != false) hash ^= RequireSafetyLevelOperations.GetHashCode();
-      if (UserName.Length != 0) hash ^= UserName.GetHashCode();
-      hash ^= permissions_.GetHashCode();
       return hash;
     }
 
@@ -232,15 +189,6 @@ namespace Tango.PMR.Integration {
         output.WriteRawTag(40);
         output.WriteEnum((int) Intent);
       }
-      if (RequireSafetyLevelOperations != false) {
-        output.WriteRawTag(48);
-        output.WriteBool(RequireSafetyLevelOperations);
-      }
-      if (UserName.Length != 0) {
-        output.WriteRawTag(58);
-        output.WriteString(UserName);
-      }
-      permissions_.WriteTo(output, _repeated_permissions_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -261,13 +209,6 @@ namespace Tango.PMR.Integration {
       if (Intent != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Intent);
       }
-      if (RequireSafetyLevelOperations != false) {
-        size += 1 + 1;
-      }
-      if (UserName.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(UserName);
-      }
-      size += permissions_.CalculateSize(_repeated_permissions_codec);
       return size;
     }
 
@@ -291,13 +232,6 @@ namespace Tango.PMR.Integration {
       if (other.Intent != 0) {
         Intent = other.Intent;
       }
-      if (other.RequireSafetyLevelOperations != false) {
-        RequireSafetyLevelOperations = other.RequireSafetyLevelOperations;
-      }
-      if (other.UserName.Length != 0) {
-        UserName = other.UserName;
-      }
-      permissions_.Add(other.permissions_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -328,18 +262,6 @@ namespace Tango.PMR.Integration {
             intent_ = (global::Tango.PMR.Integration.ExternalBridgeLoginIntent) input.ReadEnum();
             break;
           }
-          case 48: {
-            RequireSafetyLevelOperations = input.ReadBool();
-            break;
-          }
-          case 58: {
-            UserName = input.ReadString();
-            break;
-          }
-          case 66: {
-            permissions_.AddEntriesFrom(input, _repeated_permissions_codec);
-            break;
-          }
         }
       }
     }
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;
-          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/GenericMessageProtocol.cs b/Software/Visual_Studio/Tango.PMR/Integration/GenericMessageProtocol.cs
deleted file mode 100644
index 35c9fffe5..000000000
--- a/Software/Visual_Studio/Tango.PMR/Integration/GenericMessageProtocol.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: GenericMessageProtocol.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Integration {
-
-  /// <summary>Holder for reflection information generated from GenericMessageProtocol.proto</summary>
-  public static partial class GenericMessageProtocolReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for GenericMessageProtocol.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static GenericMessageProtocolReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChxHZW5lcmljTWVzc2FnZVByb3RvY29sLnByb3RvEhVUYW5nby5QTVIuSW50",
-            "ZWdyYXRpb24qOgoWR2VuZXJpY01lc3NhZ2VQcm90b2NvbBIICgRKc29uEAAS",
-            "CAoEQnNvbhABEgwKCFByb3RvYnVmEAJCIQofY29tLnR3aW5lLnRhbmdvLnBt",
-            "ci5pbnRlZ3JhdGlvbmIGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Integration.GenericMessageProtocol), }, null));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum GenericMessageProtocol {
-    [pbr::OriginalName("Json")] Json = 0,
-    [pbr::OriginalName("Bson")] Bson = 1,
-    [pbr::OriginalName("Protobuf")] Protobuf = 2,
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/GenericRequest.cs b/Software/Visual_Studio/Tango.PMR/Integration/GenericRequest.cs
deleted file mode 100644
index ff158a455..000000000
--- a/Software/Visual_Studio/Tango.PMR/Integration/GenericRequest.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: GenericRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Integration {
-
-  /// <summary>Holder for reflection information generated from GenericRequest.proto</summary>
-  public static partial class GenericRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for GenericRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static GenericRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChRHZW5lcmljUmVxdWVzdC5wcm90bxIVVGFuZ28uUE1SLkludGVncmF0aW9u",
-            "IiwKDkdlbmVyaWNSZXF1ZXN0EgwKBFR5cGUYASABKAkSDAoERGF0YRgCIAEo",
-            "DEIhCh9jb20udHdpbmUudGFuZ28ucG1yLmludGVncmF0aW9uYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.GenericRequest), global::Tango.PMR.Integration.GenericRequest.Parser, new[]{ "Type", "Data" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class GenericRequest : pb::IMessage<GenericRequest> {
-    private static readonly pb::MessageParser<GenericRequest> _parser = new pb::MessageParser<GenericRequest>(() => new GenericRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GenericRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Integration.GenericRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GenericRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GenericRequest(GenericRequest other) : this() {
-      type_ = other.type_;
-      data_ = other.data_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GenericRequest Clone() {
-      return new GenericRequest(this);
-    }
-
-    /// <summary>Field number for the "Type" field.</summary>
-    public const int TypeFieldNumber = 1;
-    private string type_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Type {
-      get { return type_; }
-      set {
-        type_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Data" field.</summary>
-    public const int DataFieldNumber = 2;
-    private pb::ByteString data_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pb::ByteString Data {
-      get { return data_; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GenericRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GenericRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Type != other.Type) return false;
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Type.Length != 0) hash ^= Type.GetHashCode();
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Type.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Type);
-      }
-      if (Data.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteBytes(Data);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Type.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Type);
-      }
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GenericRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Type.Length != 0) {
-        Type = other.Type;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Type = input.ReadString();
-            break;
-          }
-          case 18: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/GenericResponse.cs b/Software/Visual_Studio/Tango.PMR/Integration/GenericResponse.cs
deleted file mode 100644
index d2436665a..000000000
--- a/Software/Visual_Studio/Tango.PMR/Integration/GenericResponse.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: GenericResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Integration {
-
-  /// <summary>Holder for reflection information generated from GenericResponse.proto</summary>
-  public static partial class GenericResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for GenericResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static GenericResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChVHZW5lcmljUmVzcG9uc2UucHJvdG8SFVRhbmdvLlBNUi5JbnRlZ3JhdGlv",
-            "biItCg9HZW5lcmljUmVzcG9uc2USDAoEVHlwZRgBIAEoCRIMCgREYXRhGAIg",
-            "ASgMQiEKH2NvbS50d2luZS50YW5nby5wbXIuaW50ZWdyYXRpb25iBnByb3Rv",
-            "Mw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.GenericResponse), global::Tango.PMR.Integration.GenericResponse.Parser, new[]{ "Type", "Data" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class GenericResponse : pb::IMessage<GenericResponse> {
-    private static readonly pb::MessageParser<GenericResponse> _parser = new pb::MessageParser<GenericResponse>(() => new GenericResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GenericResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Integration.GenericResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GenericResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GenericResponse(GenericResponse other) : this() {
-      type_ = other.type_;
-      data_ = other.data_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GenericResponse Clone() {
-      return new GenericResponse(this);
-    }
-
-    /// <summary>Field number for the "Type" field.</summary>
-    public const int TypeFieldNumber = 1;
-    private string type_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Type {
-      get { return type_; }
-      set {
-        type_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Data" field.</summary>
-    public const int DataFieldNumber = 2;
-    private pb::ByteString data_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pb::ByteString Data {
-      get { return data_; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GenericResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GenericResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Type != other.Type) return false;
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Type.Length != 0) hash ^= Type.GetHashCode();
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Type.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Type);
-      }
-      if (Data.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteBytes(Data);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Type.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Type);
-      }
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GenericResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Type.Length != 0) {
-        Type = other.Type;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Type = input.ReadString();
-            break;
-          }
-          case 18: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/UpdateStatus.cs b/Software/Visual_Studio/Tango.PMR/Integration/UpdateStatus.cs
index bdf5fba08..b15f24799 100644
--- a/Software/Visual_Studio/Tango.PMR/Integration/UpdateStatus.cs
+++ b/Software/Visual_Studio/Tango.PMR/Integration/UpdateStatus.cs
@@ -22,12 +22,12 @@ namespace Tango.PMR.Integration {
     static UpdateStatusReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChJVcGRhdGVTdGF0dXMucHJvdG8SFVRhbmdvLlBNUi5JbnRlZ3JhdGlvbiqj",
-            "AQoMVXBkYXRlU3RhdHVzEhAKDERpc2Nvbm5lY3RlZBAAEgsKB1Bvd2VyVXAQ",
-            "ARILCgdTdGFuZGJ5EAISDgoKUmVhZHlUb0R5ZRADEhAKDEdldHRpbmdSZWFk",
-            "eRAEEgwKCFByaW50aW5nEAUSCwoHU2VydmljZRAGEg0KCVVwZ3JhZGluZxAH",
-            "EhAKDFNodXR0aW5nRG93bhAIEgkKBUVycm9yEAlCIQofY29tLnR3aW5lLnRh",
-            "bmdvLnBtci5pbnRlZ3JhdGlvbmIGcHJvdG8z"));
+            "ChJVcGRhdGVTdGF0dXMucHJvdG8SFVRhbmdvLlBNUi5JbnRlZ3JhdGlvbiqW",
+            "AQoMVXBkYXRlU3RhdHVzEhAKDERpc2Nvbm5lY3RlZBAAEgsKB1N0YW5kYnkQ",
+            "ARIOCgpSZWFkeVRvRHllEAISEAoMR2V0dGluZ1JlYWR5EAMSDAoIUHJpbnRp",
+            "bmcQBBILCgdTZXJ2aWNlEAUSDQoJVXBncmFkaW5nEAYSEAoMU2h1dHRpbmdE",
+            "b3duEAcSCQoFRXJyb3IQCEIhCh9jb20udHdpbmUudGFuZ28ucG1yLmludGVn",
+            "cmF0aW9uYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Integration.UpdateStatus), }, null));
@@ -38,15 +38,14 @@ namespace Tango.PMR.Integration {
   #region Enums
   public enum UpdateStatus {
     [pbr::OriginalName("Disconnected")] Disconnected = 0,
-    [pbr::OriginalName("PowerUp")] PowerUp = 1,
-    [pbr::OriginalName("Standby")] Standby = 2,
-    [pbr::OriginalName("ReadyToDye")] ReadyToDye = 3,
-    [pbr::OriginalName("GettingReady")] GettingReady = 4,
-    [pbr::OriginalName("Printing")] Printing = 5,
-    [pbr::OriginalName("Service")] Service = 6,
-    [pbr::OriginalName("Upgrading")] Upgrading = 7,
-    [pbr::OriginalName("ShuttingDown")] ShuttingDown = 8,
-    [pbr::OriginalName("Error")] Error = 9,
+    [pbr::OriginalName("Standby")] Standby = 1,
+    [pbr::OriginalName("ReadyToDye")] ReadyToDye = 2,
+    [pbr::OriginalName("GettingReady")] GettingReady = 3,
+    [pbr::OriginalName("Printing")] Printing = 4,
+    [pbr::OriginalName("Service")] Service = 5,
+    [pbr::OriginalName("Upgrading")] Upgrading = 6,
+    [pbr::OriginalName("ShuttingDown")] ShuttingDown = 7,
+    [pbr::OriginalName("Error")] Error = 8,
   }
 
   #endregion