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

3 files changed, 248 insertions, 278 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
index 562ca0491..bc654b424 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
@@ -260,58 +260,52 @@ namespace Tango.BL.Enumerations
         HeadZone6Temperature = 38,
 
         /// <summary>
-        /// (Mid Tank 1 Pressure)
+        /// (Mid Tank 1 Level)
         /// </summary>
-        [Description("Mid Tank 1 Pressure")]
-        MidTank1Pressure = 48,
+        [Description("Mid Tank 1 Level")]
+        MidTank1Level = 48,
 
         /// <summary>
-        /// (Mid Tank 2 Pressure)
+        /// (Mid Tank 2 Level)
         /// </summary>
-        [Description("Mid Tank 2 Pressure")]
-        MidTank2Pressure = 49,
+        [Description("Mid Tank 2 Level")]
+        MidTank2Level = 49,
 
         /// <summary>
-        /// (Mid Tank 3 Pressure)
+        /// (Mid Tank 3 Level)
         /// </summary>
-        [Description("Mid Tank 3 Pressure")]
-        MidTank3Pressure = 50,
+        [Description("Mid Tank 3 Level")]
+        MidTank3Level = 50,
 
         /// <summary>
-        /// (Mid Tank 4 Pressure)
+        /// (Mid Tank 4 Level)
         /// </summary>
-        [Description("Mid Tank 4 Pressure")]
-        MidTank4Pressure = 51,
+        [Description("Mid Tank 4 Level")]
+        MidTank4Level = 51,
 
         /// <summary>
-        /// (Mid Tank 5 Pressure)
+        /// (Mid Tank 5 Level)
         /// </summary>
-        [Description("Mid Tank 5 Pressure")]
-        MidTank5Pressure = 52,
+        [Description("Mid Tank 5 Level")]
+        MidTank5Level = 52,
 
         /// <summary>
-        /// (Mid Tank 6 Pressure)
+        /// (Mid Tank 6 Level)
         /// </summary>
-        [Description("Mid Tank 6 Pressure")]
-        MidTank6Pressure = 53,
+        [Description("Mid Tank 6 Level")]
+        MidTank6Level = 53,
 
         /// <summary>
-        /// (Mid Tank 7 Pressure)
+        /// (Mid Tank 7 Level)
         /// </summary>
-        [Description("Mid Tank 7 Pressure")]
-        MidTank7Pressure = 54,
+        [Description("Mid Tank 7 Level")]
+        MidTank7Level = 54,
 
         /// <summary>
-        /// (Mid Tank 8 Pressure)
+        /// (Mid Tank 8 Level)
         /// </summary>
-        [Description("Mid Tank 8 Pressure")]
-        MidTank8Pressure = 55,
-
-        /// <summary>
-        /// (Mid Tank Pressure)
-        /// </summary>
-        [Description("Mid Tank Pressure")]
-        MidTankPressure = 25,
+        [Description("Mid Tank 8 Level")]
+        MidTank8Level = 55,
 
         /// <summary>
         /// (Mixer)
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
index f2e8680c0..c2e1b538f 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v",
-            "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvItUPChNEaWFnbm9zdGljc01vbml0",
+            "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIoQNChNEaWFnbm9zdGljc01vbml0",
             "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD",
             "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl",
             "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY",
