diff options
| author | Avi Levkovich <avi@twine-s.com> | 2017-12-19 12:28:00 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2017-12-19 12:28:00 +0200 |
| commit | 6bf71c81050b824398dc82ce4b69cdf71fb4a2f7 (patch) | |
| tree | 7412cb173a2049f8287022342c6931369c29ae9c /Software/Visual_Studio/Tango.PMR/Stubs | |
| parent | 54aa9a94a60c595f7317f9187b03134f399c5667 (diff) | |
| download | Tango-6bf71c81050b824398dc82ce4b69cdf71fb4a2f7.tar.gz Tango-6bf71c81050b824398dc82ce4b69cdf71fb4a2f7.zip | |
Continue working on stubs...
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/Stubs')
14 files changed, 744 insertions, 191 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs index 7151c1325..49cf71b2e 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs @@ -25,7 +25,7 @@ namespace Tango.PMR.Stubs { "Ch9TdHViQ2FydHJpZGdlUmVhZFJlc3BvbnNlLnByb3RvEg9UYW5nby5QTVIu", "U3R1YnMioAEKGVN0dWJDYXJ0cmlkZ2VSZWFkUmVzcG9uc2USEwoLQ2FydHJp", "ZGdlSWQYASABKA0SFgoOQ2FydHJpZGdlQ29sb3IYAyABKA0SGAoQQ2FydHJp", - "ZGdlVmVyc2lvbhgEIAEoDRIVCg1DYXJ0cmlkZ2VEYXRhGAUgASgNEhUKDUNh", + "ZGdlVmVyc2lvbhgEIAEoDRIVCg1DYXJ0cmlkZ2VEYXRhGAUgASgFEhUKDUNh", "cnRyaWRnZVVzZWQYBiABKAgSDgoGU3RhdHVzGAggASgNQhsKGWNvbS50d2lu", "ZS50YW5nby5wbXIuc3R1YnNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, @@ -110,9 +110,9 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "CartridgeData" field.</summary> public const int CartridgeDataFieldNumber = 5; - private uint cartridgeData_; + private int cartridgeData_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeData { + public int CartridgeData { get { return cartridgeData_; } set { cartridgeData_ = value; @@ -196,7 +196,7 @@ namespace Tango.PMR.Stubs { } if (CartridgeData != 0) { output.WriteRawTag(40); - output.WriteUInt32(CartridgeData); + output.WriteInt32(CartridgeData); } if (CartridgeUsed != false) { output.WriteRawTag(48); @@ -221,7 +221,7 @@ namespace Tango.PMR.Stubs { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeVersion); } if (CartridgeData != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeData); + size += 1 + pb::CodedOutputStream.ComputeInt32Size(CartridgeData); } if (CartridgeUsed != false) { size += 1 + 1; @@ -278,7 +278,7 @@ namespace Tango.PMR.Stubs { break; } case 40: { - CartridgeData = input.ReadUInt32(); + CartridgeData = input.ReadInt32(); break; } case 48: { diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserRequest.cs index f28e73684..af0a51af9 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserRequest.cs @@ -25,7 +25,7 @@ namespace Tango.PMR.Stubs { "ChpTdHViRGlzcGVuc2VyUmVxdWVzdC5wcm90bxIPVGFuZ28uUE1SLlN0dWJz", "IoABChRTdHViRGlzcGVuc2VyUmVxdWVzdBITCgtEaXNwZW5zZXJJZBgBIAEo", "DRINCgVTdGFydBgCIAEoCBIUCgxTZXREaXJlY3Rpb24YAyABKAgSHAoUU2V0", - "TWljcm9zdGVwRGl2aXNpb24YBCABKAUSEAoIU2V0U3BlZWQYBSABKAVCGwoZ", + "TWljcm9zdGVwRGl2aXNpb24YBCABKA0SEAoIU2V0U3BlZWQYBSABKAVCGwoZ", "Y29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -117,12 +117,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "SetMicrostepDivision" field.</summary> public const int SetMicrostepDivisionFieldNumber = 4; - private int setMicrostepDivision_; + private uint setMicrostepDivision_; /// <summary> /// No. of steps for 360 deg. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SetMicrostepDivision { + public uint SetMicrostepDivision { get { return setMicrostepDivision_; } set { setMicrostepDivision_ = value; @@ -193,7 +193,7 @@ namespace Tango.PMR.Stubs { } if (SetMicrostepDivision != 0) { output.WriteRawTag(32); - output.WriteInt32(SetMicrostepDivision); + output.WriteUInt32(SetMicrostepDivision); } if (SetSpeed != 0) { output.WriteRawTag(40); @@ -214,7 +214,7 @@ namespace Tango.PMR.Stubs { size += 1 + 1; } if (SetMicrostepDivision != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SetMicrostepDivision); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SetMicrostepDivision); } if (SetSpeed != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(SetSpeed); @@ -265,7 +265,7 @@ namespace Tango.PMR.Stubs { break; } case 32: { - SetMicrostepDivision = input.ReadInt32(); + SetMicrostepDivision = input.ReadUInt32(); break; } case 40: { diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOInputSetupRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOInputSetupRequest.cs new file mode 100644 index 000000000..36187252f --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOInputSetupRequest.cs @@ -0,0 +1,257 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StubGPIOInputSetupRequest.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 StubGPIOInputSetupRequest.proto</summary> + public static partial class StubGPIOInputSetupRequestReflection { + + #region Descriptor + /// <summary>File descriptor for StubGPIOInputSetupRequest.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static StubGPIOInputSetupRequestReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "Ch9TdHViR1BJT0lucHV0U2V0dXBSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIu", + "U3R1YnMiXwoZU3R1YkdQSU9JbnB1dFNldHVwUmVxdWVzdBIOCgZQb3J0SWQY", + "ASABKAkSDQoFUGluSWQYAiABKA0SEAoIU2V0SW5wdXQYAyABKA0SEQoJU2V0", + "UHVsbFVQGAQgASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIuc3R1YnNiBnBy", + "b3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubGPIOInputSetupRequest), global::Tango.PMR.Stubs.StubGPIOInputSetupRequest.Parser, new[]{ "PortId", "PinId", "SetInput", "SetPullUP" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class StubGPIOInputSetupRequest : pb::IMessage<StubGPIOInputSetupRequest> { + private static readonly pb::MessageParser<StubGPIOInputSetupRequest> _parser = new pb::MessageParser<StubGPIOInputSetupRequest>(() => new StubGPIOInputSetupRequest()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<StubGPIOInputSetupRequest> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Stubs.StubGPIOInputSetupRequestReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public StubGPIOInputSetupRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public StubGPIOInputSetupRequest(StubGPIOInputSetupRequest other) : this() { + portId_ = other.portId_; + pinId_ = other.pinId_; + setInput_ = other.setInput_; + setPullUP_ = other.setPullUP_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public StubGPIOInputSetupRequest Clone() { + return new StubGPIOInputSetupRequest(this); + } + + /// <summary>Field number for the "PortId" field.</summary> + public const int PortIdFieldNumber = 1; + private string portId_ = ""; + /// <summary> + /// A.. + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string PortId { + get { return portId_; } + set { + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// <summary>Field number for the "PinId" field.</summary> + public const int PinIdFieldNumber = 2; + private uint pinId_; + /// <summary> + /// 0..7 + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint PinId { + get { return pinId_; } + set { + pinId_ = value; + } + } + + /// <summary>Field number for the "SetInput" field.</summary> + public const int SetInputFieldNumber = 3; + private uint setInput_; + /// <summary> + /// 0 - Set OUTPUT, 1 - Set INPUT, + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint SetInput { + get { return setInput_; } + set { + setInput_ = value; + } + } + + /// <summary>Field number for the "SetPullUP" field.</summary> + public const int SetPullUPFieldNumber = 4; + private uint setPullUP_; + /// <summary> + ///0 - Down, 1 - Up + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint SetPullUP { + get { return setPullUP_; } + set { + setPullUP_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as StubGPIOInputSetupRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(StubGPIOInputSetupRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (PortId != other.PortId) return false; + if (PinId != other.PinId) return false; + if (SetInput != other.SetInput) return false; + if (SetPullUP != other.SetPullUP) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); + if (PinId != 0) hash ^= PinId.GetHashCode(); + if (SetInput != 0) hash ^= SetInput.GetHashCode(); + if (SetPullUP != 0) hash ^= SetPullUP.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 (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); + } + if (PinId != 0) { + output.WriteRawTag(16); + output.WriteUInt32(PinId); + } + if (SetInput != 0) { + output.WriteRawTag(24); + output.WriteUInt32(SetInput); + } + if (SetPullUP != 0) { + output.WriteRawTag(32); + output.WriteUInt32(SetPullUP); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); + } + if (PinId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PinId); + } + if (SetInput != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SetInput); + } + if (SetPullUP != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SetPullUP); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(StubGPIOInputSetupRequest other) { + if (other == null) { + return; + } + if (other.PortId.Length != 0) { + PortId = other.PortId; + } + if (other.PinId != 0) { + PinId = other.PinId; + } + if (other.SetInput != 0) { + SetInput = other.SetInput; + } + if (other.SetPullUP != 0) { + SetPullUP = other.SetPullUP; + } + } + + [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: { + PortId = input.ReadString(); + break; + } + case 16: { + PinId = input.ReadUInt32(); + break; + } + case 24: { + SetInput = input.ReadUInt32(); + break; + } + case 32: { + SetPullUP = input.ReadUInt32(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOInputSetupResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOInputSetupResponse.cs new file mode 100644 index 000000000..b465eef4f --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOInputSetupResponse.cs @@ -0,0 +1,225 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StubGPIOInputSetupResponse.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 StubGPIOInputSetupResponse.proto</summary> + public static partial class StubGPIOInputSetupResponseReflection { + + #region Descriptor + /// <summary>File descriptor for StubGPIOInputSetupResponse.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static StubGPIOInputSetupResponseReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CiBTdHViR1BJT0lucHV0U2V0dXBSZXNwb25zZS5wcm90bxIPVGFuZ28uUE1S", + "LlN0dWJzIksKGlN0dWJHUElPSW5wdXRTZXR1cFJlc3BvbnNlEg4KBlBvcnRJ", + "ZBgBIAEoCRINCgVQaW5JZBgCIAEoDRIOCgZTdGF0dXMYAyABKA1CGwoZY29t", + "LnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubGPIOInputSetupResponse), global::Tango.PMR.Stubs.StubGPIOInputSetupResponse.Parser, new[]{ "PortId", "PinId", "Status" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class StubGPIOInputSetupResponse : pb::IMessage<StubGPIOInputSetupResponse> { + private static readonly pb::MessageParser<StubGPIOInputSetupResponse> _parser = new pb::MessageParser<StubGPIOInputSetupResponse>(() => new StubGPIOInputSetupResponse()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<StubGPIOInputSetupResponse> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Stubs.StubGPIOInputSetupResponseReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public StubGPIOInputSetupResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public StubGPIOInputSetupResponse(StubGPIOInputSetupResponse other) : this() { + portId_ = other.portId_; + pinId_ = other.pinId_; + status_ = other.status_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public StubGPIOInputSetupResponse Clone() { + return new StubGPIOInputSetupResponse(this); + } + + /// <summary>Field number for the "PortId" field.</summary> + public const int PortIdFieldNumber = 1; + private string portId_ = ""; + /// <summary> + /// A.. + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string PortId { + get { return portId_; } + set { + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// <summary>Field number for the "PinId" field.</summary> + public const int PinIdFieldNumber = 2; + private uint pinId_; + /// <summary> + /// 0..7 + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint PinId { + get { return pinId_; } + set { + pinId_ = value; + } + } + + /// <summary>Field number for the "Status" field.</summary> + public const int StatusFieldNumber = 3; + private uint status_; + /// <summary> + /// 0-OK 1-Failed + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Status { + get { return status_; } + set { + status_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as StubGPIOInputSetupResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(StubGPIOInputSetupResponse other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (PortId != other.PortId) return false; + if (PinId != other.PinId) return false; + if (Status != other.Status) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); + if (PinId != 0) hash ^= PinId.GetHashCode(); + if (Status != 0) hash ^= Status.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 (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); + } + if (PinId != 0) { + output.WriteRawTag(16); + output.WriteUInt32(PinId); + } + if (Status != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Status); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); + } + if (PinId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PinId); + } + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Status); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(StubGPIOInputSetupResponse other) { + if (other == null) { + return; + } + if (other.PortId.Length != 0) { + PortId = other.PortId; + } + if (other.PinId != 0) { + PinId = other.PinId; + } + if (other.Status != 0) { + Status = other.Status; + } + } + + [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: { + PortId = input.ReadString(); + break; + } + case 16: { + PinId = input.ReadUInt32(); + break; + } + case 24: { + Status = input.ReadUInt32(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitRequest.cs index 1228d9300..42d7cc10e 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitRequest.cs @@ -23,13 +23,13 @@ namespace Tango.PMR.Stubs { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChxTdHViR1BJT1JlYWRCaXRSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIuU3R1", - "YnMiNwoWU3R1YkdQSU9SZWFkQml0UmVxdWVzdBIOCgZQb3J0SWQYASABKA0S", - "DQoFUGluSWQYAiABKA1CGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IG", - "cHJvdG8z")); + "YnMiXgoWU3R1YkdQSU9SZWFkQml0UmVxdWVzdBIOCgZQb3J0SWQYASABKAkS", + "DQoFUGluSWQYAiABKA0SDwoHUG9sbGluZxgDIAEoCBIUCgxQb2xsRXhwVmFs", + "dWUYBCABKAhCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubGPIOReadBitRequest), global::Tango.PMR.Stubs.StubGPIOReadBitRequest.Parser, new[]{ "PortId", "PinId" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubGPIOReadBitRequest), global::Tango.PMR.Stubs.StubGPIOReadBitRequest.Parser, new[]{ "PortId", "PinId", "Polling", "PollExpValue" }, null, null, null) })); } #endregion @@ -62,6 +62,8 @@ namespace Tango.PMR.Stubs { public StubGPIOReadBitRequest(StubGPIOReadBitRequest other) : this() { portId_ = other.portId_; pinId_ = other.pinId_; + polling_ = other.polling_; + pollExpValue_ = other.pollExpValue_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -71,15 +73,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -97,6 +99,34 @@ namespace Tango.PMR.Stubs { } } + /// <summary>Field number for the "Polling" field.</summary> + public const int PollingFieldNumber = 3; + private bool polling_; + /// <summary> + /// 1 - Polling + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Polling { + get { return polling_; } + set { + polling_ = value; + } + } + + /// <summary>Field number for the "PollExpValue" field.</summary> + public const int PollExpValueFieldNumber = 4; + private bool pollExpValue_; + /// <summary> + /// 0/1 + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool PollExpValue { + get { return pollExpValue_; } + set { + pollExpValue_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as StubGPIOReadBitRequest); @@ -112,14 +142,18 @@ namespace Tango.PMR.Stubs { } if (PortId != other.PortId) return false; if (PinId != other.PinId) return false; + if (Polling != other.Polling) return false; + if (PollExpValue != other.PollExpValue) return false; return true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); if (PinId != 0) hash ^= PinId.GetHashCode(); + if (Polling != false) hash ^= Polling.GetHashCode(); + if (PollExpValue != false) hash ^= PollExpValue.GetHashCode(); return hash; } @@ -130,25 +164,39 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } if (PinId != 0) { output.WriteRawTag(16); output.WriteUInt32(PinId); } + if (Polling != false) { + output.WriteRawTag(24); + output.WriteBool(Polling); + } + if (PollExpValue != false) { + output.WriteRawTag(32); + output.WriteBool(PollExpValue); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } if (PinId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PinId); } + if (Polling != false) { + size += 1 + 1; + } + if (PollExpValue != false) { + size += 1 + 1; + } return size; } @@ -157,12 +205,18 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } if (other.PinId != 0) { PinId = other.PinId; } + if (other.Polling != false) { + Polling = other.Polling; + } + if (other.PollExpValue != false) { + PollExpValue = other.PollExpValue; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -173,14 +227,22 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 16: { PinId = input.ReadUInt32(); break; } + case 24: { + Polling = input.ReadBool(); + break; + } + case 32: { + PollExpValue = input.ReadBool(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitResponse.cs index f18bf50d7..ec260262b 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadBitResponse.cs @@ -24,8 +24,8 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch1TdHViR1BJT1JlYWRCaXRSZXNwb25zZS5wcm90bxIPVGFuZ28uUE1SLlN0", "dWJzIloKF1N0dWJHUElPUmVhZEJpdFJlc3BvbnNlEg4KBlBvcnRJZBgBIAEo", - "DRINCgVQaW5JZBgCIAEoDRIQCghCaXRWYWx1ZRgDIAEoCBIOCgZTdGF0dXMY", - "BCABKAhCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); + "CRINCgVQaW5JZBgCIAEoDRIQCghCaXRWYWx1ZRgDIAEoCBIOCgZTdGF0dXMY", + "BCABKA1CGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { @@ -73,15 +73,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -112,12 +112,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "Status" field.</summary> public const int StatusFieldNumber = 4; - private bool status_; + private uint status_; /// <summary> /// 0-OK 1-Failed /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Status { + public uint Status { get { return status_; } set { status_ = value; @@ -147,10 +147,10 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); if (PinId != 0) hash ^= PinId.GetHashCode(); if (BitValue != false) hash ^= BitValue.GetHashCode(); - if (Status != false) hash ^= Status.GetHashCode(); + if (Status != 0) hash ^= Status.GetHashCode(); return hash; } @@ -161,9 +161,9 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } if (PinId != 0) { output.WriteRawTag(16); @@ -173,17 +173,17 @@ namespace Tango.PMR.Stubs { output.WriteRawTag(24); output.WriteBool(BitValue); } - if (Status != false) { + if (Status != 0) { output.WriteRawTag(32); - output.WriteBool(Status); + output.WriteUInt32(Status); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } if (PinId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PinId); @@ -191,8 +191,8 @@ namespace Tango.PMR.Stubs { if (BitValue != false) { size += 1 + 1; } - if (Status != false) { - size += 1 + 1; + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Status); } return size; } @@ -202,7 +202,7 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } if (other.PinId != 0) { @@ -211,7 +211,7 @@ namespace Tango.PMR.Stubs { if (other.BitValue != false) { BitValue = other.BitValue; } - if (other.Status != false) { + if (other.Status != 0) { Status = other.Status; } } @@ -224,8 +224,8 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 16: { @@ -237,7 +237,7 @@ namespace Tango.PMR.Stubs { break; } case 32: { - Status = input.ReadBool(); + Status = input.ReadUInt32(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteRequest.cs index 9d3194982..28021c777 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteRequest.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch1TdHViR1BJT1JlYWRCeXRlUmVxdWVzdC5wcm90bxIPVGFuZ28uUE1SLlN0", "dWJzIikKF1N0dWJHUElPUmVhZEJ5dGVSZXF1ZXN0Eg4KBlBvcnRJZBgBIAEo", - "DUIbChljb20udHdpbmUudGFuZ28ucG1yLnN0dWJzYgZwcm90bzM=")); + "CUIbChljb20udHdpbmUudGFuZ28ucG1yLnN0dWJzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { @@ -69,15 +69,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -101,7 +101,7 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); return hash; } @@ -112,17 +112,17 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } return size; } @@ -132,7 +132,7 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } } @@ -145,8 +145,8 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteResponse.cs index 5a1418ca2..96cf86efd 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOReadByteResponse.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch5TdHViR1BJT1JlYWRCeXRlUmVzcG9uc2UucHJvdG8SD1RhbmdvLlBNUi5T", "dHVicyJNChhTdHViR1BJT1JlYWRCeXRlUmVzcG9uc2USDgoGUG9ydElkGAEg", - "ASgNEhEKCUJ5dGVWYWx1ZRgCIAEoDRIOCgZzdGF0dXMYAyABKAhCGwoZY29t", + "ASgJEhEKCUJ5dGVWYWx1ZRgCIAEoDRIOCgZzdGF0dXMYAyABKA1CGwoZY29t", "LnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -72,15 +72,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -97,12 +97,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "status" field.</summary> public const int StatusFieldNumber = 3; - private bool status_; + private uint status_; /// <summary> /// 0-OK 1-Failed /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Status { + public uint Status { get { return status_; } set { status_ = value; @@ -131,9 +131,9 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); if (ByteValue != 0) hash ^= ByteValue.GetHashCode(); - if (Status != false) hash ^= Status.GetHashCode(); + if (Status != 0) hash ^= Status.GetHashCode(); return hash; } @@ -144,31 +144,31 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } if (ByteValue != 0) { output.WriteRawTag(16); output.WriteUInt32(ByteValue); } - if (Status != false) { + if (Status != 0) { output.WriteRawTag(24); - output.WriteBool(Status); + output.WriteUInt32(Status); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } if (ByteValue != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ByteValue); } - if (Status != false) { - size += 1 + 1; + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Status); } return size; } @@ -178,13 +178,13 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } if (other.ByteValue != 0) { ByteValue = other.ByteValue; } - if (other.Status != false) { + if (other.Status != 0) { Status = other.Status; } } @@ -197,8 +197,8 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 16: { @@ -206,7 +206,7 @@ namespace Tango.PMR.Stubs { break; } case 24: { - Status = input.ReadBool(); + Status = input.ReadUInt32(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitRequest.cs index 051afcb2a..ff37290d2 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitRequest.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch1TdHViR1BJT1dyaXRlQml0UmVxdWVzdC5wcm90bxIPVGFuZ28uUE1SLlN0", "dWJzIkwKF1N0dWJHUElPV3JpdGVCaXRSZXF1ZXN0Eg4KBlBvcnRJZBgBIAEo", - "DRINCgVQaW5JZBgCIAEoDRISCgpCaXRUb1dyaXRlGAMgASgIQhsKGWNvbS50", + "CRINCgVQaW5JZBgCIAEoDRISCgpCaXRUb1dyaXRlGAMgASgIQhsKGWNvbS50", "d2luZS50YW5nby5wbXIuc3R1YnNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -72,15 +72,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -131,7 +131,7 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); if (PinId != 0) hash ^= PinId.GetHashCode(); if (BitToWrite != false) hash ^= BitToWrite.GetHashCode(); return hash; @@ -144,9 +144,9 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } if (PinId != 0) { output.WriteRawTag(16); @@ -161,8 +161,8 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } if (PinId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PinId); @@ -178,7 +178,7 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } if (other.PinId != 0) { @@ -197,8 +197,8 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 16: { diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitResponse.cs index ef7847f04..1c3c0441b 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteBitResponse.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch5TdHViR1BJT1dyaXRlQml0UmVzcG9uc2UucHJvdG8SD1RhbmdvLlBNUi5T", "dHVicyJJChhTdHViR1BJT1dyaXRlQml0UmVzcG9uc2USDgoGUG9ydElkGAEg", - "ASgNEg0KBVBpbklkGAIgASgNEg4KBlN0YXR1cxgDIAEoCEIbChljb20udHdp", + "ASgJEg0KBVBpbklkGAIgASgNEg4KBlN0YXR1cxgDIAEoDUIbChljb20udHdp", "bmUudGFuZ28ucG1yLnN0dWJzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -72,15 +72,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -100,12 +100,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "Status" field.</summary> public const int StatusFieldNumber = 3; - private bool status_; + private uint status_; /// <summary> /// 0-OK 1-Failed /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Status { + public uint Status { get { return status_; } set { status_ = value; @@ -134,9 +134,9 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); if (PinId != 0) hash ^= PinId.GetHashCode(); - if (Status != false) hash ^= Status.GetHashCode(); + if (Status != 0) hash ^= Status.GetHashCode(); return hash; } @@ -147,31 +147,31 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } if (PinId != 0) { output.WriteRawTag(16); output.WriteUInt32(PinId); } - if (Status != false) { + if (Status != 0) { output.WriteRawTag(24); - output.WriteBool(Status); + output.WriteUInt32(Status); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } if (PinId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PinId); } - if (Status != false) { - size += 1 + 1; + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Status); } return size; } @@ -181,13 +181,13 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } if (other.PinId != 0) { PinId = other.PinId; } - if (other.Status != false) { + if (other.Status != 0) { Status = other.Status; } } @@ -200,8 +200,8 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 16: { @@ -209,7 +209,7 @@ namespace Tango.PMR.Stubs { break; } case 24: { - Status = input.ReadBool(); + Status = input.ReadUInt32(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteRequest.cs index 121c55438..9c0b054e1 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteRequest.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch5TdHViR1BJT1dyaXRlQnl0ZVJlcXVlc3QucHJvdG8SD1RhbmdvLlBNUi5T", "dHVicyI/ChhTdHViR1BJT1dyaXRlQnl0ZVJlcXVlc3QSDgoGUG9ydElkGAEg", - "ASgNEhMKC0RhdGFUb1dyaXRlGAMgASgNQhsKGWNvbS50d2luZS50YW5nby5w", + "ASgJEhMKC0RhdGFUb1dyaXRlGAMgASgNQhsKGWNvbS50d2luZS50YW5nby5w", "bXIuc3R1YnNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -71,15 +71,15 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } @@ -115,7 +115,7 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); if (DataToWrite != 0) hash ^= DataToWrite.GetHashCode(); return hash; } @@ -127,9 +127,9 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } if (DataToWrite != 0) { output.WriteRawTag(24); @@ -140,8 +140,8 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } if (DataToWrite != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DataToWrite); @@ -154,7 +154,7 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } if (other.DataToWrite != 0) { @@ -170,8 +170,8 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 24: { diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteResponse.cs index 45b92b7d3..4ec69e36c 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubGPIOWriteByteResponse.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.Stubs { string.Concat( "Ch9TdHViR1BJT1dyaXRlQnl0ZVJlc3BvbnNlLnByb3RvEg9UYW5nby5QTVIu", "U3R1YnMiOwoZU3R1YkdQSU9Xcml0ZUJ5dGVSZXNwb25zZRIOCgZQb3J0SWQY", - "ASABKA0SDgoGc3RhdHVzGAMgASgIQhsKGWNvbS50d2luZS50YW5nby5wbXIu", + "ASABKAkSDgoGc3RhdHVzGAMgASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIu", "c3R1YnNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -71,26 +71,26 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "PortId" field.</summary> public const int PortIdFieldNumber = 1; - private uint portId_; + private string portId_ = ""; /// <summary> - /// 0..119 + /// A.. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint PortId { + public string PortId { get { return portId_; } set { - portId_ = value; + portId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } /// <summary>Field number for the "status" field.</summary> public const int StatusFieldNumber = 3; - private bool status_; + private uint status_; /// <summary> /// 0-OK 1-Failed /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Status { + public uint Status { get { return status_; } set { status_ = value; @@ -118,8 +118,8 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (PortId != 0) hash ^= PortId.GetHashCode(); - if (Status != false) hash ^= Status.GetHashCode(); + if (PortId.Length != 0) hash ^= PortId.GetHashCode(); + if (Status != 0) hash ^= Status.GetHashCode(); return hash; } @@ -130,24 +130,24 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (PortId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(PortId); + if (PortId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PortId); } - if (Status != false) { + if (Status != 0) { output.WriteRawTag(24); - output.WriteBool(Status); + output.WriteUInt32(Status); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (PortId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PortId); + if (PortId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PortId); } - if (Status != false) { - size += 1 + 1; + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Status); } return size; } @@ -157,10 +157,10 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.PortId != 0) { + if (other.PortId.Length != 0) { PortId = other.PortId; } - if (other.Status != false) { + if (other.Status != 0) { Status = other.Status; } } @@ -173,12 +173,12 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - PortId = input.ReadUInt32(); + case 10: { + PortId = input.ReadString(); break; } case 24: { - Status = input.ReadBool(); + Status = input.ReadUInt32(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubSteperMotorRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubSteperMotorRequest.cs index 3ff12ce33..2ef0ed9b5 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubSteperMotorRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubSteperMotorRequest.cs @@ -25,7 +25,7 @@ namespace Tango.PMR.Stubs { "ChxTdHViU3RlcGVyTW90b3JSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIuU3R1", "YnMifgoWU3R1YlN0ZXBlck1vdG9yUmVxdWVzdBIPCgdNb3RvcklkGAEgASgN", "Eg0KBVN0YXJ0GAIgASgIEhQKDFNldERpcmVjdGlvbhgDIAEoCBIcChRTZXRN", - "aWNyb3N0ZXBEaXZpc2lvbhgEIAEoBRIQCghTZXRTcGVlZBgFIAEoBUIbChlj", + "aWNyb3N0ZXBEaXZpc2lvbhgEIAEoDRIQCghTZXRTcGVlZBgFIAEoBUIbChlj", "b20udHdpbmUudGFuZ28ucG1yLnN0dWJzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -117,12 +117,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "SetMicrostepDivision" field.</summary> public const int SetMicrostepDivisionFieldNumber = 4; - private int setMicrostepDivision_; + private uint setMicrostepDivision_; /// <summary> /// No. of steps for 360 deg. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SetMicrostepDivision { + public uint SetMicrostepDivision { get { return setMicrostepDivision_; } set { setMicrostepDivision_ = value; @@ -196,7 +196,7 @@ namespace Tango.PMR.Stubs { } if (SetMicrostepDivision != 0) { output.WriteRawTag(32); - output.WriteInt32(SetMicrostepDivision); + output.WriteUInt32(SetMicrostepDivision); } if (SetSpeed != 0) { output.WriteRawTag(40); @@ -217,7 +217,7 @@ namespace Tango.PMR.Stubs { size += 1 + 1; } if (SetMicrostepDivision != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SetMicrostepDivision); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SetMicrostepDivision); } if (SetSpeed != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(SetSpeed); @@ -268,7 +268,7 @@ namespace Tango.PMR.Stubs { break; } case 32: { - SetMicrostepDivision = input.ReadInt32(); + SetMicrostepDivision = input.ReadUInt32(); break; } case 40: { diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubValveRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubValveRequest.cs index b33dcf8c5..bd50b6415 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubValveRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubValveRequest.cs @@ -23,8 +23,8 @@ namespace Tango.PMR.Stubs { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChZTdHViVmFsdmVSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIuU3R1YnMiRQoQ", - "U3R1YlZhbHZlUmVxdWVzdBIPCgdWYWx2ZUlkGAEgASgFEg8KB0lua2Zsb3cY", - "AiABKAUSDwoHVmFsdmVPbhgDIAEoBUIbChljb20udHdpbmUudGFuZ28ucG1y", + "U3R1YlZhbHZlUmVxdWVzdBIPCgdWYWx2ZUlkGAEgASgNEg8KB0lua2Zsb3cY", + "AiABKA0SDwoHVmFsdmVPbhgDIAEoCEIbChljb20udHdpbmUudGFuZ28ucG1y", "LnN0dWJzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -72,9 +72,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "ValveId" field.</summary> public const int ValveIdFieldNumber = 1; - private int valveId_; + private uint valveId_; + /// <summary> + /// 0..19 + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int ValveId { + public uint ValveId { get { return valveId_; } set { valveId_ = value; @@ -83,9 +86,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "Inkflow" field.</summary> public const int InkflowFieldNumber = 2; - private int inkflow_; + private uint inkflow_; + /// <summary> + ///0 - Min + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int Inkflow { + public uint Inkflow { get { return inkflow_; } set { inkflow_ = value; @@ -94,9 +100,12 @@ namespace Tango.PMR.Stubs { /// <summary>Field number for the "ValveOn" field.</summary> public const int ValveOnFieldNumber = 3; - private int valveOn_; + private bool valveOn_; + /// <summary> + ///0-Off 1-On + /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int ValveOn { + public bool ValveOn { get { return valveOn_; } set { valveOn_ = value; @@ -127,7 +136,7 @@ namespace Tango.PMR.Stubs { int hash = 1; if (ValveId != 0) hash ^= ValveId.GetHashCode(); if (Inkflow != 0) hash ^= Inkflow.GetHashCode(); - if (ValveOn != 0) hash ^= ValveOn.GetHashCode(); + if (ValveOn != false) hash ^= ValveOn.GetHashCode(); return hash; } @@ -140,15 +149,15 @@ namespace Tango.PMR.Stubs { public void WriteTo(pb::CodedOutputStream output) { if (ValveId != 0) { output.WriteRawTag(8); - output.WriteInt32(ValveId); + output.WriteUInt32(ValveId); } if (Inkflow != 0) { output.WriteRawTag(16); - output.WriteInt32(Inkflow); + output.WriteUInt32(Inkflow); } - if (ValveOn != 0) { + if (ValveOn != false) { output.WriteRawTag(24); - output.WriteInt32(ValveOn); + output.WriteBool(ValveOn); } } @@ -156,13 +165,13 @@ namespace Tango.PMR.Stubs { public int CalculateSize() { int size = 0; if (ValveId != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ValveId); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ValveId); } if (Inkflow != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(Inkflow); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Inkflow); } - if (ValveOn != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ValveOn); + if (ValveOn != false) { + size += 1 + 1; } return size; } @@ -178,7 +187,7 @@ namespace Tango.PMR.Stubs { if (other.Inkflow != 0) { Inkflow = other.Inkflow; } - if (other.ValveOn != 0) { + if (other.ValveOn != false) { ValveOn = other.ValveOn; } } @@ -192,15 +201,15 @@ namespace Tango.PMR.Stubs { input.SkipLastField(); break; case 8: { - ValveId = input.ReadInt32(); + ValveId = input.ReadUInt32(); break; } case 16: { - Inkflow = input.ReadInt32(); + Inkflow = input.ReadUInt32(); break; } case 24: { - ValveOn = input.ReadInt32(); + ValveOn = input.ReadBool(); break; } } |
