From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- .../Utilities/Tango.AlarmParametersGenerator/Program.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs') diff --git a/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs index ae60e04b4..ac31cfb9c 100644 --- a/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs @@ -32,7 +32,6 @@ namespace Tango.AlarmParametersGenerator public String Guidance { get; set; } //Embedded - public String Persistent { get; set; } public String SWIndex { get; set; } public String Frequency { get; set; } public String Source { get; set; } @@ -90,20 +89,19 @@ namespace Tango.AlarmParametersGenerator { if (!String.IsNullOrWhiteSpace(item.Source)) { - Console.WriteLine($"Parsing event {item.Code}, {item.Name},{item.Source}..."); + Console.WriteLine($"Parsing event {item.Code}, {item.Name}..."); AlarmHandlingItem alarm = new AlarmHandlingItem(); alarm.AlarmSource = item.Source.ToEnum(); - //alarm.Frequency = item.Frequency.ToUint(); + alarm.Frequency = item.Frequency.ToUint(); alarm.DeviceId = item.DeviceId.ToUint(); alarm.ModuleDeviceId = item.ApplicationDeviceID.ToUint(); alarm.AlarmValue = item.Criteria.ToUint(); alarm.AlarmDirection = item.Direction.ToBoolean(); alarm.Severity = item.Severity.ToEnum(); - //alarm.Predecessor = item.Predeccesor.ToUint(); + alarm.Predecessor = item.Predeccesor.ToUint(); alarm.DebounceValue = item.DebounceValue.ToUint(); alarm.EventType = (EventType)item.Code.ToUint(); - alarm.IsPersistent = item.Persistent.ToBooleanYesNo(); parameters.AlarmItem.Add(alarm); } @@ -149,10 +147,5 @@ namespace Tango.AlarmParametersGenerator { return String.IsNullOrWhiteSpace(str) ? false : (str.Contains("0") ? false : true); } - - public static bool ToBooleanYesNo(this String str) - { - return String.IsNullOrWhiteSpace(str) ? false : (str.Contains("Yes") ? true : false); - } } } \ No newline at end of file -- cgit v1.3.1