fix conflict

2 files changed, 287 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubRealTimeUsageRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubRealTimeUsageRequest.cs
new file mode 100644
index 000000000..d5873dd8f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubRealTimeUsageRequest.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: StubRealTimeUsageRequest.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.Stubs {
+
+  /// <summary>Holder for reflection information generated from StubRealTimeUsageRequest.proto</summary>
+  public static partial class StubRealTimeUsageRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for StubRealTimeUsageRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static StubRealTimeUsageRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch5TdHViUmVhbFRpbWVVc2FnZVJlcXVlc3QucHJvdG8SD1RhbmdvLlBNUi5T",
+            "dHVicyIaChhTdHViUmVhbFRpbWVVc2FnZVJlcXVlc3RCGwoZY29tLnR3aW5l",
+            "LnRhbmdvLnBtci5zdHVic2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubRealTimeUsageRequest), global::Tango.PMR.Stubs.StubRealTimeUsageRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class StubRealTimeUsageRequest : pb::IMessage<StubRealTimeUsageRequest> {
+    private static readonly pb::MessageParser<StubRealTimeUsageRequest> _parser = new pb::MessageParser<StubRealTimeUsageRequest>(() => new StubRealTimeUsageRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<StubRealTimeUsageRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Stubs.StubRealTimeUsageRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StubRealTimeUsageRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StubRealTimeUsageRequest(StubRealTimeUsageRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StubRealTimeUsageRequest Clone() {
+      return new StubRealTimeUsageRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as StubRealTimeUsageRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(StubRealTimeUsageRequest other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      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) {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(StubRealTimeUsageRequest other) {
+      if (other == null) {
+        return;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubRealTimeUsageResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubRealTimeUsageResponse.cs
new file mode 100644
index 000000000..075450186
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubRealTimeUsageResponse.cs
@@ -0,0 +1,156 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: StubRealTimeUsageResponse.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.Stubs {
+
+  /// <summary>Holder for reflection information generated from StubRealTimeUsageResponse.proto</summary>
+  public static partial class StubRealTimeUsageResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for StubRealTimeUsageResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static StubRealTimeUsageResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch9TdHViUmVhbFRpbWVVc2FnZVJlc3BvbnNlLnByb3RvEg9UYW5nby5QTVIu",
+            "U3R1YnMiLwoZU3R1YlJlYWxUaW1lVXNhZ2VSZXNwb25zZRISCgpQZXJjZW50",
+            "aWxlGAEgAygNQhsKGWNvbS50d2luZS50YW5nby5wbXIuc3R1YnNiBnByb3Rv",
+            "Mw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubRealTimeUsageResponse), global::Tango.PMR.Stubs.StubRealTimeUsageResponse.Parser, new[]{ "Percentile" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class StubRealTimeUsageResponse : pb::IMessage<StubRealTimeUsageResponse> {
+    private static readonly pb::MessageParser<StubRealTimeUsageResponse> _parser = new pb::MessageParser<StubRealTimeUsageResponse>(() => new StubRealTimeUsageResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<StubRealTimeUsageResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Stubs.StubRealTimeUsageResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StubRealTimeUsageResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StubRealTimeUsageResponse(StubRealTimeUsageResponse other) : this() {
+      percentile_ = other.percentile_.Clone();
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StubRealTimeUsageResponse Clone() {
+      return new StubRealTimeUsageResponse(this);
+    }
+
+    /// <summary>Field number for the "Percentile" field.</summary>
+    public const int PercentileFieldNumber = 1;
+    private static readonly pb::FieldCodec<uint> _repeated_percentile_codec
+        = pb::FieldCodec.ForUInt32(10);
+    private readonly pbc::RepeatedField<uint> percentile_ = new pbc::RepeatedField<uint>();
+    /// <summary>
+    /// 0..100
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<uint> Percentile {
+      get { return percentile_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as StubRealTimeUsageResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(StubRealTimeUsageResponse other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!percentile_.Equals(other.percentile_)) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= percentile_.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) {
+      percentile_.WriteTo(output, _repeated_percentile_codec);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      size += percentile_.CalculateSize(_repeated_percentile_codec);
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(StubRealTimeUsageResponse other) {
+      if (other == null) {
+        return;
+      }
+      percentile_.Add(other.percentile_);
+    }
+
+    [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:
+          case 8: {
+            percentile_.AddEntriesFrom(input, _repeated_percentile_codec);
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code