New color conversion.

Added new pid parameters.
Changes dispenser widget orientation.
Modified NoneEmptyIdsPacks to GetSupportedIdsPacks.

1 files changed, 61 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControl.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControl.cs
index 022e0c5b9..8322cb5d8 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControl.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControl.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChhIYXJkd2FyZVBpZENvbnRyb2wucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
-            "ZRocSGFyZHdhcmVQaWRDb250cm9sVHlwZS5wcm90byL2BAoSSGFyZHdhcmVQ",
+            "ZRocSGFyZHdhcmVQaWRDb250cm9sVHlwZS5wcm90byKaBQoSSGFyZHdhcmVQ",
             "aWRDb250cm9sEkoKFkhhcmR3YXJlUGlkQ29udHJvbFR5cGUYASABKA4yKi5U",
             "YW5nby5QTVIuSGFyZHdhcmUuSGFyZHdhcmVQaWRDb250cm9sVHlwZRIkChxP",
             "dXRwdXRQcm9wb3J0aW9uYWxQb3dlckxpbWl0GAIgASgBEh4KFk91dHB1dFBy",
@@ -37,12 +37,13 @@ namespace Tango.PMR.Hardware {
             "IAEoARIjChtQcm9jZXNzVmFyaWFibGVTYW1wbGluZ1JhdGUYDiABKAESHwoX",
             "UHZJbnB1dEZpbHRlckZhY3Rvck1vZGUYDyABKAESIwobT3V0cHV0UHJvcG9y",
             "dGlvbmFsQ3ljbGVUaW1lGBAgASgFEh4KFkFjSGVhdGVyc0hhbGZDeWNsZVRp",
-            "bWUYESABKAUSGAoQUHJvcG9ydGlvbmFsR2FpbhgSIAEoAUIeChxjb20udHdp",
-            "bmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM="));
+            "bWUYESABKAUSGAoQUHJvcG9ydGlvbmFsR2FpbhgSIAEoARIRCglQaWRBY3Rp",
+            "dmUYEyABKAgSDwoHRXBzaWxvbhgUIAEoAUIeChxjb20udHdpbmUudGFuZ28u",
+            "cG1yLmhhcmR3YXJlYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwarePidControlTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwarePidControl), global::Tango.PMR.Hardware.HardwarePidControl.Parser, new[]{ "HardwarePidControlType", "OutputProportionalPowerLimit", "OutputProportionalBand", "IntegralTime", "DerivativeTime", "SensorCorrectionAdjustment", "SensorMinValue", "SensorMaxValue", "SetPointRampRateorSoftStartRamp", "SetPointControlOutputRate", "ControlOutputType", "SsrControlOutputType", "OutputOnOffHysteresisValue", "ProcessVariableSamplingRate", "PvInputFilterFactorMode", "OutputProportionalCycleTime", "AcHeatersHalfCycleTime", "ProportionalGain" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwarePidControl), global::Tango.PMR.Hardware.HardwarePidControl.Parser, new[]{ "HardwarePidControlType", "OutputProportionalPowerLimit", "OutputProportionalBand", "IntegralTime", "DerivativeTime", "SensorCorrectionAdjustment", "SensorMinValue", "SensorMaxValue", "SetPointRampRateorSoftStartRamp", "SetPointControlOutputRate", "ControlOutputType", "SsrControlOutputType", "OutputOnOffHysteresisValue", "ProcessVariableSamplingRate", "PvInputFilterFactorMode", "OutputProportionalCycleTime", "AcHeatersHalfCycleTime", "ProportionalGain", "PidActive", "Epsilon" }, null, null, null)
           }));
     }
     #endregion
@@ -91,6 +92,8 @@ namespace Tango.PMR.Hardware {
       outputProportionalCycleTime_ = other.outputProportionalCycleTime_;
       acHeatersHalfCycleTime_ = other.acHeatersHalfCycleTime_;
       proportionalGain_ = other.proportionalGain_;
+      pidActive_ = other.pidActive_;
+      epsilon_ = other.epsilon_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -296,6 +299,28 @@ namespace Tango.PMR.Hardware {
       }
     }
 
+    /// <summary>Field number for the "PidActive" field.</summary>
+    public const int PidActiveFieldNumber = 19;
+    private bool pidActive_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool PidActive {
+      get { return pidActive_; }
+      set {
+        pidActive_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Epsilon" field.</summary>
+    public const int EpsilonFieldNumber = 20;
+    private double epsilon_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double Epsilon {
+      get { return epsilon_; }
+      set {
+        epsilon_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as HardwarePidControl);
@@ -327,6 +352,8 @@ namespace Tango.PMR.Hardware {
       if (OutputProportionalCycleTime != other.OutputProportionalCycleTime) return false;
       if (AcHeatersHalfCycleTime != other.AcHeatersHalfCycleTime) return false;
       if (ProportionalGain != other.ProportionalGain) return false;
+      if (PidActive != other.PidActive) return false;
+      if (Epsilon != other.Epsilon) return false;
       return true;
     }
 
@@ -351,6 +378,8 @@ namespace Tango.PMR.Hardware {
       if (OutputProportionalCycleTime != 0) hash ^= OutputProportionalCycleTime.GetHashCode();
       if (AcHeatersHalfCycleTime != 0) hash ^= AcHeatersHalfCycleTime.GetHashCode();
       if (ProportionalGain != 0D) hash ^= ProportionalGain.GetHashCode();
+      if (PidActive != false) hash ^= PidActive.GetHashCode();
+      if (Epsilon != 0D) hash ^= Epsilon.GetHashCode();
       return hash;
     }
 
@@ -433,6 +462,14 @@ namespace Tango.PMR.Hardware {
         output.WriteRawTag(145, 1);
         output.WriteDouble(ProportionalGain);
       }
+      if (PidActive != false) {
+        output.WriteRawTag(152, 1);
+        output.WriteBool(PidActive);
+      }
+      if (Epsilon != 0D) {
+        output.WriteRawTag(161, 1);
+        output.WriteDouble(Epsilon);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -492,6 +529,12 @@ namespace Tango.PMR.Hardware {
       if (ProportionalGain != 0D) {
         size += 2 + 8;
       }
+      if (PidActive != false) {
+        size += 2 + 1;
+      }
+      if (Epsilon != 0D) {
+        size += 2 + 8;
+      }
       return size;
     }
 
@@ -554,6 +597,12 @@ namespace Tango.PMR.Hardware {
       if (other.ProportionalGain != 0D) {
         ProportionalGain = other.ProportionalGain;
       }
+      if (other.PidActive != false) {
+        PidActive = other.PidActive;
+      }
+      if (other.Epsilon != 0D) {
+        Epsilon = other.Epsilon;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -636,6 +685,14 @@ namespace Tango.PMR.Hardware {
             ProportionalGain = input.ReadDouble();
             break;
           }
+          case 152: {
+            PidActive = input.ReadBool();
+            break;
+          }
+          case 161: {
+            Epsilon = input.ReadDouble();
+            break;
+          }
         }
       }
     }