@@ -41,39 +41,31 @@ namespace Tango.PMR.Diagnostics {
             "Ii5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSRQoZRGlzcGVu",
             "c2Vyc0xpbmVhclBvc2l0aW9ucxgYIAMoCzIiLlRhbmdvLlBNUi5EaWFnbm9z",
             "dGljcy5Eb3VibGVBcnJheRI+ChJEaXNwZW5zZXJzUHJlc3N1cmUYGSADKAsy",
-            "Ii5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSFwoPTWlkVGFu",
-            "a1ByZXNzdXJlGBogAygBEhsKE0ZpbHRlckRlbHRhUHJlc3N1cmUYGyADKAES",
-            "GgoSQ2hpbGxlclRlbXBlcmF0dXJlGBwgAygBEiAKGERpc3BlbnNlcjFNb3Rv",
-            "ckZyZXF1ZW5jeRgdIAMoARIgChhEaXNwZW5zZXIyTW90b3JGcmVxdWVuY3kY",
-            "HiADKAESIAoYRGlzcGVuc2VyM01vdG9yRnJlcXVlbmN5GB8gAygBEiAKGERp",
-            "c3BlbnNlcjRNb3RvckZyZXF1ZW5jeRggIAMoARIgChhEaXNwZW5zZXI1TW90",
-            "b3JGcmVxdWVuY3kYISADKAESIAoYRGlzcGVuc2VyNk1vdG9yRnJlcXVlbmN5",
-            "GCIgAygBEiAKGERpc3BlbnNlcjdNb3RvckZyZXF1ZW5jeRgjIAMoARIgChhE",
-            "aXNwZW5zZXI4TW90b3JGcmVxdWVuY3kYJCADKAESHAoUSGVhZFpvbmU0VGVt",
-            "cGVyYXR1cmUYJSADKAESHAoUSGVhZFpvbmU1VGVtcGVyYXR1cmUYJiADKAES",
-            "HAoUSGVhZFpvbmU2VGVtcGVyYXR1cmUYJyADKAESFQoNQmxvd2VyVm9sdGFn",
-            "ZRgoIAMoARIaChJEaXNwZW5zZXIxUHJlc3N1cmUYKSADKAESGgoSRGlzcGVu",
-            "c2VyMlByZXNzdXJlGCogAygBEhoKEkRpc3BlbnNlcjNQcmVzc3VyZRgrIAMo",
-            "ARIaChJEaXNwZW5zZXI0UHJlc3N1cmUYLCADKAESGgoSRGlzcGVuc2VyNVBy",
-            "ZXNzdXJlGC0gAygBEhoKEkRpc3BlbnNlcjZQcmVzc3VyZRguIAMoARIaChJE",
-            "aXNwZW5zZXI3UHJlc3N1cmUYLyADKAESGgoSRGlzcGVuc2VyOFByZXNzdXJl",
-            "GDAgAygBEjwKEE1pZFRhbmsxUHJlc3N1cmUYMSADKAsyIi5UYW5nby5QTVIu",
-            "RGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSPAoQTWlkVGFuazJQcmVzc3VyZRgy",
-            "IAMoCzIiLlRhbmdvLlBNUi5EaWFnbm9zdGljcy5Eb3VibGVBcnJheRI8ChBN",
-            "aWRUYW5rM1ByZXNzdXJlGDMgAygLMiIuVGFuZ28uUE1SLkRpYWdub3N0aWNz",
-            "LkRvdWJsZUFycmF5EjwKEE1pZFRhbms0UHJlc3N1cmUYNCADKAsyIi5UYW5n",
-            "by5QTVIuRGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSPAoQTWlkVGFuazVQcmVz",
-            "c3VyZRg1IAMoCzIiLlRhbmdvLlBNUi5EaWFnbm9zdGljcy5Eb3VibGVBcnJh",
-            "eRI8ChBNaWRUYW5rNlByZXNzdXJlGDYgAygLMiIuVGFuZ28uUE1SLkRpYWdu",
-            "b3N0aWNzLkRvdWJsZUFycmF5EjwKEE1pZFRhbms3UHJlc3N1cmUYNyADKAsy",
-            "Ii5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSPAoQTWlkVGFu",
-            "azhQcmVzc3VyZRg4IAMoCzIiLlRhbmdvLlBNUi5EaWFnbm9zdGljcy5Eb3Vi",
-            "bGVBcnJheUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZw",
-            "cm90bzM="));
+            "Ii5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91YmxlQXJyYXkSGwoTRmlsdGVy",
+            "RGVsdGFQcmVzc3VyZRgaIAMoARIaChJDaGlsbGVyVGVtcGVyYXR1cmUYGyAD",
+            "KAESIAoYRGlzcGVuc2VyMU1vdG9yRnJlcXVlbmN5GBwgAygBEiAKGERpc3Bl",
+            "bnNlcjJNb3RvckZyZXF1ZW5jeRgdIAMoARIgChhEaXNwZW5zZXIzTW90b3JG",
+            "cmVxdWVuY3kYHiADKAESIAoYRGlzcGVuc2VyNE1vdG9yRnJlcXVlbmN5GB8g",
+            "AygBEiAKGERpc3BlbnNlcjVNb3RvckZyZXF1ZW5jeRggIAMoARIgChhEaXNw",
+            "ZW5zZXI2TW90b3JGcmVxdWVuY3kYISADKAESIAoYRGlzcGVuc2VyN01vdG9y",
+            "RnJlcXVlbmN5GCIgAygBEiAKGERpc3BlbnNlcjhNb3RvckZyZXF1ZW5jeRgj",
+            "IAMoARIcChRIZWFkWm9uZTRUZW1wZXJhdHVyZRgkIAMoARIcChRIZWFkWm9u",
+            "ZTVUZW1wZXJhdHVyZRglIAMoARIcChRIZWFkWm9uZTZUZW1wZXJhdHVyZRgm",
+            "IAMoARIVCg1CbG93ZXJWb2x0YWdlGCcgAygBEhoKEkRpc3BlbnNlcjFQcmVz",
+            "c3VyZRgoIAMoARIaChJEaXNwZW5zZXIyUHJlc3N1cmUYKSADKAESGgoSRGlz",
+            "cGVuc2VyM1ByZXNzdXJlGCogAygBEhoKEkRpc3BlbnNlcjRQcmVzc3VyZRgr",
+            "IAMoARIaChJEaXNwZW5zZXI1UHJlc3N1cmUYLCADKAESGgoSRGlzcGVuc2Vy",
+            "NlByZXNzdXJlGC0gAygBEhoKEkRpc3BlbnNlcjdQcmVzc3VyZRguIAMoARIa",
+            "ChJEaXNwZW5zZXI4UHJlc3N1cmUYLyADKAESFQoNTWlkVGFuazFMZXZlbBgw",
+            "IAMoARIVCg1NaWRUYW5rMkxldmVsGDEgAygBEhUKDU1pZFRhbmszTGV2ZWwY",
+            "MiADKAESFQoNTWlkVGFuazRMZXZlbBgzIAMoARIVCg1NaWRUYW5rNUxldmVs",
+            "GDQgAygBEhUKDU1pZFRhbms2TGV2ZWwYNSADKAESFQoNTWlkVGFuazdMZXZl",
+            "bBg2IAMoARIVCg1NaWRUYW5rOExldmVsGDcgAygBQiEKH2NvbS50d2luZS50",
+            "YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "MidTankPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Pressure", "MidTank2Pressure", "MidTank3Pressure", "MidTank4Pressure", "MidTank5Pressure", "MidTank6Pressure", "MidTank7Pressure", "MidTank8Pressure" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level" }, null, null, null)
           }));
     }
     #endregion
