Added IsPersistent to alarams handling.

2 files changed, 66 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs
index 1777459e4..0d957f6be 100644
--- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/AlarmHandlingItem.cs
@@ -24,7 +24,7 @@ namespace Tango.PMR.EmbeddedParameters {
           string.Concat(
             "ChdBbGFybUhhbmRsaW5nSXRlbS5wcm90bxIcVGFuZ28uUE1SLkVtYmVkZGVk",
             "UGFyYW1ldGVycxoVQWxhcm1Tb3VyY2VUeXBlLnByb3RvGhZEZWJ1Z0xvZ0Nh",
-            "dGVnb3J5LnByb3RvGg9FdmVudFR5cGUucHJvdG8i7QIKEUFsYXJtSGFuZGxp",
+            "dGVnb3J5LnByb3RvGg9FdmVudFR5cGUucHJvdG8igwMKEUFsYXJtSGFuZGxp",
             "bmdJdGVtEkIKC0FsYXJtU291cmNlGAEgASgOMi0uVGFuZ28uUE1SLkVtYmVk",
             "ZGVkUGFyYW1ldGVycy5BbGFybVNvdXJjZVR5cGUSEQoJRnJlcXVlbmN5GAIg",
             "ASgNEhAKCERldmljZUlkGAMgASgNEhYKDk1vZHVsZURldmljZUlkGAQgASgN",
@@ -32,12 +32,13 @@ namespace Tango.PMR.EmbeddedParameters {
             "NwoIU2V2ZXJpdHkYByABKA4yJS5UYW5nby5QTVIuRGVidWdnaW5nLkRlYnVn",
             "TG9nQ2F0ZWdvcnkSEwoLUHJlZGVjZXNzb3IYCCABKA0SFQoNRGVib3VuY2VW",
             "YWx1ZRgJIAEoDRIzCglFdmVudFR5cGUYCiABKA4yIC5UYW5nby5QTVIuRGlh",
-            "Z25vc3RpY3MuRXZlbnRUeXBlEhEKCUV2ZW50TmFtZRgLIAEoCUIoCiZjb20u",
-            "dHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z"));
+            "Z25vc3RpY3MuRXZlbnRUeXBlEhEKCUV2ZW50TmFtZRgLIAEoCRIUCgxJc1Bl",
+            "cnNpc3RlbnQYDCABKAhCKAomY29tLnR3aW5lLnRhbmdvLnBtci5lbWJlZGRl",
+            "ZHBhcmFtZXRlcnNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.AlarmSourceTypeReflection.Descriptor, global::Tango.PMR.Debugging.DebugLogCategoryReflection.Descriptor, global::Tango.PMR.Diagnostics.EventTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem), global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem.Parser, new[]{ "AlarmSource", "Frequency", "DeviceId", "ModuleDeviceId", "AlarmValue", "AlarmDirection", "Severity", "Predecessor", "DebounceValue", "EventType", "EventName" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem), global::Tango.PMR.EmbeddedParameters.AlarmHandlingItem.Parser, new[]{ "AlarmSource", "Frequency", "DeviceId", "ModuleDeviceId", "AlarmValue", "AlarmDirection", "Severity", "Predecessor", "DebounceValue", "EventType", "EventName", "IsPersistent" }, null, null, null)
           }));
     }
     #endregion
@@ -79,6 +80,7 @@ namespace Tango.PMR.EmbeddedParameters {
       debounceValue_ = other.debounceValue_;
       eventType_ = other.eventType_;
       eventName_ = other.eventName_;
+      isPersistent_ = other.isPersistent_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -210,6 +212,17 @@ namespace Tango.PMR.EmbeddedParameters {
       }
     }
 
