Added required machine status indications.

Added Tunnel_Temp on Process Params.

2 files changed, 152 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
index 18024c6d7..099069143 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
@@ -23,13 +23,16 @@ namespace Tango.PMR.MachineStatus {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz",
-            "IksKDElEU1BhY2tMZXZlbBINCgVJbmRleBgBIAEoBRIWCg5EaXNwZW5zZXJM",
-            "ZXZlbBgCIAEoBRIUCgxNaWRUYW5rTGV2ZWwYAyABKAFCIwohY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+            "IrgBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy",
+            "TGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVsGAMgASgBEhcKD0plcnJpY2Fu",
+            "UHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGltZW91dEVycm9yGAUgASgIEhQK",
+            "DE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRUYW5rUmVmaWxsUHVtcEFjdGl2",
+            "ZRgHIAEoCEIjCiFjb20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNi",
+            "BnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           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" }, 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" }, null, null, null)
           }));
     }
     #endregion
@@ -63,6 +66,10 @@ namespace Tango.PMR.MachineStatus {
       index_ = other.index_;
       dispenserLevel_ = other.dispenserLevel_;
       midTankLevel_ = other.midTankLevel_;
+      jerricanPresent_ = other.jerricanPresent_;
+      fillingTimeoutError_ = other.fillingTimeoutError_;
+      midTankEmpty_ = other.midTankEmpty_;
+      midTankRefillPumpActive_ = other.midTankRefillPumpActive_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -103,6 +110,50 @@ namespace Tango.PMR.MachineStatus {
       }
     }
 
