diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs')
| -rw-r--r-- | Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs | 73 |
1 files changed, 7 insertions, 66 deletions
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; - } } } } |
