Added new PID and heaters to hw, diagnostics and tech.

Implemented proper sorting on hw version and tech board. (DB CHANGE!)

Related Work Items: #1595

19 files changed, 1361 insertions, 84 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index 40dc82d29..7ebcbeb55 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -236,13 +236,13 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
             _db = ObservablesContext.CreateDefault();
 
-            CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwarePidControls = _db.HardwarePidControlTypes.ToList().Select(x => new HardwarePidControl() { HardwarePidControlType = x }).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareWinders = _db.HardwareWinderTypes.ToList().Select(x => new HardwareWinder() { HardwareWinderType = x }).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareSpeedSensors = _db.HardwareSpeedSensorTypes.ToList().Select(x => new HardwareSpeedSensor() { HardwareSpeedSensorType = x }).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareBlowers = _db.HardwareBlowerTypes.ToList().Select(x => new HardwareBlower() { HardwareBlowerType = x }).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareBreakSensors = _db.HardwareBreakSensorTypes.ToList().Select(x => new HardwareBreakSensor() { HardwareBreakSensorType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).OrderByAlphaNumeric(x => x.HardwareMotorType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).OrderByAlphaNumeric(x => x.HardwareDancerType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwarePidControls = _db.HardwarePidControlTypes.ToList().Select(x => new HardwarePidControl() { HardwarePidControlType = x }).OrderByAlphaNumeric(x => x.HardwarePidControlType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareWinders = _db.HardwareWinderTypes.ToList().Select(x => new HardwareWinder() { HardwareWinderType = x }).OrderByAlphaNumeric(x => x.HardwareWinderType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareSpeedSensors = _db.HardwareSpeedSensorTypes.ToList().Select(x => new HardwareSpeedSensor() { HardwareSpeedSensorType = x }).OrderByAlphaNumeric(x => x.HardwareSpeedSensorType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareBlowers = _db.HardwareBlowerTypes.ToList().Select(x => new HardwareBlower() { HardwareBlowerType = x }).OrderByAlphaNumeric(x => x.HardwareBlowerType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareBreakSensors = _db.HardwareBreakSensorTypes.ToList().Select(x => new HardwareBreakSensor() { HardwareBreakSensorType = x }).OrderByAlphaNumeric(x => x.HardwareBreakSensorType.Description).ToSynchronizedObservableCollection();
         }
 
         private void RefreshVersions()
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs
index 1f2a3deec..53c30ce7e 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs
@@ -25,5 +25,23 @@ namespace Tango.BL.Enumerations
         [Description("Default Blower")]
         DefaultBlower = 0,
 
+        /// <summary>
+        /// (Head Blower 1)
+        /// </summary>
+        [Description("Head Blower 1")]
+        HeadBlower11 = 1,
+
+        /// <summary>
+        /// (Head Blower 2)
+        /// </summary>
+        [Description("Head Blower 2")]
+        HeadBlower2 = 2,
+
+        /// <summary>
+        /// (WHS Blower 2)
+        /// </summary>
+        [Description("WHS Blower 2")]
+        WHSBlower2 = 3,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs
index 6322ba4e1..85e302598 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs
@@ -157,5 +157,65 @@ namespace Tango.BL.Enumerations
         [Description("Dispenser 8")]
         Dispenser8 = 22,
 
+        /// <summary>
+        /// (Head Heater Zone 7)
+        /// </summary>
+        [Description("Head Heater Zone 7")]
+        HeadHeaterZ7 = 23,
+
+        /// <summary>
+        /// (Head Heater Zone 8)
+        /// </summary>
+        [Description("Head Heater Zone 8")]
+        HeadHeaterZ8 = 24,
+
+        /// <summary>
+        /// (Head Heater Zone 9)
+        /// </summary>
+        [Description("Head Heater Zone 9")]
+        HeadHeaterZ9 = 25,
+
+        /// <summary>
+        /// (Head Heater Zone 10)
+        /// </summary>
+        [Description("Head Heater Zone 10")]
+        HeadHeaterZ10 = 26,
+
+        /// <summary>
+        /// (Head Heater Zone 11)
+        /// </summary>
+        [Description("Head Heater Zone 11")]
+        HeadHeaterZ11 = 27,
+
+        /// <summary>
+        /// (Head Heater Zone 12)
+        /// </summary>
+        [Description("Head Heater Zone 12")]
+        HeadHeaterZ12 = 28,
+
+        /// <summary>
+        /// (Head Cover Heater 1)
+        /// </summary>
+        [Description("Head Cover Heater 1")]
+        HeadCoverHeater1 = 29,
+
+        /// <summary>
+        /// (Head Cover Heater 2)
+        /// </summary>
+        [Description("Head Cover Heater 2")]
+        HeadCoverHeater2 = 30,
+
+        /// <summary>
+        /// (Head Blower 1)
+        /// </summary>
+        [Description("Head Blower 1")]
+        HeadBlower_1 = 31,
+
+        /// <summary>
+        /// (Head Blower 2)
+        /// </summary>
+        [Description("Head Blower 2")]
+        HeadBlower_2 = 32,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs
index a73fbb244..9731e5b61 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs
@@ -79,5 +79,53 @@ namespace Tango.BL.Enumerations
         [Description("Mixer Heater")]
         MixerHeater = 9,
 
+        /// <summary>
+        /// (Heater Zone 7)
+        /// </summary>
+        [Description("Heater Zone 7")]
+        HeaterZone7 = 10,
+
+        /// <summary>
+        /// (Heater Zone 8)
+        /// </summary>
+        [Description("Heater Zone 8")]
+        HeaterZone8 = 11,
+
+        /// <summary>
+        /// (Heater Zone 9)
+        /// </summary>
+        [Description("Heater Zone 9")]
+        HeaterZone9 = 12,
+
+        /// <summary>
+        /// (Heater Zone 10)
+        /// </summary>
+        [Description("Heater Zone 10")]
+        HeaterZone10 = 13,
+
+        /// <summary>
+        /// (Heater Zone 11)
+        /// </summary>
+        [Description("Heater Zone 11")]
+        HeaterZone11 = 14,
+
+        /// <summary>
+        /// (Heater Zone 12)
+        /// </summary>
+        [Description("Heater Zone 12")]
+        HeaterZone12 = 15,
+
+        /// <summary>
+        /// (Head Cover Heater 1)
+        /// </summary>
+        [Description("Head Cover Heater 1")]
+        HeadCoverHeater1 = 16,
+
+        /// <summary>
+        /// (Head Cover Heater 2)
+        /// </summary>
+        [Description("Head Cover Heater 2")]
+        HeadCoverHeater2 = 17,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
index ad77d945c..e1761c86f 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
@@ -242,6 +242,78 @@ namespace Tango.BL.Enumerations
         HeadAirFlow = 13,
 
         /// <summary>
+        /// (Head Blower Voltage 1)
+        /// </summary>
+        [Description("Head Blower Voltage 1")]
+        HeadBlowerVoltage1 = 212,
+
+        /// <summary>
+        /// (Head Blower Voltage 2)
+        /// </summary>
+        [Description("Head Blower Voltage 2")]
+        HeadBlowerVoltage2 = 213,
+
+        /// <summary>
+        /// (Head Cover Heater 1 Current)
+        /// </summary>
+        [Description("Head Cover Heater 1 Current")]
+        HeadCoverHeater1Current = 214,
+
+        /// <summary>
+        /// (Head Cover Heater 1 Temperature)
+        /// </summary>
+        [Description("Head Cover Heater 1 Temperature")]
+        HeadCoverHeater1Temperature = 215,
+
+        /// <summary>
+        /// (Head Cover Heater 2 Current)
+        /// </summary>
+        [Description("Head Cover Heater 2 Current")]
+        HeadCoverHeater2Current = 216,
+
+        /// <summary>
+        /// (Head Cover Heater 2 Temperature)
+        /// </summary>
+        [Description("Head Cover Heater 2 Temperature")]
+        HeadCoverHeater2Temperature = 217,
+
+        /// <summary>
+        /// (Head Zone 10 Heater Current)
+        /// </summary>
+        [Description("Head Zone 10 Heater Current")]
+        HeadZone10HeaterCurrent = 206,
+
+        /// <summary>
+        /// (Head Zone 10)
+        /// </summary>
+        [Description("Head Zone 10")]
+        HeadZone10Temperature = 207,
+
+        /// <summary>
+        /// (Head Zone 11 Heater Current)
+        /// </summary>
+        [Description("Head Zone 11 Heater Current")]
+        HeadZone11HeaterCurrent = 208,
+
+        /// <summary>
+        /// (Head Zone 11)
+        /// </summary>
+        [Description("Head Zone 11")]
+        HeadZone11Temperature = 209,
+
+        /// <summary>
+        /// (Head Zone 12 Heater Current)
+        /// </summary>
+        [Description("Head Zone 12 Heater Current")]
+        HeadZone12HeaterCurrent = 210,
+
+        /// <summary>
+        /// (Head Zone 12)
+        /// </summary>
+        [Description("Head Zone 12")]
+        HeadZone12Temperature = 211,
+
+        /// <summary>
         /// (Head Zone 1 Heater Current)
         /// </summary>
         [Description("Head Zone 1 Heater Current")]
@@ -308,6 +380,42 @@ namespace Tango.BL.Enumerations
         HeadZone6Temperature = 38,
 
         /// <summary>
+        /// (Head Zone 7 Heater Current)
+        /// </summary>
+        [Description("Head Zone 7 Heater Current")]
+        HeadZone7HeaterCurrent = 200,
+
+        /// <summary>
+        /// (Head Zone 7)
+        /// </summary>
+        [Description("Head Zone 7")]
+        HeadZone7Temperature = 201,
+
+        /// <summary>
+        /// (Head Zone 8 Heater Current)
+        /// </summary>
+        [Description("Head Zone 8 Heater Current")]
+        HeadZone8HeaterCurrent = 202,
+
+        /// <summary>
+        /// (Head Zone 8)
+        /// </summary>
+        [Description("Head Zone 8")]
+        HeadZone8Temperature = 203,
+
+        /// <summary>
+        /// (Head Zone 9 Heater Current)
+        /// </summary>
+        [Description("Head Zone 9 Heater Current")]
+        HeadZone9HeaterCurrent = 204,
+
+        /// <summary>
+        /// (Head Zone 9)
+        /// </summary>
+        [Description("Head Zone 9")]
+        HeadZone9Temperature = 205,
+
+        /// <summary>
         /// (Mid Tank 1 Level)
         /// </summary>
         [Description("Mid Tank 1 Level")]
@@ -404,6 +512,12 @@ namespace Tango.BL.Enumerations
         ThreadSpeed = 8,
 
         /// <summary>
+        /// (WHS Blower 2 Voltage)
+        /// </summary>
+        [Description("WHS Blower 2 Voltage")]
+        WHSBlower2Voltage = 300,
+
+        /// <summary>
         /// (Winder Motor)
         /// </summary>
         [Description("Winder Motor")]
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs
index 1e0d5546d..5d1c3e148 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs
@@ -58,8 +58,6 @@ namespace Tango.BL
             {
                 db = ObservablesContext.CreateDefault();
 
-                TaskSequencer sequencer = new TaskSequencer();
-
                 WindingMethods = db.WindingMethods.ToObservableCollection();
 
                 ColorSpaces = db.ColorSpaces.ToObservableCollection();
@@ -67,33 +65,33 @@ namespace Tango.BL
 
                 EventTypes = db.EventTypes.ToObservableCollection();
 
-                HardwareBlowerTypes = db.HardwareBlowerTypes.ToObservableCollection();
+                HardwareBlowerTypes = db.HardwareBlowerTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwareBlowers = db.HardwareBlowers.ToObservableCollection();
 
-                HardwareBreakSensorTypes = db.HardwareBreakSensorTypes.ToObservableCollection();
+                HardwareBreakSensorTypes = db.HardwareBreakSensorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwareBreakSensors = db.HardwareBreakSensors.ToObservableCollection();
 
-                HardwareDancerTypes = db.HardwareDancerTypes.ToObservableCollection();
+                HardwareDancerTypes = db.HardwareDancerTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwareDancers = db.HardwareDancers.ToObservableCollection();
 
-                HardwareMotorTypes = db.HardwareMotorTypes.ToObservableCollection();
+                HardwareMotorTypes = db.HardwareMotorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwareMotors = db.HardwareMotors.ToObservableCollection();
 
-                HardwarePidControlTypes = db.HardwarePidControlTypes.ToObservableCollection();
+                HardwarePidControlTypes = db.HardwarePidControlTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwarePidControls = db.HardwarePidControls.ToObservableCollection();
 
-                HardwareSpeedSensorTypes = db.HardwareSpeedSensorTypes.ToObservableCollection();
+                HardwareSpeedSensorTypes = db.HardwareSpeedSensorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwareSpeedSensors = db.HardwareSpeedSensors.ToObservableCollection();
 
-                HardwareWinderTypes = db.HardwareWinderTypes.ToObservableCollection();
+                HardwareWinderTypes = db.HardwareWinderTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 HardwareWinders = db.HardwareWinders.ToObservableCollection();
 
-                TechControllers = db.TechControllers.ToObservableCollection();
-                TechDispensers = db.TechDispensers.ToObservableCollection();
+                TechControllers = db.TechControllers.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
+                TechDispensers = db.TechDispensers.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
                 TechIos = db.TechIos.ToObservableCollection();
-                TechMonitors = db.TechMonitors.ToObservableCollection();
-                TechValves = db.TechValves.ToObservableCollection();
-                TechHeaters = db.TechHeaters.ToObservableCollection();
+                TechMonitors = db.TechMonitors.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
+                TechValves = db.TechValves.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
+                TechHeaters = db.TechHeaters.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection();
 
                 Machines = db.Machines.Include(x => x.Organization).ToObservableCollection();
 
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs
index f4192a88b..68594d8ac 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/IEnumerableExtensions.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Tango.Core;
 
@@ -104,5 +105,21 @@ public static class IEnumerableExtensions
     {
         return source.GroupBy(property).Select(g => g.First());
     }
+
+    /// <summary>
+    /// Orders the collection by natural alphanumeric string.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="source">The source.</param>
+    /// <param name="selector">The selector.</param>
+    /// <returns></returns>
+    public static IOrderedEnumerable<T> OrderByAlphaNumeric<T>(this IEnumerable<T> source, Func<T, string> selector)
+    {
+        int max = source
+            .SelectMany(i => Regex.Matches(selector(i), @"\d+").Cast<Match>().Select(m => (int?)m.Value.Length))
+            .Max() ?? 0;
+
+        return source.OrderBy(i => Regex.Replace(selector(i), @"\d+", m => m.Value.PadLeft(max, '0')));
+    }
 }
 
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index 6ae399816..38e58a257 100644
--- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
@@ -22,7 +22,7 @@ namespace Tango.PMR.Common {
     static MessageTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirvMwoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiq2NAoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -142,36 +142,37 @@ namespace Tango.PMR.Common {
             "RGVidWdMb2dSZXF1ZXN0EKAfEhoKFVN0YXJ0RGVidWdMb2dSZXNwb25zZRCh",
             "HxIYChNTdG9wRGVidWdMb2dSZXF1ZXN0EKIfEhkKFFN0b3BEZWJ1Z0xvZ1Jl",
             "c3BvbnNlEKMfEh8KGlNldERlYnVnTG9nQ2F0ZWdvcnlSZXF1ZXN0EKQfEiAK",
-            "G1NldERlYnVnTG9nQ2F0ZWdvcnlSZXNwb25zZRClHxInCiJVcGxvYWRIYXJk",
-            "d2FyZUNvbmZpZ3VyYXRpb25SZXF1ZXN0EIgnEigKI1VwbG9hZEhhcmR3YXJl",
-            "Q29uZmlndXJhdGlvblJlc3BvbnNlEIknEhcKElN5c3RlbVJlc2V0UmVxdWVz",
-            "dBCKJxIYChNTeXN0ZW1SZXNldFJlc3BvbnNlEIsnEhUKEEtlZXBBbGl2ZVJl",
-            "cXVlc3QQ8C4SFgoRS2VlcEFsaXZlUmVzcG9uc2UQ8S4SEwoOQ29ubmVjdFJl",
-            "cXVlc3QQ8i4SFAoPQ29ubmVjdFJlc3BvbnNlEPMuEhYKEURpc2Nvbm5lY3RS",
-            "ZXF1ZXN0EPQuEhcKEkRpc2Nvbm5lY3RSZXNwb25zZRD1LhIWChFGaWxlVXBs",
-            "b2FkUmVxdWVzdBDYNhIXChJGaWxlVXBsb2FkUmVzcG9uc2UQ2TYSGwoWRmls",
-            "ZUNodW5rVXBsb2FkUmVxdWVzdBDaNhIcChdGaWxlQ2h1bmtVcGxvYWRSZXNw",
-            "b25zZRDbNhIaChVFeGVjdXRlUHJvY2Vzc1JlcXVlc3QQ3DYSGwoWRXhlY3V0",
-            "ZVByb2Nlc3NSZXNwb25zZRDdNhIXChJLaWxsUHJvY2Vzc1JlcXVlc3QQ3jYS",
-            "GAoTS2lsbFByb2Nlc3NSZXNwb25zZRDfNhISCg1DcmVhdGVSZXF1ZXN0EOA2",
-            "EhMKDkNyZWF0ZVJlc3BvbnNlEOE2EhIKDURlbGV0ZVJlcXVlc3QQ4jYSEwoO",
-            "RGVsZXRlUmVzcG9uc2UQ4zYSGgoVR2V0U3RvcmFnZUluZm9SZXF1ZXN0EOQ2",
-            "EhsKFkdldFN0b3JhZ2VJbmZvUmVzcG9uc2UQ5TYSFAoPR2V0RmlsZXNSZXF1",
-            "ZXN0EOY2EhUKEEdldEZpbGVzUmVzcG9uc2UQ5zYSGAoTRmlsZURvd25sb2Fk",
-            "UmVxdWVzdBDoNhIZChRGaWxlRG93bmxvYWRSZXNwb25zZRDpNhIdChhGaWxl",
-            "Q2h1bmtEb3dubG9hZFJlcXVlc3QQ6jYSHgoZRmlsZUNodW5rRG93bmxvYWRS",
-            "ZXNwb25zZRDrNhIbChZWYWxpZGF0ZVZlcnNpb25SZXF1ZXN0EOw2EhwKF1Zh",
-            "bGlkYXRlVmVyc2lvblJlc3BvbnNlEO02EhsKFkFjdGl2YXRlVmVyc2lvblJl",
-            "cXVlc3QQ7jYSHAoXQWN0aXZhdGVWZXJzaW9uUmVzcG9uc2UQ7zYSGQoURGlz",
-            "cGVuc2VyRGF0YVJlcXVlc3QQwD4SGgoVRGlzcGVuc2VyRGF0YVJlc3BvbnNl",
-            "EME+EhwKF01pZFRhbmtEYXRhU2V0dXBSZXF1ZXN0EMI+Eh0KGE1pZFRhbmtE",
-            "YXRhU2V0dXBSZXNwb25zZRDDPhIiCh1NYWNoaW5lQ2FsaWJyYXRpb25EYXRh",
-            "UmVxdWVzdBDEPhIjCh5NYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVzcG9uc2UQ",
-            "xT4SJAofU3RhcnRNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCoRhIlCiBT",
-            "dGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXNwb25zZRCpRhIjCh5TdG9wTWFj",
-            "aGluZVN0YXR1c1VwZGF0ZVJlcXVlc3QQqkYSJAofU3RvcE1hY2hpbmVTdGF0",
-            "dXNVcGRhdGVSZXNwb25zZRCrRkIcChpjb20udHdpbmUudGFuZ28ucG1yLmNv",
-            "bW1vbmIGcHJvdG8z"));
+            "G1NldERlYnVnTG9nQ2F0ZWdvcnlSZXNwb25zZRClHxIhChxTZXR1cERlYnVn",
+            "RGlzcmlidXRvcnNSZXF1ZXN0EKYfEiIKHVNldHVwRGVidWdEaXNyaWJ1dG9y",
+            "c1Jlc3BvbnNlEKcfEicKIlVwbG9hZEhhcmR3YXJlQ29uZmlndXJhdGlvblJl",
+            "cXVlc3QQiCcSKAojVXBsb2FkSGFyZHdhcmVDb25maWd1cmF0aW9uUmVzcG9u",
+            "c2UQiScSFwoSU3lzdGVtUmVzZXRSZXF1ZXN0EIonEhgKE1N5c3RlbVJlc2V0",
+            "UmVzcG9uc2UQiycSFQoQS2VlcEFsaXZlUmVxdWVzdBDwLhIWChFLZWVwQWxp",
+            "dmVSZXNwb25zZRDxLhITCg5Db25uZWN0UmVxdWVzdBDyLhIUCg9Db25uZWN0",
+            "UmVzcG9uc2UQ8y4SFgoRRGlzY29ubmVjdFJlcXVlc3QQ9C4SFwoSRGlzY29u",
+            "bmVjdFJlc3BvbnNlEPUuEhYKEUZpbGVVcGxvYWRSZXF1ZXN0ENg2EhcKEkZp",
+            "bGVVcGxvYWRSZXNwb25zZRDZNhIbChZGaWxlQ2h1bmtVcGxvYWRSZXF1ZXN0",
+            "ENo2EhwKF0ZpbGVDaHVua1VwbG9hZFJlc3BvbnNlENs2EhoKFUV4ZWN1dGVQ",
+            "cm9jZXNzUmVxdWVzdBDcNhIbChZFeGVjdXRlUHJvY2Vzc1Jlc3BvbnNlEN02",
+            "EhcKEktpbGxQcm9jZXNzUmVxdWVzdBDeNhIYChNLaWxsUHJvY2Vzc1Jlc3Bv",
+            "bnNlEN82EhIKDUNyZWF0ZVJlcXVlc3QQ4DYSEwoOQ3JlYXRlUmVzcG9uc2UQ",
+            "4TYSEgoNRGVsZXRlUmVxdWVzdBDiNhITCg5EZWxldGVSZXNwb25zZRDjNhIa",
+            "ChVHZXRTdG9yYWdlSW5mb1JlcXVlc3QQ5DYSGwoWR2V0U3RvcmFnZUluZm9S",
+            "ZXNwb25zZRDlNhIUCg9HZXRGaWxlc1JlcXVlc3QQ5jYSFQoQR2V0RmlsZXNS",
+            "ZXNwb25zZRDnNhIYChNGaWxlRG93bmxvYWRSZXF1ZXN0EOg2EhkKFEZpbGVE",
+            "b3dubG9hZFJlc3BvbnNlEOk2Eh0KGEZpbGVDaHVua0Rvd25sb2FkUmVxdWVz",
+            "dBDqNhIeChlGaWxlQ2h1bmtEb3dubG9hZFJlc3BvbnNlEOs2EhsKFlZhbGlk",
+            "YXRlVmVyc2lvblJlcXVlc3QQ7DYSHAoXVmFsaWRhdGVWZXJzaW9uUmVzcG9u",
+            "c2UQ7TYSGwoWQWN0aXZhdGVWZXJzaW9uUmVxdWVzdBDuNhIcChdBY3RpdmF0",
+            "ZVZlcnNpb25SZXNwb25zZRDvNhIZChREaXNwZW5zZXJEYXRhUmVxdWVzdBDA",
+            "PhIaChVEaXNwZW5zZXJEYXRhUmVzcG9uc2UQwT4SHAoXTWlkVGFua0RhdGFT",
+            "ZXR1cFJlcXVlc3QQwj4SHQoYTWlkVGFua0RhdGFTZXR1cFJlc3BvbnNlEMM+",
+            "EiIKHU1hY2hpbmVDYWxpYnJhdGlvbkRhdGFSZXF1ZXN0EMQ+EiMKHk1hY2hp",
+            "bmVDYWxpYnJhdGlvbkRhdGFSZXNwb25zZRDFPhIkCh9TdGFydE1hY2hpbmVT",
+            "dGF0dXNVcGRhdGVSZXF1ZXN0EKhGEiUKIFN0YXJ0TWFjaGluZVN0YXR1c1Vw",
+            "ZGF0ZVJlc3BvbnNlEKlGEiMKHlN0b3BNYWNoaW5lU3RhdHVzVXBkYXRlUmVx",
+            "dWVzdBCqRhIkCh9TdG9wTWFjaGluZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKtG",
+            "QhwKGmNvbS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -388,6 +389,8 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("StopDebugLogResponse")] StopDebugLogResponse = 4003,
     [pbr::OriginalName("SetDebugLogCategoryRequest")] SetDebugLogCategoryRequest = 4004,
     [pbr::OriginalName("SetDebugLogCategoryResponse")] SetDebugLogCategoryResponse = 4005,
+    [pbr::OriginalName("SetupDebugDisributorsRequest")] SetupDebugDisributorsRequest = 4006,
+    [pbr::OriginalName("SetupDebugDisributorsResponse")] SetupDebugDisributorsResponse = 4007,
     /// <summary>
     ///Hardware
     /// </summary>
diff --git a/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs b/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs
index 363edab57..a17852dcf 100644
--- a/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Debugging/SetupDebugDisributorsRequest.cs
@@ -23,13 +23,15 @@ namespace Tango.PMR.Debugging {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiJTZXR1cERlYnVnRGlzcmlidXRvcnNSZXF1ZXN0LnByb3RvEhNUYW5nby5Q",
-            "TVIuRGVidWdnaW5nIjkKHFNldHVwRGVidWdEaXNyaWJ1dG9yc1JlcXVlc3QS",
-            "GQoRRGlzdHJpYnV0b3JBY3RpdmUYASADKAhCHwodY29tLnR3aW5lLnRhbmdv",
-            "LnBtci5kZWJ1Z2dpbmdiBnByb3RvMw=="));
+            "TVIuRGVidWdnaW5nGhpEZWJ1Z0Rpc3RyaWJ1dG9yVHlwZS5wcm90byJ+ChxT",
+            "ZXR1cERlYnVnRGlzcmlidXRvcnNSZXF1ZXN0EkMKEERlYnVnRGlzdHJpYnV0",
+            "b3IYASABKA4yKS5UYW5nby5QTVIuRGVidWdnaW5nLkRlYnVnRGlzdHJpYnV0",
+            "b3JUeXBlEhkKEURpc3RyaWJ1dG9yQWN0aXZlGAIgASgIQh8KHWNvbS50d2lu",
+            "ZS50YW5nby5wbXIuZGVidWdnaW5nYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
+          new pbr::FileDescriptor[] { global::Tango.PMR.Debugging.DebugDistributorTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Debugging.SetupDebugDisributorsRequest), global::Tango.PMR.Debugging.SetupDebugDisributorsRequest.Parser, new[]{ "DistributorActive" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Debugging.SetupDebugDisributorsRequest), global::Tango.PMR.Debugging.SetupDebugDisributorsRequest.Parser, new[]{ "DebugDistributor", "DistributorActive" }, null, null, null)
           }));
     }
     #endregion