+    /// <summary>Field number for the "JerricanPresent" field.</summary>
+    public const int JerricanPresentFieldNumber = 4;
+    private bool jerricanPresent_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool JerricanPresent {
+      get { return jerricanPresent_; }
+      set {
+        jerricanPresent_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "FillingTimeoutError" field.</summary>
+    public const int FillingTimeoutErrorFieldNumber = 5;
+    private bool fillingTimeoutError_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool FillingTimeoutError {
+      get { return fillingTimeoutError_; }
+      set {
+        fillingTimeoutError_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "MidTankEmpty" field.</summary>
+    public const int MidTankEmptyFieldNumber = 6;
+    private bool midTankEmpty_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool MidTankEmpty {
+      get { return midTankEmpty_; }
+      set {
+        midTankEmpty_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "MidTankRefillPumpActive" field.</summary>
+    public const int MidTankRefillPumpActiveFieldNumber = 7;
+    private bool midTankRefillPumpActive_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool MidTankRefillPumpActive {
+      get { return midTankRefillPumpActive_; }
+      set {
+        midTankRefillPumpActive_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as IDSPackLevel);
@@ -119,6 +170,10 @@ namespace Tango.PMR.MachineStatus {
       if (Index != other.Index) return false;
       if (DispenserLevel != other.DispenserLevel) return false;
       if (MidTankLevel != other.MidTankLevel) return false;
+      if (JerricanPresent != other.JerricanPresent) return false;
+      if (FillingTimeoutError != other.FillingTimeoutError) return false;
+      if (MidTankEmpty != other.MidTankEmpty) return false;
+      if (MidTankRefillPumpActive != other.MidTankRefillPumpActive) return false;
       return true;
     }
 
@@ -128,6 +183,10 @@ namespace Tango.PMR.MachineStatus {
       if (Index != 0) hash ^= Index.GetHashCode();
       if (DispenserLevel != 0) hash ^= DispenserLevel.GetHashCode();
       if (MidTankLevel != 0D) hash ^= MidTankLevel.GetHashCode();
+      if (JerricanPresent != false) hash ^= JerricanPresent.GetHashCode();
+      if (FillingTimeoutError != false) hash ^= FillingTimeoutError.GetHashCode();
+      if (MidTankEmpty != false) hash ^= MidTankEmpty.GetHashCode();
+      if (MidTankRefillPumpActive != false) hash ^= MidTankRefillPumpActive.GetHashCode();
       return hash;
     }
 
@@ -150,6 +209,22 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(25);
         output.WriteDouble(MidTankLevel);
       }
+      if (JerricanPresent != false) {
+        output.WriteRawTag(32);
+        output.WriteBool(JerricanPresent);
+      }
+      if (FillingTimeoutError != false) {
+        output.WriteRawTag(40);
+        output.WriteBool(FillingTimeoutError);
+      }
+      if (MidTankEmpty != false) {
+        output.WriteRawTag(48);
+        output.WriteBool(MidTankEmpty);
+      }
+      if (MidTankRefillPumpActive != false) {
+        output.WriteRawTag(56);
+        output.WriteBool(MidTankRefillPumpActive);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -164,6 +239,18 @@ namespace Tango.PMR.MachineStatus {
       if (MidTankLevel != 0D) {
         size += 1 + 8;
       }
+      if (JerricanPresent != false) {
+        size += 1 + 1;
+      }
+      if (FillingTimeoutError != false) {
+        size += 1 + 1;
+      }
+      if (MidTankEmpty != false) {
+        size += 1 + 1;
+      }
+      if (MidTankRefillPumpActive != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -181,6 +268,18 @@ namespace Tango.PMR.MachineStatus {
       if (other.MidTankLevel != 0D) {
         MidTankLevel = other.MidTankLevel;
       }
+      if (other.JerricanPresent != false) {
+        JerricanPresent = other.JerricanPresent;
+      }
+      if (other.FillingTimeoutError != false) {
+        FillingTimeoutError = other.FillingTimeoutError;
+      }
+      if (other.MidTankEmpty != false) {
+        MidTankEmpty = other.MidTankEmpty;
+      }
+      if (other.MidTankRefillPumpActive != false) {
+        MidTankRefillPumpActive = other.MidTankRefillPumpActive;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -203,6 +302,22 @@ namespace Tango.PMR.MachineStatus {
             MidTankLevel = input.ReadDouble();
             break;
           }
+          case 32: {
+            JerricanPresent = input.ReadBool();
+            break;
+          }
+          case 40: {
+            FillingTimeoutError = input.ReadBool();
+            break;
+          }
+          case 48: {
+            MidTankEmpty = input.ReadBool();
+            break;
+          }
+          case 56: {
+            MidTankRefillPumpActive = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs
index 29b8c2d9f..746e8da4d 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",
-            "IvALChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
+            "IoUMChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
             "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK",
             "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV",
             "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I",
@@ -56,12 +56,13 @@ namespace Tango.PMR.Printing {
             "c3RlQWlyRmxvdxg3IAEoARIZChFFV2FzdGVQcmVwYXJlVGltZRg4IAEoARIR",
             "CglFUHVtcFRlbXAYOSABKAESGAoQRVByZXNzdXJlQnVpbGRVcBg6IAEoARIP",
             "CgdFU3BhcmUxGDsgASgBEg8KB0VTcGFyZTIYPCABKAESDwoHRVNwYXJlMxg9",
-            "IAEoARIPCgdFU3BhcmU0GD4gASgBEg8KB0VTcGFyZTUYPyABKAFCHgocY29t",
-            "LnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
+            "IAEoARIPCgdFU3BhcmU0GD4gASgBEg8KB0VTcGFyZTUYPyABKAESEwoLRVR1",
+            "bm5lbFRlbXAYQCABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGlu",
+            "Z2IGcHJvdG8z"));
       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", "BtsrFeedingTension", "ExitTension", "BtsrThreadLengthOffset", "EWinder1Tension", "EWinder2Tension", "EWinder3Tension", "EWinder4Tension", "EBtsr1FeedingTension", "EBtsr2FeedingTension", "EBtsr3FeedingTension", "EBtsr4FeedingTension", "EMixerTemp", "EHeadZone1Temp", "EHeadZone2Temp", "EHeadZone3Temp", "EDryerZone1Temp", "EDryerZone2Temp", "EDryerZone3Temp", "ELubricantTemp", "EDryerIncomingAirFlow", "EDryerOutgoingAirFlow", "ETunnelIncomingAirFlow", "ETunnelOutgoingAirFlow", "EWasteAirFlow", "EWastePrepareTime", "EPumpTemp", "EPressureBuildUp", "ESpare1", "ESpare2", "ESpare3", "ESpare4", "ESpare5" }, 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", "EWinder1Tension", "EWinder2Tension", "EWinder3Tension", "EWinder4Tension", "EBtsr1FeedingTension", "EBtsr2FeedingTension", "EBtsr3FeedingTension", "EBtsr4FeedingTension", "EMixerTemp", "EHeadZone1Temp", "EHeadZone2Temp", "EHeadZone3Temp", "EDryerZone1Temp", "EDryerZone2Temp", "EDryerZone3Temp", "ELubricantTemp", "EDryerIncomingAirFlow", "EDryerOutgoingAirFlow", "ETunnelIncomingAirFlow", "ETunnelOutgoingAirFlow", "EWasteAirFlow", "EWastePrepareTime", "EPumpTemp", "EPressureBuildUp", "ESpare1", "ESpare2", "ESpare3", "ESpare4", "ESpare5", "ETunnelTemp" }, null, null, null)
           }));
     }
     #endregion
@@ -155,6 +156,7 @@ namespace Tango.PMR.Printing {
       eSpare3_ = other.eSpare3_;
       eSpare4_ = other.eSpare4_;
       eSpare5_ = other.eSpare5_;
+      eTunnelTemp_ = other.eTunnelTemp_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -855,6 +857,17 @@ namespace Tango.PMR.Printing {
       }
     }
 
+    /// <summary>Field number for the "ETunnelTemp" field.</summary>
+    public const int ETunnelTempFieldNumber = 64;
+    private double eTunnelTemp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double ETunnelTemp {
+      get { return eTunnelTemp_; }
+      set {
+        eTunnelTemp_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ProcessParameters);
@@ -931,6 +944,7 @@ namespace Tango.PMR.Printing {
       if (ESpare3 != other.ESpare3) return false;
       if (ESpare4 != other.ESpare4) return false;
       if (ESpare5 != other.ESpare5) return false;
+      if (ETunnelTemp != other.ETunnelTemp) return false;
       return true;
     }
 
@@ -1000,6 +1014,7 @@ namespace Tango.PMR.Printing {
       if (ESpare3 != 0D) hash ^= ESpare3.GetHashCode();
       if (ESpare4 != 0D) hash ^= ESpare4.GetHashCode();
       if (ESpare5 != 0D) hash ^= ESpare5.GetHashCode();
+      if (ETunnelTemp != 0D) hash ^= ETunnelTemp.GetHashCode();
       return hash;
     }
 
@@ -1262,6 +1277,10 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(249, 3);
         output.WriteDouble(ESpare5);
       }
+      if (ETunnelTemp != 0D) {
+        output.WriteRawTag(129, 4);
+        output.WriteDouble(ETunnelTemp);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1456,6 +1475,9 @@ namespace Tango.PMR.Printing {
       if (ESpare5 != 0D) {
         size += 2 + 8;
       }
+      if (ETunnelTemp != 0D) {
+        size += 2 + 8;
+      }
       return size;
     }
 
@@ -1653,6 +1675,9 @@ namespace Tango.PMR.Printing {
       if (other.ESpare5 != 0D) {
         ESpare5 = other.ESpare5;
       }
+      if (other.ETunnelTemp != 0D) {
+        ETunnelTemp = other.ETunnelTemp;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1915,6 +1940,10 @@ namespace Tango.PMR.Printing {
             ESpare5 = input.ReadDouble();
             break;
           }
+          case 513: {
+            ETunnelTemp = input.ReadDouble();
+            break;
+          }
         }
       }
     }