@@ -129,7 +121,6 @@ namespace Tango.PMR.Diagnostics {
       dispensersAngularEncoders_ = other.dispensersAngularEncoders_.Clone();
       dispensersLinearPositions_ = other.dispensersLinearPositions_.Clone();
       dispensersPressure_ = other.dispensersPressure_.Clone();
-      midTankPressure_ = other.midTankPressure_.Clone();
       filterDeltaPressure_ = other.filterDeltaPressure_.Clone();
       chillerTemperature_ = other.chillerTemperature_.Clone();
       dispenser1MotorFrequency_ = other.dispenser1MotorFrequency_.Clone();
@@ -152,14 +143,14 @@ namespace Tango.PMR.Diagnostics {
       dispenser6Pressure_ = other.dispenser6Pressure_.Clone();
       dispenser7Pressure_ = other.dispenser7Pressure_.Clone();
       dispenser8Pressure_ = other.dispenser8Pressure_.Clone();
-      midTank1Pressure_ = other.midTank1Pressure_.Clone();
-      midTank2Pressure_ = other.midTank2Pressure_.Clone();
-      midTank3Pressure_ = other.midTank3Pressure_.Clone();
-      midTank4Pressure_ = other.midTank4Pressure_.Clone();
-      midTank5Pressure_ = other.midTank5Pressure_.Clone();
-      midTank6Pressure_ = other.midTank6Pressure_.Clone();
-      midTank7Pressure_ = other.midTank7Pressure_.Clone();
-      midTank8Pressure_ = other.midTank8Pressure_.Clone();
+      midTank1Level_ = other.midTank1Level_.Clone();
+      midTank2Level_ = other.midTank2Level_.Clone();
+      midTank3Level_ = other.midTank3Level_.Clone();
+      midTank4Level_ = other.midTank4Level_.Clone();
+      midTank5Level_ = other.midTank5Level_.Clone();
+      midTank6Level_ = other.midTank6Level_.Clone();
+      midTank7Level_ = other.midTank7Level_.Clone();
+      midTank8Level_ = other.midTank8Level_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -492,23 +483,10 @@ namespace Tango.PMR.Diagnostics {
       get { return dispensersPressure_; }
     }
 
-    /// <summary>Field number for the "MidTankPressure" field.</summary>
-    public const int MidTankPressureFieldNumber = 26;
-    private static readonly pb::FieldCodec<double> _repeated_midTankPressure_codec
-        = pb::FieldCodec.ForDouble(210);
-    private readonly pbc::RepeatedField<double> midTankPressure_ = new pbc::RepeatedField<double>();
-    /// <summary>
-    ///Mid Tank Pressure (Min = 0, Max = 100, PPF = 1)
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<double> MidTankPressure {
-      get { return midTankPressure_; }
-    }
-
     /// <summary>Field number for the "FilterDeltaPressure" field.</summary>
-    public const int FilterDeltaPressureFieldNumber = 27;
+    public const int FilterDeltaPressureFieldNumber = 26;
     private static readonly pb::FieldCodec<double> _repeated_filterDeltaPressure_codec
-        = pb::FieldCodec.ForDouble(218);
+        = pb::FieldCodec.ForDouble(210);
     private readonly pbc::RepeatedField<double> filterDeltaPressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Filter Delta Pressure (Min = 0, Max = 100, PPF = 1)
@@ -519,9 +497,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "ChillerTemperature" field.</summary>
-    public const int ChillerTemperatureFieldNumber = 28;
+    public const int ChillerTemperatureFieldNumber = 27;
     private static readonly pb::FieldCodec<double> _repeated_chillerTemperature_codec
-        = pb::FieldCodec.ForDouble(226);
+        = pb::FieldCodec.ForDouble(218);
     private readonly pbc::RepeatedField<double> chillerTemperature_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Chiller Temperature (Min = 0, Max = 300, PPF = 10)
@@ -532,9 +510,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser1MotorFrequency" field.</summary>
-    public const int Dispenser1MotorFrequencyFieldNumber = 29;
+    public const int Dispenser1MotorFrequencyFieldNumber = 28;
     private static readonly pb::FieldCodec<double> _repeated_dispenser1MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(234);
+        = pb::FieldCodec.ForDouble(226);
     private readonly pbc::RepeatedField<double> dispenser1MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 1 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -545,9 +523,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser2MotorFrequency" field.</summary>
-    public const int Dispenser2MotorFrequencyFieldNumber = 30;
+    public const int Dispenser2MotorFrequencyFieldNumber = 29;
     private static readonly pb::FieldCodec<double> _repeated_dispenser2MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(242);
+        = pb::FieldCodec.ForDouble(234);
     private readonly pbc::RepeatedField<double> dispenser2MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 2 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -558,9 +536,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser3MotorFrequency" field.</summary>
-    public const int Dispenser3MotorFrequencyFieldNumber = 31;
+    public const int Dispenser3MotorFrequencyFieldNumber = 30;
     private static readonly pb::FieldCodec<double> _repeated_dispenser3MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(250);
+        = pb::FieldCodec.ForDouble(242);
     private readonly pbc::RepeatedField<double> dispenser3MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 3 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -571,9 +549,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser4MotorFrequency" field.</summary>
-    public const int Dispenser4MotorFrequencyFieldNumber = 32;
+    public const int Dispenser4MotorFrequencyFieldNumber = 31;
     private static readonly pb::FieldCodec<double> _repeated_dispenser4MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(258);
+        = pb::FieldCodec.ForDouble(250);
     private readonly pbc::RepeatedField<double> dispenser4MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 4 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -584,9 +562,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser5MotorFrequency" field.</summary>
-    public const int Dispenser5MotorFrequencyFieldNumber = 33;
+    public const int Dispenser5MotorFrequencyFieldNumber = 32;
     private static readonly pb::FieldCodec<double> _repeated_dispenser5MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(266);
+        = pb::FieldCodec.ForDouble(258);
     private readonly pbc::RepeatedField<double> dispenser5MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 5 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -597,9 +575,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser6MotorFrequency" field.</summary>
-    public const int Dispenser6MotorFrequencyFieldNumber = 34;
+    public const int Dispenser6MotorFrequencyFieldNumber = 33;
     private static readonly pb::FieldCodec<double> _repeated_dispenser6MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(274);
+        = pb::FieldCodec.ForDouble(266);
     private readonly pbc::RepeatedField<double> dispenser6MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 6 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -610,9 +588,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser7MotorFrequency" field.</summary>
-    public const int Dispenser7MotorFrequencyFieldNumber = 35;
+    public const int Dispenser7MotorFrequencyFieldNumber = 34;
     private static readonly pb::FieldCodec<double> _repeated_dispenser7MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(282);
+        = pb::FieldCodec.ForDouble(274);
     private readonly pbc::RepeatedField<double> dispenser7MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 7 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -623,9 +601,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser8MotorFrequency" field.</summary>
-    public const int Dispenser8MotorFrequencyFieldNumber = 36;
+    public const int Dispenser8MotorFrequencyFieldNumber = 35;
     private static readonly pb::FieldCodec<double> _repeated_dispenser8MotorFrequency_codec
-        = pb::FieldCodec.ForDouble(290);
+        = pb::FieldCodec.ForDouble(282);
     private readonly pbc::RepeatedField<double> dispenser8MotorFrequency_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 8 Motor Frequency (Min = 0, Max = 100000, PPF = 100)
@@ -636,9 +614,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "HeadZone4Temperature" field.</summary>
-    public const int HeadZone4TemperatureFieldNumber = 37;
+    public const int HeadZone4TemperatureFieldNumber = 36;
     private static readonly pb::FieldCodec<double> _repeated_headZone4Temperature_codec
-        = pb::FieldCodec.ForDouble(298);
+        = pb::FieldCodec.ForDouble(290);
     private readonly pbc::RepeatedField<double> headZone4Temperature_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Head Zone 4 (Min = 0, Max = 300, PPF = 10)
@@ -649,9 +627,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "HeadZone5Temperature" field.</summary>
-    public const int HeadZone5TemperatureFieldNumber = 38;
+    public const int HeadZone5TemperatureFieldNumber = 37;
     private static readonly pb::FieldCodec<double> _repeated_headZone5Temperature_codec
-        = pb::FieldCodec.ForDouble(306);
+        = pb::FieldCodec.ForDouble(298);
     private readonly pbc::RepeatedField<double> headZone5Temperature_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Head Zone 5 (Min = 0, Max = 300, PPF = 10)
@@ -662,9 +640,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "HeadZone6Temperature" field.</summary>
-    public const int HeadZone6TemperatureFieldNumber = 39;
+    public const int HeadZone6TemperatureFieldNumber = 38;
     private static readonly pb::FieldCodec<double> _repeated_headZone6Temperature_codec
-        = pb::FieldCodec.ForDouble(314);
+        = pb::FieldCodec.ForDouble(306);
     private readonly pbc::RepeatedField<double> headZone6Temperature_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Head Zone 6 (Min = 0, Max = 300, PPF = 10)
@@ -675,9 +653,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "BlowerVoltage" field.</summary>
-    public const int BlowerVoltageFieldNumber = 40;
+    public const int BlowerVoltageFieldNumber = 39;
     private static readonly pb::FieldCodec<double> _repeated_blowerVoltage_codec
-        = pb::FieldCodec.ForDouble(322);
+        = pb::FieldCodec.ForDouble(314);
     private readonly pbc::RepeatedField<double> blowerVoltage_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Blower Voltage (Min = 0, Max = 100, PPF = 10)
@@ -688,9 +666,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser1Pressure" field.</summary>
-    public const int Dispenser1PressureFieldNumber = 41;
+    public const int Dispenser1PressureFieldNumber = 40;
     private static readonly pb::FieldCodec<double> _repeated_dispenser1Pressure_codec
-        = pb::FieldCodec.ForDouble(330);
+        = pb::FieldCodec.ForDouble(322);
     private readonly pbc::RepeatedField<double> dispenser1Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 1 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -701,9 +679,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser2Pressure" field.</summary>
-    public const int Dispenser2PressureFieldNumber = 42;
+    public const int Dispenser2PressureFieldNumber = 41;
     private static readonly pb::FieldCodec<double> _repeated_dispenser2Pressure_codec
-        = pb::FieldCodec.ForDouble(338);
+        = pb::FieldCodec.ForDouble(330);
     private readonly pbc::RepeatedField<double> dispenser2Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 2 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -714,9 +692,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser3Pressure" field.</summary>
-    public const int Dispenser3PressureFieldNumber = 43;
+    public const int Dispenser3PressureFieldNumber = 42;
     private static readonly pb::FieldCodec<double> _repeated_dispenser3Pressure_codec
-        = pb::FieldCodec.ForDouble(346);
+        = pb::FieldCodec.ForDouble(338);
     private readonly pbc::RepeatedField<double> dispenser3Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 3 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -727,9 +705,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser4Pressure" field.</summary>
-    public const int Dispenser4PressureFieldNumber = 44;
+    public const int Dispenser4PressureFieldNumber = 43;
     private static readonly pb::FieldCodec<double> _repeated_dispenser4Pressure_codec
-        = pb::FieldCodec.ForDouble(354);
+        = pb::FieldCodec.ForDouble(346);
     private readonly pbc::RepeatedField<double> dispenser4Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 4 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -740,9 +718,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser5Pressure" field.</summary>
-    public const int Dispenser5PressureFieldNumber = 45;
+    public const int Dispenser5PressureFieldNumber = 44;
     private static readonly pb::FieldCodec<double> _repeated_dispenser5Pressure_codec
-        = pb::FieldCodec.ForDouble(362);
+        = pb::FieldCodec.ForDouble(354);
     private readonly pbc::RepeatedField<double> dispenser5Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 5 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -753,9 +731,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser6Pressure" field.</summary>
-    public const int Dispenser6PressureFieldNumber = 46;
+    public const int Dispenser6PressureFieldNumber = 45;
     private static readonly pb::FieldCodec<double> _repeated_dispenser6Pressure_codec
-        = pb::FieldCodec.ForDouble(370);
+        = pb::FieldCodec.ForDouble(362);
     private readonly pbc::RepeatedField<double> dispenser6Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 6 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -766,9 +744,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser7Pressure" field.</summary>
-    public const int Dispenser7PressureFieldNumber = 47;
+    public const int Dispenser7PressureFieldNumber = 46;
     private static readonly pb::FieldCodec<double> _repeated_dispenser7Pressure_codec
-        = pb::FieldCodec.ForDouble(378);
+        = pb::FieldCodec.ForDouble(370);
     private readonly pbc::RepeatedField<double> dispenser7Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 7 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -779,9 +757,9 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Dispenser8Pressure" field.</summary>
-    public const int Dispenser8PressureFieldNumber = 48;
+    public const int Dispenser8PressureFieldNumber = 47;
     private static readonly pb::FieldCodec<double> _repeated_dispenser8Pressure_codec
-        = pb::FieldCodec.ForDouble(386);
+        = pb::FieldCodec.ForDouble(378);
     private readonly pbc::RepeatedField<double> dispenser8Pressure_ = new pbc::RepeatedField<double>();
     /// <summary>
     ///Dispenser 8 Pressure (Min = 0, Max = 100, PPF = 1)
@@ -791,108 +769,108 @@ namespace Tango.PMR.Diagnostics {
       get { return dispenser8Pressure_; }
     }
 
-    /// <summary>Field number for the "MidTank1Pressure" field.</summary>
-    public const int MidTank1PressureFieldNumber = 49;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank1Pressure_codec
-        = pb::FieldCodec.ForMessage(394, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank1Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank1Level" field.</summary>
+    public const int MidTank1LevelFieldNumber = 48;
+    private static readonly pb::FieldCodec<double> _repeated_midTank1Level_codec
+        = pb::FieldCodec.ForDouble(386);
+    private readonly pbc::RepeatedField<double> midTank1Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 1 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 1 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank1Pressure {
-      get { return midTank1Pressure_; }
+    public pbc::RepeatedField<double> MidTank1Level {
+      get { return midTank1Level_; }
     }
 
-    /// <summary>Field number for the "MidTank2Pressure" field.</summary>
-    public const int MidTank2PressureFieldNumber = 50;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank2Pressure_codec
-        = pb::FieldCodec.ForMessage(402, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank2Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank2Level" field.</summary>
+    public const int MidTank2LevelFieldNumber = 49;
+    private static readonly pb::FieldCodec<double> _repeated_midTank2Level_codec
+        = pb::FieldCodec.ForDouble(394);
+    private readonly pbc::RepeatedField<double> midTank2Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 2 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 2 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank2Pressure {
-      get { return midTank2Pressure_; }
+    public pbc::RepeatedField<double> MidTank2Level {
+      get { return midTank2Level_; }
     }
 
-    /// <summary>Field number for the "MidTank3Pressure" field.</summary>
-    public const int MidTank3PressureFieldNumber = 51;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank3Pressure_codec
-        = pb::FieldCodec.ForMessage(410, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank3Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank3Level" field.</summary>
+    public const int MidTank3LevelFieldNumber = 50;
+    private static readonly pb::FieldCodec<double> _repeated_midTank3Level_codec
+        = pb::FieldCodec.ForDouble(402);
+    private readonly pbc::RepeatedField<double> midTank3Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 3 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 3 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank3Pressure {
-      get { return midTank3Pressure_; }
+    public pbc::RepeatedField<double> MidTank3Level {
+      get { return midTank3Level_; }
     }
 
-    /// <summary>Field number for the "MidTank4Pressure" field.</summary>
-    public const int MidTank4PressureFieldNumber = 52;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank4Pressure_codec
-        = pb::FieldCodec.ForMessage(418, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank4Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank4Level" field.</summary>
+    public const int MidTank4LevelFieldNumber = 51;
+    private static readonly pb::FieldCodec<double> _repeated_midTank4Level_codec
+        = pb::FieldCodec.ForDouble(410);
+    private readonly pbc::RepeatedField<double> midTank4Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 4 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 4 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank4Pressure {
-      get { return midTank4Pressure_; }
+    public pbc::RepeatedField<double> MidTank4Level {
+      get { return midTank4Level_; }
     }
 
-    /// <summary>Field number for the "MidTank5Pressure" field.</summary>
-    public const int MidTank5PressureFieldNumber = 53;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank5Pressure_codec
-        = pb::FieldCodec.ForMessage(426, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank5Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank5Level" field.</summary>
+    public const int MidTank5LevelFieldNumber = 52;
+    private static readonly pb::FieldCodec<double> _repeated_midTank5Level_codec
+        = pb::FieldCodec.ForDouble(418);
+    private readonly pbc::RepeatedField<double> midTank5Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 5 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 5 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank5Pressure {
-      get { return midTank5Pressure_; }
+    public pbc::RepeatedField<double> MidTank5Level {
+      get { return midTank5Level_; }
     }
 
-    /// <summary>Field number for the "MidTank6Pressure" field.</summary>
-    public const int MidTank6PressureFieldNumber = 54;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank6Pressure_codec
-        = pb::FieldCodec.ForMessage(434, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank6Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank6Level" field.</summary>
+    public const int MidTank6LevelFieldNumber = 53;
+    private static readonly pb::FieldCodec<double> _repeated_midTank6Level_codec
+        = pb::FieldCodec.ForDouble(426);
+    private readonly pbc::RepeatedField<double> midTank6Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 6 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 6 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank6Pressure {
-      get { return midTank6Pressure_; }
+    public pbc::RepeatedField<double> MidTank6Level {
+      get { return midTank6Level_; }
     }
 
-    /// <summary>Field number for the "MidTank7Pressure" field.</summary>
-    public const int MidTank7PressureFieldNumber = 55;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank7Pressure_codec
-        = pb::FieldCodec.ForMessage(442, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank7Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank7Level" field.</summary>
+    public const int MidTank7LevelFieldNumber = 54;
+    private static readonly pb::FieldCodec<double> _repeated_midTank7Level_codec
+        = pb::FieldCodec.ForDouble(434);
+    private readonly pbc::RepeatedField<double> midTank7Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 7 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 7 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank7Pressure {
-      get { return midTank7Pressure_; }
+    public pbc::RepeatedField<double> MidTank7Level {
+      get { return midTank7Level_; }
     }
 
-    /// <summary>Field number for the "MidTank8Pressure" field.</summary>
-    public const int MidTank8PressureFieldNumber = 56;
-    private static readonly pb::FieldCodec<global::Tango.PMR.Diagnostics.DoubleArray> _repeated_midTank8Pressure_codec
-        = pb::FieldCodec.ForMessage(450, global::Tango.PMR.Diagnostics.DoubleArray.Parser);
-    private readonly pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> midTank8Pressure_ = new pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray>();
+    /// <summary>Field number for the "MidTank8Level" field.</summary>
+    public const int MidTank8LevelFieldNumber = 55;
+    private static readonly pb::FieldCodec<double> _repeated_midTank8Level_codec
+        = pb::FieldCodec.ForDouble(442);
+    private readonly pbc::RepeatedField<double> midTank8Level_ = new pbc::RepeatedField<double>();
     /// <summary>
-    ///Mid Tank 8 Pressure (Min = 0, Max = 100, PPF = 1) Channel Count = 0
+    ///Mid Tank 8 Level (Min = 0, Max = 100, PPF = 1)
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Tango.PMR.Diagnostics.DoubleArray> MidTank8Pressure {
-      get { return midTank8Pressure_; }
+    public pbc::RepeatedField<double> MidTank8Level {
+      get { return midTank8Level_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -933,7 +911,6 @@ namespace Tango.PMR.Diagnostics {
       if(!dispensersAngularEncoders_.Equals(other.dispensersAngularEncoders_)) return false;
       if(!dispensersLinearPositions_.Equals(other.dispensersLinearPositions_)) return false;
       if(!dispensersPressure_.Equals(other.dispensersPressure_)) return false;
-      if(!midTankPressure_.Equals(other.midTankPressure_)) return false;
       if(!filterDeltaPressure_.Equals(other.filterDeltaPressure_)) return false;
       if(!chillerTemperature_.Equals(other.chillerTemperature_)) return false;
       if(!dispenser1MotorFrequency_.Equals(other.dispenser1MotorFrequency_)) return false;
@@ -956,14 +933,14 @@ namespace Tango.PMR.Diagnostics {
       if(!dispenser6Pressure_.Equals(other.dispenser6Pressure_)) return false;
       if(!dispenser7Pressure_.Equals(other.dispenser7Pressure_)) return false;
       if(!dispenser8Pressure_.Equals(other.dispenser8Pressure_)) return false;
-      if(!midTank1Pressure_.Equals(other.midTank1Pressure_)) return false;
-      if(!midTank2Pressure_.Equals(other.midTank2Pressure_)) return false;
-      if(!midTank3Pressure_.Equals(other.midTank3Pressure_)) return false;
-      if(!midTank4Pressure_.Equals(other.midTank4Pressure_)) return false;
-      if(!midTank5Pressure_.Equals(other.midTank5Pressure_)) return false;
-      if(!midTank6Pressure_.Equals(other.midTank6Pressure_)) return false;
-      if(!midTank7Pressure_.Equals(other.midTank7Pressure_)) return false;
-      if(!midTank8Pressure_.Equals(other.midTank8Pressure_)) return false;
+      if(!midTank1Level_.Equals(other.midTank1Level_)) return false;
+      if(!midTank2Level_.Equals(other.midTank2Level_)) return false;
+      if(!midTank3Level_.Equals(other.midTank3Level_)) return false;
+      if(!midTank4Level_.Equals(other.midTank4Level_)) return false;
+      if(!midTank5Level_.Equals(other.midTank5Level_)) return false;
+      if(!midTank6Level_.Equals(other.midTank6Level_)) return false;
+      if(!midTank7Level_.Equals(other.midTank7Level_)) return false;
+      if(!midTank8Level_.Equals(other.midTank8Level_)) return false;
       return true;
     }
 
@@ -995,7 +972,6 @@ namespace Tango.PMR.Diagnostics {
       hash ^= dispensersAngularEncoders_.GetHashCode();
       hash ^= dispensersLinearPositions_.GetHashCode();
       hash ^= dispensersPressure_.GetHashCode();
-      hash ^= midTankPressure_.GetHashCode();
       hash ^= filterDeltaPressure_.GetHashCode();
       hash ^= chillerTemperature_.GetHashCode();
       hash ^= dispenser1MotorFrequency_.GetHashCode();
@@ -1018,14 +994,14 @@ namespace Tango.PMR.Diagnostics {
       hash ^= dispenser6Pressure_.GetHashCode();
       hash ^= dispenser7Pressure_.GetHashCode();
       hash ^= dispenser8Pressure_.GetHashCode();
-      hash ^= midTank1Pressure_.GetHashCode();
-      hash ^= midTank2Pressure_.GetHashCode();
-      hash ^= midTank3Pressure_.GetHashCode();
-      hash ^= midTank4Pressure_.GetHashCode();
-      hash ^= midTank5Pressure_.GetHashCode();
-      hash ^= midTank6Pressure_.GetHashCode();
-      hash ^= midTank7Pressure_.GetHashCode();
-      hash ^= midTank8Pressure_.GetHashCode();
+      hash ^= midTank1Level_.GetHashCode();
+      hash ^= midTank2Level_.GetHashCode();
+      hash ^= midTank3Level_.GetHashCode();
+      hash ^= midTank4Level_.GetHashCode();
+      hash ^= midTank5Level_.GetHashCode();
+      hash ^= midTank6Level_.GetHashCode();
+      hash ^= midTank7Level_.GetHashCode();
+      hash ^= midTank8Level_.GetHashCode();
       return hash;
     }
 
@@ -1061,7 +1037,6 @@ namespace Tango.PMR.Diagnostics {
       dispensersAngularEncoders_.WriteTo(output, _repeated_dispensersAngularEncoders_codec);
       dispensersLinearPositions_.WriteTo(output, _repeated_dispensersLinearPositions_codec);
       dispensersPressure_.WriteTo(output, _repeated_dispensersPressure_codec);
-      midTankPressure_.WriteTo(output, _repeated_midTankPressure_codec);
       filterDeltaPressure_.WriteTo(output, _repeated_filterDeltaPressure_codec);
       chillerTemperature_.WriteTo(output, _repeated_chillerTemperature_codec);
       dispenser1MotorFrequency_.WriteTo(output, _repeated_dispenser1MotorFrequency_codec);
@@ -1084,14 +1059,14 @@ namespace Tango.PMR.Diagnostics {
       dispenser6Pressure_.WriteTo(output, _repeated_dispenser6Pressure_codec);
       dispenser7Pressure_.WriteTo(output, _repeated_dispenser7Pressure_codec);
       dispenser8Pressure_.WriteTo(output, _repeated_dispenser8Pressure_codec);
-      midTank1Pressure_.WriteTo(output, _repeated_midTank1Pressure_codec);
-      midTank2Pressure_.WriteTo(output, _repeated_midTank2Pressure_codec);
-      midTank3Pressure_.WriteTo(output, _repeated_midTank3Pressure_codec);
-      midTank4Pressure_.WriteTo(output, _repeated_midTank4Pressure_codec);
-      midTank5Pressure_.WriteTo(output, _repeated_midTank5Pressure_codec);
-      midTank6Pressure_.WriteTo(output, _repeated_midTank6Pressure_codec);
-      midTank7Pressure_.WriteTo(output, _repeated_midTank7Pressure_codec);
-      midTank8Pressure_.WriteTo(output, _repeated_midTank8Pressure_codec);
+      midTank1Level_.WriteTo(output, _repeated_midTank1Level_codec);
+      midTank2Level_.WriteTo(output, _repeated_midTank2Level_codec);
+      midTank3Level_.WriteTo(output, _repeated_midTank3Level_codec);
+      midTank4Level_.WriteTo(output, _repeated_midTank4Level_codec);
+      midTank5Level_.WriteTo(output, _repeated_midTank5Level_codec);
+      midTank6Level_.WriteTo(output, _repeated_midTank6Level_codec);
+      midTank7Level_.WriteTo(output, _repeated_midTank7Level_codec);
+      midTank8Level_.WriteTo(output, _repeated_midTank8Level_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1122,7 +1097,6 @@ namespace Tango.PMR.Diagnostics {
       size += dispensersAngularEncoders_.CalculateSize(_repeated_dispensersAngularEncoders_codec);
       size += dispensersLinearPositions_.CalculateSize(_repeated_dispensersLinearPositions_codec);
       size += dispensersPressure_.CalculateSize(_repeated_dispensersPressure_codec);
-      size += midTankPressure_.CalculateSize(_repeated_midTankPressure_codec);
       size += filterDeltaPressure_.CalculateSize(_repeated_filterDeltaPressure_codec);
       size += chillerTemperature_.CalculateSize(_repeated_chillerTemperature_codec);
       size += dispenser1MotorFrequency_.CalculateSize(_repeated_dispenser1MotorFrequency_codec);
@@ -1145,14 +1119,14 @@ namespace Tango.PMR.Diagnostics {
       size += dispenser6Pressure_.CalculateSize(_repeated_dispenser6Pressure_codec);
       size += dispenser7Pressure_.CalculateSize(_repeated_dispenser7Pressure_codec);
       size += dispenser8Pressure_.CalculateSize(_repeated_dispenser8Pressure_codec);
-      size += midTank1Pressure_.CalculateSize(_repeated_midTank1Pressure_codec);
-      size += midTank2Pressure_.CalculateSize(_repeated_midTank2Pressure_codec);
-      size += midTank3Pressure_.CalculateSize(_repeated_midTank3Pressure_codec);
-      size += midTank4Pressure_.CalculateSize(_repeated_midTank4Pressure_codec);
-      size += midTank5Pressure_.CalculateSize(_repeated_midTank5Pressure_codec);
-      size += midTank6Pressure_.CalculateSize(_repeated_midTank6Pressure_codec);
-      size += midTank7Pressure_.CalculateSize(_repeated_midTank7Pressure_codec);
-      size += midTank8Pressure_.CalculateSize(_repeated_midTank8Pressure_codec);
+      size += midTank1Level_.CalculateSize(_repeated_midTank1Level_codec);
+      size += midTank2Level_.CalculateSize(_repeated_midTank2Level_codec);
+      size += midTank3Level_.CalculateSize(_repeated_midTank3Level_codec);
+      size += midTank4Level_.CalculateSize(_repeated_midTank4Level_codec);
+      size += midTank5Level_.CalculateSize(_repeated_midTank5Level_codec);
+      size += midTank6Level_.CalculateSize(_repeated_midTank6Level_codec);
+      size += midTank7Level_.CalculateSize(_repeated_midTank7Level_codec);
+      size += midTank8Level_.CalculateSize(_repeated_midTank8Level_codec);
       return size;
     }
 
@@ -1186,7 +1160,6 @@ namespace Tango.PMR.Diagnostics {
       dispensersAngularEncoders_.Add(other.dispensersAngularEncoders_);
       dispensersLinearPositions_.Add(other.dispensersLinearPositions_);
       dispensersPressure_.Add(other.dispensersPressure_);
-      midTankPressure_.Add(other.midTankPressure_);
       filterDeltaPressure_.Add(other.filterDeltaPressure_);
       chillerTemperature_.Add(other.chillerTemperature_);
       dispenser1MotorFrequency_.Add(other.dispenser1MotorFrequency_);
@@ -1209,14 +1182,14 @@ namespace Tango.PMR.Diagnostics {
       dispenser6Pressure_.Add(other.dispenser6Pressure_);
       dispenser7Pressure_.Add(other.dispenser7Pressure_);
       dispenser8Pressure_.Add(other.dispenser8Pressure_);
-      midTank1Pressure_.Add(other.midTank1Pressure_);
-      midTank2Pressure_.Add(other.midTank2Pressure_);
-      midTank3Pressure_.Add(other.midTank3Pressure_);
-      midTank4Pressure_.Add(other.midTank4Pressure_);
-      midTank5Pressure_.Add(other.midTank5Pressure_);
-      midTank6Pressure_.Add(other.midTank6Pressure_);
-      midTank7Pressure_.Add(other.midTank7Pressure_);
-      midTank8Pressure_.Add(other.midTank8Pressure_);
+      midTank1Level_.Add(other.midTank1Level_);
+      midTank2Level_.Add(other.midTank2Level_);
+      midTank3Level_.Add(other.midTank3Level_);
+      midTank4Level_.Add(other.midTank4Level_);
+      midTank5Level_.Add(other.midTank5Level_);
+      midTank6Level_.Add(other.midTank6Level_);
+      midTank7Level_.Add(other.midTank7Level_);
+      midTank8Level_.Add(other.midTank8Level_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1350,149 +1323,152 @@ namespace Tango.PMR.Diagnostics {
           }
           case 210:
           case 209: {
-            midTankPressure_.AddEntriesFrom(input, _repeated_midTankPressure_codec);
+            filterDeltaPressure_.AddEntriesFrom(input, _repeated_filterDeltaPressure_codec);
             break;
           }
           case 218:
           case 217: {
-            filterDeltaPressure_.AddEntriesFrom(input, _repeated_filterDeltaPressure_codec);
+            chillerTemperature_.AddEntriesFrom(input, _repeated_chillerTemperature_codec);
             break;
           }
           case 226:
           case 225: {
-            chillerTemperature_.AddEntriesFrom(input, _repeated_chillerTemperature_codec);
+            dispenser1MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser1MotorFrequency_codec);
             break;
           }
           case 234:
           case 233: {
-            dispenser1MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser1MotorFrequency_codec);
+            dispenser2MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser2MotorFrequency_codec);
             break;
           }
           case 242:
           case 241: {
-            dispenser2MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser2MotorFrequency_codec);
+            dispenser3MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser3MotorFrequency_codec);
             break;
           }
           case 250:
           case 249: {
-            dispenser3MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser3MotorFrequency_codec);
+            dispenser4MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser4MotorFrequency_codec);
             break;
           }
           case 258:
           case 257: {
-            dispenser4MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser4MotorFrequency_codec);
+            dispenser5MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser5MotorFrequency_codec);
             break;
           }
           case 266:
           case 265: {
-            dispenser5MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser5MotorFrequency_codec);
+            dispenser6MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser6MotorFrequency_codec);
             break;
           }
           case 274:
           case 273: {
-            dispenser6MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser6MotorFrequency_codec);
+            dispenser7MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser7MotorFrequency_codec);
             break;
           }
           case 282:
           case 281: {
-            dispenser7MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser7MotorFrequency_codec);
+            dispenser8MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser8MotorFrequency_codec);
             break;
           }
           case 290:
           case 289: {
-            dispenser8MotorFrequency_.AddEntriesFrom(input, _repeated_dispenser8MotorFrequency_codec);
+            headZone4Temperature_.AddEntriesFrom(input, _repeated_headZone4Temperature_codec);
             break;
           }
           case 298:
           case 297: {
-            headZone4Temperature_.AddEntriesFrom(input, _repeated_headZone4Temperature_codec);
+            headZone5Temperature_.AddEntriesFrom(input, _repeated_headZone5Temperature_codec);
             break;
           }
           case 306:
           case 305: {
-            headZone5Temperature_.AddEntriesFrom(input, _repeated_headZone5Temperature_codec);
+            headZone6Temperature_.AddEntriesFrom(input, _repeated_headZone6Temperature_codec);
             break;
           }
           case 314:
           case 313: {
-            headZone6Temperature_.AddEntriesFrom(input, _repeated_headZone6Temperature_codec);
+            blowerVoltage_.AddEntriesFrom(input, _repeated_blowerVoltage_codec);
             break;
           }
           case 322:
           case 321: {
-            blowerVoltage_.AddEntriesFrom(input, _repeated_blowerVoltage_codec);
+            dispenser1Pressure_.AddEntriesFrom(input, _repeated_dispenser1Pressure_codec);
             break;
           }
           case 330:
           case 329: {
-            dispenser1Pressure_.AddEntriesFrom(input, _repeated_dispenser1Pressure_codec);
+            dispenser2Pressure_.AddEntriesFrom(input, _repeated_dispenser2Pressure_codec);
             break;
           }
           case 338:
           case 337: {
-            dispenser2Pressure_.AddEntriesFrom(input, _repeated_dispenser2Pressure_codec);
+            dispenser3Pressure_.AddEntriesFrom(input, _repeated_dispenser3Pressure_codec);
             break;
           }
           case 346:
           case 345: {
-            dispenser3Pressure_.AddEntriesFrom(input, _repeated_dispenser3Pressure_codec);
+            dispenser4Pressure_.AddEntriesFrom(input, _repeated_dispenser4Pressure_codec);
             break;
           }
           case 354:
           case 353: {
-            dispenser4Pressure_.AddEntriesFrom(input, _repeated_dispenser4Pressure_codec);
+            dispenser5Pressure_.AddEntriesFrom(input, _repeated_dispenser5Pressure_codec);
             break;
           }
           case 362:
           case 361: {
-            dispenser5Pressure_.AddEntriesFrom(input, _repeated_dispenser5Pressure_codec);
+            dispenser6Pressure_.AddEntriesFrom(input, _repeated_dispenser6Pressure_codec);
             break;
           }
           case 370:
           case 369: {
-            dispenser6Pressure_.AddEntriesFrom(input, _repeated_dispenser6Pressure_codec);
+            dispenser7Pressure_.AddEntriesFrom(input, _repeated_dispenser7Pressure_codec);
             break;
           }
           case 378:
           case 377: {
-            dispenser7Pressure_.AddEntriesFrom(input, _repeated_dispenser7Pressure_codec);
+            dispenser8Pressure_.AddEntriesFrom(input, _repeated_dispenser8Pressure_codec);
             break;
           }
           case 386:
           case 385: {
-            dispenser8Pressure_.AddEntriesFrom(input, _repeated_dispenser8Pressure_codec);
-            break;
-          }
-          case 394: {
-            midTank1Pressure_.AddEntriesFrom(input, _repeated_midTank1Pressure_codec);
+            midTank1Level_.AddEntriesFrom(input, _repeated_midTank1Level_codec);
             break;
           }
-          case 402: {
-            midTank2Pressure_.AddEntriesFrom(input, _repeated_midTank2Pressure_codec);
+          case 394:
+          case 393: {
+            midTank2Level_.AddEntriesFrom(input, _repeated_midTank2Level_codec);
             break;
           }
-          case 410: {
-            midTank3Pressure_.AddEntriesFrom(input, _repeated_midTank3Pressure_codec);
+          case 402:
+          case 401: {
+            midTank3Level_.AddEntriesFrom(input, _repeated_midTank3Level_codec);
             break;
           }
-          case 418: {
-            midTank4Pressure_.AddEntriesFrom(input, _repeated_midTank4Pressure_codec);
+          case 410:
+          case 409: {
+            midTank4Level_.AddEntriesFrom(input, _repeated_midTank4Level_codec);
             break;
           }
-          case 426: {
-            midTank5Pressure_.AddEntriesFrom(input, _repeated_midTank5Pressure_codec);
+          case 418:
+          case 417: {
+            midTank5Level_.AddEntriesFrom(input, _repeated_midTank5Level_codec);
             break;
           }
-          case 434: {
-            midTank6Pressure_.AddEntriesFrom(input, _repeated_midTank6Pressure_codec);
+          case 426:
+          case 425: {
+            midTank6Level_.AddEntriesFrom(input, _repeated_midTank6Level_codec);
             break;
           }
-          case 442: {
-            midTank7Pressure_.AddEntriesFrom(input, _repeated_midTank7Pressure_codec);
+          case 434:
+          case 433: {
+            midTank7Level_.AddEntriesFrom(input, _repeated_midTank7Level_codec);
             break;
           }
-          case 450: {
-            midTank8Pressure_.AddEntriesFrom(input, _repeated_midTank8Pressure_codec);
+          case 442:
+          case 441: {
+            midTank8Level_.AddEntriesFrom(input, _repeated_midTank8Level_codec);
             break;
           }
         }
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Program.cs
index 7564022d1..62e4498f7 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Program.cs
@@ -118,7 +118,7 @@ namespace Tango.Stubs.CLI
                         }
 
                         Console.WriteLine("Response Received:");
-                        var type = typeof(MessageFactory).Assembly.GetType("Tango.PMR.Stubs." + responseContainer.Type.ToString());
+                        var type = typeof(MessageFactory).Assembly.GetType("Tango.PMR.Stubs." + responseContainer.Type.ToOriginalName());
                         MessageParser parser = type.GetProperty("Parser").GetValue(container) as MessageParser;
                         IMessage message = parser.ParseFrom(responseContainer.Data);
                         Console.WriteLine(JsonConvert.SerializeObject(message, Formatting.Indented));