@@ -60,7 +62,8 @@ namespace Tango.PMR.Debugging {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public SetupDebugDisributorsRequest(SetupDebugDisributorsRequest other) : this() {
-      distributorActive_ = other.distributorActive_.Clone();
+      debugDistributor_ = other.debugDistributor_;
+      distributorActive_ = other.distributorActive_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -68,14 +71,26 @@ namespace Tango.PMR.Debugging {
       return new SetupDebugDisributorsRequest(this);
     }
 
+    /// <summary>Field number for the "DebugDistributor" field.</summary>
+    public const int DebugDistributorFieldNumber = 1;
+    private global::Tango.PMR.Debugging.DebugDistributorType debugDistributor_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.Debugging.DebugDistributorType DebugDistributor {
+      get { return debugDistributor_; }
+      set {
+        debugDistributor_ = value;
+      }
+    }
+
     /// <summary>Field number for the "DistributorActive" field.</summary>
-    public const int DistributorActiveFieldNumber = 1;
-    private static readonly pb::FieldCodec<bool> _repeated_distributorActive_codec
-        = pb::FieldCodec.ForBool(10);
-    private readonly pbc::RepeatedField<bool> distributorActive_ = new pbc::RepeatedField<bool>();
+    public const int DistributorActiveFieldNumber = 2;
+    private bool distributorActive_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<bool> DistributorActive {
+    public bool DistributorActive {
       get { return distributorActive_; }
+      set {
+        distributorActive_ = value;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -91,14 +106,16 @@ namespace Tango.PMR.Debugging {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if(!distributorActive_.Equals(other.distributorActive_)) return false;
+      if (DebugDistributor != other.DebugDistributor) return false;
+      if (DistributorActive != other.DistributorActive) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      hash ^= distributorActive_.GetHashCode();
+      if (DebugDistributor != 0) hash ^= DebugDistributor.GetHashCode();
+      if (DistributorActive != false) hash ^= DistributorActive.GetHashCode();
       return hash;
     }
 
@@ -109,13 +126,25 @@ namespace Tango.PMR.Debugging {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      distributorActive_.WriteTo(output, _repeated_distributorActive_codec);
+      if (DebugDistributor != 0) {
+        output.WriteRawTag(8);
+        output.WriteEnum((int) DebugDistributor);
+      }
+      if (DistributorActive != false) {
+        output.WriteRawTag(16);
+        output.WriteBool(DistributorActive);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      size += distributorActive_.CalculateSize(_repeated_distributorActive_codec);
+      if (DebugDistributor != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DebugDistributor);
+      }
+      if (DistributorActive != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -124,7 +153,12 @@ namespace Tango.PMR.Debugging {
       if (other == null) {
         return;
       }
-      distributorActive_.Add(other.distributorActive_);
+      if (other.DebugDistributor != 0) {
+        DebugDistributor = other.DebugDistributor;
+      }
+      if (other.DistributorActive != false) {
+        DistributorActive = other.DistributorActive;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -135,9 +169,12 @@ namespace Tango.PMR.Debugging {
           default:
             input.SkipLastField();
             break;
-          case 10:
           case 8: {
-            distributorActive_.AddEntriesFrom(input, _repeated_distributorActive_codec);
+            debugDistributor_ = (global::Tango.PMR.Debugging.DebugDistributorType) input.ReadEnum();
+            break;
+          }
+          case 16: {
+            DistributorActive = input.ReadBool();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
index ea6dfb0cb..dae46d41b 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",
-            "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIp8QChNEaWFnbm9zdGljc01vbml0",
+            "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIvgUChNEaWFnbm9zdGljc01vbml0",
             "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD",
             "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl",
             "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY",
@@ -69,12 +69,26 @@ namespace Tango.PMR.Diagnostics {
             "YXRlckN1cnJlbnQYPyADKAESPgoSRGlzcGVuc2Vyc0lua0xldmVsGEAgAygL",
             "MiIuVGFuZ28uUE1SLkRpYWdub3N0aWNzLkRvdWJsZUFycmF5EjwKEE1pZFRh",
             "bmtzSW5rTGV2ZWwYQSADKAsyIi5UYW5nby5QTVIuRGlhZ25vc3RpY3MuRG91",
-            "YmxlQXJyYXkSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGEIgAygBQiEKH2NvbS50",
-            "d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw=="));
+            "YmxlQXJyYXkSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGEIgAygBEh4KFkhlYWRa",
+            "b25lN0hlYXRlckN1cnJlbnQYQyADKAESHAoUSGVhZFpvbmU3VGVtcGVyYXR1",
+            "cmUYRCADKAESHgoWSGVhZFpvbmU4SGVhdGVyQ3VycmVudBhFIAMoARIcChRI",
+            "ZWFkWm9uZThUZW1wZXJhdHVyZRhGIAMoARIeChZIZWFkWm9uZTlIZWF0ZXJD",
+            "dXJyZW50GEcgAygBEhwKFEhlYWRab25lOVRlbXBlcmF0dXJlGEggAygBEh8K",
+            "F0hlYWRab25lMTBIZWF0ZXJDdXJyZW50GEkgAygBEh0KFUhlYWRab25lMTBU",
+            "ZW1wZXJhdHVyZRhKIAMoARIfChdIZWFkWm9uZTExSGVhdGVyQ3VycmVudBhL",
+            "IAMoARIdChVIZWFkWm9uZTExVGVtcGVyYXR1cmUYTCADKAESHwoXSGVhZFpv",
+            "bmUxMkhlYXRlckN1cnJlbnQYTSADKAESHQoVSGVhZFpvbmUxMlRlbXBlcmF0",
+            "dXJlGE4gAygBEhoKEkhlYWRCbG93ZXJWb2x0YWdlMRhPIAMoARIaChJIZWFk",
+            "Qmxvd2VyVm9sdGFnZTIYUCADKAESHwoXSGVhZENvdmVySGVhdGVyMUN1cnJl",
+            "bnQYUSADKAESIwobSGVhZENvdmVySGVhdGVyMVRlbXBlcmF0dXJlGFIgAygB",
+            "Eh8KF0hlYWRDb3ZlckhlYXRlcjJDdXJyZW50GFMgAygBEiMKG0hlYWRDb3Zl",
+            "ckhlYXRlcjJUZW1wZXJhdHVyZRhUIAMoARIZChFXSFNCbG93ZXIyVm9sdGFn",
+            "ZRhVIAMoAUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZw",
+            "cm90bzM="));
       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", "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", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature" }, 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", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage" }, null, null, null)
           }));
     }
     #endregion
@@ -171,6 +185,25 @@ namespace Tango.PMR.Diagnostics {
       dispensersInkLevel_ = other.dispensersInkLevel_.Clone();
       midTanksInkLevel_ = other.midTanksInkLevel_.Clone();
       overallTemperature_ = other.overallTemperature_.Clone();
+      headZone7HeaterCurrent_ = other.headZone7HeaterCurrent_.Clone();
+      headZone7Temperature_ = other.headZone7Temperature_.Clone();
+      headZone8HeaterCurrent_ = other.headZone8HeaterCurrent_.Clone();
+      headZone8Temperature_ = other.headZone8Temperature_.Clone();
+      headZone9HeaterCurrent_ = other.headZone9HeaterCurrent_.Clone();
+      headZone9Temperature_ = other.headZone9Temperature_.Clone();
+      headZone10HeaterCurrent_ = other.headZone10HeaterCurrent_.Clone();
+      headZone10Temperature_ = other.headZone10Temperature_.Clone();
+      headZone11HeaterCurrent_ = other.headZone11HeaterCurrent_.Clone();
+      headZone11Temperature_ = other.headZone11Temperature_.Clone();
+      headZone12HeaterCurrent_ = other.headZone12HeaterCurrent_.Clone();
+      headZone12Temperature_ = other.headZone12Temperature_.Clone();
+      headBlowerVoltage1_ = other.headBlowerVoltage1_.Clone();
+      headBlowerVoltage2_ = other.headBlowerVoltage2_.Clone();
+      headCoverHeater1Current_ = other.headCoverHeater1Current_.Clone();
+      headCoverHeater1Temperature_ = other.headCoverHeater1Temperature_.Clone();
+      headCoverHeater2Current_ = other.headCoverHeater2Current_.Clone();
+      headCoverHeater2Temperature_ = other.headCoverHeater2Temperature_.Clone();
+      wHSBlower2Voltage_ = other.wHSBlower2Voltage_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1036,6 +1069,253 @@ namespace Tango.PMR.Diagnostics {
       get { return overallTemperature_; }
     }
 
+    /// <summary>Field number for the "HeadZone7HeaterCurrent" field.</summary>
+    public const int HeadZone7HeaterCurrentFieldNumber = 67;
+    private static readonly pb::FieldCodec<double> _repeated_headZone7HeaterCurrent_codec
+        = pb::FieldCodec.ForDouble(538);
+    private readonly pbc::RepeatedField<double> headZone7HeaterCurrent_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 7 Heater Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone7HeaterCurrent {
+      get { return headZone7HeaterCurrent_; }
+    }
+
+    /// <summary>Field number for the "HeadZone7Temperature" field.</summary>
+    public const int HeadZone7TemperatureFieldNumber = 68;
+    private static readonly pb::FieldCodec<double> _repeated_headZone7Temperature_codec
+        = pb::FieldCodec.ForDouble(546);
+    private readonly pbc::RepeatedField<double> headZone7Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 7 (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone7Temperature {
+      get { return headZone7Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadZone8HeaterCurrent" field.</summary>
+    public const int HeadZone8HeaterCurrentFieldNumber = 69;
+    private static readonly pb::FieldCodec<double> _repeated_headZone8HeaterCurrent_codec
+        = pb::FieldCodec.ForDouble(554);
+    private readonly pbc::RepeatedField<double> headZone8HeaterCurrent_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 8 Heater Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone8HeaterCurrent {
+      get { return headZone8HeaterCurrent_; }
+    }
+
+    /// <summary>Field number for the "HeadZone8Temperature" field.</summary>
+    public const int HeadZone8TemperatureFieldNumber = 70;
+    private static readonly pb::FieldCodec<double> _repeated_headZone8Temperature_codec
+        = pb::FieldCodec.ForDouble(562);
+    private readonly pbc::RepeatedField<double> headZone8Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 8 (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone8Temperature {
+      get { return headZone8Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadZone9HeaterCurrent" field.</summary>
+    public const int HeadZone9HeaterCurrentFieldNumber = 71;
+    private static readonly pb::FieldCodec<double> _repeated_headZone9HeaterCurrent_codec
+        = pb::FieldCodec.ForDouble(570);
+    private readonly pbc::RepeatedField<double> headZone9HeaterCurrent_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 9 Heater Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone9HeaterCurrent {
+      get { return headZone9HeaterCurrent_; }
+    }
+
+    /// <summary>Field number for the "HeadZone9Temperature" field.</summary>
+    public const int HeadZone9TemperatureFieldNumber = 72;
+    private static readonly pb::FieldCodec<double> _repeated_headZone9Temperature_codec
+        = pb::FieldCodec.ForDouble(578);
+    private readonly pbc::RepeatedField<double> headZone9Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 9 (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone9Temperature {
+      get { return headZone9Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadZone10HeaterCurrent" field.</summary>
+    public const int HeadZone10HeaterCurrentFieldNumber = 73;
+    private static readonly pb::FieldCodec<double> _repeated_headZone10HeaterCurrent_codec
+        = pb::FieldCodec.ForDouble(586);
+    private readonly pbc::RepeatedField<double> headZone10HeaterCurrent_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 10 Heater Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone10HeaterCurrent {
+      get { return headZone10HeaterCurrent_; }
+    }
+
+    /// <summary>Field number for the "HeadZone10Temperature" field.</summary>
+    public const int HeadZone10TemperatureFieldNumber = 74;
+    private static readonly pb::FieldCodec<double> _repeated_headZone10Temperature_codec
+        = pb::FieldCodec.ForDouble(594);
+    private readonly pbc::RepeatedField<double> headZone10Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 10 (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone10Temperature {
+      get { return headZone10Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadZone11HeaterCurrent" field.</summary>
+    public const int HeadZone11HeaterCurrentFieldNumber = 75;
+    private static readonly pb::FieldCodec<double> _repeated_headZone11HeaterCurrent_codec
+        = pb::FieldCodec.ForDouble(602);
+    private readonly pbc::RepeatedField<double> headZone11HeaterCurrent_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 11 Heater Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone11HeaterCurrent {
+      get { return headZone11HeaterCurrent_; }
+    }
+
+    /// <summary>Field number for the "HeadZone11Temperature" field.</summary>
+    public const int HeadZone11TemperatureFieldNumber = 76;
+    private static readonly pb::FieldCodec<double> _repeated_headZone11Temperature_codec
+        = pb::FieldCodec.ForDouble(610);
+    private readonly pbc::RepeatedField<double> headZone11Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 11 (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone11Temperature {
+      get { return headZone11Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadZone12HeaterCurrent" field.</summary>
+    public const int HeadZone12HeaterCurrentFieldNumber = 77;
+    private static readonly pb::FieldCodec<double> _repeated_headZone12HeaterCurrent_codec
+        = pb::FieldCodec.ForDouble(618);
+    private readonly pbc::RepeatedField<double> headZone12HeaterCurrent_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 12 Heater Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone12HeaterCurrent {
+      get { return headZone12HeaterCurrent_; }
+    }
+
+    /// <summary>Field number for the "HeadZone12Temperature" field.</summary>
+    public const int HeadZone12TemperatureFieldNumber = 78;
+    private static readonly pb::FieldCodec<double> _repeated_headZone12Temperature_codec
+        = pb::FieldCodec.ForDouble(626);
+    private readonly pbc::RepeatedField<double> headZone12Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Zone 12 (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadZone12Temperature {
+      get { return headZone12Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadBlowerVoltage1" field.</summary>
+    public const int HeadBlowerVoltage1FieldNumber = 79;
+    private static readonly pb::FieldCodec<double> _repeated_headBlowerVoltage1_codec
+        = pb::FieldCodec.ForDouble(634);
+    private readonly pbc::RepeatedField<double> headBlowerVoltage1_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Blower Voltage 1 (Min = 0, Max = 100, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadBlowerVoltage1 {
+      get { return headBlowerVoltage1_; }
+    }
+
+    /// <summary>Field number for the "HeadBlowerVoltage2" field.</summary>
+    public const int HeadBlowerVoltage2FieldNumber = 80;
+    private static readonly pb::FieldCodec<double> _repeated_headBlowerVoltage2_codec
+        = pb::FieldCodec.ForDouble(642);
+    private readonly pbc::RepeatedField<double> headBlowerVoltage2_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Blower Voltage 2 (Min = 0, Max = 100, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadBlowerVoltage2 {
+      get { return headBlowerVoltage2_; }
+    }
+
+    /// <summary>Field number for the "HeadCoverHeater1Current" field.</summary>
+    public const int HeadCoverHeater1CurrentFieldNumber = 81;
+    private static readonly pb::FieldCodec<double> _repeated_headCoverHeater1Current_codec
+        = pb::FieldCodec.ForDouble(650);
+    private readonly pbc::RepeatedField<double> headCoverHeater1Current_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Cover Heater 1 Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadCoverHeater1Current {
+      get { return headCoverHeater1Current_; }
+    }
+
+    /// <summary>Field number for the "HeadCoverHeater1Temperature" field.</summary>
+    public const int HeadCoverHeater1TemperatureFieldNumber = 82;
+    private static readonly pb::FieldCodec<double> _repeated_headCoverHeater1Temperature_codec
+        = pb::FieldCodec.ForDouble(658);
+    private readonly pbc::RepeatedField<double> headCoverHeater1Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Cover Heater 1 Temperature (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadCoverHeater1Temperature {
+      get { return headCoverHeater1Temperature_; }
+    }
+
+    /// <summary>Field number for the "HeadCoverHeater2Current" field.</summary>
+    public const int HeadCoverHeater2CurrentFieldNumber = 83;
+    private static readonly pb::FieldCodec<double> _repeated_headCoverHeater2Current_codec
+        = pb::FieldCodec.ForDouble(666);
+    private readonly pbc::RepeatedField<double> headCoverHeater2Current_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Cover Heater 2 Current (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadCoverHeater2Current {
+      get { return headCoverHeater2Current_; }
+    }
+
+    /// <summary>Field number for the "HeadCoverHeater2Temperature" field.</summary>
+    public const int HeadCoverHeater2TemperatureFieldNumber = 84;
+    private static readonly pb::FieldCodec<double> _repeated_headCoverHeater2Temperature_codec
+        = pb::FieldCodec.ForDouble(674);
+    private readonly pbc::RepeatedField<double> headCoverHeater2Temperature_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Cover Heater 2 Temperature (Min = 0, Max = 300, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadCoverHeater2Temperature {
+      get { return headCoverHeater2Temperature_; }
+    }
+
+    /// <summary>Field number for the "WHSBlower2Voltage" field.</summary>
+    public const int WHSBlower2VoltageFieldNumber = 85;
+    private static readonly pb::FieldCodec<double> _repeated_wHSBlower2Voltage_codec
+        = pb::FieldCodec.ForDouble(682);
+    private readonly pbc::RepeatedField<double> wHSBlower2Voltage_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///WHS Blower 2 Voltage (Min = 0, Max = 100, PPF = 10)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> WHSBlower2Voltage {
+      get { return wHSBlower2Voltage_; }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as DiagnosticsMonitors);
@@ -1115,6 +1395,25 @@ namespace Tango.PMR.Diagnostics {
       if(!dispensersInkLevel_.Equals(other.dispensersInkLevel_)) return false;
       if(!midTanksInkLevel_.Equals(other.midTanksInkLevel_)) return false;
       if(!overallTemperature_.Equals(other.overallTemperature_)) return false;
+      if(!headZone7HeaterCurrent_.Equals(other.headZone7HeaterCurrent_)) return false;
+      if(!headZone7Temperature_.Equals(other.headZone7Temperature_)) return false;
+      if(!headZone8HeaterCurrent_.Equals(other.headZone8HeaterCurrent_)) return false;
+      if(!headZone8Temperature_.Equals(other.headZone8Temperature_)) return false;
+      if(!headZone9HeaterCurrent_.Equals(other.headZone9HeaterCurrent_)) return false;
+      if(!headZone9Temperature_.Equals(other.headZone9Temperature_)) return false;
+      if(!headZone10HeaterCurrent_.Equals(other.headZone10HeaterCurrent_)) return false;
+      if(!headZone10Temperature_.Equals(other.headZone10Temperature_)) return false;
+      if(!headZone11HeaterCurrent_.Equals(other.headZone11HeaterCurrent_)) return false;
+      if(!headZone11Temperature_.Equals(other.headZone11Temperature_)) return false;
+      if(!headZone12HeaterCurrent_.Equals(other.headZone12HeaterCurrent_)) return false;
+      if(!headZone12Temperature_.Equals(other.headZone12Temperature_)) return false;
+      if(!headBlowerVoltage1_.Equals(other.headBlowerVoltage1_)) return false;
+      if(!headBlowerVoltage2_.Equals(other.headBlowerVoltage2_)) return false;
+      if(!headCoverHeater1Current_.Equals(other.headCoverHeater1Current_)) return false;
+      if(!headCoverHeater1Temperature_.Equals(other.headCoverHeater1Temperature_)) return false;
+      if(!headCoverHeater2Current_.Equals(other.headCoverHeater2Current_)) return false;
+      if(!headCoverHeater2Temperature_.Equals(other.headCoverHeater2Temperature_)) return false;
+      if(!wHSBlower2Voltage_.Equals(other.wHSBlower2Voltage_)) return false;
       return true;
     }
 
@@ -1187,6 +1486,25 @@ namespace Tango.PMR.Diagnostics {
       hash ^= dispensersInkLevel_.GetHashCode();
       hash ^= midTanksInkLevel_.GetHashCode();
       hash ^= overallTemperature_.GetHashCode();
+      hash ^= headZone7HeaterCurrent_.GetHashCode();
+      hash ^= headZone7Temperature_.GetHashCode();
+      hash ^= headZone8HeaterCurrent_.GetHashCode();
+      hash ^= headZone8Temperature_.GetHashCode();
+      hash ^= headZone9HeaterCurrent_.GetHashCode();
+      hash ^= headZone9Temperature_.GetHashCode();
+      hash ^= headZone10HeaterCurrent_.GetHashCode();
+      hash ^= headZone10Temperature_.GetHashCode();
+      hash ^= headZone11HeaterCurrent_.GetHashCode();
+      hash ^= headZone11Temperature_.GetHashCode();
+      hash ^= headZone12HeaterCurrent_.GetHashCode();
+      hash ^= headZone12Temperature_.GetHashCode();
+      hash ^= headBlowerVoltage1_.GetHashCode();
+      hash ^= headBlowerVoltage2_.GetHashCode();
+      hash ^= headCoverHeater1Current_.GetHashCode();
+      hash ^= headCoverHeater1Temperature_.GetHashCode();
+      hash ^= headCoverHeater2Current_.GetHashCode();
+      hash ^= headCoverHeater2Temperature_.GetHashCode();
+      hash ^= wHSBlower2Voltage_.GetHashCode();
       return hash;
     }
 
@@ -1263,6 +1581,25 @@ namespace Tango.PMR.Diagnostics {
       dispensersInkLevel_.WriteTo(output, _repeated_dispensersInkLevel_codec);
       midTanksInkLevel_.WriteTo(output, _repeated_midTanksInkLevel_codec);
       overallTemperature_.WriteTo(output, _repeated_overallTemperature_codec);
+      headZone7HeaterCurrent_.WriteTo(output, _repeated_headZone7HeaterCurrent_codec);
+      headZone7Temperature_.WriteTo(output, _repeated_headZone7Temperature_codec);
+      headZone8HeaterCurrent_.WriteTo(output, _repeated_headZone8HeaterCurrent_codec);
+      headZone8Temperature_.WriteTo(output, _repeated_headZone8Temperature_codec);
+      headZone9HeaterCurrent_.WriteTo(output, _repeated_headZone9HeaterCurrent_codec);
+      headZone9Temperature_.WriteTo(output, _repeated_headZone9Temperature_codec);
+      headZone10HeaterCurrent_.WriteTo(output, _repeated_headZone10HeaterCurrent_codec);
+      headZone10Temperature_.WriteTo(output, _repeated_headZone10Temperature_codec);
+      headZone11HeaterCurrent_.WriteTo(output, _repeated_headZone11HeaterCurrent_codec);
+      headZone11Temperature_.WriteTo(output, _repeated_headZone11Temperature_codec);
+      headZone12HeaterCurrent_.WriteTo(output, _repeated_headZone12HeaterCurrent_codec);
+      headZone12Temperature_.WriteTo(output, _repeated_headZone12Temperature_codec);
+      headBlowerVoltage1_.WriteTo(output, _repeated_headBlowerVoltage1_codec);
+      headBlowerVoltage2_.WriteTo(output, _repeated_headBlowerVoltage2_codec);
+      headCoverHeater1Current_.WriteTo(output, _repeated_headCoverHeater1Current_codec);
+      headCoverHeater1Temperature_.WriteTo(output, _repeated_headCoverHeater1Temperature_codec);
+      headCoverHeater2Current_.WriteTo(output, _repeated_headCoverHeater2Current_codec);
+      headCoverHeater2Temperature_.WriteTo(output, _repeated_headCoverHeater2Temperature_codec);
+      wHSBlower2Voltage_.WriteTo(output, _repeated_wHSBlower2Voltage_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1334,6 +1671,25 @@ namespace Tango.PMR.Diagnostics {
       size += dispensersInkLevel_.CalculateSize(_repeated_dispensersInkLevel_codec);
       size += midTanksInkLevel_.CalculateSize(_repeated_midTanksInkLevel_codec);
       size += overallTemperature_.CalculateSize(_repeated_overallTemperature_codec);
+      size += headZone7HeaterCurrent_.CalculateSize(_repeated_headZone7HeaterCurrent_codec);
+      size += headZone7Temperature_.CalculateSize(_repeated_headZone7Temperature_codec);
+      size += headZone8HeaterCurrent_.CalculateSize(_repeated_headZone8HeaterCurrent_codec);
+      size += headZone8Temperature_.CalculateSize(_repeated_headZone8Temperature_codec);
+      size += headZone9HeaterCurrent_.CalculateSize(_repeated_headZone9HeaterCurrent_codec);
+      size += headZone9Temperature_.CalculateSize(_repeated_headZone9Temperature_codec);
+      size += headZone10HeaterCurrent_.CalculateSize(_repeated_headZone10HeaterCurrent_codec);
+      size += headZone10Temperature_.CalculateSize(_repeated_headZone10Temperature_codec);
+      size += headZone11HeaterCurrent_.CalculateSize(_repeated_headZone11HeaterCurrent_codec);
+      size += headZone11Temperature_.CalculateSize(_repeated_headZone11Temperature_codec);
+      size += headZone12HeaterCurrent_.CalculateSize(_repeated_headZone12HeaterCurrent_codec);
+      size += headZone12Temperature_.CalculateSize(_repeated_headZone12Temperature_codec);
+      size += headBlowerVoltage1_.CalculateSize(_repeated_headBlowerVoltage1_codec);
+      size += headBlowerVoltage2_.CalculateSize(_repeated_headBlowerVoltage2_codec);
+      size += headCoverHeater1Current_.CalculateSize(_repeated_headCoverHeater1Current_codec);
+      size += headCoverHeater1Temperature_.CalculateSize(_repeated_headCoverHeater1Temperature_codec);
+      size += headCoverHeater2Current_.CalculateSize(_repeated_headCoverHeater2Current_codec);
+      size += headCoverHeater2Temperature_.CalculateSize(_repeated_headCoverHeater2Temperature_codec);
+      size += wHSBlower2Voltage_.CalculateSize(_repeated_wHSBlower2Voltage_codec);
       return size;
     }
 
@@ -1408,6 +1764,25 @@ namespace Tango.PMR.Diagnostics {
       dispensersInkLevel_.Add(other.dispensersInkLevel_);
       midTanksInkLevel_.Add(other.midTanksInkLevel_);
       overallTemperature_.Add(other.overallTemperature_);
+      headZone7HeaterCurrent_.Add(other.headZone7HeaterCurrent_);
+      headZone7Temperature_.Add(other.headZone7Temperature_);
+      headZone8HeaterCurrent_.Add(other.headZone8HeaterCurrent_);
+      headZone8Temperature_.Add(other.headZone8Temperature_);
+      headZone9HeaterCurrent_.Add(other.headZone9HeaterCurrent_);
+      headZone9Temperature_.Add(other.headZone9Temperature_);
+      headZone10HeaterCurrent_.Add(other.headZone10HeaterCurrent_);
+      headZone10Temperature_.Add(other.headZone10Temperature_);
+      headZone11HeaterCurrent_.Add(other.headZone11HeaterCurrent_);
+      headZone11Temperature_.Add(other.headZone11Temperature_);
+      headZone12HeaterCurrent_.Add(other.headZone12HeaterCurrent_);
+      headZone12Temperature_.Add(other.headZone12Temperature_);
+      headBlowerVoltage1_.Add(other.headBlowerVoltage1_);
+      headBlowerVoltage2_.Add(other.headBlowerVoltage2_);
+      headCoverHeater1Current_.Add(other.headCoverHeater1Current_);
+      headCoverHeater1Temperature_.Add(other.headCoverHeater1Temperature_);
+      headCoverHeater2Current_.Add(other.headCoverHeater2Current_);
+      headCoverHeater2Temperature_.Add(other.headCoverHeater2Temperature_);
+      wHSBlower2Voltage_.Add(other.wHSBlower2Voltage_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1742,6 +2117,101 @@ namespace Tango.PMR.Diagnostics {
             overallTemperature_.AddEntriesFrom(input, _repeated_overallTemperature_codec);
             break;
           }
+          case 538:
+          case 537: {
+            headZone7HeaterCurrent_.AddEntriesFrom(input, _repeated_headZone7HeaterCurrent_codec);
+            break;
+          }
+          case 546:
+          case 545: {
+            headZone7Temperature_.AddEntriesFrom(input, _repeated_headZone7Temperature_codec);
+            break;
+          }
+          case 554:
+          case 553: {
+            headZone8HeaterCurrent_.AddEntriesFrom(input, _repeated_headZone8HeaterCurrent_codec);
+            break;
+          }
+          case 562:
+          case 561: {
+            headZone8Temperature_.AddEntriesFrom(input, _repeated_headZone8Temperature_codec);
+            break;
+          }
+          case 570:
+          case 569: {
+            headZone9HeaterCurrent_.AddEntriesFrom(input, _repeated_headZone9HeaterCurrent_codec);
+            break;
+          }
+          case 578:
+          case 577: {
+            headZone9Temperature_.AddEntriesFrom(input, _repeated_headZone9Temperature_codec);
+            break;
+          }
+          case 586:
+          case 585: {
+            headZone10HeaterCurrent_.AddEntriesFrom(input, _repeated_headZone10HeaterCurrent_codec);
+            break;
+          }
+          case 594:
+          case 593: {
+            headZone10Temperature_.AddEntriesFrom(input, _repeated_headZone10Temperature_codec);
+            break;
+          }
+          case 602:
+          case 601: {
+            headZone11HeaterCurrent_.AddEntriesFrom(input, _repeated_headZone11HeaterCurrent_codec);
+            break;
+          }
+          case 610:
+          case 609: {
+            headZone11Temperature_.AddEntriesFrom(input, _repeated_headZone11Temperature_codec);
+            break;
+          }
+          case 618:
+          case 617: {
+            headZone12HeaterCurrent_.AddEntriesFrom(input, _repeated_headZone12HeaterCurrent_codec);
+            break;
+          }
+          case 626:
+          case 625: {
+            headZone12Temperature_.AddEntriesFrom(input, _repeated_headZone12Temperature_codec);
+            break;
+          }
+          case 634:
+          case 633: {
+            headBlowerVoltage1_.AddEntriesFrom(input, _repeated_headBlowerVoltage1_codec);
+            break;
+          }
+          case 642:
+          case 641: {
+            headBlowerVoltage2_.AddEntriesFrom(input, _repeated_headBlowerVoltage2_codec);
+            break;
+          }
+          case 650:
+          case 649: {
+            headCoverHeater1Current_.AddEntriesFrom(input, _repeated_headCoverHeater1Current_codec);
+            break;
+          }
+          case 658:
+          case 657: {
+            headCoverHeater1Temperature_.AddEntriesFrom(input, _repeated_headCoverHeater1Temperature_codec);
+            break;
+          }
+          case 666:
+          case 665: {
+            headCoverHeater2Current_.AddEntriesFrom(input, _repeated_headCoverHeater2Current_codec);
+            break;
+          }
+          case 674:
+          case 673: {
+            headCoverHeater2Temperature_.AddEntriesFrom(input, _repeated_headCoverHeater2Temperature_codec);
+            break;
+          }
+          case 682:
+          case 681: {
+            wHSBlower2Voltage_.AddEntriesFrom(input, _repeated_wHSBlower2Voltage_codec);
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs
index 0f1606597..304e0ebe6 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs
@@ -22,13 +22,16 @@ namespace Tango.PMR.Diagnostics {
     static HeaterTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChBIZWF0ZXJUeXBlLnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3RpY3MqxgEK",
+            "ChBIZWF0ZXJUeXBlLnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3RpY3Mq2wIK",
             "CkhlYXRlclR5cGUSEgoORHJ5ZXJBaXJIZWF0ZXIQABITCg9Ecnllck1haW5I",
             "ZWF0ZXIQARIYChREcnllclNlY29uZGFyeUhlYXRlchACEg8KC0hlYXRlclpv",
             "bmUxEAMSDwoLSGVhdGVyWm9uZTIQBBIPCgtIZWF0ZXJab25lMxAFEg8KC0hl",
             "YXRlclpvbmU0EAYSDwoLSGVhdGVyWm9uZTUQBxIPCgtIZWF0ZXJab25lNhAI",
-            "Eg8KC01peGVySGVhdGVyEAlCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFn",
-            "bm9zdGljc2IGcHJvdG8z"));
+            "Eg8KC01peGVySGVhdGVyEAkSDwoLSGVhdGVyWm9uZTcQChIPCgtIZWF0ZXJa",
+            "b25lOBALEg8KC0hlYXRlclpvbmU5EAwSEAoMSGVhdGVyWm9uZTEwEA0SEAoM",
+            "SGVhdGVyWm9uZTExEA4SEAoMSGVhdGVyWm9uZTEyEA8SFAoQSGVhZENvdmVy",
+            "SGVhdGVyMRAQEhQKEEhlYWRDb3ZlckhlYXRlcjIQEUIhCh9jb20udHdpbmUu",
+            "dGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.HeaterType), }, null));
@@ -48,6 +51,14 @@ namespace Tango.PMR.Diagnostics {
     [pbr::OriginalName("HeaterZone5")] HeaterZone5 = 7,
     [pbr::OriginalName("HeaterZone6")] HeaterZone6 = 8,
     [pbr::OriginalName("MixerHeater")] MixerHeater = 9,
+    [pbr::OriginalName("HeaterZone7")] HeaterZone7 = 10,
+    [pbr::OriginalName("HeaterZone8")] HeaterZone8 = 11,
+    [pbr::OriginalName("HeaterZone9")] HeaterZone9 = 12,
+    [pbr::OriginalName("HeaterZone10")] HeaterZone10 = 13,
+    [pbr::OriginalName("HeaterZone11")] HeaterZone11 = 14,
+    [pbr::OriginalName("HeaterZone12")] HeaterZone12 = 15,
+    [pbr::OriginalName("HeadCoverHeater1")] HeadCoverHeater1 = 16,
+    [pbr::OriginalName("HeadCoverHeater2")] HeadCoverHeater2 = 17,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartThreadLoadingUpdateRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartThreadLoadingUpdateRequest.cs
new file mode 100644
index 000000000..a466722ad
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartThreadLoadingUpdateRequest.cs
@@ -0,0 +1,132 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: StartThreadLoadingUpdateRequest.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Diagnostics {
+
+  /// <summary>Holder for reflection information generated from StartThreadLoadingUpdateRequest.proto</summary>
+  public static partial class StartThreadLoadingUpdateRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for StartThreadLoadingUpdateRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static StartThreadLoadingUpdateRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiVTdGFydFRocmVhZExvYWRpbmdVcGRhdGVSZXF1ZXN0LnByb3RvEhVUYW5n",
+            "by5QTVIuRGlhZ25vc3RpY3MiIQofU3RhcnRUaHJlYWRMb2FkaW5nVXBkYXRl",
+            "UmVxdWVzdEIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZw",
+            "cm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartThreadLoadingUpdateRequest), global::Tango.PMR.Diagnostics.StartThreadLoadingUpdateRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class StartThreadLoadingUpdateRequest : pb::IMessage<StartThreadLoadingUpdateRequest> {
+    private static readonly pb::MessageParser<StartThreadLoadingUpdateRequest> _parser = new pb::MessageParser<StartThreadLoadingUpdateRequest>(() => new StartThreadLoadingUpdateRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<StartThreadLoadingUpdateRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Diagnostics.StartThreadLoadingUpdateRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StartThreadLoadingUpdateRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StartThreadLoadingUpdateRequest(StartThreadLoadingUpdateRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StartThreadLoadingUpdateRequest Clone() {
+      return new StartThreadLoadingUpdateRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as StartThreadLoadingUpdateRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(StartThreadLoadingUpdateRequest other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(StartThreadLoadingUpdateRequest other) {
+      if (other == null) {
+        return;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartThreadLoadingUpdateResponse.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartThreadLoadingUpdateResponse.cs
new file mode 100644
index 000000000..0c62e31c7
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartThreadLoadingUpdateResponse.cs
@@ -0,0 +1,162 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: StartThreadLoadingUpdateResponse.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Diagnostics {
+
+  /// <summary>Holder for reflection information generated from StartThreadLoadingUpdateResponse.proto</summary>
+  public static partial class StartThreadLoadingUpdateResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for StartThreadLoadingUpdateResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static StartThreadLoadingUpdateResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiZTdGFydFRocmVhZExvYWRpbmdVcGRhdGVSZXNwb25zZS5wcm90bxIVVGFu",
+            "Z28uUE1SLkRpYWdub3N0aWNzGhhUaHJlYWRMb2FkaW5nU3RhdGUucHJvdG8i",
+            "aQogU3RhcnRUaHJlYWRMb2FkaW5nVXBkYXRlUmVzcG9uc2USRQoSVGhyZWFk",
+            "TG9hZGluZ1N0YXRlGAEgASgOMikuVGFuZ28uUE1SLkRpYWdub3N0aWNzLlRo",
+            "cmVhZExvYWRpbmdTdGF0ZUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdu",
+            "b3N0aWNzYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.ThreadLoadingStateReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartThreadLoadingUpdateResponse), global::Tango.PMR.Diagnostics.StartThreadLoadingUpdateResponse.Parser, new[]{ "ThreadLoadingState" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class StartThreadLoadingUpdateResponse : pb::IMessage<StartThreadLoadingUpdateResponse> {
+    private static readonly pb::MessageParser<StartThreadLoadingUpdateResponse> _parser = new pb::MessageParser<StartThreadLoadingUpdateResponse>(() => new StartThreadLoadingUpdateResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<StartThreadLoadingUpdateResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Diagnostics.StartThreadLoadingUpdateResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StartThreadLoadingUpdateResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StartThreadLoadingUpdateResponse(StartThreadLoadingUpdateResponse other) : this() {
+      threadLoadingState_ = other.threadLoadingState_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public StartThreadLoadingUpdateResponse Clone() {
+      return new StartThreadLoadingUpdateResponse(this);
+    }
+
+    /// <summary>Field number for the "ThreadLoadingState" field.</summary>
+    public const int ThreadLoadingStateFieldNumber = 1;
+    private global::Tango.PMR.Diagnostics.ThreadLoadingState threadLoadingState_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.Diagnostics.ThreadLoadingState ThreadLoadingState {
+      get { return threadLoadingState_; }
+      set {
+        threadLoadingState_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as StartThreadLoadingUpdateResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(StartThreadLoadingUpdateResponse other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (ThreadLoadingState != other.ThreadLoadingState) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (ThreadLoadingState != 0) hash ^= ThreadLoadingState.GetHashCode();
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (ThreadLoadingState != 0) {
+        output.WriteRawTag(8);
+        output.WriteEnum((int) ThreadLoadingState);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (ThreadLoadingState != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ThreadLoadingState);
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(StartThreadLoadingUpdateResponse other) {
+      if (other == null) {
+        return;
+      }
+      if (other.ThreadLoadingState != 0) {
+        ThreadLoadingState = other.ThreadLoadingState;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 8: {
+            threadLoadingState_ = (global::Tango.PMR.Diagnostics.ThreadLoadingState) input.ReadEnum();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadLoadingState.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadLoadingState.cs
new file mode 100644
index 000000000..8322cbef4
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadLoadingState.cs
@@ -0,0 +1,97 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ThreadLoadingState.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Diagnostics {
+
+  /// <summary>Holder for reflection information generated from ThreadLoadingState.proto</summary>
+  public static partial class ThreadLoadingStateReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for ThreadLoadingState.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static ThreadLoadingStateReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChhUaHJlYWRMb2FkaW5nU3RhdGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9z",
+            "dGljcyq1AwoSVGhyZWFkTG9hZGluZ1N0YXRlEhIKDlRocmVhZExvYWRJbml0",
+            "EAASGAoUVGhyZWFkTG9hZFJlZHVjZUhlYXQQARInCiNUaHJlYWRMb2FkU2V0",
+            "TG9hZEFybVRvU3RhcnRQb3NpdGlvbhACEhgKFFRocmVhZExvYWRPcGVuQ292",
+            "ZXJzEAMSGQoVVGhyZWFkTG9hZExpZnREYW5jZXJzEAQSGQoVVGhyZWFkTG9h",
+            "ZExpZnRSb2NrZXJzEAUSHAoYVGhyZWFkTG9hZEluaXRpYWxUZW5zaW9uEAYS",
+            "GgoWVGhyZWFkTG9hZENsb3NlUm9ja2VycxAHEhoKFlRocmVhZExvYWRDbG9z",
+            "ZURhbmNlcnMQCBIXChNUaHJlYWRMb2FkQ2xvc2VMaWRzEAkSJAogVGhyZWFk",
+            "TG9hZEpvZ0ZlZWRlclRvTWlkZGxlUG9pbnQQChIaChZUaHJlYWRMb2FkRHJ5",
+            "ZXJMb2FkaW5nEAsSGwoXVGhyZWFkTG9hZFJlc3VtZUhlYXRpbmcQDBIXChNU",
+            "aHJlYWRMb2FkSm9nVGhyZWFkEA0SEQoNVGhyZWFkTG9hZEVuZBAOQiEKH2Nv",
+            "bS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.ThreadLoadingState), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum ThreadLoadingState {
+    [pbr::OriginalName("ThreadLoadInit")] ThreadLoadInit = 0,
+    /// <summary>
+    ///Heaters Off; Dryer Blower Off; Blower Low;
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadReduceHeat")] ThreadLoadReduceHeat = 1,
+    /// <summary>
+    ///Use Notation How Many Rotations In The Dryer; Or Check Against Stopper. Move Slowly
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadSetLoadArmToStartPosition")] ThreadLoadSetLoadArmToStartPosition = 2,
+    /// <summary>
+    ///Open Dyeing Head Cover And Dryer Lid
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadOpenCovers")] ThreadLoadOpenCovers = 3,
+    [pbr::OriginalName("ThreadLoadLiftDancers")] ThreadLoadLiftDancers = 4,
+    /// <summary>
+    ///Machine Is Ready. Send Message; Start Timer To Close Lids; Wait For Operator Response
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadLiftRockers")] ThreadLoadLiftRockers = 5,
+    /// <summary>
+    ///Check Spool Presencerun Winder Until Break Sensor Is Identifieing Movement For A Second
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadInitialTension")] ThreadLoadInitialTension = 6,
+    [pbr::OriginalName("ThreadLoadCloseRockers")] ThreadLoadCloseRockers = 7,
+    /// <summary>
+    ///Send Dancer Motors To Preset Location; Check That The Dancers Are On The Thread
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadCloseDancers")] ThreadLoadCloseDancers = 8,
+    [pbr::OriginalName("ThreadLoadCloseLids")] ThreadLoadCloseLids = 9,
+    /// <summary>
+    ///Jog The Feeder Motor Until The Feeder Dancer Is At Middle Position
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadJogFeederToMiddlePoint")] ThreadLoadJogFeederToMiddlePoint = 10,
+    /// <summary>
+    ///Start Feeder Pid Rotate Loading Arm Counter Thread Direction X Circles According To Rml. Feeder Speed Is 40
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadDryerLoading")] ThreadLoadDryerLoading = 11,
+    /// <summary>
+    ///Keep Notation How Many Rotations In The Dryer
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadResumeHeating")] ThreadLoadResumeHeating = 12,
+    /// <summary>
+    ///Jog Thread Shortly To Make Sure Spool Is Running. Report End Of Loading
+    /// </summary>
+    [pbr::OriginalName("ThreadLoadJogThread")] ThreadLoadJogThread = 13,
+    [pbr::OriginalName("ThreadLoadEnd")] ThreadLoadEnd = 14,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
index eae9c9809..339224396 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
@@ -23,8 +23,9 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChhIYXJkd2FyZUJsb3dlclR5cGUucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
-            "ZSonChJIYXJkd2FyZUJsb3dlclR5cGUSEQoNRGVmYXVsdEJsb3dlchAAQh4K",
-            "HGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
+            "ZSpaChJIYXJkd2FyZUJsb3dlclR5cGUSEQoNRGVmYXVsdEJsb3dlchAAEhAK",
+            "DEhlYWRCbG93ZXIxMRABEg8KC0hlYWRCbG93ZXIyEAISDgoKV0hTQmxvd2Vy",
+            "MhADQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareBlowerType), }, null));
@@ -38,6 +39,18 @@ namespace Tango.PMR.Hardware {
     ///Default Blower
     /// </summary>
     [pbr::OriginalName("DefaultBlower")] DefaultBlower = 0,
+    /// <summary>
+    ///Head Blower 1
+    /// </summary>
+    [pbr::OriginalName("HeadBlower11")] HeadBlower11 = 1,
+    /// <summary>
+    ///Head Blower 2
+    /// </summary>
+    [pbr::OriginalName("HeadBlower2")] HeadBlower2 = 2,
+    /// <summary>
+    ///WHS Blower 2
+    /// </summary>
+    [pbr::OriginalName("WHSBlower2")] Whsblower2 = 3,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControlType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControlType.cs
index 23609d642..f2769eb81 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControlType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControlType.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChxIYXJkd2FyZVBpZENvbnRyb2xUeXBlLnByb3RvEhJUYW5nby5QTVIuSGFy",
-            "ZHdhcmUqsgMKFkhhcmR3YXJlUGlkQ29udHJvbFR5cGUSFwoTRHJ5ZXJBaXJU",
+            "ZHdhcmUq8QQKFkhhcmR3YXJlUGlkQ29udHJvbFR5cGUSFwoTRHJ5ZXJBaXJU",
             "ZW1wZXJhdHVyZRAAEhMKD0RyeWVySGVhdGVyTWFpbhABEhgKFERyeWVySGVh",
             "dGVyU2Vjb25kYXJ5EAISEAoMSGVhZEhlYXRlcloxEAMSEAoMSGVhZEhlYXRl",
             "cloyEAQSEAoMSGVhZEhlYXRlclozEAUSEAoMSGVhZEhlYXRlclo0EAYSEAoM",
@@ -32,8 +32,12 @@ namespace Tango.PMR.Hardware {
             "b3JGZWVkZXIQDBIPCgtNb3RvclBvb2xlchANEg8KC01vdG9yV2luZGVyEA4S",
             "DgoKRGlzcGVuc2VyMRAPEg4KCkRpc3BlbnNlcjIQEBIOCgpEaXNwZW5zZXIz",
             "EBESDgoKRGlzcGVuc2VyNBASEg4KCkRpc3BlbnNlcjUQExIOCgpEaXNwZW5z",
-            "ZXI2EBQSDgoKRGlzcGVuc2VyNxAVEg4KCkRpc3BlbnNlcjgQFkIeChxjb20u",
-            "dHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM="));
+            "ZXI2EBQSDgoKRGlzcGVuc2VyNxAVEg4KCkRpc3BlbnNlcjgQFhIQCgxIZWFk",
+            "SGVhdGVyWjcQFxIQCgxIZWFkSGVhdGVyWjgQGBIQCgxIZWFkSGVhdGVyWjkQ",
+            "GRIRCg1IZWFkSGVhdGVyWjEwEBoSEQoNSGVhZEhlYXRlcloxMRAbEhEKDUhl",
+            "YWRIZWF0ZXJaMTIQHBIUChBIZWFkQ292ZXJIZWF0ZXIxEB0SFAoQSGVhZENv",
+            "dmVySGVhdGVyMhAeEhAKDEhlYWRCbG93ZXJfMRAfEhAKDEhlYWRCbG93ZXJf",
+            "MhAgQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwarePidControlType), }, null));
@@ -135,6 +139,46 @@ namespace Tango.PMR.Hardware {
     ///Dispenser 8
     /// </summary>
     [pbr::OriginalName("Dispenser8")] Dispenser8 = 22,
+    /// <summary>
+    ///Head Heater Zone 7
+    /// </summary>
+    [pbr::OriginalName("HeadHeaterZ7")] HeadHeaterZ7 = 23,
+    /// <summary>
+    ///Head Heater Zone 8
+    /// </summary>
+    [pbr::OriginalName("HeadHeaterZ8")] HeadHeaterZ8 = 24,
+    /// <summary>
+    ///Head Heater Zone 9
+    /// </summary>
+    [pbr::OriginalName("HeadHeaterZ9")] HeadHeaterZ9 = 25,
+    /// <summary>
+    ///Head Heater Zone 10
+    /// </summary>
+    [pbr::OriginalName("HeadHeaterZ10")] HeadHeaterZ10 = 26,
+    /// <summary>
+    ///Head Heater Zone 11
+    /// </summary>
+    [pbr::OriginalName("HeadHeaterZ11")] HeadHeaterZ11 = 27,
+    /// <summary>
+    ///Head Heater Zone 12
+    /// </summary>
+    [pbr::OriginalName("HeadHeaterZ12")] HeadHeaterZ12 = 28,
+    /// <summary>
+    ///Head Cover Heater 1
+    /// </summary>
+    [pbr::OriginalName("HeadCoverHeater1")] HeadCoverHeater1 = 29,
+    /// <summary>
+    ///Head Cover Heater 2
+    /// </summary>
+    [pbr::OriginalName("HeadCoverHeater2")] HeadCoverHeater2 = 30,
+    /// <summary>
+    ///Head Blower 1
+    /// </summary>
+    [pbr::OriginalName("HeadBlower_1")] HeadBlower1 = 31,
+    /// <summary>
+    ///Head Blower 2
+    /// </summary>
+    [pbr::OriginalName("HeadBlower_2")] HeadBlower2 = 32,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index ad4e8e170..8a3c8a73a 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -131,6 +131,8 @@
     <Compile Include="Diagnostics\StartDiagnosticsResponse.cs" />
     <Compile Include="Diagnostics\StartEventsNotificationRequest.cs" />
     <Compile Include="Diagnostics\StartEventsNotificationResponse.cs" />
+    <Compile Include="Diagnostics\StartThreadLoadingUpdateRequest.cs" />
+    <Compile Include="Diagnostics\StartThreadLoadingUpdateResponse.cs" />
     <Compile Include="Diagnostics\StopCartridgesUpdateRequest.cs" />
     <Compile Include="Diagnostics\StopCartridgesUpdateResponse.cs" />
     <Compile Include="Diagnostics\StopDiagnosticsRequest.cs" />
@@ -141,6 +143,7 @@
     <Compile Include="Diagnostics\ThreadAbortJoggingResponse.cs" />
     <Compile Include="Diagnostics\ThreadJoggingRequest.cs" />
     <Compile Include="Diagnostics\ThreadJoggingResponse.cs" />
+    <Compile Include="Diagnostics\ThreadLoadingState.cs" />
     <Compile Include="Diagnostics\ValueComponent.cs" />
     <Compile Include="Diagnostics\ValueComponentState.cs" />
     <Compile Include="Diagnostics\ValveState.cs" />
@@ -309,7 +312,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/ObservableCollectionToViewSourceConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/ObservableCollectionToViewSourceConverter.cs
new file mode 100644
index 000000000..a2363575a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/ObservableCollectionToViewSourceConverter.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    public class ObservableCollectionToViewSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            String sortMember = parameter != null ? parameter.ToString() : null;
+            IList list = value as IList;
+            if (list != null)
+            {
+                var view = CollectionViewSource.GetDefaultView(list);
+                view.SortDescriptions.Clear();
+
+                //Delay because the DataGrid clears the sort description after source change.
+                Task.Factory.StartNew(() =>
+                {
+                    Thread.Sleep(10);
+
+                    Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        view.SortDescriptions.Add(new SortDescription(sortMember, ListSortDirection.Ascending));
+                        view.Refresh();
+                    }));
+                });
+                return view;
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index 4ee00a06e..a65ac7322 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -114,6 +114,7 @@
     <Compile Include="Converters\MathOperatorConverter.cs" />
     <Compile Include="Converters\NumberToFileSizeConverter.cs" />
     <Compile Include="Converters\ObjectToObjectTypeConverter.cs" />
+    <Compile Include="Converters\ObservableCollectionToViewSourceConverter.cs" />
     <Compile Include="Converters\OneToPercentConverter.cs" />
     <Compile Include="Converters\SegmentLengthToWidthConverter.cs" />
     <Compile Include="Converters\SegmentToBrushConverter.cs" />
@@ -238,7 +239,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file