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

[MECF.Framework.RT.EquipmentLibrary] 

1.隔热罩Interlock增加检测当前位置和Down位置做比较
This commit is contained in:
LAPTOP-9VQH4NI5\LCR 2023-05-11 15:22:19 +08:00
parent ca2e8f7dfd
commit deb0e6a2d5
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MECF.Framework.Common/ReleaseNote.md
View File

@ -1,4 +1,12 @@
# 同时应用于RT和UI端的对象，以及WCF通讯使用的对象
## Version 2.1.3.6
***2023-05-11***
- Bug
- 隔热罩Interlock增加检测当前位置和Down位置做比较
- 新特性
- 无
## Version 2.1.2.7

17
MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs
View File

@ -56,6 +56,8 @@ namespace Aitex.Core.RT.Device.Devices
private DIAccessor _diHeaterTempBelow900CSW = null;
private DIAccessor _diConfinementRingDown = null;
private AIAccessor _aiActualSpeed = null;
private AIAccessor _aiCurPos = null;
private AIAccessor _aiDownPos = null;
private AIAccessor _aiChamPress = null;
private AIAccessor _aiTempCtrl1 = null;
@ -303,7 +305,12 @@ namespace Aitex.Core.RT.Device.Devices
_diPSUEnable = ParseDiNode("diPSUEnable", node, ioModule);
_diHeaterTempBelow900CSW = ParseDiNode("diHeaterTempBelow900CSW", node, ioModule);
_diConfinementRingDown = ParseDiNode("diConfinementRingDown", node, ioModule);
_aiActualSpeed = ParseAiNode("aiActualSpeed", node, ioModule);
_aiCurPos = ParseAiNode("aiCurPos", node, ioModule);
_aiDownPos = ParseAiNode("aiDownPos", node, ioModule);
_aiChamPress = ParseAiNode("aiChamPress", node, ioModule);
_doPMASlitDoorClosed = ParseDoNode("doPMASlitDoorClosed", node, ioModule);
@ -643,9 +650,10 @@ namespace Aitex.Core.RT.Device.Devices
{
if (_doReactorATMTransferReady != null)
{
if (_diPMATMSW != null && _diPSUEnable != null && _aiActualSpeed != null && _diConfinementRingDown != null)
if (_diPMATMSW != null && _diPSUEnable != null && _aiActualSpeed != null && _diConfinementRingDown != null && _aiCurPos != null && _aiDownPos != null)
{
if (!_diPSUEnable.Value && _diPMATMSW.Value && _aiActualSpeed.FloatValue == 0 && _diConfinementRingDown.Value)
if (!_diPSUEnable.Value && _diPMATMSW.Value && _aiActualSpeed.FloatValue == 0 && _diConfinementRingDown.Value &&
Math.Abs(_aiActualSpeed.FloatValue - _aiDownPos.FloatValue) < 0.5)
{
if (!_doReactorATMTransferReady.Value)
{
@ -666,9 +674,10 @@ namespace Aitex.Core.RT.Device.Devices
{
if (_doReactorVACTransferReady != null)
{
if (_aiChamPress != null && _scPmVacPress != null && _aiActualSpeed != null && _diConfinementRingDown != null)
if (_aiChamPress != null && _scPmVacPress != null && _aiActualSpeed != null && _diConfinementRingDown != null && _aiCurPos != null && _aiDownPos != null)
{
if (_aiChamPress.FloatValue <= _scPmVacPress.DoubleValue && _aiActualSpeed.FloatValue == 0 && _diConfinementRingDown.Value)
if (_aiChamPress.FloatValue <= _scPmVacPress.DoubleValue && _aiActualSpeed.FloatValue == 0 && _diConfinementRingDown.Value &&
Math.Abs(_aiActualSpeed.FloatValue - _aiDownPos.FloatValue) < 0.5)
{
if (!_doReactorVACTransferReady.Value)
{

2
MECF.Framework.RT.EquipmentLibrary/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.3.5")]
[assembly: AssemblyVersion("2.0.3.6")]
//[assembly: AssemblyFileVersion("1.0.0.0")]