merge

5 files changed, 15 insertions, 115 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs
index 8138b2d70..4685c17fa 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs
@@ -98,6 +98,9 @@ namespace Tango.PMR.Hardware {
     /// <summary>Field number for the "Voltage" field.</summary>
     public const int VoltageFieldNumber = 3;
     private double voltage_;
+    /// <summary>
+    ///Voltage Description
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public double Voltage {
       get { return voltage_; }
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
index 8f338b083..eae9c9809 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
@@ -23,10 +23,8 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChhIYXJkd2FyZUJsb3dlclR5cGUucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
-            "ZSp9ChJIYXJkd2FyZUJsb3dlclR5cGUSEQoNRGVmYXVsdEJsb3dlchAAEg8K",
-            "C0hlYWRCbG93ZXIxEAESDwoLSGVhZEJsb3dlcjIQAhIOCgpXSFNCbG93ZXIy",
-            "EAMSEAoMV0hTU21hbGxGYW5zEAQSEAoMV0hTTGFyZ2VGYW5zEAVCHgocY29t",
-            "LnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
+            "ZSonChJIYXJkd2FyZUJsb3dlclR5cGUSEQoNRGVmYXVsdEJsb3dlchAAQh4K",
+            "HGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareBlowerType), }, null));
@@ -40,26 +38,6 @@ namespace Tango.PMR.Hardware {
     ///Default Blower
     /// </summary>
     [pbr::OriginalName("DefaultBlower")] DefaultBlower = 0,
-    /// <summary>
-    ///Head Blower 1
-    /// </summary>
-    [pbr::OriginalName("HeadBlower1")] HeadBlower1 = 1,
-    /// <summary>
-    ///Head Blower 2
-    /// </summary>
-    [pbr::OriginalName("HeadBlower2")] HeadBlower2 = 2,
-    /// <summary>
-    ///WHS Blower 2
-    /// </summary>
-    [pbr::OriginalName("WHSBlower2")] Whsblower2 = 3,
-    /// <summary>
-    ///WHS Small Fans
-    /// </summary>
-    [pbr::OriginalName("WHSSmallFans")] WhssmallFans = 4,
-    /// <summary>
-    ///WHS Large Fans
-    /// </summary>
-    [pbr::OriginalName("WHSLargeFans")] WhslargeFans = 5,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancerType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancerType.cs
index 7d2bdd014..f9273789e 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancerType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancerType.cs
@@ -23,10 +23,9 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChhIYXJkd2FyZURhbmNlclR5cGUucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
-            "ZSpqChJIYXJkd2FyZURhbmNlclR5cGUSDgoKTGVmdERhbmNlchAAEhAKDE1p",
-            "ZGRsZURhbmNlchABEg8KC1JpZ2h0RGFuY2VyEAISDwoLVGhpcmREYW5jZXIQ",
-            "AxIQCgxGb3VydGhEYW5jZXIQBEIeChxjb20udHdpbmUudGFuZ28ucG1yLmhh",
-            "cmR3YXJlYgZwcm90bzM="));
+            "ZSpHChJIYXJkd2FyZURhbmNlclR5cGUSDgoKTGVmdERhbmNlchAAEhAKDE1p",
+            "ZGRsZURhbmNlchABEg8KC1JpZ2h0RGFuY2VyEAJCHgocY29tLnR3aW5lLnRh",
+            "bmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareDancerType), }, null));
@@ -48,14 +47,6 @@ namespace Tango.PMR.Hardware {
     ///Right Dancer
     /// </summary>
     [pbr::OriginalName("RightDancer")] RightDancer = 2,
-    /// <summary>
-    ///Third Dancer
-    /// </summary>
-    [pbr::OriginalName("ThirdDancer")] ThirdDancer = 3,
-    /// <summary>
-    ///Fourth Dancer
-    /// </summary>
-    [pbr::OriginalName("FourthDancer")] FourthDancer = 4,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
index d90e74d77..8bbbbba73 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChNIYXJkd2FyZU1vdG9yLnByb3RvEhJUYW5nby5QTVIuSGFyZHdhcmUaF0hh",
-            "cmR3YXJlTW90b3JUeXBlLnByb3RvIo4GCg1IYXJkd2FyZU1vdG9yEkAKEUhh",
+            "cmR3YXJlTW90b3JUeXBlLnByb3RvIvcFCg1IYXJkd2FyZU1vdG9yEkAKEUhh",
             "cmR3YXJlTW90b3JUeXBlGAEgASgOMiUuVGFuZ28uUE1SLkhhcmR3YXJlLkhh",
             "cmR3YXJlTW90b3JUeXBlEhQKDE1pbkZyZXF1ZW5jeRgCIAEoBRIUCgxNYXhG",
             "cmVxdWVuY3kYAyABKAUSFAoMU2V0TWljcm9TdGVwGAQgASgFEhEKCU1pY3Jv",
@@ -40,12 +40,12 @@ namespace Tango.PMR.Hardware {
             "EhAKCEdhdGVDZmcxGBogASgFEhAKCEdhdGVDZmcyGBsgASgFEhAKCFRWYWxI",
             "b2xkGBwgASgFEg8KB1RWYWxSdW4YHSABKAUSDwoHVFZhbEFjYxgeIAEoBRIP",
             "CgdUVmFsRGVjGB8gASgFEg0KBVRGYXN0GCAgASgFEg4KBlRPbk1pbhghIAEo",
-            "BRIPCgdUT2ZmTWluGCIgASgFEhUKDVAwMUNvbmZpZ1dvcmQYIyABKAVCHgoc",
-            "Y29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
+            "BRIPCgdUT2ZmTWluGCIgASgFQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFy",
+            "ZHdhcmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareMotorTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareMotor), global::Tango.PMR.Hardware.HardwareMotor.Parser, new[]{ "HardwareMotorType", "MinFrequency", "MaxFrequency", "SetMicroStep", "MicroStep", "MaxChangeSlope", "HighLengthMicroSecond", "SpeedMaster", "PulsePerRound", "PulleyRadius", "ConfigWord", "DirectionThreadWize", "KvalHold", "KvalRun", "KvalAcc", "KvalDec", "OverCurrentThreshold", "StallThreshold", "ThermalCompensationFactor", "LowSpeedOptimization", "StSlp", "IntSpd", "FnSlpAcc", "FnSlpDec", "FsSpd", "GateCfg1", "GateCfg2", "TValHold", "TValRun", "TValAcc", "TValDec", "TFast", "TOnMin", "TOffMin", "P01ConfigWord" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareMotor), global::Tango.PMR.Hardware.HardwareMotor.Parser, new[]{ "HardwareMotorType", "MinFrequency", "MaxFrequency", "SetMicroStep", "MicroStep", "MaxChangeSlope", "HighLengthMicroSecond", "SpeedMaster", "PulsePerRound", "PulleyRadius", "ConfigWord", "DirectionThreadWize", "KvalHold", "KvalRun", "KvalAcc", "KvalDec", "OverCurrentThreshold", "StallThreshold", "ThermalCompensationFactor", "LowSpeedOptimization", "StSlp", "IntSpd", "FnSlpAcc", "FnSlpDec", "FsSpd", "GateCfg1", "GateCfg2", "TValHold", "TValRun", "TValAcc", "TValDec", "TFast", "TOnMin", "TOffMin" }, null, null, null)
           }));
     }
     #endregion