+    /// <summary>Field number for the "IsPersistent" field.</summary>
+    public const int IsPersistentFieldNumber = 12;
+    private bool isPersistent_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool IsPersistent {
+      get { return isPersistent_; }
+      set {
+        isPersistent_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as AlarmHandlingItem);
@@ -234,6 +247,7 @@ namespace Tango.PMR.EmbeddedParameters {
       if (DebounceValue != other.DebounceValue) return false;
       if (EventType != other.EventType) return false;
       if (EventName != other.EventName) return false;
+      if (IsPersistent != other.IsPersistent) return false;
       return true;
     }
 
@@ -251,6 +265,7 @@ namespace Tango.PMR.EmbeddedParameters {
       if (DebounceValue != 0) hash ^= DebounceValue.GetHashCode();
       if (EventType != 0) hash ^= EventType.GetHashCode();
       if (EventName.Length != 0) hash ^= EventName.GetHashCode();
+      if (IsPersistent != false) hash ^= IsPersistent.GetHashCode();
       return hash;
     }
 
@@ -305,6 +320,10 @@ namespace Tango.PMR.EmbeddedParameters {
         output.WriteRawTag(90);
         output.WriteString(EventName);
       }
+      if (IsPersistent != false) {
+        output.WriteRawTag(96);
+        output.WriteBool(IsPersistent);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -343,6 +362,9 @@ namespace Tango.PMR.EmbeddedParameters {
       if (EventName.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(EventName);
       }
+      if (IsPersistent != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -384,6 +406,9 @@ namespace Tango.PMR.EmbeddedParameters {
       if (other.EventName.Length != 0) {
         EventName = other.EventName;
       }
+      if (other.IsPersistent != false) {
+        IsPersistent = other.IsPersistent;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -438,6 +463,10 @@ namespace Tango.PMR.EmbeddedParameters {
             EventName = input.ReadString();
             break;
           }
+          case 96: {
+            IsPersistent = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs
index 2082d6b52..1e7767423 100644
--- a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/ConfigurationParameters.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.EmbeddedParameters {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch1Db25maWd1cmF0aW9uUGFyYW1ldGVycy5wcm90bxIcVGFuZ28uUE1SLkVt",
-            "YmVkZGVkUGFyYW1ldGVycyL4CQoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
+            "YmVkZGVkUGFyYW1ldGVycyKNCgoXQ29uZmlndXJhdGlvblBhcmFtZXRlcnMS",
             "GAoQQnJlYWtTZW5zb3JMaW1pdBgBIAEoDRIhChlEaWFnbm9zdGljQ29sbGVj",
             "dGlvbkxpbWl0GAIgASgNEhoKEk92ZXJIZWF0Q291bnRMaW1pdBgDIAEoDRIb",
             "ChNVbmRlckhlYXRDb3VudExpbWl0GAQgASgNEhkKEUNsb3NlVmFsdmVUaW1l",
@@ -51,12 +51,13 @@ namespace Tango.PMR.EmbeddedParameters {
             "ICABKA0SGwoTSWRsZUhlYWRUZW1wZXJhdHVyZRghIAEoDRIcChRJZGxlTWl4",
             "ZXJUZW1wZXJhdHVyZRgiIAEoDRIgChhQb3dlck9mZlRlbXBlcmF0dXJlTGlt",
             "aXQYIyABKA0SLQolSURTX1ByZVNlZ21lbnRfV0ZDRl9UaW1lQmVmb3JlU2Vn",
-            "bWVudBgkIAEoARITCgtGaWxlVmVyc2lvbhglIAEoDUIoCiZjb20udHdpbmUu",
-            "dGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z"));
+            "bWVudBgkIAEoARITCgtGaWxlVmVyc2lvbhglIAEoDRITCgtEZXNjcmlwdGlv",
+            "bhgmIAEoCUIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1l",
+            "dGVyc2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.ConfigurationParameters), global::Tango.PMR.EmbeddedParameters.ConfigurationParameters.Parser, new[]{ "BreakSensorLimit", "DiagnosticCollectionLimit", "OverHeatCountLimit", "UnderHeatCountLimit", "CloseValveTimeout", "OpenValveTimeout", "InitialDispenserPressure", "InitialDispenserTimeout", "InitialDispenserTimeLag", "DispenserBuildPressureSpeed", "DispenserBuildPressureLimit", "DispenserBuildPressureTimeout", "DispenserBuildPressureLag", "ACHeatersLowerOperationLimit", "ACHeatersUpperOperationLimit", "DCHeatersLowerOperationLimit", "DCHeatersUpperOperationLimit", "MidTankPressureCorrection", "DispenserPresegmentWFCF", "StartHeatingOnInitSequence", "GeneralParameters", "CurrentAlarmLowLimit", "CurrentAlarmHighLimit", "IDSSegmentRefillTimeout", "IDSPreSegmentBuildupTime", "IDSCleaningSpeed", "IDSCleaningStopBeforeSegmentTime", "IDSCleaningStartSprayPreSegmentTime", "IDSLeftCleaningMotorSpeed", "IDSRightCleaningMotorSpeed", "SwitchToIdleTimeinSeconds", "IdleDrierTemperature", "IdleHeadTemperature", "IdleMixerTemperature", "PowerOffTemperatureLimit", "IDSPreSegmentWFCFTimeBeforeSegment", "FileVersion" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.ConfigurationParameters), global::Tango.PMR.EmbeddedParameters.ConfigurationParameters.Parser, new[]{ "BreakSensorLimit", "DiagnosticCollectionLimit", "OverHeatCountLimit", "UnderHeatCountLimit", "CloseValveTimeout", "OpenValveTimeout", "InitialDispenserPressure", "InitialDispenserTimeout", "InitialDispenserTimeLag", "DispenserBuildPressureSpeed", "DispenserBuildPressureLimit", "DispenserBuildPressureTimeout", "DispenserBuildPressureLag", "ACHeatersLowerOperationLimit", "ACHeatersUpperOperationLimit", "DCHeatersLowerOperationLimit", "DCHeatersUpperOperationLimit", "MidTankPressureCorrection", "DispenserPresegmentWFCF", "StartHeatingOnInitSequence", "GeneralParameters", "CurrentAlarmLowLimit", "CurrentAlarmHighLimit", "IDSSegmentRefillTimeout", "IDSPreSegmentBuildupTime", "IDSCleaningSpeed", "IDSCleaningStopBeforeSegmentTime", "IDSCleaningStartSprayPreSegmentTime", "IDSLeftCleaningMotorSpeed", "IDSRightCleaningMotorSpeed", "SwitchToIdleTimeinSeconds", "IdleDrierTemperature", "IdleHeadTemperature", "IdleMixerTemperature", "PowerOffTemperatureLimit", "IDSPreSegmentWFCFTimeBeforeSegment", "FileVersion", "Description" }, null, null, null)
           }));
     }
     #endregion
@@ -124,6 +125,7 @@ namespace Tango.PMR.EmbeddedParameters {
       powerOffTemperatureLimit_ = other.powerOffTemperatureLimit_;
       iDSPreSegmentWFCFTimeBeforeSegment_ = other.iDSPreSegmentWFCFTimeBeforeSegment_;
       fileVersion_ = other.fileVersion_;
+      description_ = other.description_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -597,6 +599,17 @@ namespace Tango.PMR.EmbeddedParameters {
       }
     }
 
+    /// <summary>Field number for the "Description" field.</summary>
+    public const int DescriptionFieldNumber = 38;
+    private string description_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public string Description {
+      get { return description_; }
+      set {
+        description_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConfigurationParameters);
@@ -647,6 +660,7 @@ namespace Tango.PMR.EmbeddedParameters {
       if (PowerOffTemperatureLimit != other.PowerOffTemperatureLimit) return false;
       if (IDSPreSegmentWFCFTimeBeforeSegment != other.IDSPreSegmentWFCFTimeBeforeSegment) return false;
       if (FileVersion != other.FileVersion) return false;
+      if (Description != other.Description) return false;
       return true;
     }
 
@@ -690,6 +704,7 @@ namespace Tango.PMR.EmbeddedParameters {
       if (PowerOffTemperatureLimit != 0) hash ^= PowerOffTemperatureLimit.GetHashCode();
       if (IDSPreSegmentWFCFTimeBeforeSegment != 0D) hash ^= IDSPreSegmentWFCFTimeBeforeSegment.GetHashCode();
       if (FileVersion != 0) hash ^= FileVersion.GetHashCode();
+      if (Description.Length != 0) hash ^= Description.GetHashCode();
       return hash;
     }
 
@@ -845,6 +860,10 @@ namespace Tango.PMR.EmbeddedParameters {
         output.WriteRawTag(168, 2);
         output.WriteUInt32(FileVersion);
       }
+      if (Description.Length != 0) {
+        output.WriteRawTag(178, 2);
+        output.WriteString(Description);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -959,6 +978,9 @@ namespace Tango.PMR.EmbeddedParameters {
       if (FileVersion != 0) {
         size += 2 + pb::CodedOutputStream.ComputeUInt32Size(FileVersion);
       }
+      if (Description.Length != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeStringSize(Description);
+      }
       return size;
     }
 
@@ -1076,6 +1098,9 @@ namespace Tango.PMR.EmbeddedParameters {
       if (other.FileVersion != 0) {
         FileVersion = other.FileVersion;
       }
+      if (other.Description.Length != 0) {
+        Description = other.Description;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1235,6 +1260,10 @@ namespace Tango.PMR.EmbeddedParameters {
             FileVersion = input.ReadUInt32();
             break;
           }
+          case 306: {
+            Description = input.ReadString();
+            break;
+          }
         }
       }
     }