From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- .../Debugging/SetupDebugDisributorsRequest.cs | 73 ++++++---------------- 1 file changed, 18 insertions(+), 55 deletions(-) (limited to 'Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs') diff --git a/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs b/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs index a17852dcf..363edab57 100644 --- a/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs @@ -23,15 +23,13 @@ namespace Tango.PMR.Debugging { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiJTZXR1cERlYnVnRGlzcmlidXRvcnNSZXF1ZXN0LnByb3RvEhNUYW5nby5Q", - "TVIuRGVidWdnaW5nGhpEZWJ1Z0Rpc3RyaWJ1dG9yVHlwZS5wcm90byJ+ChxT", - "ZXR1cERlYnVnRGlzcmlidXRvcnNSZXF1ZXN0EkMKEERlYnVnRGlzdHJpYnV0", - "b3IYASABKA4yKS5UYW5nby5QTVIuRGVidWdnaW5nLkRlYnVnRGlzdHJpYnV0", - "b3JUeXBlEhkKEURpc3RyaWJ1dG9yQWN0aXZlGAIgASgIQh8KHWNvbS50d2lu", - "ZS50YW5nby5wbXIuZGVidWdnaW5nYgZwcm90bzM=")); + "TVIuRGVidWdnaW5nIjkKHFNldHVwRGVidWdEaXNyaWJ1dG9yc1JlcXVlc3QS", + "GQoRRGlzdHJpYnV0b3JBY3RpdmUYASADKAhCHwodY29tLnR3aW5lLnRhbmdv", + "LnBtci5kZWJ1Z2dpbmdiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.Debugging.DebugDistributorTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Debugging.SetupDebugDisributorsRequest), global::Tango.PMR.Debugging.SetupDebugDisributorsRequest.Parser, new[]{ "DebugDistributor", "DistributorActive" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Debugging.SetupDebugDisributorsRequest), global::Tango.PMR.Debugging.SetupDebugDisributorsRequest.Parser, new[]{ "DistributorActive" }, null, null, null) })); } #endregion @@ -62,8 +60,7 @@ namespace Tango.PMR.Debugging { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public SetupDebugDisributorsRequest(SetupDebugDisributorsRequest other) : this() { - debugDistributor_ = other.debugDistributor_; - distributorActive_ = other.distributorActive_; + distributorActive_ = other.distributorActive_.Clone(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -71,26 +68,14 @@ namespace Tango.PMR.Debugging { return new SetupDebugDisributorsRequest(this); } - /// Field number for the "DebugDistributor" field. - public const int DebugDistributorFieldNumber = 1; - private global::Tango.PMR.Debugging.DebugDistributorType debugDistributor_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.Debugging.DebugDistributorType DebugDistributor { - get { return debugDistributor_; } - set { - debugDistributor_ = value; - } - } - /// Field number for the "DistributorActive" field. - public const int DistributorActiveFieldNumber = 2; - private bool distributorActive_; + public const int DistributorActiveFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_distributorActive_codec + = pb::FieldCodec.ForBool(10); + private readonly pbc::RepeatedField distributorActive_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool DistributorActive { + public pbc::RepeatedField DistributorActive { get { return distributorActive_; } - set { - distributorActive_ = value; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -106,16 +91,14 @@ namespace Tango.PMR.Debugging { if (ReferenceEquals(other, this)) { return true; } - if (DebugDistributor != other.DebugDistributor) return false; - if (DistributorActive != other.DistributorActive) return false; + if(!distributorActive_.Equals(other.distributorActive_)) return false; return true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (DebugDistributor != 0) hash ^= DebugDistributor.GetHashCode(); - if (DistributorActive != false) hash ^= DistributorActive.GetHashCode(); + hash ^= distributorActive_.GetHashCode(); return hash; } @@ -126,25 +109,13 @@ namespace Tango.PMR.Debugging { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (DebugDistributor != 0) { - output.WriteRawTag(8); - output.WriteEnum((int) DebugDistributor); - } - if (DistributorActive != false) { - output.WriteRawTag(16); - output.WriteBool(DistributorActive); - } + distributorActive_.WriteTo(output, _repeated_distributorActive_codec); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (DebugDistributor != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DebugDistributor); - } - if (DistributorActive != false) { - size += 1 + 1; - } + size += distributorActive_.CalculateSize(_repeated_distributorActive_codec); return size; } @@ -153,12 +124,7 @@ namespace Tango.PMR.Debugging { if (other == null) { return; } - if (other.DebugDistributor != 0) { - DebugDistributor = other.DebugDistributor; - } - if (other.DistributorActive != false) { - DistributorActive = other.DistributorActive; - } + distributorActive_.Add(other.distributorActive_); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -169,12 +135,9 @@ namespace Tango.PMR.Debugging { default: input.SkipLastField(); break; + case 10: case 8: { - debugDistributor_ = (global::Tango.PMR.Debugging.DebugDistributorType) input.ReadEnum(); - break; - } - case 16: { - DistributorActive = input.ReadBool(); + distributorActive_.AddEntriesFrom(input, _repeated_distributorActive_codec); break; } } -- cgit v1.3.1