Some Db,BL,PMR changes.

1 files changed, 20 insertions, 20 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs
index 0a92c27e3..0d45ef6bf 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",
-            "IqcGChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
+            "IqMGChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU",
             "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK",
             "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV",
             "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I",
@@ -39,13 +39,13 @@ namespace Tango.PMR.Printing {
             "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARITCgtSQmxvd2VyRmxv",
             "dxgbIAEoARITCgtSQmxvd2VyVGVtcBgcIAEoARITCgtMQmxvd2VyRmxvdxgd",
             "IAEoARITCgtMQmxvd2VyVGVtcBgeIAEoARIXCg9QcmVzc3VyZUJ1aWxkVXAY",
-            "HyABKAESGgoSQnRzckZlZWRpbmdUZW5zaW9uGCAgASgBEhcKD0J0c3JFeGl0",
-            "VGVuc2lvbhghIAEoARIeChZCdHNyVGhyZWFkTGVuZ3RoT2Zmc2V0GCIgASgB",
-            "Qh4KHGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw=="));
+            "HyABKAESGgoSQnRzckZlZWRpbmdUZW5zaW9uGCAgASgBEhMKC0V4aXRUZW5z",
+            "aW9uGCEgASgBEh4KFkJ0c3JUaHJlYWRMZW5ndGhPZmZzZXQYIiABKAFCHgoc",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
       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", "BtsrExitTension", "BtsrThreadLengthOffset" }, 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" }, null, null, null)
           }));
     }
     #endregion
@@ -108,7 +108,7 @@ namespace Tango.PMR.Printing {
       lBlowerTemp_ = other.lBlowerTemp_;
       pressureBuildUp_ = other.pressureBuildUp_;
       btsrFeedingTension_ = other.btsrFeedingTension_;
-      btsrExitTension_ = other.btsrExitTension_;
+      exitTension_ = other.exitTension_;
       btsrThreadLengthOffset_ = other.btsrThreadLengthOffset_;
     }
 
@@ -469,14 +469,14 @@ namespace Tango.PMR.Printing {
       }
     }
 
-    /// <summary>Field number for the "BtsrExitTension" field.</summary>
-    public const int BtsrExitTensionFieldNumber = 33;
-    private double btsrExitTension_;
+    /// <summary>Field number for the "ExitTension" field.</summary>
+    public const int ExitTensionFieldNumber = 33;
+    private double exitTension_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double BtsrExitTension {
-      get { return btsrExitTension_; }
+    public double ExitTension {
+      get { return exitTension_; }
       set {
-        btsrExitTension_ = value;
+        exitTension_ = value;
       }
     }
 
@@ -536,7 +536,7 @@ namespace Tango.PMR.Printing {
       if (LBlowerTemp != other.LBlowerTemp) return false;
       if (PressureBuildUp != other.PressureBuildUp) return false;
       if (BtsrFeedingTension != other.BtsrFeedingTension) return false;
-      if (BtsrExitTension != other.BtsrExitTension) return false;
+      if (ExitTension != other.ExitTension) return false;
       if (BtsrThreadLengthOffset != other.BtsrThreadLengthOffset) return false;
       return true;
     }
@@ -576,7 +576,7 @@ namespace Tango.PMR.Printing {
       if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode();
       if (PressureBuildUp != 0D) hash ^= PressureBuildUp.GetHashCode();
       if (BtsrFeedingTension != 0D) hash ^= BtsrFeedingTension.GetHashCode();
-      if (BtsrExitTension != 0D) hash ^= BtsrExitTension.GetHashCode();
+      if (ExitTension != 0D) hash ^= ExitTension.GetHashCode();
       if (BtsrThreadLengthOffset != 0D) hash ^= BtsrThreadLengthOffset.GetHashCode();
       return hash;
     }
@@ -716,9 +716,9 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(129, 2);
         output.WriteDouble(BtsrFeedingTension);
       }
-      if (BtsrExitTension != 0D) {
+      if (ExitTension != 0D) {
         output.WriteRawTag(137, 2);
-        output.WriteDouble(BtsrExitTension);
+        output.WriteDouble(ExitTension);
       }
       if (BtsrThreadLengthOffset != 0D) {
         output.WriteRawTag(145, 2);
@@ -825,7 +825,7 @@ namespace Tango.PMR.Printing {
       if (BtsrFeedingTension != 0D) {
         size += 2 + 8;
       }
-      if (BtsrExitTension != 0D) {
+      if (ExitTension != 0D) {
         size += 2 + 8;
       }
       if (BtsrThreadLengthOffset != 0D) {
@@ -935,8 +935,8 @@ namespace Tango.PMR.Printing {
       if (other.BtsrFeedingTension != 0D) {
         BtsrFeedingTension = other.BtsrFeedingTension;
       }
-      if (other.BtsrExitTension != 0D) {
-        BtsrExitTension = other.BtsrExitTension;
+      if (other.ExitTension != 0D) {
+        ExitTension = other.ExitTension;
       }
       if (other.BtsrThreadLengthOffset != 0D) {
         BtsrThreadLengthOffset = other.BtsrThreadLengthOffset;
@@ -1080,7 +1080,7 @@ namespace Tango.PMR.Printing {
             break;
           }
           case 265: {
-            BtsrExitTension = input.ReadDouble();
+            ExitTension = input.ReadDouble();
             break;
           }
           case 273: {