merge

1 files changed, 4 insertions, 33 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
index c716906e6..7261ba19b 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
@@ -23,18 +23,17 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Cg5Kb2JTcG9vbC5wcm90bxISVGFuZ28uUE1SLlByaW50aW5nGhJKb2JTcG9v",
-            "bFR5cGUucHJvdG8ingIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo",
+            "bFR5cGUucHJvdG8i+QEKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo",
             "DjIgLlRhbmdvLlBNUi5QcmludGluZy5Kb2JTcG9vbFR5cGUSDgoGTGVuZ3Ro",
             "GAIgASgBEg4KBldlaWdodBgDIAEoARIQCghEaWFtZXRlchgEIAEoARIbChNS",
             "b3RhdGlvbnNQZXJQYXNzYWdlGAUgASgBEhkKEVN0YXJ0T2Zmc2V0UHVsc2Vz",
             "GAYgASgFEhMKC0JhY2tpbmdSYXRlGAcgASgFEhsKE1NlZ21lbnRPZmZzZXRQ",
-            "dWxzZXMYCCABKAUSGQoRQm90dG9tQmFja2luZ1JhdGUYCSABKAUSIwobTGlt",
-            "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFQh4KHGNvbS50d2luZS50",
-            "YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw=="));
+            "dWxzZXMYCCABKAUSGQoRQm90dG9tQmFja2luZ1JhdGUYCSABKAVCHgocY29t",
+            "LnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate" }, null, null, null)
           }));
     }
     #endregion
@@ -74,7 +73,6 @@ namespace Tango.PMR.Printing {
       backingRate_ = other.backingRate_;
       segmentOffsetPulses_ = other.segmentOffsetPulses_;
       bottomBackingRate_ = other.bottomBackingRate_;
-      limitSwitchStartPointOffset_ = other.limitSwitchStartPointOffset_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -181,17 +179,6 @@ namespace Tango.PMR.Printing {
       }
     }
 
-    /// <summary>Field number for the "LimitSwitchStartPointOffset" field.</summary>
-    public const int LimitSwitchStartPointOffsetFieldNumber = 10;
-    private int limitSwitchStartPointOffset_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int LimitSwitchStartPointOffset {
-      get { return limitSwitchStartPointOffset_; }
-      set {
-        limitSwitchStartPointOffset_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as JobSpool);
@@ -214,7 +201,6 @@ namespace Tango.PMR.Printing {
       if (BackingRate != other.BackingRate) return false;
       if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false;
       if (BottomBackingRate != other.BottomBackingRate) return false;
-      if (LimitSwitchStartPointOffset != other.LimitSwitchStartPointOffset) return false;
       return true;
     }
 
@@ -230,7 +216,6 @@ namespace Tango.PMR.Printing {
       if (BackingRate != 0) hash ^= BackingRate.GetHashCode();
       if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode();
       if (BottomBackingRate != 0) hash ^= BottomBackingRate.GetHashCode();
-      if (LimitSwitchStartPointOffset != 0) hash ^= LimitSwitchStartPointOffset.GetHashCode();
       return hash;
     }
 
@@ -277,10 +262,6 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(72);
         output.WriteInt32(BottomBackingRate);
       }
-      if (LimitSwitchStartPointOffset != 0) {
-        output.WriteRawTag(80);
-        output.WriteInt32(LimitSwitchStartPointOffset);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -313,9 +294,6 @@ namespace Tango.PMR.Printing {
       if (BottomBackingRate != 0) {
         size += 1 + pb::CodedOutputStream.ComputeInt32Size(BottomBackingRate);
       }
-      if (LimitSwitchStartPointOffset != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(LimitSwitchStartPointOffset);
-      }
       return size;
     }
 
@@ -351,9 +329,6 @@ namespace Tango.PMR.Printing {
       if (other.BottomBackingRate != 0) {
         BottomBackingRate = other.BottomBackingRate;
       }
-      if (other.LimitSwitchStartPointOffset != 0) {
-        LimitSwitchStartPointOffset = other.LimitSwitchStartPointOffset;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -400,10 +375,6 @@ namespace Tango.PMR.Printing {
             BottomBackingRate = input.ReadInt32();
             break;
           }
-          case 80: {
-            LimitSwitchStartPointOffset = input.ReadInt32();
-            break;
-          }
         }
       }
     }