Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 3 insertions, 32 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs
index 0f03cf4f0..b0c29288f 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",
-            "IvUFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
+            "ItIFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
             "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK",
             "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV",
             "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I",
@@ -39,12 +39,11 @@ namespace Tango.PMR.Printing {
             "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARITCgtSQmxvd2VyRmxv",
             "dxgbIAEoARITCgtSQmxvd2VyVGVtcBgcIAEoARITCgtMQmxvd2VyRmxvdxgd",
             "IAEoARITCgtMQmxvd2VyVGVtcBgeIAEoARIXCg9QcmVzc3VyZUJ1aWxkVXAY",
-            "HyABKAESIQoZQXJjSGVhZENsZWFuaW5nTW90b3JTcGVlZBggIAEoAUIeChxj",
-            "b20udHdpbmUudGFuZ28ucG1yLnByaW50aW5nYgZwcm90bzM="));
+            "HyABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
       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", "ArcHeadCleaningMotorSpeed" }, 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" }, null, null, null)
           }));
     }
     #endregion
@@ -106,7 +105,6 @@ namespace Tango.PMR.Printing {
       lBlowerFlow_ = other.lBlowerFlow_;
       lBlowerTemp_ = other.lBlowerTemp_;
       pressureBuildUp_ = other.pressureBuildUp_;
-      arcHeadCleaningMotorSpeed_ = other.arcHeadCleaningMotorSpeed_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -455,17 +453,6 @@ namespace Tango.PMR.Printing {
       }
     }
 
-    /// <summary>Field number for the "ArcHeadCleaningMotorSpeed" field.</summary>
-    public const int ArcHeadCleaningMotorSpeedFieldNumber = 32;
-    private double arcHeadCleaningMotorSpeed_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double ArcHeadCleaningMotorSpeed {
-      get { return arcHeadCleaningMotorSpeed_; }
-      set {
-        arcHeadCleaningMotorSpeed_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ProcessParameters);
@@ -510,7 +497,6 @@ namespace Tango.PMR.Printing {
       if (LBlowerFlow != other.LBlowerFlow) return false;
       if (LBlowerTemp != other.LBlowerTemp) return false;
       if (PressureBuildUp != other.PressureBuildUp) return false;
-      if (ArcHeadCleaningMotorSpeed != other.ArcHeadCleaningMotorSpeed) return false;
       return true;
     }
 
@@ -548,7 +534,6 @@ namespace Tango.PMR.Printing {
       if (LBlowerFlow != 0D) hash ^= LBlowerFlow.GetHashCode();
       if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode();
       if (PressureBuildUp != 0D) hash ^= PressureBuildUp.GetHashCode();
-      if (ArcHeadCleaningMotorSpeed != 0D) hash ^= ArcHeadCleaningMotorSpeed.GetHashCode();
       return hash;
     }
 
@@ -683,10 +668,6 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(249, 1);
         output.WriteDouble(PressureBuildUp);
       }
-      if (ArcHeadCleaningMotorSpeed != 0D) {
-        output.WriteRawTag(129, 2);
-        output.WriteDouble(ArcHeadCleaningMotorSpeed);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -785,9 +766,6 @@ namespace Tango.PMR.Printing {
       if (PressureBuildUp != 0D) {
         size += 2 + 8;
       }
-      if (ArcHeadCleaningMotorSpeed != 0D) {
-        size += 2 + 8;
-      }
       return size;
     }
 
@@ -889,9 +867,6 @@ namespace Tango.PMR.Printing {
       if (other.PressureBuildUp != 0D) {
         PressureBuildUp = other.PressureBuildUp;
       }
-      if (other.ArcHeadCleaningMotorSpeed != 0D) {
-        ArcHeadCleaningMotorSpeed = other.ArcHeadCleaningMotorSpeed;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1026,10 +1001,6 @@ namespace Tango.PMR.Printing {
             PressureBuildUp = input.ReadDouble();
             break;
           }
-          case 257: {
-            ArcHeadCleaningMotorSpeed = input.ReadDouble();
-            break;
-          }
         }
       }
     }