From 0cfe77d1aa433872281e79f3f7613ebe9c5d3c79 Mon Sep 17 00:00:00 2001 From: SL Date: Wed, 27 Dec 2023 10:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3JobDone=E8=9C=82=E9=B8=A3?= =?UTF-8?q?=E5=99=A8=E9=B8=A3=E5=93=8D=E5=BE=AA=E7=8E=AF=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BB=8D=E7=84=B6=E7=BB=A7=E7=BB=AD=E9=B8=A3?= =?UTF-8?q?=E5=93=8D=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=B8=89=E8=89=B2=E7=81=AF=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Aitex/Core/RT/Event/EventManager.cs | 5 +- .../MECF.Framework.Common.csproj | 6 +- .../Common/Device/Bases/LightType.cs | 2 +- .../Bases/{STEventAction.cs => STAction.cs} | 45 ++- .../Common/Device/Bases/STBlinkPattern.cs | 16 +- .../Framework/Common/Device/Bases/STEvents.cs | 28 +- ...erLightStatus.cs => SignalTowerActions.cs} | 2 +- .../Common/Device/Bases/SignalTowerBase.cs | 337 ++++++++++-------- ...werPartBase.cs => SignalTowerLightBase.cs} | 50 +-- .../Common/OperationCenter/IInvokeService.cs | 2 +- ...gnalTowerPart.cs => IoSignalTowerLight.cs} | 8 +- .../HardwareUnits/Efems/IEfemBase.cs | 2 +- .../HardwareUnits/Efems/Rorzes/RorzeEfem.cs | 2 +- .../Efems/Rorzes/RorzeEfemHandler.cs | 34 +- .../MECF.Framework.RT.EquipmentLibrary.csproj | 2 +- .../Common/Device/Bases/STEventsTests.cs | 2 +- 16 files changed, 290 insertions(+), 253 deletions(-) rename MECF.Framework.Common/MECF/Framework/Common/Device/Bases/{STEventAction.cs => STAction.cs} (55%) rename MECF.Framework.Common/MECF/Framework/Common/Device/Bases/{TowerLightStatus.cs => SignalTowerActions.cs} (96%) rename MECF.Framework.Common/MECF/Framework/Common/Device/Bases/{SignalTowerPartBase.cs => SignalTowerLightBase.cs} (88%) rename MECF.Framework.RT.EquipmentLibrary/Devices/{IoSignalTowerPart.cs => IoSignalTowerLight.cs} (73%) diff --git a/MECF.Framework.Common/Aitex/Core/RT/Event/EventManager.cs b/MECF.Framework.Common/Aitex/Core/RT/Event/EventManager.cs index b48b0bf..a51afe2 100644 --- a/MECF.Framework.Common/Aitex/Core/RT/Event/EventManager.cs +++ b/MECF.Framework.Common/Aitex/Core/RT/Event/EventManager.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.ServiceModel; using Aitex.Core.Account; using Aitex.Core.RT.DataCenter; @@ -227,7 +228,9 @@ namespace Aitex.Core.RT.Event OP.Subscribe("System.Diagnosis.GenPjDoneEvent", (s, args) => { - WriteEvent(ModuleName.System.ToString(), "PJ_DONE", "LoadLock", "0"); + //WriteEvent(ModuleName.System.ToString(), "PJ_DONE", "LoadLock", "0"); + EV.PostMessage(ModuleName.System.ToString(), EventEnum.PJ_DONE, "LoadLock", "0"); + OP.DoOperation("System.AlertJobDone"); return true; }); diff --git a/MECF.Framework.Common/MECF.Framework.Common.csproj b/MECF.Framework.Common/MECF.Framework.Common.csproj index 08ef4ce..acb17c4 100644 --- a/MECF.Framework.Common/MECF.Framework.Common.csproj +++ b/MECF.Framework.Common/MECF.Framework.Common.csproj @@ -704,9 +704,9 @@ - + - + @@ -722,7 +722,7 @@ - + diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/LightType.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/LightType.cs index 6d9f728..fac18c2 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/LightType.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/LightType.cs @@ -1,6 +1,6 @@ namespace MECF.Framework.Common.Device.Bases { - public enum LightType + public enum STLightTypes { Red = 0, Yellow = 1, diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEventAction.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STAction.cs similarity index 55% rename from MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEventAction.cs rename to MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STAction.cs index 1f52620..120061a 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEventAction.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STAction.cs @@ -5,24 +5,25 @@ namespace MECF.Framework.Common.Device.Bases /// /// 预设的信号灯塔元件动作。 /// - public class STEventAction : IComparable, ICloneable + public class STAction : IComparable, ICloneable { #region Constructors /// /// 信号灯塔元件动作构造函数。 /// - /// 动作名称。 + /// 动作名称。 /// 信号塔组件对象的实例。 - /// 信号塔组件输出状态。 + /// 信号塔组件输出状态。 /// 信号塔组件工作模式。如果传入空值，则自动调用 /// 以创建默认工作模式。 - public STEventAction(string name, SignalTowerPartBase light, TowerLightStatus status, STBlinkPattern blinkPattern = null) + public STAction(string eventName, SignalTowerLightBase light, SignalTowerActions action, STBlinkPattern blinkPattern = null) { - Name = name; - StPart = light; - Status = status; + EventName = eventName; + Light = light; + Output = action; BlinkPattern = blinkPattern ?? STBlinkPattern.GetDefaultPattern(); + IsCycleDone = false; } @@ -31,26 +32,36 @@ namespace MECF.Framework.Common.Device.Bases #region Properties /// - /// 动作名称。 + /// 动作对应的事件名称。 /// - public string Name { get; } + public string EventName { get; } + + /// + /// 返回执行当前动作的信号灯。 + /// + public STLightTypes LightType => Light.Type; /// /// 返回信号灯实例。 /// - public SignalTowerPartBase StPart { get; } + public SignalTowerLightBase Light { get; } /// /// 设置或返回信号灯的输出状态。 - /// 支持的状态请参考枚举。 + /// 支持的状态请参考枚举。 /// - public TowerLightStatus Status { get; set; } + public SignalTowerActions Output { get; set; } /// /// 设置或返回信号灯闪烁模式。 /// public STBlinkPattern BlinkPattern { get; set; } + /// + /// 设置或返回是否循环结束。 + /// + public bool IsCycleDone { get; set; } + #endregion #region Methods @@ -58,12 +69,12 @@ namespace MECF.Framework.Common.Device.Bases /// public int CompareTo(object obj) { - if (obj is not STEventAction target) + if (obj is not STAction target) return -1; return (BlinkPattern.CompareTo(target.BlinkPattern) == 0 - && Status == target.Status - && StPart == target.StPart) + && Output == target.Output + && Light == target.Light) ? 0 : -1; } @@ -71,13 +82,13 @@ namespace MECF.Framework.Common.Device.Bases /// public object Clone() { - return new STEventAction(Name, StPart, Status, (STBlinkPattern)BlinkPattern.Clone()); + return new STAction(EventName, Light, Output, (STBlinkPattern)BlinkPattern.Clone()); } /// public override string ToString() { - return $"{StPart}, {Status}"; + return $"{Light}, {Output}"; } #endregion diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STBlinkPattern.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STBlinkPattern.cs index a8a7ada..7793963 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STBlinkPattern.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STBlinkPattern.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.Serialization; using System.Text.RegularExpressions; using Aitex.Core.RT.Log; -using BlinkDataType = System.Collections.Generic.KeyValuePair; +using BlinkDataType = System.Collections.Generic.KeyValuePair; namespace MECF.Framework.Common.Device.Bases; @@ -131,7 +131,7 @@ public class STBlinkPattern : IComparable, ICloneable #region Static Methods /// - /// 解析闪烁模式字串，生成闪烁数据供M产生闪烁效果。 + /// 解析闪烁模式字串，生成闪烁数据供M产生闪烁效果。 /// /// /// 闪烁效果数据。 @@ -171,14 +171,14 @@ public class STBlinkPattern : IComparable, ICloneable var length = (uint)match.Length; // 根据每组的字符判断动作。 - TowerLightStatus action; + SignalTowerActions action; switch (leadChar) { case "-": - action = TowerLightStatus.On; + action = SignalTowerActions.On; break; case ".": - action = TowerLightStatus.Off; + action = SignalTowerActions.Off; break; default: @@ -238,7 +238,7 @@ public class STBlinkPattern : IComparable, ICloneable /// public static STBlinkPattern GetDefaultPattern() { - return new STBlinkPattern(PATTERN_SLOW, (int)TowerLightStatus.Customized); + return new STBlinkPattern(PATTERN_SLOW, (int)SignalTowerActions.Customized); } @@ -246,12 +246,12 @@ public class STBlinkPattern : IComparable, ICloneable /// 获取预设的工艺完成闪烁模式。 /// /// - /// 以开200ms、关200ms方式连续闪烁3次，然后关1s，循环5次。 + /// 以开200ms、关200ms方式连续闪烁3次，然后关1s，循环3次。 /// /// public static STBlinkPattern GetJobDonePattern() { - return new STBlinkPattern(PATTERN_JOB_DONE, priority:-1); + return new STBlinkPattern(PATTERN_JOB_DONE, priority:-1, cycle:3); } #endregion diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEvents.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEvents.cs index 56c9b59..25668ef 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEvents.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/STEvents.cs @@ -32,9 +32,9 @@ namespace MECF.Framework.Common.Device.Bases /// ļж¼ /// /// - /// ֵ䡣 + /// ֵ䡣 /// - /// Ҫӳ䵽ӦҪӦֵ䣻 + /// Ҫӳ䵽ӦҪӦֵ䣻 /// ֵ캯д /// /// @@ -43,12 +43,12 @@ namespace MECF.Framework.Common.Device.Bases /// /// ¼ֵKeyΪ¼ƣΪRTעBoolݣͨDATA.Pollʡ ///
- /// ¼Ϊбʾ¼ΪTrueʱָźִеĶ + /// ¼Ϊбʾ¼ΪTrueʱָźִеĶ /// /// - public void ParseEvents(Dictionary dicLights, out Dictionary> events) + public void ParseEvents(Dictionary dicLights, out Dictionary> events) { - events = new Dictionary>(); + events = new Dictionary>(); foreach (var stEvent in Events) { @@ -57,24 +57,24 @@ namespace MECF.Framework.Common.Device.Bases continue; // ֵдһ¼Ŀ - events[stEvent.Name] = new List(); + events[stEvent.Name] = new List(); // ǰ¼ִеĶ - foreach (LightType light in Enum.GetValues(typeof(LightType))) + foreach (STLightTypes light in Enum.GetValues(typeof(STLightTypes))) { var strStatus = stEvent.GetType().GetProperty(light.ToString())?.GetValue(stEvent)?.ToString().ToLower(); if (!string.IsNullOrEmpty(strStatus)) { - var status = TowerLightStatus.Unknown; + var status = SignalTowerActions.Unknown; STBlinkPattern blinkPattern = null; - if (strStatus.Contains(TowerLightStatus.On.ToString().ToLower())) + if (strStatus.Contains(SignalTowerActions.On.ToString().ToLower())) { - status = TowerLightStatus.On; + status = SignalTowerActions.On; } - else if (strStatus.Contains(TowerLightStatus.Off.ToString().ToLower())) + else if (strStatus.Contains(SignalTowerActions.Off.ToString().ToLower())) { - status = TowerLightStatus.Off; + status = SignalTowerActions.Off; } else { @@ -91,11 +91,11 @@ namespace MECF.Framework.Common.Device.Bases } - status = TowerLightStatus.Customized; + status = SignalTowerActions.Customized; } if(dicLights.TryGetValue(light, out var part)) - events[stEvent.Name].Add(new STEventAction(stEvent.Name, part, status, blinkPattern)); + events[stEvent.Name].Add(new STAction(stEvent.Name, part, status, blinkPattern)); else LOG.Error($"Unable to find signal tower part {light} from STEvent config file."); } diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/TowerLightStatus.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerActions.cs similarity index 96% rename from MECF.Framework.Common/MECF/Framework/Common/Device/Bases/TowerLightStatus.cs rename to MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerActions.cs index d0a0eeb..0632e86 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/TowerLightStatus.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerActions.cs @@ -10,7 +10,7 @@ namespace MECF.Framework.Common.Device.Bases /// [Serializable] [DataContract] - public enum TowerLightStatus + public enum SignalTowerActions { /// /// 使用STEvents配置文件中配置的工作模式模板 diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerBase.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerBase.cs index 73de514..833b2c2 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerBase.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerBase.cs @@ -13,8 +13,8 @@ using System.IO; using System.Linq; using System.Xml; -using DicEventActions = System.Collections.Generic.Dictionary>; -using DicLightActions = System.Collections.Generic.Dictionary; +using DictEvent = System.Collections.Generic.Dictionary>; +using DictActionsPerLight = System.Collections.Generic.Dictionary; namespace MECF.Framework.Common.Device.Bases { @@ -30,6 +30,11 @@ namespace MECF.Framework.Common.Device.Bases /// protected const string KEY_PATTERN_JOB_DONE = "JobDone"; + /// + /// 信号灯字典。 + /// + private readonly Dictionary _dictStLights; + /// /// 是否关闭蜂鸣器输出。 /// True：蜂鸣器被手动关闭，满足事件条件也不要打开蜂鸣器。 @@ -48,7 +53,7 @@ namespace MECF.Framework.Common.Device.Bases /// 内容改动后，会重新创建该字典，此时有可能Monitor()方法正在使用此字典。 /// /// - private DicEventActions _dicPreDefinedStEvents; + private DictEvent _dictPreDefinedEvents; /// /// 信号塔扩展事件字典。 @@ -56,28 +61,23 @@ namespace MECF.Framework.Common.Device.Bases /// 除STEvents配置中预设的事件外，还有一类事件通常由RT触发，这类事件也需要参与三色灯输出状态判断。 /// /// - private readonly DicEventActions _dicRtGeneratedStEvents; + private readonly DictEvent _dictDynamicSTLightActions; - /// - /// 信号塔中组件字典。 - /// - private readonly Dictionary _dicStParts; - /// /// 信号塔组件动作字典。 /// - private Dictionary _dicMergedActions; + private DictActionsPerLight _dictSTLightActions; /// /// 上一次Monitor周期触发的事件列表。 /// 用于下一次Monitor周期判断是否有新的事件产生，已解决蜂鸣器被手动关闭后，如果未按下Reset，则下次新事件产生时，无法响蜂鸣器的问题。 /// - private readonly List _lastEventsWithBuzzer = new List(); + private readonly List _lastEventsWithBuzzer = []; /// /// STEvents配置文件解析对象。 /// - private STEvents _originStEvents; + private STEvents _eventsFileLoader; #endregion @@ -88,12 +88,14 @@ namespace MECF.Framework.Common.Device.Bases /// /// 当前模组名称。 /// 设备配置文件。 + /// /// 所属Module的名称。 public SignalTowerBase(string module, XmlElement node, string ioModule = "") : base(module, node, ioModule) { - _dicStParts = new Dictionary(); - _dicRtGeneratedStEvents = new (); + _dictSTLightActions = new(); + _dictStLights = new Dictionary(); + _dictDynamicSTLightActions = new (); var doRedLight = ParseDoNode("doRed", node, ioModule); var doYellowLight = ParseDoNode("doYellow", node, ioModule); @@ -116,27 +118,27 @@ namespace MECF.Framework.Common.Device.Bases Debug.Assert(doBuzzer != null, "DO RedLight is not valid"); // 创建三色灯控制元件。 - CreateSignalPart(LightType.Red, doRedLight); - CreateSignalPart(LightType.Yellow, doYellowLight); - CreateSignalPart(LightType.Green, doGreenLight); - CreateSignalPart(LightType.Blue, doBlueLight); - CreateSignalPart(LightType.White, doWhiteLight); - CreateSignalPart(LightType.Buzzer, doBuzzer, aoBuzzerBlinkFreq); - CreateSignalPart(LightType.Buzzer1, doBuzzer1); - CreateSignalPart(LightType.Buzzer2, doBuzzer2); - CreateSignalPart(LightType.Buzzer3, doBuzzer3); - CreateSignalPart(LightType.Buzzer4, doBuzzer4); - CreateSignalPart(LightType.Buzzer5, doBuzzer5); + CreateSTLight(STLightTypes.Red, doRedLight); + CreateSTLight(STLightTypes.Yellow, doYellowLight); + CreateSTLight(STLightTypes.Green, doGreenLight); + CreateSTLight(STLightTypes.Blue, doBlueLight); + CreateSTLight(STLightTypes.White, doWhiteLight); + CreateSTLight(STLightTypes.Buzzer, doBuzzer, aoBuzzerBlinkFreq); + CreateSTLight(STLightTypes.Buzzer1, doBuzzer1); + CreateSTLight(STLightTypes.Buzzer2, doBuzzer2); + CreateSTLight(STLightTypes.Buzzer3, doBuzzer3); + CreateSTLight(STLightTypes.Buzzer4, doBuzzer4); + CreateSTLight(STLightTypes.Buzzer5, doBuzzer5); // 添加文件到监视器，当文件内容发生变化时重新加载配置。 var fullFn = PathManager.GetCfgDir() + eventFile; FileSystemWatcherManager.Instance.Register(fullFn, fn => { - ParseSignalTowerEvent(fn); + ParseSTEvent(fn); }); //解析三色灯Event - ParseSignalTowerEvent(fullFn); + ParseSTEvent(fullFn); } #endregion @@ -152,17 +154,17 @@ namespace MECF.Framework.Common.Device.Bases DeviceName = Name, DeviceSchematicId = DeviceID, DisplayName = Display, - IsGreenLightOn = GetSignalTowerPartValue(LightType.Green), - IsRedLightOn = GetSignalTowerPartValue(LightType.Red), - IsYellowLightOn = GetSignalTowerPartValue(LightType.Yellow), - IsBlueLightOn = GetSignalTowerPartValue(LightType.Blue), - IsWhiteLightOn = GetSignalTowerPartValue(LightType.White), - IsBuzzerOn = GetSignalTowerPartValue(LightType.Buzzer), - IsBuzzer1On = GetSignalTowerPartValue(LightType.Buzzer1), - IsBuzzer2On = GetSignalTowerPartValue(LightType.Buzzer2), - IsBuzzer3On = GetSignalTowerPartValue(LightType.Buzzer3), - IsBuzzer4On = GetSignalTowerPartValue(LightType.Buzzer4), - IsBuzzer5On = GetSignalTowerPartValue(LightType.Buzzer5), + IsGreenLightOn = GetSignalTowerPartValue(STLightTypes.Green), + IsRedLightOn = GetSignalTowerPartValue(STLightTypes.Red), + IsYellowLightOn = GetSignalTowerPartValue(STLightTypes.Yellow), + IsBlueLightOn = GetSignalTowerPartValue(STLightTypes.Blue), + IsWhiteLightOn = GetSignalTowerPartValue(STLightTypes.White), + IsBuzzerOn = GetSignalTowerPartValue(STLightTypes.Buzzer), + IsBuzzer1On = GetSignalTowerPartValue(STLightTypes.Buzzer1), + IsBuzzer2On = GetSignalTowerPartValue(STLightTypes.Buzzer2), + IsBuzzer3On = GetSignalTowerPartValue(STLightTypes.Buzzer3), + IsBuzzer4On = GetSignalTowerPartValue(STLightTypes.Buzzer4), + IsBuzzer5On = GetSignalTowerPartValue(STLightTypes.Buzzer5), }; #endregion @@ -172,13 +174,13 @@ namespace MECF.Framework.Common.Device.Bases /// /// 创建一个信号塔元件，并添加到字典中。 /// - /// 信号塔元件类型，请参考。 + /// 信号塔元件类型，请参考。 /// 控制元件开关的DO。 /// 控制Blink频率的AO。 - private void CreateSignalPart(LightType light, DOAccessor doSw, AOAccessor aoBlinkFreq = null) + private void CreateSTLight(STLightTypes light, DOAccessor doSw, AOAccessor aoBlinkFreq = null) { if (doSw != null) - _dicStParts.Add(light, new SignalTowerPartBase(light, doSw, aoBlinkFreq)); + _dictStLights.Add(light, new SignalTowerLightBase(light, doSw, aoBlinkFreq)); } /// @@ -186,7 +188,7 @@ namespace MECF.Framework.Common.Device.Bases /// /// 包含完整路径的配置文件文件名。 /// - private bool ParseSignalTowerEvent(string fileName) + private bool ParseSTEvent(string fileName) { try { @@ -196,15 +198,15 @@ namespace MECF.Framework.Common.Device.Bases return false; } - _originStEvents = CustomXmlSerializer.Deserialize(new FileInfo(fileName)); - _originStEvents.ParseEvents(_dicStParts, out var events); + _eventsFileLoader = CustomXmlSerializer.Deserialize(new FileInfo(fileName)); + _eventsFileLoader.ParseEvents(_dictStLights, out var events); if (events == null) LOG.Error("Unable to parse the signal tower events from config file."); lock (SyncRoot) { - _dicPreDefinedStEvents = events; - return _dicPreDefinedStEvents != null; + _dictPreDefinedEvents = events; + return _dictPreDefinedEvents != null; } } catch (Exception ex) @@ -235,9 +237,9 @@ namespace MECF.Framework.Common.Device.Bases public void Reset() { _switchBuzzerOff = false; - _dicRtGeneratedStEvents?.Clear(); + _dictDynamicSTLightActions?.Clear(); - foreach (var light in _dicStParts.Values) + foreach (var light in _dictStLights.Values) light.Reset(); } @@ -246,7 +248,7 @@ namespace MECF.Framework.Common.Device.Bases /// public void Terminate() { - foreach (var light in _dicStParts.Values) + foreach (var light in _dictStLights.Values) light.Terminate(); } @@ -256,51 +258,57 @@ namespace MECF.Framework.Common.Device.Bases /// protected override void HandleMonitor() { - // 创建上次发生的事件列表副本 + // 遍历所有预设的事件，决定信号塔各元件的输出状态。 + MonitorEvents(out var buzzerOnEvents); - List events1; - lock (SyncRoot) - { - // 遍历所有预设的事件，决定信号塔各元件的输出状态。 - _dicMergedActions = ConvertEventsToActions(_dicPreDefinedStEvents, out events1); - } - - // 遍历所有扩展的事件，决定信号塔各元件的输出状态。 - _dicMergedActions = ConvertEventsToActions(_dicRtGeneratedStEvents, out var events2, _dicMergedActions, false); - - // 判断是否有新事件产生，如果有，需要复位_switchBuzzerOff状态，以重新使能蜂鸣器，解决蜂鸣器被手动关闭后，如果不按Reset，则无法重启启用的问题。 - var eventCombined = new List(events1.Concat(events2)); - var newEvents = _lastEventsWithBuzzer.Except(eventCombined); - if (newEvents.Any()) + // 判断是否有新的Buzzer相关事件产生，如果有，需要复位_switchBuzzerOff状态，以重新使能蜂鸣器，解决蜂鸣器被手动关闭后，如果不按Reset，则无法重启启用的问题。 + var buzzerOnEventArray = buzzerOnEvents as string[] ?? buzzerOnEvents.ToArray(); + var newBuzzerOnEvents = _lastEventsWithBuzzer.Except(buzzerOnEventArray); + if (newBuzzerOnEvents.Any()) { _lastEventsWithBuzzer.Clear(); - _lastEventsWithBuzzer.AddRange(eventCombined); + _lastEventsWithBuzzer.AddRange(buzzerOnEventArray); _switchBuzzerOff = false; } - // 设置信号塔每个组件的输出。 - foreach (var kvp in _dicMergedActions) + // 分配每个信号灯的动作。 + foreach (var kvp in _dictSTLightActions) { var action = kvp.Value; - if (action == null) - continue; - - if (action.StPart == null) + + if (action?.Light == null) continue; // 创建动作副本，因为后续可能根据_switchBuzzerOff调整输出状态，避免覆盖原配置。 - var cloned = (STEventAction)action.Clone(); + var cloned = (STAction)action.Clone(); // 如果蜂鸣器被强制关闭，则将待执行动作中的状态修改为Off - if (action.StPart.IsBuzzer && _switchBuzzerOff) - cloned.Status = TowerLightStatus.Off; + if (action.Light.IsBuzzer && _switchBuzzerOff) + cloned.Output = SignalTowerActions.Off; - action.StPart.SetAction(cloned); + action.Light.SetAction(cloned); } // 扫描信号塔组件状态 - foreach (var light in _dicStParts.Values) - light?.Monitor(); + foreach (var light in _dictStLights.Values) + { + if(light == null) + continue; + + light.Monitor(); + + // remove the cycle done action from dynamic STEvent dictionary + var currAction = light.GetAction(); + if (currAction is { IsCycleDone: true } + && _dictDynamicSTLightActions.TryGetValue(currAction.EventName, out var actions)) + { + for (var i = actions.Count - 1; i >= 0; i--) + { + if (actions[i].LightType == light.Type) + actions.RemoveAt(i); + } + } + } } /// @@ -309,7 +317,7 @@ namespace MECF.Framework.Common.Device.Bases /// 指定的信号塔元件。 /// 闪烁模式。 /// True：启动闪烁成功；False：启动闪烁失败。 - public bool Blink(LightType light, STBlinkPattern pattern) + public bool Blink(STLightTypes light, STBlinkPattern pattern) { if (pattern == null) { @@ -317,7 +325,11 @@ namespace MECF.Framework.Common.Device.Bases return false; } - CreateRtEvent(new STEventAction("Rt Triggered Blink", _dicStParts[light], TowerLightStatus.Customized, pattern)); + var evName = $"Manual_Blink_{light}_{Guid.NewGuid()}"; + var blinkAction = new STAction(evName, _dictStLights[light], SignalTowerActions.Customized, + pattern); + + CreateDynamicEvent(evName, [blinkAction]); return true; } @@ -325,27 +337,25 @@ namespace MECF.Framework.Common.Device.Bases /// /// 当Wafer回到Cassette后，打开蜂鸣器以指示ProcessJob结束。 /// - /// 如果打开蜂鸣器失败，提示失败原因。 /// - public bool SwitchOnBuzzerForJobDone(out string reason) + public bool AlertJobDone() { - reason = ""; - SignalTowerPartBase targetBuzzer = null; + SignalTowerLightBase targetBuzzer = null; STBlinkPattern blinkPattern = null; // 读取STEvents配置文件中的JobDone模式的配置。 - var settings = _originStEvents.PatternsSettings.FirstOrDefault(x => x.Name == KEY_PATTERN_JOB_DONE); + var alertPattern = _eventsFileLoader.PatternsSettings.FirstOrDefault(x => x.Name == KEY_PATTERN_JOB_DONE); - if (settings != null) + if (alertPattern != null) { // 解析配置中的Buzzer，如果未指定Buzzer，或指定为除Buzzer以外的信号灯，则默认使用Buzzer。 - var targetPart = settings.Part; - if (Enum.TryParse(targetPart, out LightType lightType) - && _dicStParts.TryGetValue(lightType, out var buzzer) + var targetLight = alertPattern.Part; + if (Enum.TryParse(targetLight, out STLightTypes lightType) + && _dictStLights.TryGetValue(lightType, out var buzzer) && buzzer.IsBuzzer) targetBuzzer = buzzer; - blinkPattern = new STBlinkPattern(settings.Pattern, priority: settings.Priority, cycle: settings.Cycles); + blinkPattern = new STBlinkPattern(alertPattern.Pattern, priority: alertPattern.Priority, cycle: alertPattern.Cycles); } else { @@ -354,10 +364,12 @@ namespace MECF.Framework.Common.Device.Bases LOG.Warning($"Unable to find pre-defined pattern for {KEY_PATTERN_JOB_DONE}"); } - CreateRtEvent(new STEventAction(KEY_PATTERN_JOB_DONE, targetBuzzer, TowerLightStatus.Customized, blinkPattern)); + var buzzerAction = new STAction(KEY_PATTERN_JOB_DONE, targetBuzzer, SignalTowerActions.Customized, + blinkPattern); + CreateDynamicEvent(KEY_PATTERN_JOB_DONE, [buzzerAction]); return true; } - + /// /// 打开或关闭蜂鸣器。 /// @@ -382,9 +394,9 @@ namespace MECF.Framework.Common.Device.Bases } /// - /// 合并信号事件。 + /// 获取优先级更高的STAction。 /// - /// 根据的优先级决定执行的动作。 + /// 根据的优先级决定执行的动作。 ///
/// 此属性的数值越小，表示优先级越高。 /// @@ -392,7 +404,7 @@ namespace MECF.Framework.Common.Device.Bases /// 当前输出状态。 /// 期望的输出状态。 /// 合并后的信号灯输出状态。 - private STEventAction MergeAction(STEventAction currentAction, STEventAction nextAction) + private STAction PickPriorAction(STAction currentAction, STAction nextAction) { if (currentAction == null) return nextAction; @@ -400,14 +412,14 @@ namespace MECF.Framework.Common.Device.Bases return currentAction; // 获取当前动作的优先级 - var curPrior = currentAction.Status == TowerLightStatus.Customized + var curPrior = currentAction.Output == SignalTowerActions.Customized ? currentAction.BlinkPattern.Priority - : (int)currentAction.Status; + : (int)currentAction.Output; // 获取下一个动作的优先级 - var nextPrior = nextAction.Status == TowerLightStatus.Customized + var nextPrior = nextAction.Output == SignalTowerActions.Customized ? nextAction.BlinkPattern.Priority - : (int)nextAction.Status; + : (int)nextAction.Output; return curPrior < nextPrior ? currentAction : nextAction; @@ -418,104 +430,115 @@ namespace MECF.Framework.Common.Device.Bases /// /// /// - private bool GetSignalTowerPartValue(LightType light) + private bool GetSignalTowerPartValue(STLightTypes light) { - if (_dicStParts.TryGetValue(light, out var part)) + if (_dictStLights.TryGetValue(light, out var part)) return part.GetValue(); return false; } /// - /// 获取RT中已触发的事件列表。 + /// 从RT拉取已发生的STEvent列表。 /// /// - private static DicEventActions PollRtAlarms(DicEventActions dicEvents) + private static DictEvent PollRaisedEvents(DictEvent dicEvents) { if (dicEvents == null) - return new DicEventActions(); + return new(); - var data = dicEvents.Keys.ToList(); - var polled = DATA.PollData(data); + var events = dicEvents.Keys.ToList(); + var data = DATA.PollData(events); + var raisedEvents = data.Where(x => x.Value is true).Select(x => x.Key).ToList(); - var eventTriggered = polled.Where(x => x.Value is true).Select(x => x.Key).ToList(); - - return dicEvents.Where(x => eventTriggered.Contains(x.Key)).ToDictionary(x => x.Key, v => v.Value); + return dicEvents.Where(x => raisedEvents.Contains(x.Key)).ToDictionary(x => x.Key, v => v.Value); } /// - /// 更具RT当前状态合并所有事件的动作，决定信号塔组件的输出状态。 + /// 监视STEvent.xml中定义的事件。 /// - /// 事件字典。 - /// 返回需要触发Buzzer的事件的名称列表。 - /// 信号塔组件初始动作字典。 - /// - /// 是否从RT拉去事件对应的属性值。 - /// - /// 对于事件列表，不需要从RT拉去数据，直接合并动作即可。 - /// - /// - /// - private DicLightActions ConvertEventsToActions(DicEventActions dicEvents, out List eventsWithBuzzerOn, DicLightActions initActions = null, bool isPollDataNeeded = true) + /// + private void MonitorEvents(out IEnumerable eventsWithBuzzerOn) { - // 创建初始动作字典 - initActions ??= _dicStParts.ToDictionary( - x => x.Key, - v => new STEventAction("", v.Value, TowerLightStatus.Off)); - - // 对于STEvent配置文件中的事件，我们只需要关注那些条件为True的事件。 - // 创建一个临时字典，筛选条件为True的事件，或直接使用_dicRtGeneratedEvents事件字典。 - var dicEventsTmp = dicEvents; - - // 需要从RT拉取事件状态 - if (isPollDataNeeded) - dicEventsTmp = PollRtAlarms(dicEvents); - - // 保存触发的事件名称列表。 - var eventsBuzzerNotOff = dicEventsTmp - .Where(x => x.Value - .Any(v => v.StPart.IsBuzzer && v.Status != TowerLightStatus.Off)) - .Select(x => x.Key); - - eventsWithBuzzerOn = new List(eventsBuzzerNotOff); - - // 遍历所有预设的事件，决定信号塔各元件的输出状态。 - foreach (var stEvent in dicEventsTmp) + lock (SyncRoot) { - foreach (var newAction in stEvent.Value) + // Clear previous actions + _dictSTLightActions.Clear(); + + // Poll raised events of RT + var raisedEvents = PollRaisedEvents(_dictPreDefinedEvents); + + // Create dictionary '_dictSTLightActions' + AssignSTActions(raisedEvents); + AssignSTActions(_dictDynamicSTLightActions); + + // Get a list of events related to turning on a buzzer + var buzzerOnEv1 = GetBuzzerOnEvents(raisedEvents).ToArray(); + var buzzerOnEv2 = GetBuzzerOnEvents(_dictDynamicSTLightActions).ToArray(); + + eventsWithBuzzerOn = buzzerOnEv1.Concat(buzzerOnEv2.Except(buzzerOnEv1)); + } + } + + /// + /// 根据已发生的STEvent分配各个信号灯的动作。 + /// + /// + private void AssignSTActions(DictEvent raisedEvents) + { + foreach (var stEvent in raisedEvents) + { + foreach (var action in stEvent.Value) { - if (!_dicStParts.TryGetValue(newAction.StPart.Light, out var stPart)) + // Maybe the target light of the action is not defined + if (!_dictStLights.ContainsKey(action.LightType)) continue; - // 根据当前设备状态，判断下一步信号组件的输出动作是什么 - var mergedAction = MergeAction(initActions[stPart.Light], newAction); + // Make it easier to access dictionaries using the key + var light = action.LightType; - initActions[stPart.Light] = mergedAction; + // Determine the action of light according to the event raised + if (!_dictSTLightActions.TryGetValue(light, out var oldAction)) + _dictSTLightActions.Add(light, action); + else + _dictSTLightActions[light] = PickPriorAction(oldAction, action); } } - - return initActions; - } /// - /// 创建一个自定义的RT事件，以驱动指定的信号塔组件。 + /// 获取需要打开Buzzer的事件的名称。 + /// + /// + /// + private IEnumerable GetBuzzerOnEvents(DictEvent events) + { + // create a list for the events operating the buzzer + var buzzerOnEvents = events + .Where(x => x.Value + .Any(v => v.Light.IsBuzzer && v.Output != SignalTowerActions.Off)) + .Select(x => x.Key); + + return buzzerOnEvents; + } + + /// + /// 创建一个动态RT事件，以驱动指定的信号塔组件。 /// /// 自动创建Guid作为事件的Key，以和STEvent配置字典的格式保持一致，以为Monitor方法中需要同时对这两个字典处理；格式的统一有助于统一处理任务的逻辑。 /// /// + /// /// 该事件执行的动作列表。 /// /// 列表的每一个元素对应一个信号塔组件需执行的动作。 /// /// - - private void CreateRtEvent(params STEventAction[] actions) + private void CreateDynamicEvent(string eventName, List actions) { - _dicRtGeneratedStEvents.Add(Guid.NewGuid().ToString(), actions.ToList()); - SwitchOffBuzzer(false); + _dictDynamicSTLightActions[eventName] = actions; } - + #endregion } diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerLightBase.cs similarity index 88% rename from MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs rename to MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerLightBase.cs index 3cdfcf1..44ae99f 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerLightBase.cs @@ -5,19 +5,18 @@ using Aitex.Core.RT.Device; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.Log; using Aitex.Core.Util; -using SciChart.Charting2D.Interop; -using BlinkDataType = System.Collections.Generic.KeyValuePair; +using BlinkDataType = System.Collections.Generic.KeyValuePair; namespace MECF.Framework.Common.Device.Bases { /// /// 信号塔元件对象，包含灯和蜂鸣器。 - /// 受支持的元件请参考。 + /// 受支持的元件请参考。 /// /// 信号塔元件的Blink模式基于一个简单的Switch-Case状态机实现。 /// /// - public class SignalTowerPartBase : BaseDevice, IDevice + public class SignalTowerLightBase : BaseDevice, IDevice { #region Variables @@ -36,8 +35,8 @@ namespace MECF.Framework.Common.Device.Bases private DOAccessor _doLight; private AOAccessor _aoBlinkFreqHz; - private readonly LightType _lightType; - private STEventAction _action; + private readonly STLightTypes _lightType; + private STAction _action; /// /// 闪烁次数计数器。 @@ -62,10 +61,10 @@ namespace MECF.Framework.Common.Device.Bases /// /// 构建信号塔元件对象的实例。 /// - /// 信号塔元件类型，请参考。 + /// 信号塔元件类型，请参考。 /// 控制元件开关的DO。 /// 控制Blink频率的AO。 - public SignalTowerPartBase(LightType light, DOAccessor doSwitch, AOAccessor aoBlinkFreq) + public SignalTowerLightBase(STLightTypes light, DOAccessor doSwitch, AOAccessor aoBlinkFreq) { _lightType = light; _doLight = doSwitch; @@ -82,7 +81,7 @@ namespace MECF.Framework.Common.Device.Bases /// /// 返回信号塔元件类型。 /// - public LightType Light => _lightType; + public STLightTypes Type => _lightType; /// @@ -117,13 +116,13 @@ namespace MECF.Framework.Common.Device.Bases return; // 如果信号塔元件的状态已经转为Off，但状态机没有进入Idle，说明可能人为取消了信号，需要复位状态机。 - if (_action.Status == TowerLightStatus.Off && _blinkStage != FsmStateBlink.Idle) + if (_action.Output == SignalTowerActions.Off && _blinkStage != FsmStateBlink.Idle) { Reset(); } // 如果动作状态指定使用自定义模式，并且循环次数未用完，则根据Pattern进行闪烁 - if (_action.Status == TowerLightStatus.Customized && _blinkCycleDownCounter > 0) + if (_action.Output == SignalTowerActions.Customized && _blinkCycleDownCounter > 0) { switch (_blinkStage) { @@ -155,9 +154,9 @@ namespace MECF.Framework.Common.Device.Bases _nextBlinkData = _qBlinkData.Dequeue(); - if (_nextBlinkData.Key == TowerLightStatus.On) + if (_nextBlinkData.Key == SignalTowerActions.On) _blinkStage = FsmStateBlink.PrepareOn; - else if (_nextBlinkData.Key == TowerLightStatus.Off) + else if (_nextBlinkData.Key == SignalTowerActions.Off) _blinkStage = FsmStateBlink.PrepareOff; else { @@ -213,8 +212,9 @@ namespace MECF.Framework.Common.Device.Bases { // Blink循环结束，关闭输出 _doLight.Value = false; - _action.Status = TowerLightStatus.Off; + _action.Output = SignalTowerActions.Off; _blinkStage = FsmStateBlink.Cleanup; + _action.IsCycleDone = true; } else { @@ -245,7 +245,7 @@ namespace MECF.Framework.Common.Device.Bases /// 获取信号塔元件当前正在执行的动作。 /// /// - public STEventAction GetAction() + public STAction GetAction() { return _action; } @@ -261,10 +261,10 @@ namespace MECF.Framework.Common.Device.Bases /// /// 设置信号塔元件动作。 - /// 请参考枚举获取支持的动作类型。 + /// 请参考枚举获取支持的动作类型。 /// /// 信号灯的动作。 - public void SetAction(STEventAction action) + public void SetAction(STAction action) { if (action == null) { @@ -288,20 +288,20 @@ namespace MECF.Framework.Common.Device.Bases } // 执行动作 - switch (_action.Status) + switch (_action.Output) { - case TowerLightStatus.On: + case SignalTowerActions.On: _blinkCycleDownCounter = 0; _doLight.Value = true; break; - case TowerLightStatus.Off: + case SignalTowerActions.Off: _blinkCycleDownCounter = 0; _doLight.Value = false; Reset(); // 复位状态机 break; - case TowerLightStatus.Customized: + case SignalTowerActions.Customized: // 当工作在闪烁状态时，如果没有指定闪烁模式，则创建一个默认模式。 _blinkPattern = _action.BlinkPattern; _blinkPattern ??= new STBlinkPattern(); @@ -320,7 +320,7 @@ namespace MECF.Framework.Common.Device.Bases if (!STBlinkPattern.GetBlinkData(_blinkPattern, out _blinkData, out var reason)) { // 如果解析闪烁数据，如果解析错误，使用默认的闪烁模式。 - LOG.Error($"Unable to set {Light} to {action}, {reason}"); + LOG.Error($"Unable to set {Type} to {action}, {reason}"); STBlinkPattern.GetBlinkData(STBlinkPattern.GetDefaultPattern(), out _blinkData, out _); Debug.Assert(_blinkData != null); } @@ -332,8 +332,8 @@ namespace MECF.Framework.Common.Device.Bases break; - case TowerLightStatus.Unknown: - LOG.Error($"{Light} Undefined output status"); + case SignalTowerActions.Unknown: + LOG.Error($"{Type} Undefined output status"); break; default: @@ -350,7 +350,7 @@ namespace MECF.Framework.Common.Device.Bases _blinkStage = FsmStateBlink.Idle; if (_action != null) - _action.Status = TowerLightStatus.Off; + _action.Output = SignalTowerActions.Off; _blinkCycleDownCounter = 0; _doLight.Value = false; diff --git a/MECF.Framework.Common/MECF/Framework/Common/OperationCenter/IInvokeService.cs b/MECF.Framework.Common/MECF/Framework/Common/OperationCenter/IInvokeService.cs index f7f1ead..64d2da9 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/OperationCenter/IInvokeService.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/OperationCenter/IInvokeService.cs @@ -18,7 +18,7 @@ namespace MECF.Framework.Common.OperationCenter [ServiceKnownType(typeof(WaferStatus))] [ServiceKnownType(typeof(TransferInfo[]))] [ServiceKnownType(typeof(TransferInfo))] - [ServiceKnownType(typeof(TowerLightStatus))] + [ServiceKnownType(typeof(SignalTowerActions))] [ServiceKnownType(typeof(short[]))] [ServiceKnownType(typeof(bool[]))] [ServiceKnownType(typeof(string[]))] diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoSignalTowerPart.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoSignalTowerLight.cs similarity index 73% rename from MECF.Framework.RT.EquipmentLibrary/Devices/IoSignalTowerPart.cs rename to MECF.Framework.RT.EquipmentLibrary/Devices/IoSignalTowerLight.cs index e14dfae..a6c2a1b 100644 --- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoSignalTowerPart.cs +++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoSignalTowerLight.cs @@ -5,20 +5,20 @@ namespace MECF.Framework.RT.EquipmentLibrary.Devices { /// /// 信号塔元件对象，包含灯和蜂鸣器。 - /// 受支持的元件请参考。 + /// 受支持的元件请参考。 /// /// 信号塔元件的Blink模式基于一个简单的Switch-Case状态机实现。 /// /// - public class IoSignalTowerPart : SignalTowerPartBase + public class IoSignalTowerLight : SignalTowerLightBase { /// /// 构造IoSignalTowerPart对象。 /// - /// 信号塔元件类型，请参考。 + /// 信号塔元件类型，请参考。 /// 控制元件开关的DO。 /// 控制Blink频率的AO。 - public IoSignalTowerPart(LightType light, DOAccessor doSw, AOAccessor aoBlinkFreq) + public IoSignalTowerLight(STLightTypes light, DOAccessor doSw, AOAccessor aoBlinkFreq) : base(light, doSw, aoBlinkFreq) { diff --git a/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/IEfemBase.cs b/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/IEfemBase.cs index 710316c..54cbe62 100644 --- a/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/IEfemBase.cs +++ b/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/IEfemBase.cs @@ -77,7 +77,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Efems bool MoveToReadyPut(ModuleName chamber, int slot, Hand hand, out string reason); //signal tower - bool SetSignalLight(LightType type, TowerLightStatus state, out string reason); + bool SetSignalLight(STLightTypes type, SignalTowerActions state, out string reason); [Obsolete] bool SetLoadPortLight(ModuleName chamber, Indicator light, IndicatorState state); diff --git a/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfem.cs b/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfem.cs index f27f0a8..4dcb801 100644 --- a/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfem.cs +++ b/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfem.cs @@ -421,7 +421,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Efems.Rorzes return _connection.Execute(new RorzeEfemHandlerGoto(this, chamber, slot, hand, false), out reason); } - public bool SetSignalLight(LightType type, TowerLightStatus state, out string reason) + public bool SetSignalLight(STLightTypes type, SignalTowerActions state, out string reason) { if (_connection == null || !_connection.IsConnected || !IsCommunicationReady) { diff --git a/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfemHandler.cs b/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfemHandler.cs index cb011de..f9739a7 100644 --- a/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfemHandler.cs +++ b/MECF.Framework.RT.EquipmentLibrary/HardwareUnits/Efems/Rorzes/RorzeEfemHandler.cs @@ -752,7 +752,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Efems.Rorzes MutexId = -1; } - public RorzeEfemHandlerSigout(RorzeEfem device, ModuleName module, LightType type, TowerLightStatus state) + public RorzeEfemHandlerSigout(RorzeEfem device, ModuleName module, STLightTypes type, SignalTowerActions state) : base(device, module, RorzeEfemMessageType.SET, RorzeEfemBasicMessage.SIGOUT, BuildParameter(module, type, state), false) { Name = $"Set Signal Tower"; @@ -780,30 +780,30 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Efems.Rorzes return $"{par1}/{par2}/{par3}"; } - public static string BuildParameter(ModuleName target, LightType type, TowerLightStatus state) + public static string BuildParameter(ModuleName target, STLightTypes type, SignalTowerActions state) { - if (type == LightType.Buzzer) + if (type == STLightTypes.Buzzer) { - type = state == TowerLightStatus.Customized ? LightType.Buzzer2 : LightType.Buzzer1; - state = state == TowerLightStatus.Off ? TowerLightStatus.Off : TowerLightStatus.On; + type = state == SignalTowerActions.Customized ? STLightTypes.Buzzer2 : STLightTypes.Buzzer1; + state = state == SignalTowerActions.Off ? SignalTowerActions.Off : SignalTowerActions.On; } - Dictionary mapLightType = new Dictionary() + Dictionary mapLightType = new Dictionary() { - {LightType.Red, "RED"}, - {LightType.Yellow, "YELLOW"}, - {LightType.Green, "GREEN"}, - {LightType.Blue, "BLUE"}, - {LightType.White, "WHITE"}, - {LightType.Buzzer1, "BUZZER1"}, - {LightType.Buzzer2, "BUZZER2"}, + {STLightTypes.Red, "RED"}, + {STLightTypes.Yellow, "YELLOW"}, + {STLightTypes.Green, "GREEN"}, + {STLightTypes.Blue, "BLUE"}, + {STLightTypes.White, "WHITE"}, + {STLightTypes.Buzzer1, "BUZZER1"}, + {STLightTypes.Buzzer2, "BUZZER2"}, }; - Dictionary mapLightState = new Dictionary() + Dictionary mapLightState = new Dictionary() { - {TowerLightStatus.On, "ON"}, - {TowerLightStatus.Off, "OFF"}, - {TowerLightStatus.Customized, "BLINK"}, + {SignalTowerActions.On, "ON"}, + {SignalTowerActions.Off, "OFF"}, + {SignalTowerActions.Customized, "BLINK"}, }; string par1 = "STOWER"; diff --git a/MECF.Framework.RT.EquipmentLibrary/MECF.Framework.RT.EquipmentLibrary.csproj b/MECF.Framework.RT.EquipmentLibrary/MECF.Framework.RT.EquipmentLibrary.csproj index c3fe1a9..6d820bb 100644 --- a/MECF.Framework.RT.EquipmentLibrary/MECF.Framework.RT.EquipmentLibrary.csproj +++ b/MECF.Framework.RT.EquipmentLibrary/MECF.Framework.RT.EquipmentLibrary.csproj @@ -97,7 +97,7 @@ - + diff --git a/UnitTest/MECF.Framework.Common.Test/MECF/Framework/Common/Device/Bases/STEventsTests.cs b/UnitTest/MECF.Framework.Common.Test/MECF/Framework/Common/Device/Bases/STEventsTests.cs index 130002f..7599189 100644 --- a/UnitTest/MECF.Framework.Common.Test/MECF/Framework/Common/Device/Bases/STEventsTests.cs +++ b/UnitTest/MECF.Framework.Common.Test/MECF/Framework/Common/Device/Bases/STEventsTests.cs @@ -23,7 +23,7 @@ namespace MECF.Framework.Common.Device.Bases.Tests [Fact()] public void ParseEventsTest() { - var mockDictStParts = new Mock>(); + var mockDictStParts = new Mock>(); var stEvents = CustomXmlSerializer.Deserialize(new FileInfo(FN_STSETTINGS)); stEvents.ParseEvents(null, out var events); Assert.NotNull(events);