aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-10-07 13:37:53 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-10-07 13:37:53 +0300
commit5c35ffb5ad6deae690e60f49c80d261cc263ba27 (patch)
tree9634558bcd09f882209186460e99e94e6aafb7fd /Software/Visual_Studio
parentbd514806e6c261d49a78938daad1f1185f167441 (diff)
downloadTango-5c35ffb5ad6deae690e60f49c80d261cc263ba27.tar.gz
Tango-5c35ffb5ad6deae690e60f49c80d261cc263ba27.zip
Added new Tech Heaters to PMR & Observables.
Diffstat (limited to 'Software/Visual_Studio')
-rw-r--r--Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs36
-rw-r--r--Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs28
2 files changed, 47 insertions, 17 deletions
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs
index 45e72beee..a73fbb244 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs
@@ -20,40 +20,64 @@ namespace Tango.BL.Enumerations
{
/// <summary>
+ /// (Dryer Air Heater)
+ /// </summary>
+ [Description("Dryer Air Heater")]
+ DryerAirHeater = 0,
+
+ /// <summary>
+ /// (Dryer Main Heater)
+ /// </summary>
+ [Description("Dryer Main Heater")]
+ DryerMainHeater = 1,
+
+ /// <summary>
+ /// (Dryer Secondary Heater)
+ /// </summary>
+ [Description("Dryer Secondary Heater")]
+ DryerSecondaryHeater = 2,
+
+ /// <summary>
/// (Heater Zone 1)
/// </summary>
[Description("Heater Zone 1")]
- HeaterZone1 = 0,
+ HeaterZone1 = 3,
/// <summary>
/// (Heater Zone 2)
/// </summary>
[Description("Heater Zone 2")]
- HeaterZone2 = 1,
+ HeaterZone2 = 4,
/// <summary>
/// (Heater Zone 3)
/// </summary>
[Description("Heater Zone 3")]
- HeaterZone3 = 2,
+ HeaterZone3 = 5,
/// <summary>
/// (Heater Zone 4)
/// </summary>
[Description("Heater Zone 4")]
- HeaterZone4 = 3,
+ HeaterZone4 = 6,
/// <summary>
/// (Heater Zone 5)
/// </summary>
[Description("Heater Zone 5")]
- HeaterZone5 = 4,
+ HeaterZone5 = 7,
/// <summary>
/// (Heater Zone 6)
/// </summary>
[Description("Heater Zone 6")]
- HeaterZone6 = 5,
+ HeaterZone6 = 8,
+
+ /// <summary>
+ /// (Mixer Heater)
+ /// </summary>
+ [Description("Mixer Heater")]
+ MixerHeater = 9,
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs
index 7ffdd7130..0f1606597 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/HeaterType.cs
@@ -22,11 +22,13 @@ namespace Tango.PMR.Diagnostics {
static HeaterTypeReflection() {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
- "ChBIZWF0ZXJUeXBlLnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3RpY3MqcgoK",
- "SGVhdGVyVHlwZRIPCgtIZWF0ZXJab25lMRAAEg8KC0hlYXRlclpvbmUyEAES",
- "DwoLSGVhdGVyWm9uZTMQAhIPCgtIZWF0ZXJab25lNBADEg8KC0hlYXRlclpv",
- "bmU1EAQSDwoLSGVhdGVyWm9uZTYQBUIhCh9jb20udHdpbmUudGFuZ28ucG1y",
- "LmRpYWdub3N0aWNzYgZwcm90bzM="));
+ "ChBIZWF0ZXJUeXBlLnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3RpY3MqxgEK",
+ "CkhlYXRlclR5cGUSEgoORHJ5ZXJBaXJIZWF0ZXIQABITCg9Ecnllck1haW5I",
+ "ZWF0ZXIQARIYChREcnllclNlY29uZGFyeUhlYXRlchACEg8KC0hlYXRlclpv",
+ "bmUxEAMSDwoLSGVhdGVyWm9uZTIQBBIPCgtIZWF0ZXJab25lMxAFEg8KC0hl",
+ "YXRlclpvbmU0EAYSDwoLSGVhdGVyWm9uZTUQBxIPCgtIZWF0ZXJab25lNhAI",
+ "Eg8KC01peGVySGVhdGVyEAlCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFn",
+ "bm9zdGljc2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.HeaterType), }, null));
@@ -36,12 +38,16 @@ namespace Tango.PMR.Diagnostics {
}
#region Enums
public enum HeaterType {
- [pbr::OriginalName("HeaterZone1")] HeaterZone1 = 0,
- [pbr::OriginalName("HeaterZone2")] HeaterZone2 = 1,
- [pbr::OriginalName("HeaterZone3")] HeaterZone3 = 2,
- [pbr::OriginalName("HeaterZone4")] HeaterZone4 = 3,
- [pbr::OriginalName("HeaterZone5")] HeaterZone5 = 4,
- [pbr::OriginalName("HeaterZone6")] HeaterZone6 = 5,
+ [pbr::OriginalName("DryerAirHeater")] DryerAirHeater = 0,
+ [pbr::OriginalName("DryerMainHeater")] DryerMainHeater = 1,
+ [pbr::OriginalName("DryerSecondaryHeater")] DryerSecondaryHeater = 2,
+ [pbr::OriginalName("HeaterZone1")] HeaterZone1 = 3,
+ [pbr::OriginalName("HeaterZone2")] HeaterZone2 = 4,
+ [pbr::OriginalName("HeaterZone3")] HeaterZone3 = 5,
+ [pbr::OriginalName("HeaterZone4")] HeaterZone4 = 6,
+ [pbr::OriginalName("HeaterZone5")] HeaterZone5 = 7,
+ [pbr::OriginalName("HeaterZone6")] HeaterZone6 = 8,
+ [pbr::OriginalName("MixerHeater")] MixerHeater = 9,
}
#endregion