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

[RT.Equipment] 

移除IoInterlock对象中关于DO-100互锁处理。
IoValve中新增注册Status数据。
This commit is contained in:
SL 2023-09-01 10:26:42 +08:00
parent dbacb5a041
commit d841220f69
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,21 +168,21 @@ namespace Aitex.Core.RT.Device.Devices
No related alarm according to the interlock table No related alarm according to the interlock table
<Limit ai="PM1.AI_ActualSpeed" value="0" tip="" tip.zh-CN="" tip.en-US="AI-118" /> 这个放在配置文件里面，程序会变得很慢，所以放到ChamMoveBodyUpDownEnableCanDo函数里 <Limit ai="PM1.AI_ActualSpeed" value="0" tip="" tip.zh-CN="" tip.en-US="AI-118" /> 这个放在配置文件里面，程序会变得很慢，所以放到ChamMoveBodyUpDownEnableCanDo函数里
*/ */
[Subscription("PSU1.AllHeatEnable")] //[Subscription("PSU1.AllHeatEnable")]
public bool AllHeatEnable { get; set; } //public bool AllHeatEnable { get; set; }
[Subscription("IsService")] //[Subscription("IsService")]
public bool IsService { get; set; } //public bool IsService { get; set; }
/// <summary> ///// <summary>
/// DO-100 ///// DO-100
/// </summary> ///// </summary>
public bool ChamMoveBodyUpDownEnable //public bool ChamMoveBodyUpDownEnable
{ //{
get // get
{ // {
return this.ChamMoveBodyUpDownEnableCanDo(); // return this.ChamMoveBodyUpDownEnableCanDo();
} // }
} //}
#endregion #endregion
@ -583,7 +583,7 @@ namespace Aitex.Core.RT.Device.Devices
public bool Initialize() public bool Initialize()
{ {
DATA.Subscribe($"{Module}.{Name}.ChamMoveBodyUpDownEnable", () => ChamMoveBodyUpDownEnable); //DATA.Subscribe($"{Module}.{Name}.ChamMoveBodyUpDownEnable", () => ChamMoveBodyUpDownEnable);
return true; return true;
@ -1207,18 +1207,29 @@ namespace Aitex.Core.RT.Device.Devices
} }
/// <summary> ///// <summary>
/// ChamMoveBodyUpDownEnableCanDo ///// ChamMoveBodyUpDownEnableCanDo
/// </summary> ///// </summary>
/// <returns></returns> ///// <returns></returns>
public bool ChamMoveBodyUpDownEnableCanDo() //public bool ChamMoveBodyUpDownEnableCanDo()
{ //{
//PSU disable // //PSU disable
//Service mode // //Service mode
// var v39 = (bool)DATA.Poll(Module, "V39.Status");
// var v40 = (bool)DATA.Poll(Module, "V40.Status");
// var v41 = (bool)DATA.Poll(Module, "V41.Status");
// var v53 = (bool)DATA.Poll(Module, "V53.Status");
// var v54 = (bool)DATA.Poll(Module, "V54.Status");
// var v55 = (bool)DATA.Poll(Module, "V55.Status");
// var v59 = (bool)DATA.Poll(Module, "V59.Status");
return (!AllHeatEnable) && IsService && (_aiActualSpeed.Value == 0); // var isService = (bool)DATA.Poll(Module, "IsService");
} // var heaterEnabled = (bool)DATA.Poll(Module, "PSU1.AllHeatEnable");
// return (!AllHeatEnable) && IsService && (_aiActualSpeed.Value == 0);
//}
} }
} }

1
MECF.Framework.RT.EquipmentLibrary/Devices/IoValve.cs
View File

@ -165,6 +165,7 @@ namespace Aitex.Core.RT.Device.Devices
{ {
DATA.Subscribe($"Device.{Module}.{GVName}", () => DeviceData); DATA.Subscribe($"Device.{Module}.{GVName}", () => DeviceData);
DATA.Subscribe($"{_uniqueName}.DeviceData", () => DeviceData); DATA.Subscribe($"{_uniqueName}.DeviceData", () => DeviceData);
DATA.Subscribe($"{_uniqueName}.Status", () => Status);
OP.Subscribe($"{_uniqueName}.{AITValveOperation.GVTurnValve}", InvokeOpenCloseValve); OP.Subscribe($"{_uniqueName}.{AITValveOperation.GVTurnValve}", InvokeOpenCloseValve);