aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.PMR/MachineStatus
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-11-19 15:39:54 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-11-19 15:39:54 +0200
commit0a197fa4d8447271aa7decd28e3afcea611d53cd (patch)
tree2c17b33c48baf500cffa219fd9db4d0db17dc3c2 /Software/Visual_Studio/Tango.PMR/MachineStatus
parentcea15cb84f21398f4be393b158c7cd9a672e76e3 (diff)
downloadTango-0a197fa4d8447271aa7decd28e3afcea611d53cd.tar.gz
Tango-0a197fa4d8447271aa7decd28e3afcea611d53cd.zip
Added OverallTemperature to MachineStatus PMR.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/MachineStatus')
-rw-r--r--Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs37
1 files changed, 33 insertions, 4 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
index 413789202..a077f2207 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
@@ -23,15 +23,16 @@ namespace Tango.PMR.MachineStatus {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1",
- "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8ihAEK",
+ "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8ioAEK",
"DU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASABKA4yJS5UYW5nby5QTVIuTWFj",
"aGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoOSURTUGFja3NMZXZlbHMYAiAD",
- "KAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5JRFNQYWNrTGV2ZWxCIwoh",
- "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+ "KAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5JRFNQYWNrTGV2ZWwSGgoS",
+ "T3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBQiMKIWNvbS50d2luZS50YW5nby5w",
+ "bXIubWFjaGluZXN0YXR1c2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
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" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature" }, null, null, null)
}));
}
#endregion
@@ -64,6 +65,7 @@ namespace Tango.PMR.MachineStatus {
public MachineStatus(MachineStatus other) : this() {
state_ = other.state_;
iDSPacksLevels_ = other.iDSPacksLevels_.Clone();
+ overallTemperature_ = other.overallTemperature_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -92,6 +94,17 @@ 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;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as MachineStatus);
@@ -107,6 +120,7 @@ namespace Tango.PMR.MachineStatus {
}
if (State != other.State) return false;
if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false;
+ if (OverallTemperature != other.OverallTemperature) return false;
return true;
}
@@ -115,6 +129,7 @@ namespace Tango.PMR.MachineStatus {
int hash = 1;
if (State != 0) hash ^= State.GetHashCode();
hash ^= iDSPacksLevels_.GetHashCode();
+ if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode();
return hash;
}
@@ -130,6 +145,10 @@ namespace Tango.PMR.MachineStatus {
output.WriteEnum((int) State);
}
iDSPacksLevels_.WriteTo(output, _repeated_iDSPacksLevels_codec);
+ if (OverallTemperature != 0D) {
+ output.WriteRawTag(25);
+ output.WriteDouble(OverallTemperature);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -139,6 +158,9 @@ namespace Tango.PMR.MachineStatus {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) State);
}
size += iDSPacksLevels_.CalculateSize(_repeated_iDSPacksLevels_codec);
+ if (OverallTemperature != 0D) {
+ size += 1 + 8;
+ }
return size;
}
@@ -151,6 +173,9 @@ namespace Tango.PMR.MachineStatus {
State = other.State;
}
iDSPacksLevels_.Add(other.iDSPacksLevels_);
+ if (other.OverallTemperature != 0D) {
+ OverallTemperature = other.OverallTemperature;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -169,6 +194,10 @@ namespace Tango.PMR.MachineStatus {
iDSPacksLevels_.AddEntriesFrom(input, _repeated_iDSPacksLevels_codec);
break;
}
+ case 25: {
+ OverallTemperature = input.ReadDouble();
+ break;
+ }
}
}
}