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

2 files changed, 62 insertions, 5 deletions

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