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

1 files changed, 55 insertions, 18 deletions

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;
           }
         }