Telemetry Wire + Machine Status Pumps.

1 files changed, 32 insertions, 10 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
index b25739df8..a62f0d261 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
@@ -23,18 +23,20 @@ namespace Tango.PMR.MachineStatus {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz",
-            "IqcCCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy",
-            "TGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVsGAMgASgBEhcKD0plcnJpY2Fu",
-            "UHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGltZW91dEVycm9yGAUgASgIEhQK",
-            "DE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRUYW5rUmVmaWxsUHVtcEFjdGl2",
-            "ZRgHIAEoCBIdChVUaW1lclJlbWFpbmluZ1NlY29uZHMYCCABKAUSGAoQRGlz",
-            "cGVuc2VyTGV2ZWw2NBgJIAEoAxIVCg1Ub3RhbFB1bXBGbG93GAogASgCEh0K",
-            "FVRvdGFsUHVtcEFjdGl2aXR5VGltZRgLIAEoDUIjCiFjb20udHdpbmUudGFu",
-            "Z28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw=="));
+            "GhBQdW1wU3RhdHVzLnByb3RvItsCCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgY",
+            "ASABKAUSFgoORGlzcGVuc2VyTGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVs",
+            "GAMgASgBEhcKD0plcnJpY2FuUHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGlt",
+            "ZW91dEVycm9yGAUgASgIEhQKDE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRU",
+            "YW5rUmVmaWxsUHVtcEFjdGl2ZRgHIAEoCBIdChVUaW1lclJlbWFpbmluZ1Nl",
+            "Y29uZHMYCCABKAUSGAoQRGlzcGVuc2VyTGV2ZWw2NBgJIAEoAxIVCg1Ub3Rh",
+            "bFB1bXBGbG93GAogASgCEh0KFVRvdGFsUHVtcEFjdGl2aXR5VGltZRgLIAEo",
+            "DRIyCgVQdW1wcxgMIAMoCzIjLlRhbmdvLlBNUi5NYWNoaW5lU3RhdHVzLlB1",
+            "bXBTdGF0dXNCIwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVz",
+            "YgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
+          new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.PumpStatusReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive", "TimerRemainingSeconds", "DispenserLevel64", "TotalPumpFlow", "TotalPumpActivityTime" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive", "TimerRemainingSeconds", "DispenserLevel64", "TotalPumpFlow", "TotalPumpActivityTime", "Pumps" }, null, null, null)
           }));
     }
     #endregion
@@ -76,6 +78,7 @@ namespace Tango.PMR.MachineStatus {
       dispenserLevel64_ = other.dispenserLevel64_;
       totalPumpFlow_ = other.totalPumpFlow_;
       totalPumpActivityTime_ = other.totalPumpActivityTime_;
+      pumps_ = other.pumps_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -207,6 +210,16 @@ namespace Tango.PMR.MachineStatus {
       }
     }
 
+    /// <summary>Field number for the "Pumps" field.</summary>
+    public const int PumpsFieldNumber = 12;
+    private static readonly pb::FieldCodec<global::Tango.PMR.MachineStatus.PumpStatus> _repeated_pumps_codec
+        = pb::FieldCodec.ForMessage(98, global::Tango.PMR.MachineStatus.PumpStatus.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.MachineStatus.PumpStatus> pumps_ = new pbc::RepeatedField<global::Tango.PMR.MachineStatus.PumpStatus>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.MachineStatus.PumpStatus> Pumps {
+      get { return pumps_; }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as IDSPackLevel);
@@ -231,6 +244,7 @@ namespace Tango.PMR.MachineStatus {
       if (DispenserLevel64 != other.DispenserLevel64) return false;
       if (TotalPumpFlow != other.TotalPumpFlow) return false;
       if (TotalPumpActivityTime != other.TotalPumpActivityTime) return false;
+      if(!pumps_.Equals(other.pumps_)) return false;
       return true;
     }
 
@@ -248,6 +262,7 @@ namespace Tango.PMR.MachineStatus {
       if (DispenserLevel64 != 0L) hash ^= DispenserLevel64.GetHashCode();
       if (TotalPumpFlow != 0F) hash ^= TotalPumpFlow.GetHashCode();
       if (TotalPumpActivityTime != 0) hash ^= TotalPumpActivityTime.GetHashCode();
+      hash ^= pumps_.GetHashCode();
       return hash;
     }
 
@@ -302,6 +317,7 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(88);
         output.WriteUInt32(TotalPumpActivityTime);
       }
+      pumps_.WriteTo(output, _repeated_pumps_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -340,6 +356,7 @@ namespace Tango.PMR.MachineStatus {
       if (TotalPumpActivityTime != 0) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TotalPumpActivityTime);
       }
+      size += pumps_.CalculateSize(_repeated_pumps_codec);
       return size;
     }
 
@@ -381,6 +398,7 @@ namespace Tango.PMR.MachineStatus {
       if (other.TotalPumpActivityTime != 0) {
         TotalPumpActivityTime = other.TotalPumpActivityTime;
       }
+      pumps_.Add(other.pumps_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -435,6 +453,10 @@ namespace Tango.PMR.MachineStatus {
             TotalPumpActivityTime = input.ReadUInt32();
             break;
           }
+          case 98: {
+            pumps_.AddEntriesFrom(input, _repeated_pumps_codec);
+            break;
+          }
         }
       }
     }