merge

1 files changed, 12 insertions, 12 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
index 18024c6d7..007a72214 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
@@ -24,7 +24,7 @@ namespace Tango.PMR.MachineStatus {
           string.Concat(
             "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz",
             "IksKDElEU1BhY2tMZXZlbBINCgVJbmRleBgBIAEoBRIWCg5EaXNwZW5zZXJM",
-            "ZXZlbBgCIAEoBRIUCgxNaWRUYW5rTGV2ZWwYAyABKAFCIwohY29tLnR3aW5l",
+            "ZXZlbBgCIAEoBRIUCgxNaWRUYW5rTGV2ZWwYAyABKAVCIwohY29tLnR3aW5l",
             "LnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
@@ -94,9 +94,9 @@ namespace Tango.PMR.MachineStatus {
 
     /// <summary>Field number for the "MidTankLevel" field.</summary>
     public const int MidTankLevelFieldNumber = 3;
-    private double midTankLevel_;
+    private int midTankLevel_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double MidTankLevel {
+    public int MidTankLevel {
       get { return midTankLevel_; }
       set {
         midTankLevel_ = value;
@@ -127,7 +127,7 @@ namespace Tango.PMR.MachineStatus {
       int hash = 1;
       if (Index != 0) hash ^= Index.GetHashCode();
       if (DispenserLevel != 0) hash ^= DispenserLevel.GetHashCode();
-      if (MidTankLevel != 0D) hash ^= MidTankLevel.GetHashCode();
+      if (MidTankLevel != 0) hash ^= MidTankLevel.GetHashCode();
       return hash;
     }
 
@@ -146,9 +146,9 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(16);
         output.WriteInt32(DispenserLevel);
       }
-      if (MidTankLevel != 0D) {
-        output.WriteRawTag(25);
-        output.WriteDouble(MidTankLevel);
+      if (MidTankLevel != 0) {
+        output.WriteRawTag(24);
+        output.WriteInt32(MidTankLevel);
       }
     }
 
@@ -161,8 +161,8 @@ namespace Tango.PMR.MachineStatus {
       if (DispenserLevel != 0) {
         size += 1 + pb::CodedOutputStream.ComputeInt32Size(DispenserLevel);
       }
-      if (MidTankLevel != 0D) {
-        size += 1 + 8;
+      if (MidTankLevel != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(MidTankLevel);
       }
       return size;
     }
@@ -178,7 +178,7 @@ namespace Tango.PMR.MachineStatus {
       if (other.DispenserLevel != 0) {
         DispenserLevel = other.DispenserLevel;
       }
-      if (other.MidTankLevel != 0D) {
+      if (other.MidTankLevel != 0) {
         MidTankLevel = other.MidTankLevel;
       }
     }
@@ -199,8 +199,8 @@ namespace Tango.PMR.MachineStatus {
             DispenserLevel = input.ReadInt32();
             break;
           }
-          case 25: {
-            MidTankLevel = input.ReadDouble();
+          case 24: {
+            MidTankLevel = input.ReadInt32();
             break;
           }
         }