diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/Debugging')
3 files changed, 41 insertions, 109 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs b/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs index f1f0725f9..02faf67a9 100644 --- a/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs +++ b/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs @@ -23,15 +23,14 @@ namespace Tango.PMR.Debugging { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChpEZWJ1Z0Rpc3RyaWJ1dG9yVHlwZS5wcm90bxITVGFuZ28uUE1SLkRlYnVn", - "Z2luZyrJAgoURGVidWdEaXN0cmlidXRvclR5cGUSEQoNQ29udHJvbEZpbHRl", + "Z2luZyqpAgoURGVidWdEaXN0cmlidXRvclR5cGUSEQoNQ29udHJvbEZpbHRl", "chAAEhEKDUhlYXRlcnNGaWx0ZXIQARINCglKb2JGaWx0ZXIQAhIPCgtXYXN0", "ZUZpbHRlchADEg8KC0FsYXJtRmlsdGVyEAQSFQoRRGlhZ25vc3RpY3NGaWx0", "ZXIQBRINCglJRFNGaWx0ZXIQBhIQCgxUaHJlYWRGaWx0ZXIQBxIRCg1HZW5l", "cmFsRmlsdGVyEAgSDgoKQ29tbUZpbHRlchAJEg4KCkZQR0FGaWx0ZXIQChIO", "CgpMb2FkRmlsdGVyEAsSDgoKSW5pdEZpbHRlchAMEg8KC01haW50RmlsdGVy", - "EA0SDQoJSUZTRmlsdGVyEA4SDwoLRmlsZXNGaWx0ZXIQDxINCglJMkNGaWx0", - "ZXIQEBIPCgtNb3RvckZpbHRlchARQh8KHWNvbS50d2luZS50YW5nby5wbXIu", - "ZGVidWdnaW5nYgZwcm90bzM=")); + "EA0SDQoJSUZTRmlsdGVyEA4SDwoLRmlsZXNGaWx0ZXIQD0IfCh1jb20udHdp", + "bmUudGFuZ28ucG1yLmRlYnVnZ2luZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Debugging.DebugDistributorType), }, null)); @@ -57,8 +56,6 @@ namespace Tango.PMR.Debugging { [pbr::OriginalName("MaintFilter")] MaintFilter = 13, [pbr::OriginalName("IFSFilter")] Ifsfilter = 14, [pbr::OriginalName("FilesFilter")] FilesFilter = 15, - [pbr::OriginalName("I2CFilter")] I2Cfilter = 16, - [pbr::OriginalName("MotorFilter")] MotorFilter = 17, } #endregion 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); } - /// <summary>Field number for the "DebugDistributor" field.</summary> - 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; - } - } - /// <summary>Field number for the "DistributorActive" field.</summary> - public const int DistributorActiveFieldNumber = 2; - private bool distributorActive_; + public const int DistributorActiveFieldNumber = 1; + private static readonly pb::FieldCodec<bool> _repeated_distributorActive_codec + = pb::FieldCodec.ForBool(10); + private readonly pbc::RepeatedField<bool> distributorActive_ = new pbc::RepeatedField<bool>(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool DistributorActive { + public pbc::RepeatedField<bool> 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; } } diff --git a/Software/Visual_Studio/Tango.PMR/Debugging/StartDebugLogResponse.cs b/Software/Visual_Studio/Tango.PMR/Debugging/StartDebugLogResponse.cs index cb875a520..107442cd2 100644 --- a/Software/Visual_Studio/Tango.PMR/Debugging/StartDebugLogResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Debugging/StartDebugLogResponse.cs @@ -23,16 +23,16 @@ namespace Tango.PMR.Debugging { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChtTdGFydERlYnVnTG9nUmVzcG9uc2UucHJvdG8SE1RhbmdvLlBNUi5EZWJ1", - "Z2dpbmcaFkRlYnVnTG9nQ2F0ZWdvcnkucHJvdG8ivAEKFVN0YXJ0RGVidWdM", + "Z2dpbmcaFkRlYnVnTG9nQ2F0ZWdvcnkucHJvdG8iqQEKFVN0YXJ0RGVidWdM", "b2dSZXNwb25zZRI3CghDYXRlZ29yeRgBIAEoDjIlLlRhbmdvLlBNUi5EZWJ1", "Z2dpbmcuRGVidWdMb2dDYXRlZ29yeRIQCghGaWxlTmFtZRgCIAEoCRISCgpM", - "aW5lTnVtYmVyGAMgASgFEg4KBkZpbHRlchgEIAEoBRIPCgdNZXNzYWdlGAUg", - "ASgJEhAKCE1vZHVsZUlkGAYgASgFEhEKCVBhcmFtZXRlchgHIAEoBUIfCh1j", - "b20udHdpbmUudGFuZ28ucG1yLmRlYnVnZ2luZ2IGcHJvdG8z")); + "aW5lTnVtYmVyGAMgASgNEg4KBkZpbHRlchgEIAEoDRIPCgdNZXNzYWdlGAUg", + "ASgJEhAKCE1vZHVsZUlkGAYgASgNQh8KHWNvbS50d2luZS50YW5nby5wbXIu", + "ZGVidWdnaW5nYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Debugging.DebugLogCategoryReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Debugging.StartDebugLogResponse), global::Tango.PMR.Debugging.StartDebugLogResponse.Parser, new[]{ "Category", "FileName", "LineNumber", "Filter", "Message", "ModuleId", "Parameter" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Debugging.StartDebugLogResponse), global::Tango.PMR.Debugging.StartDebugLogResponse.Parser, new[]{ "Category", "FileName", "LineNumber", "Filter", "Message", "ModuleId" }, null, null, null) })); } #endregion @@ -69,7 +69,6 @@ namespace Tango.PMR.Debugging { filter_ = other.filter_; message_ = other.message_; moduleId_ = other.moduleId_; - parameter_ = other.parameter_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -101,9 +100,9 @@ namespace Tango.PMR.Debugging { /// <summary>Field number for the "LineNumber" field.</summary> public const int LineNumberFieldNumber = 3; - private int lineNumber_; + private uint lineNumber_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int LineNumber { + public uint LineNumber { get { return lineNumber_; } set { lineNumber_ = value; @@ -112,9 +111,9 @@ namespace Tango.PMR.Debugging { /// <summary>Field number for the "Filter" field.</summary> public const int FilterFieldNumber = 4; - private int filter_; + private uint filter_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int Filter { + public uint Filter { get { return filter_; } set { filter_ = value; @@ -134,26 +133,15 @@ namespace Tango.PMR.Debugging { /// <summary>Field number for the "ModuleId" field.</summary> public const int ModuleIdFieldNumber = 6; - private int moduleId_; + private uint moduleId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int ModuleId { + public uint ModuleId { get { return moduleId_; } set { moduleId_ = value; } } - /// <summary>Field number for the "Parameter" field.</summary> - public const int ParameterFieldNumber = 7; - private int parameter_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int Parameter { - get { return parameter_; } - set { - parameter_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as StartDebugLogResponse); @@ -173,7 +161,6 @@ namespace Tango.PMR.Debugging { if (Filter != other.Filter) return false; if (Message != other.Message) return false; if (ModuleId != other.ModuleId) return false; - if (Parameter != other.Parameter) return false; return true; } @@ -186,7 +173,6 @@ namespace Tango.PMR.Debugging { if (Filter != 0) hash ^= Filter.GetHashCode(); if (Message.Length != 0) hash ^= Message.GetHashCode(); if (ModuleId != 0) hash ^= ModuleId.GetHashCode(); - if (Parameter != 0) hash ^= Parameter.GetHashCode(); return hash; } @@ -207,11 +193,11 @@ namespace Tango.PMR.Debugging { } if (LineNumber != 0) { output.WriteRawTag(24); - output.WriteInt32(LineNumber); + output.WriteUInt32(LineNumber); } if (Filter != 0) { output.WriteRawTag(32); - output.WriteInt32(Filter); + output.WriteUInt32(Filter); } if (Message.Length != 0) { output.WriteRawTag(42); @@ -219,11 +205,7 @@ namespace Tango.PMR.Debugging { } if (ModuleId != 0) { output.WriteRawTag(48); - output.WriteInt32(ModuleId); - } - if (Parameter != 0) { - output.WriteRawTag(56); - output.WriteInt32(Parameter); + output.WriteUInt32(ModuleId); } } @@ -237,19 +219,16 @@ namespace Tango.PMR.Debugging { size += 1 + pb::CodedOutputStream.ComputeStringSize(FileName); } if (LineNumber != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(LineNumber); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LineNumber); } if (Filter != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(Filter); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Filter); } if (Message.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Message); } if (ModuleId != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ModuleId); - } - if (Parameter != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(Parameter); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ModuleId); } return size; } @@ -277,9 +256,6 @@ namespace Tango.PMR.Debugging { if (other.ModuleId != 0) { ModuleId = other.ModuleId; } - if (other.Parameter != 0) { - Parameter = other.Parameter; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -299,11 +275,11 @@ namespace Tango.PMR.Debugging { break; } case 24: { - LineNumber = input.ReadInt32(); + LineNumber = input.ReadUInt32(); break; } case 32: { - Filter = input.ReadInt32(); + Filter = input.ReadUInt32(); break; } case 42: { @@ -311,11 +287,7 @@ namespace Tango.PMR.Debugging { break; } case 48: { - ModuleId = input.ReadInt32(); - break; - } - case 56: { - Parameter = input.ReadInt32(); + ModuleId = input.ReadUInt32(); break; } } |