@@ -110,7 +110,6 @@ namespace Tango.PMR.Hardware {
       tFast_ = other.tFast_;
       tOnMin_ = other.tOnMin_;
       tOffMin_ = other.tOffMin_;
-      p01ConfigWord_ = other.p01ConfigWord_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -495,17 +494,6 @@ namespace Tango.PMR.Hardware {
       }
     }
 
-    /// <summary>Field number for the "P01ConfigWord" field.</summary>
-    public const int P01ConfigWordFieldNumber = 35;
-    private int p01ConfigWord_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int P01ConfigWord {
-      get { return p01ConfigWord_; }
-      set {
-        p01ConfigWord_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as HardwareMotor);
@@ -553,7 +541,6 @@ namespace Tango.PMR.Hardware {
       if (TFast != other.TFast) return false;
       if (TOnMin != other.TOnMin) return false;
       if (TOffMin != other.TOffMin) return false;
-      if (P01ConfigWord != other.P01ConfigWord) return false;
       return true;
     }
 
@@ -594,7 +581,6 @@ namespace Tango.PMR.Hardware {
       if (TFast != 0) hash ^= TFast.GetHashCode();
       if (TOnMin != 0) hash ^= TOnMin.GetHashCode();
       if (TOffMin != 0) hash ^= TOffMin.GetHashCode();
-      if (P01ConfigWord != 0) hash ^= P01ConfigWord.GetHashCode();
       return hash;
     }
 
@@ -741,10 +727,6 @@ namespace Tango.PMR.Hardware {
         output.WriteRawTag(144, 2);
         output.WriteInt32(TOffMin);
       }
-      if (P01ConfigWord != 0) {
-        output.WriteRawTag(152, 2);
-        output.WriteInt32(P01ConfigWord);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -852,9 +834,6 @@ namespace Tango.PMR.Hardware {
       if (TOffMin != 0) {
         size += 2 + pb::CodedOutputStream.ComputeInt32Size(TOffMin);
       }
-      if (P01ConfigWord != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(P01ConfigWord);
-      }
       return size;
     }
 
@@ -965,9 +944,6 @@ namespace Tango.PMR.Hardware {
       if (other.TOffMin != 0) {
         TOffMin = other.TOffMin;
       }
-      if (other.P01ConfigWord != 0) {
-        P01ConfigWord = other.P01ConfigWord;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1114,10 +1090,6 @@ namespace Tango.PMR.Hardware {
             TOffMin = input.ReadInt32();
             break;
           }
-          case 280: {
-            P01ConfigWord = input.ReadInt32();
-            break;
-          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControlType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwarePidControlType.cs
index f2769eb81..23609d642 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",
-            "ZHdhcmUq8QQKFkhhcmR3YXJlUGlkQ29udHJvbFR5cGUSFwoTRHJ5ZXJBaXJU",
+            "ZHdhcmUqsgMKFkhhcmR3YXJlUGlkQ29udHJvbFR5cGUSFwoTRHJ5ZXJBaXJU",
             "ZW1wZXJhdHVyZRAAEhMKD0RyeWVySGVhdGVyTWFpbhABEhgKFERyeWVySGVh",
             "dGVyU2Vjb25kYXJ5EAISEAoMSGVhZEhlYXRlcloxEAMSEAoMSGVhZEhlYXRl",
             "cloyEAQSEAoMSGVhZEhlYXRlclozEAUSEAoMSGVhZEhlYXRlclo0EAYSEAoM",
@@ -32,12 +32,8 @@ namespace Tango.PMR.Hardware {
             "b3JGZWVkZXIQDBIPCgtNb3RvclBvb2xlchANEg8KC01vdG9yV2luZGVyEA4S",
             "DgoKRGlzcGVuc2VyMRAPEg4KCkRpc3BlbnNlcjIQEBIOCgpEaXNwZW5zZXIz",
             "EBESDgoKRGlzcGVuc2VyNBASEg4KCkRpc3BlbnNlcjUQExIOCgpEaXNwZW5z",
-            "ZXI2EBQSDgoKRGlzcGVuc2VyNxAVEg4KCkRpc3BlbnNlcjgQFhIQCgxIZWFk",
-            "SGVhdGVyWjcQFxIQCgxIZWFkSGVhdGVyWjgQGBIQCgxIZWFkSGVhdGVyWjkQ",
-            "GRIRCg1IZWFkSGVhdGVyWjEwEBoSEQoNSGVhZEhlYXRlcloxMRAbEhEKDUhl",
-            "YWRIZWF0ZXJaMTIQHBIUChBIZWFkQ292ZXJIZWF0ZXIxEB0SFAoQSGVhZENv",
-            "dmVySGVhdGVyMhAeEhAKDEhlYWRCbG93ZXJfMRAfEhAKDEhlYWRCbG93ZXJf",
-            "MhAgQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
+            "ZXI2EBQSDgoKRGlzcGVuc2VyNxAVEg4KCkRpc3BlbnNlcjgQFkIeChxjb20u",
+            "dHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwarePidControlType), }, null));
@@ -139,46 +135,6 @@ 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