diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-17 23:44:54 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-17 23:44:54 +0200 |
| commit | 8dbf9aea30b685b56b2eae2aa490440e3d46d725 (patch) | |
| tree | 1819d07c6d0e7a66b36db66e8344549b4ebc7ad9 /Software/Visual_Studio/Tango.PMR | |
| parent | 6f4a841e55653dbcea859afe617d67f6f9432e9a (diff) | |
| parent | 6013f5eb39578d46f78c6901058272e9ac31db40 (diff) | |
| download | Tango-8dbf9aea30b685b56b2eae2aa490440e3d46d725.tar.gz Tango-8dbf9aea30b685b56b2eae2aa490440e3d46d725.zip | |
Merged BTSR branch.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR')
8 files changed, 587 insertions, 97 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs new file mode 100644 index 000000000..c7d6c2616 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs @@ -0,0 +1,65 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrApplicationType.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.BTSR { + + /// <summary>Holder for reflection information generated from BtsrApplicationType.proto</summary> + public static partial class BtsrApplicationTypeReflection { + + #region Descriptor + /// <summary>File descriptor for BtsrApplicationType.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrApplicationTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChlCdHNyQXBwbGljYXRpb25UeXBlLnByb3RvEg5UYW5nby5QTVIuQlRTUiqO", + "AgoTQnRzckFwcGxpY2F0aW9uVHlwZRIZChVVTkRFRklORURfQVBQTElDQVRJ", + "T04QABIJCgVTT0NLUxABEhEKDVJFVkVSU0VfU09DS1MQAhIRCg1NRURJQ0FM", + "X1NPQ0tTEAMSDQoJUEFOVFlIT1NFEAQSDAoIU0VBTUxFU1MQBRIICgRLTklU", + "EAYSEAoMUkVWRVJTRV9LTklUEAcSCwoHUkFTQ0hFTBAIEgoKBlNFV0lORxAJ", + "Eg0KCUZMQVRfS05JVBAKEg4KClNNQUxMX0xPT00QCxIJCgVTSE9FUxAMEg4K", + "CkZMQVRfU0hPRVMQERIJCgVJTkxBWRASEggKBFdBUlAQHhIKCgZSRVdJTkQQ", + "H0IaChhjb20udHdpbmUudGFuZ28ucG1yLmJ0c3JiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.BTSR.BtsrApplicationType), }, null)); + } + #endregion + + } + #region Enums + public enum BtsrApplicationType { + [pbr::OriginalName("UNDEFINED_APPLICATION")] UndefinedApplication = 0, + [pbr::OriginalName("SOCKS")] Socks = 1, + [pbr::OriginalName("REVERSE_SOCKS")] ReverseSocks = 2, + [pbr::OriginalName("MEDICAL_SOCKS")] MedicalSocks = 3, + [pbr::OriginalName("PANTYHOSE")] Pantyhose = 4, + [pbr::OriginalName("SEAMLESS")] Seamless = 5, + [pbr::OriginalName("KNIT")] Knit = 6, + [pbr::OriginalName("REVERSE_KNIT")] ReverseKnit = 7, + [pbr::OriginalName("RASCHEL")] Raschel = 8, + [pbr::OriginalName("SEWING")] Sewing = 9, + [pbr::OriginalName("FLAT_KNIT")] FlatKnit = 10, + [pbr::OriginalName("SMALL_LOOM")] SmallLoom = 11, + [pbr::OriginalName("SHOES")] Shoes = 12, + [pbr::OriginalName("FLAT_SHOES")] FlatShoes = 17, + [pbr::OriginalName("INLAY")] Inlay = 18, + [pbr::OriginalName("WARP")] Warp = 30, + [pbr::OriginalName("REWIND")] Rewind = 31, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs new file mode 100644 index 000000000..964e490d0 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs @@ -0,0 +1,219 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrParameters.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.BTSR { + + /// <summary>Holder for reflection information generated from BtsrParameters.proto</summary> + public static partial class BtsrParametersReflection { + + #region Descriptor + /// <summary>File descriptor for BtsrParameters.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrParametersReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChRCdHNyUGFyYW1ldGVycy5wcm90bxIOVGFuZ28uUE1SLkJUU1IaGUJ0c3JB", + "cHBsaWNhdGlvblR5cGUucHJvdG8aEkJ0c3JZYXJuVHlwZS5wcm90byKcAQoO", + "QnRzclBhcmFtZXRlcnMSQAoTQnRzckFwcGxpY2F0aW9uVHlwZRgBIAEoDjIj", + "LlRhbmdvLlBNUi5CVFNSLkJ0c3JBcHBsaWNhdGlvblR5cGUSMgoMQnRzcllh", + "cm5UeXBlGAIgASgOMhwuVGFuZ28uUE1SLkJUU1IuQnRzcllhcm5UeXBlEhQK", + "DFRlbnNpb25FcnJvchgDIAEoAkIaChhjb20udHdpbmUudGFuZ28ucG1yLmJ0", + "c3JiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::Tango.PMR.BTSR.BtsrApplicationTypeReflection.Descriptor, global::Tango.PMR.BTSR.BtsrYarnTypeReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.BTSR.BtsrParameters), global::Tango.PMR.BTSR.BtsrParameters.Parser, new[]{ "BtsrApplicationType", "BtsrYarnType", "TensionError" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class BtsrParameters : pb::IMessage<BtsrParameters> { + private static readonly pb::MessageParser<BtsrParameters> _parser = new pb::MessageParser<BtsrParameters>(() => new BtsrParameters()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<BtsrParameters> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.BTSR.BtsrParametersReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters(BtsrParameters other) : this() { + btsrApplicationType_ = other.btsrApplicationType_; + btsrYarnType_ = other.btsrYarnType_; + tensionError_ = other.tensionError_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters Clone() { + return new BtsrParameters(this); + } + + /// <summary>Field number for the "BtsrApplicationType" field.</summary> + public const int BtsrApplicationTypeFieldNumber = 1; + private global::Tango.PMR.BTSR.BtsrApplicationType btsrApplicationType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrApplicationType BtsrApplicationType { + get { return btsrApplicationType_; } + set { + btsrApplicationType_ = value; + } + } + + /// <summary>Field number for the "BtsrYarnType" field.</summary> + public const int BtsrYarnTypeFieldNumber = 2; + private global::Tango.PMR.BTSR.BtsrYarnType btsrYarnType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrYarnType BtsrYarnType { + get { return btsrYarnType_; } + set { + btsrYarnType_ = value; + } + } + + /// <summary>Field number for the "TensionError" field.</summary> + public const int TensionErrorFieldNumber = 3; + private float tensionError_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float TensionError { + get { return tensionError_; } + set { + tensionError_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as BtsrParameters); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(BtsrParameters other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (BtsrApplicationType != other.BtsrApplicationType) return false; + if (BtsrYarnType != other.BtsrYarnType) return false; + if (TensionError != other.TensionError) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (BtsrApplicationType != 0) hash ^= BtsrApplicationType.GetHashCode(); + if (BtsrYarnType != 0) hash ^= BtsrYarnType.GetHashCode(); + if (TensionError != 0F) hash ^= TensionError.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 (BtsrApplicationType != 0) { + output.WriteRawTag(8); + output.WriteEnum((int) BtsrApplicationType); + } + if (BtsrYarnType != 0) { + output.WriteRawTag(16); + output.WriteEnum((int) BtsrYarnType); + } + if (TensionError != 0F) { + output.WriteRawTag(29); + output.WriteFloat(TensionError); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (BtsrApplicationType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BtsrApplicationType); + } + if (BtsrYarnType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BtsrYarnType); + } + if (TensionError != 0F) { + size += 1 + 4; + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(BtsrParameters other) { + if (other == null) { + return; + } + if (other.BtsrApplicationType != 0) { + BtsrApplicationType = other.BtsrApplicationType; + } + if (other.BtsrYarnType != 0) { + BtsrYarnType = other.BtsrYarnType; + } + if (other.TensionError != 0F) { + TensionError = other.TensionError; + } + } + + [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: { + btsrApplicationType_ = (global::Tango.PMR.BTSR.BtsrApplicationType) input.ReadEnum(); + break; + } + case 16: { + btsrYarnType_ = (global::Tango.PMR.BTSR.BtsrYarnType) input.ReadEnum(); + break; + } + case 29: { + TensionError = input.ReadFloat(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs new file mode 100644 index 000000000..995922a22 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs @@ -0,0 +1,52 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrYarnType.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.BTSR { + + /// <summary>Holder for reflection information generated from BtsrYarnType.proto</summary> + public static partial class BtsrYarnTypeReflection { + + #region Descriptor + /// <summary>File descriptor for BtsrYarnType.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrYarnTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChJCdHNyWWFyblR5cGUucHJvdG8SDlRhbmdvLlBNUi5CVFNSKn8KDEJ0c3JZ", + "YXJuVHlwZRISCg5VTkRFRklORURfWUFSThAAEg0KCUVMQVNUSUNfMRABEg4K", + "CkFMTF9ZQVJOXzEQAhIOCgpBTExfWUFSTl8yEAMSDgoKQUxMX1lBUk5fMxAE", + "Eg0KCUVMQVNUSUNfMhAFEg0KCUVMQVNUSUNfMxAGQhoKGGNvbS50d2luZS50", + "YW5nby5wbXIuYnRzcmIGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.BTSR.BtsrYarnType), }, null)); + } + #endregion + + } + #region Enums + public enum BtsrYarnType { + [pbr::OriginalName("UNDEFINED_YARN")] UndefinedYarn = 0, + [pbr::OriginalName("ELASTIC_1")] Elastic1 = 1, + [pbr::OriginalName("ALL_YARN_1")] AllYarn1 = 2, + [pbr::OriginalName("ALL_YARN_2")] AllYarn2 = 3, + [pbr::OriginalName("ALL_YARN_3")] AllYarn3 = 4, + [pbr::OriginalName("ELASTIC_2")] Elastic2 = 5, + [pbr::OriginalName("ELASTIC_3")] Elastic3 = 6, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index d69fb761b..1af8dad60 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -1242,67 +1242,67 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("MIXER_CURRENT_LOOP_BREAK")] MixerCurrentLoopBreak = 6005, /// <summary> - ///Overpressure in @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_1_OVERPRESSURE")] Dispenser1Overpressure = 7000, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_2_OVERPRESSURE")] Dispenser2Overpressure = 7001, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_3_OVERPRESSURE")] Dispenser3Overpressure = 7002, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_4_OVERPRESSURE")] Dispenser4Overpressure = 7003, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_5_OVERPRESSURE")] Dispenser5Overpressure = 7004, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_6_OVERPRESSURE")] Dispenser6Overpressure = 7005, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_7_OVERPRESSURE")] Dispenser7Overpressure = 7006, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_8_OVERPRESSURE")] Dispenser8Overpressure = 7007, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_UNDERPRESSURE")] Dispenser1Underpressure = 7008, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_UNDERPRESSURE")] Dispenser2Underpressure = 7009, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_UNDERPRESSURE")] Dispenser3Underpressure = 7010, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_UNDERPRESSURE")] Dispenser4Underpressure = 7011, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_UNDERPRESSURE")] Dispenser5Underpressure = 7012, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_UNDERPRESSURE")] Dispenser6Underpressure = 7013, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_UNDERPRESSURE")] Dispenser7Underpressure = 7014, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_UNDERPRESSURE")] Dispenser8Underpressure = 7015, /// <summary> @@ -1562,227 +1562,227 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DISPENSER_8_LOWER_HARD_LIMIT")] Dispenser8LowerHardLimit = 7079, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_HIGH_PRESSURE")] Dispenser1HighPressure = 7080, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_HIGH_PRESSURE")] Dispenser2HighPressure = 7081, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_HIGH_PRESSURE")] Dispenser3HighPressure = 7082, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_HIGH_PRESSURE")] Dispenser4HighPressure = 7083, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_HIGH_PRESSURE")] Dispenser5HighPressure = 7084, /// <summary> - ///Pressure in@ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_HIGH_PRESSURE")] Dispenser6HighPressure = 7085, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_HIGH_PRESSURE")] Dispenser7HighPressure = 7086, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_HIGH_PRESSURE")] Dispenser8HighPressure = 7087, /// <summary> - ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + ///Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_OVERPRESSURE")] Dispenser9Overpressure = 7088, /// <summary> - ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_UNDERPRESSURE")] Dispenser9Underpressure = 7089, /// <summary> - ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + ///Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_OVERPRESSURE")] Dispenser10Overpressure = 7090, /// <summary> - ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_UNDERPRESSURE")] Dispenser10Underpressure = 7091, /// <summary> - ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_MOTOR_1_MALFUNCTION")] Dispenser9Motor1Malfunction = 7092, /// <summary> - ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_MOTOR_2_MALFUNCTION")] Dispenser9Motor2Malfunction = 7093, /// <summary> - ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_MOTOR_1_MALFUNCTION")] Dispenser10Motor1Malfunction = 7094, /// <summary> - ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_MOTOR_2_MALFUNCTION")] Dispenser10Motor2Malfunction = 7095, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_1_LOW_LEVEL")] MidTank1LowLevel = 8000, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_2_LOW_LEVEL")] MidTank2LowLevel = 8001, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_3_LOW_LEVEL")] MidTank3LowLevel = 8002, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_4_LOW_LEVEL")] MidTank4LowLevel = 8003, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_5_LOW_LEVEL")] MidTank5LowLevel = 8004, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_6_LOW_LEVEL")] MidTank6LowLevel = 8005, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_7_LOW_LEVEL")] MidTank7LowLevel = 8006, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_8_LOW_LEVEL")] MidTank8LowLevel = 8007, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_EMPTY")] MidTank1Empty = 8008, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_EMPTY")] MidTank2Empty = 8009, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_EMPTY")] MidTank3Empty = 8010, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_EMPTY")] MidTank4Empty = 8011, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_EMPTY")] MidTank5Empty = 8012, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_EMPTY")] MidTank6Empty = 8013, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_EMPTY")] MidTank7Empty = 8014, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_EMPTY")] MidTank8Empty = 8015, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_OVERFLOW")] MidTank1Overflow = 8016, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_OVERFLOW")] MidTank2Overflow = 8017, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_OVERFLOW")] MidTank3Overflow = 8018, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_OVERFLOW")] MidTank4Overflow = 8019, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_OVERFLOW")] MidTank5Overflow = 8020, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_OVERFLOW")] MidTank6Overflow = 8021, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_OVERFLOW")] MidTank7Overflow = 8022, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_OVERFLOW")] MidTank8Overflow = 8023, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_FILL_TIMEOUT")] MidTank1FillTimeout = 8024, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_FILL_TIMEOUT")] MidTank2FillTimeout = 8025, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_FILL_TIMEOUT")] MidTank3FillTimeout = 8026, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_FILL_TIMEOUT")] MidTank4FillTimeout = 8027, /// <summary> - ///Failed to fill @ ink. Canot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_FILL_TIMEOUT")] MidTank5FillTimeout = 8028, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_FILL_TIMEOUT")] MidTank6FillTimeout = 8029, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_FILL_TIMEOUT")] MidTank7FillTimeout = 8030, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_FILL_TIMEOUT")] MidTank8FillTimeout = 8031, /// <summary> - ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_9_LOW_LEVEL")] MidTank9LowLevel = 8032, /// <summary> - ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_9_EMPTY")] MidTank9Empty = 8033, /// <summary> - ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_9_OVERFLOW")] MidTank9Overflow = 8034, /// <summary> - ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_9_FILL_TIMEOUT")] MidTank9FillTimeout = 8035, /// <summary> - ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_10_LOW_LEVEL")] MidTank10LowLevel = 8036, /// <summary> - ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_10_EMPTY")] MidTank10Empty = 8037, /// <summary> - ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_10_OVERFLOW")] MidTank10Overflow = 8038, /// <summary> - ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_10_FILL_TIMEOUT")] MidTank10FillTimeout = 8039, /// <summary> diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs index c716906e6..def81f838 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs @@ -23,18 +23,19 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Cg5Kb2JTcG9vbC5wcm90bxISVGFuZ28uUE1SLlByaW50aW5nGhJKb2JTcG9v", - "bFR5cGUucHJvdG8ingIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo", + "bFR5cGUucHJvdG8iuAIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo", "DjIgLlRhbmdvLlBNUi5QcmludGluZy5Kb2JTcG9vbFR5cGUSDgoGTGVuZ3Ro", "GAIgASgBEg4KBldlaWdodBgDIAEoARIQCghEaWFtZXRlchgEIAEoARIbChNS", "b3RhdGlvbnNQZXJQYXNzYWdlGAUgASgBEhkKEVN0YXJ0T2Zmc2V0UHVsc2Vz", "GAYgASgFEhMKC0JhY2tpbmdSYXRlGAcgASgFEhsKE1NlZ21lbnRPZmZzZXRQ", "dWxzZXMYCCABKAUSGQoRQm90dG9tQmFja2luZ1JhdGUYCSABKAUSIwobTGlt", - "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFQh4KHGNvbS50d2luZS50", - "YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); + "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFEhgKEEJ0c3JTcG9vbFRl", + "bnNpb24YCyABKAVCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset", "BtsrSpoolTension" }, null, null, null) })); } #endregion @@ -75,6 +76,7 @@ namespace Tango.PMR.Printing { segmentOffsetPulses_ = other.segmentOffsetPulses_; bottomBackingRate_ = other.bottomBackingRate_; limitSwitchStartPointOffset_ = other.limitSwitchStartPointOffset_; + btsrSpoolTension_ = other.btsrSpoolTension_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -192,6 +194,17 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "BtsrSpoolTension" field.</summary> + public const int BtsrSpoolTensionFieldNumber = 11; + private int btsrSpoolTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int BtsrSpoolTension { + get { return btsrSpoolTension_; } + set { + btsrSpoolTension_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobSpool); @@ -215,6 +228,7 @@ namespace Tango.PMR.Printing { if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false; if (BottomBackingRate != other.BottomBackingRate) return false; if (LimitSwitchStartPointOffset != other.LimitSwitchStartPointOffset) return false; + if (BtsrSpoolTension != other.BtsrSpoolTension) return false; return true; } @@ -231,6 +245,7 @@ namespace Tango.PMR.Printing { if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode(); if (BottomBackingRate != 0) hash ^= BottomBackingRate.GetHashCode(); if (LimitSwitchStartPointOffset != 0) hash ^= LimitSwitchStartPointOffset.GetHashCode(); + if (BtsrSpoolTension != 0) hash ^= BtsrSpoolTension.GetHashCode(); return hash; } @@ -281,6 +296,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(80); output.WriteInt32(LimitSwitchStartPointOffset); } + if (BtsrSpoolTension != 0) { + output.WriteRawTag(88); + output.WriteInt32(BtsrSpoolTension); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -316,6 +335,9 @@ namespace Tango.PMR.Printing { if (LimitSwitchStartPointOffset != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(LimitSwitchStartPointOffset); } + if (BtsrSpoolTension != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(BtsrSpoolTension); + } return size; } @@ -354,6 +376,9 @@ namespace Tango.PMR.Printing { if (other.LimitSwitchStartPointOffset != 0) { LimitSwitchStartPointOffset = other.LimitSwitchStartPointOffset; } + if (other.BtsrSpoolTension != 0) { + BtsrSpoolTension = other.BtsrSpoolTension; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -404,6 +429,10 @@ namespace Tango.PMR.Printing { LimitSwitchStartPointOffset = input.ReadInt32(); break; } + case 88: { + BtsrSpoolTension = input.ReadInt32(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs index 8e314704d..40460508f 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs @@ -26,26 +26,28 @@ namespace Tango.PMR.Printing { "bWVudC5wcm90bxoXUHJvY2Vzc1BhcmFtZXRlcnMucHJvdG8aFkpvYldpbmRp", "bmdNZXRob2QucHJvdG8aDkpvYlNwb29sLnByb3RvGhdKb2JVcGxvYWRTdHJh", "dGVneS5wcm90bxoWVGhyZWFkUGFyYW1ldGVycy5wcm90bxocSGVhZENsZWFu", - "aW5nUGFyYW1ldGVycy5wcm90byL9BAoJSm9iVGlja2V0EgwKBEd1aWQYASAB", - "KAkSDAoETmFtZRgCIAEoCRIaChJFbmFibGVJbnRlclNlZ21lbnQYAyABKAgS", - "GgoSSW50ZXJTZWdtZW50TGVuZ3RoGAQgASgBEg4KBkxlbmd0aBgFIAEoARJA", - "ChFQcm9jZXNzUGFyYW1ldGVycxgGIAEoCzIlLlRhbmdvLlBNUi5QcmludGlu", - "Zy5Qcm9jZXNzUGFyYW1ldGVycxI7Cg1XaW5kaW5nTWV0aG9kGAcgASgOMiQu", - "VGFuZ28uUE1SLlByaW50aW5nLkpvYldpbmRpbmdNZXRob2QSKwoFU3Bvb2wY", - "CCABKAsyHC5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU3Bvb2wSMAoIU2VnbWVu", - "dHMYCSADKAsyHi5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU2VnbWVudBI9Cg5V", - "cGxvYWRTdHJhdGVneRgKIAEoDjIlLlRhbmdvLlBNUi5QcmludGluZy5Kb2JV", - "cGxvYWRTdHJhdGVneRIaChJKb2JEZXNjcmlwdGlvbkZpbGUYCyABKAkSGQoR", - "RW5hYmxlTHVicmljYXRpb24YDCABKAgSFQoNTnVtYmVyT2ZVbml0cxgNIAEo", - "DRIVCg1TYW1wbGVXaW5kaW5nGA4gASgIEj4KEFRocmVhZFBhcmFtZXRlcnMY", - "DyABKAsyJC5UYW5nby5QTVIuUHJpbnRpbmcuVGhyZWFkUGFyYW1ldGVycxJK", - "ChZIZWFkQ2xlYW5pbmdQYXJhbWV0ZXJzGBAgASgLMiouVGFuZ28uUE1SLlBy", - "aW50aW5nLkhlYWRDbGVhbmluZ1BhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRh", - "bmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "aW5nUGFyYW1ldGVycy5wcm90bxoUQnRzclBhcmFtZXRlcnMucHJvdG8itQUK", + "CUpvYlRpY2tldBIMCgRHdWlkGAEgASgJEgwKBE5hbWUYAiABKAkSGgoSRW5h", + "YmxlSW50ZXJTZWdtZW50GAMgASgIEhoKEkludGVyU2VnbWVudExlbmd0aBgE", + "IAEoARIOCgZMZW5ndGgYBSABKAESQAoRUHJvY2Vzc1BhcmFtZXRlcnMYBiAB", + "KAsyJS5UYW5nby5QTVIuUHJpbnRpbmcuUHJvY2Vzc1BhcmFtZXRlcnMSOwoN", + "V2luZGluZ01ldGhvZBgHIAEoDjIkLlRhbmdvLlBNUi5QcmludGluZy5Kb2JX", + "aW5kaW5nTWV0aG9kEisKBVNwb29sGAggASgLMhwuVGFuZ28uUE1SLlByaW50", + "aW5nLkpvYlNwb29sEjAKCFNlZ21lbnRzGAkgAygLMh4uVGFuZ28uUE1SLlBy", + "aW50aW5nLkpvYlNlZ21lbnQSPQoOVXBsb2FkU3RyYXRlZ3kYCiABKA4yJS5U", + "YW5nby5QTVIuUHJpbnRpbmcuSm9iVXBsb2FkU3RyYXRlZ3kSGgoSSm9iRGVz", + "Y3JpcHRpb25GaWxlGAsgASgJEhkKEUVuYWJsZUx1YnJpY2F0aW9uGAwgASgI", + "EhUKDU51bWJlck9mVW5pdHMYDSABKA0SFQoNU2FtcGxlV2luZGluZxgOIAEo", + "CBI+ChBUaHJlYWRQYXJhbWV0ZXJzGA8gASgLMiQuVGFuZ28uUE1SLlByaW50", + "aW5nLlRocmVhZFBhcmFtZXRlcnMSSgoWSGVhZENsZWFuaW5nUGFyYW1ldGVy", + "cxgQIAEoCzIqLlRhbmdvLlBNUi5QcmludGluZy5IZWFkQ2xlYW5pbmdQYXJh", + "bWV0ZXJzEjYKDkJ0c3JQYXJhbWV0ZXJzGBEgASgLMh4uVGFuZ28uUE1SLkJU", + "U1IuQnRzclBhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmlu", + "dGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, global::Tango.PMR.BTSR.BtsrParametersReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters", "BtsrParameters" }, null, null, null) })); } #endregion @@ -92,6 +94,7 @@ namespace Tango.PMR.Printing { sampleWinding_ = other.sampleWinding_; ThreadParameters = other.threadParameters_ != null ? other.ThreadParameters.Clone() : null; HeadCleaningParameters = other.headCleaningParameters_ != null ? other.HeadCleaningParameters.Clone() : null; + BtsrParameters = other.btsrParameters_ != null ? other.BtsrParameters.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -277,6 +280,17 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "BtsrParameters" field.</summary> + public const int BtsrParametersFieldNumber = 17; + private global::Tango.PMR.BTSR.BtsrParameters btsrParameters_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrParameters BtsrParameters { + get { return btsrParameters_; } + set { + btsrParameters_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobTicket); @@ -306,6 +320,7 @@ namespace Tango.PMR.Printing { if (SampleWinding != other.SampleWinding) return false; if (!object.Equals(ThreadParameters, other.ThreadParameters)) return false; if (!object.Equals(HeadCleaningParameters, other.HeadCleaningParameters)) return false; + if (!object.Equals(BtsrParameters, other.BtsrParameters)) return false; return true; } @@ -328,6 +343,7 @@ namespace Tango.PMR.Printing { if (SampleWinding != false) hash ^= SampleWinding.GetHashCode(); if (threadParameters_ != null) hash ^= ThreadParameters.GetHashCode(); if (headCleaningParameters_ != null) hash ^= HeadCleaningParameters.GetHashCode(); + if (btsrParameters_ != null) hash ^= BtsrParameters.GetHashCode(); return hash; } @@ -399,6 +415,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(130, 1); output.WriteMessage(HeadCleaningParameters); } + if (btsrParameters_ != null) { + output.WriteRawTag(138, 1); + output.WriteMessage(BtsrParameters); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -450,6 +470,9 @@ namespace Tango.PMR.Printing { if (headCleaningParameters_ != null) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(HeadCleaningParameters); } + if (btsrParameters_ != null) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(BtsrParameters); + } return size; } @@ -516,6 +539,12 @@ namespace Tango.PMR.Printing { } HeadCleaningParameters.MergeFrom(other.HeadCleaningParameters); } + if (other.btsrParameters_ != null) { + if (btsrParameters_ == null) { + btsrParameters_ = new global::Tango.PMR.BTSR.BtsrParameters(); + } + BtsrParameters.MergeFrom(other.BtsrParameters); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -602,6 +631,13 @@ namespace Tango.PMR.Printing { input.ReadMessage(headCleaningParameters_); break; } + case 138: { + if (btsrParameters_ == null) { + btsrParameters_ = new global::Tango.PMR.BTSR.BtsrParameters(); + } + input.ReadMessage(btsrParameters_); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index b0c29288f..0d45ef6bf 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChdQcm9jZXNzUGFyYW1ldGVycy5wcm90bxISVGFuZ28uUE1SLlByaW50aW5n", - "ItIFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "IqMGChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -39,11 +39,13 @@ namespace Tango.PMR.Printing { "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARITCgtSQmxvd2VyRmxv", "dxgbIAEoARITCgtSQmxvd2VyVGVtcBgcIAEoARITCgtMQmxvd2VyRmxvdxgd", "IAEoARITCgtMQmxvd2VyVGVtcBgeIAEoARIXCg9QcmVzc3VyZUJ1aWxkVXAY", - "HyABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "HyABKAESGgoSQnRzckZlZWRpbmdUZW5zaW9uGCAgASgBEhMKC0V4aXRUZW5z", + "aW9uGCEgASgBEh4KFkJ0c3JUaHJlYWRMZW5ndGhPZmZzZXQYIiABKAFCHgoc", + "Y29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp", "BtsrFeedingTension", "ExitTension", "BtsrThreadLengthOffset" }, null, null, null) })); } #endregion @@ -105,6 +107,9 @@ namespace Tango.PMR.Printing { lBlowerFlow_ = other.lBlowerFlow_; lBlowerTemp_ = other.lBlowerTemp_; pressureBuildUp_ = other.pressureBuildUp_; + btsrFeedingTension_ = other.btsrFeedingTension_; + exitTension_ = other.exitTension_; + btsrThreadLengthOffset_ = other.btsrThreadLengthOffset_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -453,6 +458,39 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "BtsrFeedingTension" field.</summary> + public const int BtsrFeedingTensionFieldNumber = 32; + private double btsrFeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrFeedingTension { + get { return btsrFeedingTension_; } + set { + btsrFeedingTension_ = value; + } + } + + /// <summary>Field number for the "ExitTension" field.</summary> + public const int ExitTensionFieldNumber = 33; + private double exitTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ExitTension { + get { return exitTension_; } + set { + exitTension_ = value; + } + } + + /// <summary>Field number for the "BtsrThreadLengthOffset" field.</summary> + public const int BtsrThreadLengthOffsetFieldNumber = 34; + private double btsrThreadLengthOffset_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrThreadLengthOffset { + get { return btsrThreadLengthOffset_; } + set { + btsrThreadLengthOffset_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -497,6 +535,9 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != other.LBlowerFlow) return false; if (LBlowerTemp != other.LBlowerTemp) return false; if (PressureBuildUp != other.PressureBuildUp) return false; + if (BtsrFeedingTension != other.BtsrFeedingTension) return false; + if (ExitTension != other.ExitTension) return false; + if (BtsrThreadLengthOffset != other.BtsrThreadLengthOffset) return false; return true; } @@ -534,6 +575,9 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != 0D) hash ^= LBlowerFlow.GetHashCode(); if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode(); if (PressureBuildUp != 0D) hash ^= PressureBuildUp.GetHashCode(); + if (BtsrFeedingTension != 0D) hash ^= BtsrFeedingTension.GetHashCode(); + if (ExitTension != 0D) hash ^= ExitTension.GetHashCode(); + if (BtsrThreadLengthOffset != 0D) hash ^= BtsrThreadLengthOffset.GetHashCode(); return hash; } @@ -668,6 +712,18 @@ namespace Tango.PMR.Printing { output.WriteRawTag(249, 1); output.WriteDouble(PressureBuildUp); } + if (BtsrFeedingTension != 0D) { + output.WriteRawTag(129, 2); + output.WriteDouble(BtsrFeedingTension); + } + if (ExitTension != 0D) { + output.WriteRawTag(137, 2); + output.WriteDouble(ExitTension); + } + if (BtsrThreadLengthOffset != 0D) { + output.WriteRawTag(145, 2); + output.WriteDouble(BtsrThreadLengthOffset); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -766,6 +822,15 @@ namespace Tango.PMR.Printing { if (PressureBuildUp != 0D) { size += 2 + 8; } + if (BtsrFeedingTension != 0D) { + size += 2 + 8; + } + if (ExitTension != 0D) { + size += 2 + 8; + } + if (BtsrThreadLengthOffset != 0D) { + size += 2 + 8; + } return size; } @@ -867,6 +932,15 @@ namespace Tango.PMR.Printing { if (other.PressureBuildUp != 0D) { PressureBuildUp = other.PressureBuildUp; } + if (other.BtsrFeedingTension != 0D) { + BtsrFeedingTension = other.BtsrFeedingTension; + } + if (other.ExitTension != 0D) { + ExitTension = other.ExitTension; + } + if (other.BtsrThreadLengthOffset != 0D) { + BtsrThreadLengthOffset = other.BtsrThreadLengthOffset; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1001,6 +1075,18 @@ namespace Tango.PMR.Printing { PressureBuildUp = input.ReadDouble(); break; } + case 257: { + BtsrFeedingTension = input.ReadDouble(); + break; + } + case 265: { + ExitTension = input.ReadDouble(); + break; + } + case 273: { + BtsrThreadLengthOffset = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index bbe145163..cc54b4ca2 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -48,6 +48,9 @@ <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> + <Compile Include="BTSR\BtsrApplicationType.cs" /> + <Compile Include="BTSR\BtsrParameters.cs" /> + <Compile Include="BTSR\BtsrYarnType.cs" /> <Compile Include="ColorLab\CalibrationData.cs" /> <Compile Include="ColorLab\CalibrationInput.cs" /> <Compile Include="ColorLab\CalibrationMeasurement.cs" /> |
