From b4d749b0e876ecb3b7cfa4bd93eb47c2dfa331eb Mon Sep 17 00:00:00 2001 From: THINKPAD Date: Wed, 28 Sep 2022 11:01:42 +0800 Subject: [PATCH] =?UTF-8?q?DI-32=E3=80=81DI-39=E3=80=81DI-40=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E7=B1=BB=E5=9E=8B=E6=9B=B4=E6=94=B9=E4=B8=BAWarning?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RTEquipmentLibrary/Unit/IoSensor.cs | 40 +- .../Mainframe/Config/DeviceModelSystem.xml | 102 +- Modules/SicPM/Config/DeviceModelPM.xml | 154 +- Modules/SicPM/Config/_ioDefinePM.xml | 1606 ++++++++--------- SicRT/ReleaseNotes.txt | 5 + 5 files changed, 956 insertions(+), 951 deletions(-) diff --git a/FrameworkLocal/RTEquipmentLibrary/Unit/IoSensor.cs b/FrameworkLocal/RTEquipmentLibrary/Unit/IoSensor.cs index 3b50dc3..c6a4c21 100644 --- a/FrameworkLocal/RTEquipmentLibrary/Unit/IoSensor.cs +++ b/FrameworkLocal/RTEquipmentLibrary/Unit/IoSensor.cs @@ -1,5 +1,4 @@ using System; -using System.Security.AccessControl; using System.Xml; using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.DataCenter; @@ -20,25 +19,22 @@ namespace Aitex.Core.RT.Device.Unit private R_TRIG _trigTextOut = new R_TRIG(); - private bool _textOutTrigValue; - public bool AlarmTrigValue - { - get { return _textOutTrigValue&&!string.IsNullOrEmpty(_alarmText); } - } + private bool _textOutTrigValue; - private string _warningText; + public bool AlarmTrigValue + { + get { return _textOutTrigValue && !string.IsNullOrEmpty(_alarmText); } + } + + private string _warningText; private string _alarmText; private string _infoText; - public Action WarningAction - { - get; - set; - } + public Action WarningAction { get; set; } public event Action OnSignalChanged; - public bool Value + public bool Value { get { @@ -69,7 +65,7 @@ namespace Aitex.Core.RT.Device.Unit } private bool _previous; - + public IoSensor(string module, XmlElement node, string ioModule = "") { var attrModule = node.GetAttribute("module"); @@ -84,8 +80,10 @@ namespace Aitex.Core.RT.Device.Unit _infoText = node.GetAttribute("infoText"); _warningText = node.GetAttribute("warningText"); _alarmText = node.GetAttribute("alarmText"); - - _textOutTrigValue = Convert.ToBoolean(string.IsNullOrEmpty(node.GetAttribute("textOutTrigValue")) ? "false" : node.GetAttribute("textOutTrigValue")); + + _textOutTrigValue = Convert.ToBoolean(string.IsNullOrEmpty(node.GetAttribute("textOutTrigValue")) + ? "false" + : node.GetAttribute("textOutTrigValue")); } public bool Initialize() @@ -115,12 +113,14 @@ namespace Aitex.Core.RT.Device.Unit else if (!string.IsNullOrEmpty(_warningText.Trim())) { EV.PostWarningLog(Module, _warningText); - }else if (!string.IsNullOrEmpty(_alarmText.Trim())) + } + else if (!string.IsNullOrEmpty(_alarmText.Trim())) { - EV.PostAlarmLog(Module, _alarmText); - }else if (!string.IsNullOrEmpty(_infoText.Trim())) + EV.PostAlarmLog(Module, _alarmText); + } + else if (!string.IsNullOrEmpty(_infoText.Trim())) { - EV.PostInfoLog(Module, _infoText); + EV.PostInfoLog(Module, _infoText); } } diff --git a/Modules/Mainframe/Config/DeviceModelSystem.xml b/Modules/Mainframe/Config/DeviceModelSystem.xml index 2449c69..cfde505 100644 --- a/Modules/Mainframe/Config/DeviceModelSystem.xml +++ b/Modules/Mainframe/Config/DeviceModelSystem.xml @@ -3,7 +3,7 @@ - + - - + + @@ -40,10 +40,10 @@ - - + + - + @@ -62,10 +62,10 @@ - + - - + + @@ -83,12 +83,12 @@ - + - - - + + + @@ -99,16 +99,16 @@ - - + + - - + + - + - + @@ -116,8 +116,8 @@ - - + + @@ -126,11 +126,11 @@ - + - + @@ -141,36 +141,36 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + - - - - \ No newline at end of file diff --git a/Modules/SicPM/Config/DeviceModelPM.xml b/Modules/SicPM/Config/DeviceModelPM.xml index da32a3a..93b74f6 100644 --- a/Modules/SicPM/Config/DeviceModelPM.xml +++ b/Modules/SicPM/Config/DeviceModelPM.xml @@ -11,7 +11,7 @@ aoL1LoopModeSetPoint="AO_PSUInnerLoopMode" aoL2LoopModeSetPoint="AO_PSUMiddleLoopMode" aoL3LoopModeSetPoint="AO_PSUOuterLoopMode" aoL1TargetSPSetPoint="AO_PSUInnerTargetSP" aoL2TargetSPSetPoint="AO_PSUMiddleTargetSP" aoL3TargetSPSetPoint="AO_PSUOuterTargetSP" aoL1TargetOPSetPoint="AO_PSUInnerTargetOP" aoL2TargetOPSetPoint="AO_PSUMiddleTargetOP" aoL3TargetOPSetPoint="AO_PSUOuterTargetOP" - aoL1RecipeValueSetPoint="AO_PSUInnerRecipeValue" aoL2RecipeValueSetPoint="AO_PSUMiddleRecipeValue" aoL3RecipeValueSetPoint="AO_PSUOuterRecipeValue" + aoL1RecipeValueSetPoint="AO_PSUInnerRecipeValue" aoL2RecipeValueSetPoint="AO_PSUMiddleRecipeValue" aoL3RecipeValueSetPoint="AO_PSUOuterRecipeValue" aoL1InputTempSetPoint="AO_PSUInnerPyroTemp" aoL2InputTempSetPoint="AO_PSUMiddlePyroTemp" aoL3InputTempSetPoint="AO_PSUOuterPyroTemp" aoTCPyroModeSetPoint="AO_PSUTCPyroMode" aoL1VoltageLimited="AO_PSUInnerVoltageLimited" aoL2VoltageLimited="AO_PSUMiddleVoltageLimited" aoL3VoltageLimited="AO_PSUOuterVoltageLimited" aoL1TempHighLimitSetPoint="AO_PSUInnerTempHighLimit" aoL2TempHighLimitSetPoint="AO_PSUMiddleTempHighLimit" aoL3TempHighLimitSetPoint="AO_PSUOuterTempHighLimit" @@ -29,42 +29,42 @@ aoL1LoopModeSetPoint="AO_SCRUpperLoopMode" aoL2LoopModeSetPoint="AO_SCRMiddleLoopMode" aoL3LoopModeSetPoint="AO_SCRLowerLoopMode" aoL1TargetSPSetPoint="AO_SCRUpperTargetSP" aoL2TargetSPSetPoint="AO_SCRMiddleTargetSP" aoL3TargetSPSetPoint="AO_SCRLowerTargetSP" aoL1TargetOPSetPoint="AO_SCRUpperTargetOP" aoL2TargetOPSetPoint="AO_SCRMiddleTargetOP" aoL3TargetOPSetPoint="AO_SCRLowerTargetOP" - aoL1RecipeValueSetPoint="AO_SCRUpperRecipeValue" aoL2RecipeValueSetPoint="AO_SCRMiddleRecipeValue" aoL3RecipeValueSetPoint="AO_SCRLowerRecipeValue" + aoL1RecipeValueSetPoint="AO_SCRUpperRecipeValue" aoL2RecipeValueSetPoint="AO_SCRMiddleRecipeValue" aoL3RecipeValueSetPoint="AO_SCRLowerRecipeValue" aoL1InputTempSetPoint="AO_SCRUpperPyroTemp" aoL2InputTempSetPoint="AO_SCRMiddlePyroTemp" aoL3InputTempSetPoint="AO_SCRLowerPyroTemp" aoTCPyroModeSetPoint="AO_SCRTCPyroMode" aoL1VoltageLimited="AO_SCRUpperVoltageLimited" aoL2VoltageLimited="AO_SCRMiddleVoltageLimited2" aoL3VoltageLimited="AO_SCRLowerVoltageLimited" aoL1TempHighLimitSetPoint="AO_SCRUpperTempHighLimit" aoL2TempHighLimitSetPoint="AO_SCRMiddleTempHighLimit" aoL3TempHighLimitSetPoint="AO_SCRLowerTempHighLimit" aoL1TempLowLimitSetPoint="AO_SCRUpperTempLowLimit" aoL2TempLowLimitSetPoint="AO_SCRMiddleTempLowLimit" aoL3TempLowLimitSetPoint="AO_SCRLowerTempLowLimit" aiTtempCtrlTCIN="AI_SCRTC"/> - - + - - + + + doHeatEnable="DO_HeaterEnable" diHeatEnable="DI_PSUEnableFB" doRelatedEnable="DO_OuterHeaterEnable" /> @@ -73,15 +73,15 @@ - - - + + + - + @@ -125,10 +125,10 @@ - - - - + + + + @@ -154,17 +154,17 @@ - + - - + + @@ -200,7 +200,7 @@ - + @@ -211,8 +211,8 @@ - - + + @@ -233,30 +233,30 @@ - - - - - - - - + + + + + + + + - - - + + + - + - + @@ -266,14 +266,14 @@ - - + + - - + + @@ -293,23 +293,23 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SicRT/ReleaseNotes.txt b/SicRT/ReleaseNotes.txt index d5f992f..69cf9df 100644 --- a/SicRT/ReleaseNotes.txt +++ b/SicRT/ReleaseNotes.txt @@ -9,6 +9,11 @@ Sic 系统更新历史记录 --------------------------------------------------------------------------------- +Sic04 2022-09-28 Version 1.0.0.3 + +1.DI-32、DI-39、DI-40报警类型更改为Warning。 + + Sic04 2022-09-27 Version 1.0.0.2