diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/MachineStatus')
4 files changed, 24 insertions, 128 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs index 18024c6d7..007a72214 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.MachineStatus { string.Concat( "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", "IksKDElEU1BhY2tMZXZlbBINCgVJbmRleBgBIAEoBRIWCg5EaXNwZW5zZXJM", - "ZXZlbBgCIAEoBRIUCgxNaWRUYW5rTGV2ZWwYAyABKAFCIwohY29tLnR3aW5l", + "ZXZlbBgCIAEoBRIUCgxNaWRUYW5rTGV2ZWwYAyABKAVCIwohY29tLnR3aW5l", "LnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -94,9 +94,9 @@ namespace Tango.PMR.MachineStatus { /// <summary>Field number for the "MidTankLevel" field.</summary> public const int MidTankLevelFieldNumber = 3; - private double midTankLevel_; + private int midTankLevel_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double MidTankLevel { + public int MidTankLevel { get { return midTankLevel_; } set { midTankLevel_ = value; @@ -127,7 +127,7 @@ namespace Tango.PMR.MachineStatus { int hash = 1; if (Index != 0) hash ^= Index.GetHashCode(); if (DispenserLevel != 0) hash ^= DispenserLevel.GetHashCode(); - if (MidTankLevel != 0D) hash ^= MidTankLevel.GetHashCode(); + if (MidTankLevel != 0) hash ^= MidTankLevel.GetHashCode(); return hash; } @@ -146,9 +146,9 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(16); output.WriteInt32(DispenserLevel); } - if (MidTankLevel != 0D) { - output.WriteRawTag(25); - output.WriteDouble(MidTankLevel); + if (MidTankLevel != 0) { + output.WriteRawTag(24); + output.WriteInt32(MidTankLevel); } } @@ -161,8 +161,8 @@ namespace Tango.PMR.MachineStatus { if (DispenserLevel != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(DispenserLevel); } - if (MidTankLevel != 0D) { - size += 1 + 8; + if (MidTankLevel != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(MidTankLevel); } return size; } @@ -178,7 +178,7 @@ namespace Tango.PMR.MachineStatus { if (other.DispenserLevel != 0) { DispenserLevel = other.DispenserLevel; } - if (other.MidTankLevel != 0D) { + if (other.MidTankLevel != 0) { MidTankLevel = other.MidTankLevel; } } @@ -199,8 +199,8 @@ namespace Tango.PMR.MachineStatus { DispenserLevel = input.ReadInt32(); break; } - case 25: { - MidTankLevel = input.ReadDouble(); + case 24: { + MidTankLevel = input.ReadInt32(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs index 8f421e04d..9e3725f20 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs @@ -23,10 +23,10 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJNYWNoaW5lU3RhdGUucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", - "KmwKDE1hY2hpbmVTdGF0ZRILCgdQb3dlclVwEAASCQoFUmVhZHkQARIJCgVT", - "bGVlcBACEgkKBUVycm9yEAMSDAoIUG93ZXJPZmYQBBIQCgxQcmVwYXJpbmdK", - "b2IQBRIOCgpSdW5uaW5nSm9iEAZCIwohY29tLnR3aW5lLnRhbmdvLnBtci5t", - "YWNoaW5lc3RhdHVzYgZwcm90bzM=")); + "KnEKDE1hY2hpbmVTdGF0ZRIQCgxJbml0aWFsaXppbmcQABIJCgVSZWFkeRAB", + "EgkKBVNsZWVwEAISCQoFRXJyb3IQAxIMCghQb3dlck9mZhAEEhAKDFByZXBh", + "cmluZ0pvYhAFEg4KClJ1bm5pbmdKb2IQBkIjCiFjb20udHdpbmUudGFuZ28u", + "cG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.MachineStatus.MachineState), }, null)); @@ -36,7 +36,7 @@ namespace Tango.PMR.MachineStatus { } #region Enums public enum MachineState { - [pbr::OriginalName("PowerUp")] PowerUp = 0, + [pbr::OriginalName("Initializing")] Initializing = 0, [pbr::OriginalName("Ready")] Ready = 1, [pbr::OriginalName("Sleep")] Sleep = 2, [pbr::OriginalName("Error")] Error = 3, diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs index dc2713128..413789202 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs @@ -23,18 +23,15 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1", - "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8aEFNw", - "b29sU3RhdGUucHJvdG8i2QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB", - "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO", - "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1", - "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK", - "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T", - "cG9vbFN0YXRlQiMKIWNvbS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1", - "c2IGcHJvdG8z")); + "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8ihAEK", + "DU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASABKA4yJS5UYW5nby5QTVIuTWFj", + "aGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoOSURTUGFja3NMZXZlbHMYAiAD", + "KAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5JRFNQYWNrTGV2ZWxCIwoh", + "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, global::Tango.PMR.MachineStatus.SpoolStateReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels" }, null, null, null) })); } #endregion @@ -67,8 +64,6 @@ namespace Tango.PMR.MachineStatus { public MachineStatus(MachineStatus other) : this() { state_ = other.state_; iDSPacksLevels_ = other.iDSPacksLevels_.Clone(); - overallTemperature_ = other.overallTemperature_; - spoolState_ = other.spoolState_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -97,28 +92,6 @@ namespace Tango.PMR.MachineStatus { get { return iDSPacksLevels_; } } - /// <summary>Field number for the "OverallTemperature" field.</summary> - public const int OverallTemperatureFieldNumber = 3; - private double overallTemperature_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double OverallTemperature { - get { return overallTemperature_; } - set { - overallTemperature_ = value; - } - } - - /// <summary>Field number for the "SpoolState" field.</summary> - public const int SpoolStateFieldNumber = 4; - private global::Tango.PMR.MachineStatus.SpoolState spoolState_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.MachineStatus.SpoolState SpoolState { - get { return spoolState_; } - set { - spoolState_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as MachineStatus); @@ -134,8 +107,6 @@ namespace Tango.PMR.MachineStatus { } if (State != other.State) return false; if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false; - if (OverallTemperature != other.OverallTemperature) return false; - if (SpoolState != other.SpoolState) return false; return true; } @@ -144,8 +115,6 @@ namespace Tango.PMR.MachineStatus { int hash = 1; if (State != 0) hash ^= State.GetHashCode(); hash ^= iDSPacksLevels_.GetHashCode(); - if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode(); - if (SpoolState != 0) hash ^= SpoolState.GetHashCode(); return hash; } @@ -161,14 +130,6 @@ namespace Tango.PMR.MachineStatus { output.WriteEnum((int) State); } iDSPacksLevels_.WriteTo(output, _repeated_iDSPacksLevels_codec); - if (OverallTemperature != 0D) { - output.WriteRawTag(25); - output.WriteDouble(OverallTemperature); - } - if (SpoolState != 0) { - output.WriteRawTag(32); - output.WriteEnum((int) SpoolState); - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -178,12 +139,6 @@ namespace Tango.PMR.MachineStatus { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) State); } size += iDSPacksLevels_.CalculateSize(_repeated_iDSPacksLevels_codec); - if (OverallTemperature != 0D) { - size += 1 + 8; - } - if (SpoolState != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState); - } return size; } @@ -196,12 +151,6 @@ namespace Tango.PMR.MachineStatus { State = other.State; } iDSPacksLevels_.Add(other.iDSPacksLevels_); - if (other.OverallTemperature != 0D) { - OverallTemperature = other.OverallTemperature; - } - if (other.SpoolState != 0) { - SpoolState = other.SpoolState; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -220,14 +169,6 @@ namespace Tango.PMR.MachineStatus { iDSPacksLevels_.AddEntriesFrom(input, _repeated_iDSPacksLevels_codec); break; } - case 25: { - OverallTemperature = input.ReadDouble(); - break; - } - case 32: { - spoolState_ = (global::Tango.PMR.MachineStatus.SpoolState) input.ReadEnum(); - break; - } } } } diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SpoolState.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SpoolState.cs deleted file mode 100644 index cd1b5c48c..000000000 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/SpoolState.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: SpoolState.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.MachineStatus { - - /// <summary>Holder for reflection information generated from SpoolState.proto</summary> - public static partial class SpoolStateReflection { - - #region Descriptor - /// <summary>File descriptor for SpoolState.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static SpoolStateReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChBTcG9vbFN0YXRlLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1cyol", - "CgpTcG9vbFN0YXRlEgoKBkFic2VudBAAEgsKB1ByZXNlbnQQAUIjCiFjb20u", - "dHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw==")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.MachineStatus.SpoolState), }, null)); - } - #endregion - - } - #region Enums - public enum SpoolState { - [pbr::OriginalName("Absent")] Absent = 0, - [pbr::OriginalName("Present")] Present = 1, - } - - #endregion - -} - -#endregion Designer generated code |