Sic-Software
/
Sic04
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DI-32、DI-39、DI-40报警类型更改为Warning。

This commit is contained in:
THINKPAD 2022-09-28 11:01:42 +08:00
parent 03f5d74334
commit b4d749b0e8
5 changed files with 956 additions and 951 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FrameworkLocal/RTEquipmentLibrary/Unit/IoSensor.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Security.AccessControl;
using System.Xml;
using Aitex.Core.Common.DeviceData;
using Aitex.Core.RT.DataCenter;
@ -21,6 +20,7 @@ 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); }
@ -30,11 +30,7 @@ namespace Aitex.Core.RT.Device.Unit
private string _alarmText;
private string _infoText;
public Action WarningAction
{
get;
set;
}
public Action WarningAction { get; set; }
public event Action<IoSensor, bool> OnSignalChanged;
@ -85,7 +81,9 @@ namespace Aitex.Core.RT.Device.Unit
_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,10 +113,12 @@ 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()))
}
else if (!string.IsNullOrEmpty(_infoText.Trim()))
{
EV.PostInfoLog(Module, _infoText);
}

6
Modules/SicPM/Config/DeviceModelPM.xml
View File

@ -342,12 +342,12 @@
<IoSensor id="SensorTMFlow2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TMTopLidFlowSW" infoText="" warningText="" alarmText ="Alarm16 TM Pump Low Flow -U12 [DI-26]"/>
<IoSensor id="SensorPMH2DetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMH2DetectorSW" infoText="" warningText="" alarmText ="Alarm19 PM H2 Leak Detect [DI-30]"/>
<IoSensor id="SensorGBHCLDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBHCLDetectorSW" infoText="" warningText="" alarmText ="Alarm20 Gasbox HCL Leak Detect [DI-31]"/>
<IoSensor id="SensorGBExhaustDPSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBExhaustDPSW" infoText="" warningText="" alarmText ="Alarm21 Gasbox Exhaust DP Error [DI-32]"/>
<IoSensor id="SensorGBExhaustDPSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBExhaustDPSW" infoText="" warningText="Alarm21 Gasbox Exhaust DP Error [DI-32]" alarmText =""/>
<IoSensor id="SensorGasPipeTempCtrlAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GasPipeTempCtrlAlarm" infoText="" warningText="Warning39 GasPipeTempCtrl Alarm [DI-35]" alarmText =""/>
<IoSensor id="SensorDryPumpAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PM1DryPumpAlarm" infoText="" warningText="" alarmText ="Alarm22 PM1DryPump.Alarm [DI-36]"/>
<IoSensor id="SensorPumpExhaustPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PumpExhaustPressSW" infoText="" warningText="" alarmText ="Alarm23 Pump Exhaust Pressure Abnormal [DI-38]"/>
<IoSensor id="SensorPMAExhaustDPSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMAExhaustDPSW" infoText="" warningText="" alarmText ="Alarm24 PM Exhaust DP Error [DI-39]"/>
<IoSensor id="SensorPumpExhaustDPSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PumpExhaustDPSW" infoText="" warningText="" alarmText ="Alarm25 Pump Exhaust DP Error [DI-40]"/>
<IoSensor id="SensorPMAExhaustDPSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMAExhaustDPSW" infoText="" warningText="Alarm24 PM Exhaust DP Error [DI-39]" alarmText =""/>
<IoSensor id="SensorPumpExhaustDPSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PumpExhaustDPSW" infoText="" warningText="Alarm25 Pump Exhaust DP Error [DI-40]" alarmText =""/>
<IoSensor id="SensorScrubberIntlkSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ScrubberIntlkSW" infoText="" warningText="" alarmText ="Alarm26 Scrubber System Error [DI-41]"/>
<IoSensor id="SensorFacilityIntlkSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_FacilityIntlkSW" infoText="" warningText="" alarmText ="Alarm27 Facility Error [DI-42]"/>
<IoSensor id="SensorServoDriverFaultSW" module = "" display = "" schematicId = "" unit = "" aioType = "" textOutTrigValue = "false" di = "DI_ServoDriverFaultSW" infoText = "" warningText = "" alarmText = "Alarm29 Rotation Servo Driver Error [DI-45]" />

5
SicRT/ReleaseNotes.txt
View File

@ -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