From 76d171a7cdcef7fa4c59dcab7c6664d7576c3774 Mon Sep 17 00:00:00 2001 From: SL <123@123.com> Date: Thu, 3 Aug 2023 14:00:39 +0800 Subject: [PATCH] =?UTF-8?q?[RT.Equipment]=20=E7=A7=BB=E9=99=A4PSU2?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=87=8F=E9=99=90=E5=88=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=B8=A9=E5=BA=A6=E6=B3=A2=E5=8A=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=80=9A=E8=BF=872704=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Devices/IoPSU.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoPSU.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoPSU.cs index cf0b542..bd4735d 100644 --- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoPSU.cs +++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoPSU.cs @@ -179,9 +179,9 @@ namespace Aitex.Core.RT.Device.Devices DATA.Subscribe($"{Module}.{Name}.SimVoltageFeedBack", () => SimVoltageFeedBack); DATA.Subscribe($"{Module}.{Name}.SimArmsFeedBack", () => SimArmsFeedBack); DATA.Subscribe($"{Module}.{Name}.ConstantSetPoint", () => ConstantSetPoint); - DATA.Subscribe($"{Module}.{Name}.OutputLimitHigh", () => OutputLimitHigh); + /*DATA.Subscribe($"{Module}.{Name}.OutputLimitHigh", () => OutputLimitHigh); DATA.Subscribe($"{Module}.{Name}.OutputLimitLow", () => OutputLimitLow); - DATA.Subscribe($"{Module}.{Name}.OutputLimitHighTuningTemp", () => _outputLimitHighTuningTemp); + DATA.Subscribe($"{Module}.{Name}.OutputLimitHighTuningTemp", () => _outputLimitHighTuningTemp);*/ DATA.Subscribe($"{Module}.{Name}.AlarmFeedBack", () => AlarmFeedBack); DATA.Subscribe($"{Module}.{Name}.AllHeatEnable", () => AllHeatEnable); @@ -209,6 +209,7 @@ namespace Aitex.Core.RT.Device.Devices return true; }); + /* OP.Subscribe($"{Module}.{Name}.SetOutputLimitHighTuningTemp", (function, args) => { if (args.Length == 1 && args[0] is double value) @@ -265,6 +266,7 @@ namespace Aitex.Core.RT.Device.Devices EV.PostWarningLog(Module, $"SetOutputLimitLow fail, args error"); return false; }); + */ return true; } @@ -363,7 +365,7 @@ namespace Aitex.Core.RT.Device.Devices { try { - MonitorPsu2OutputLimit(); + // MonitorPsu2OutputLimit(); MonitorEnableTimer(); MonitorAlarm(); MonitorDoResetDone(); @@ -451,7 +453,9 @@ namespace Aitex.Core.RT.Device.Devices } } - private readonly R_TRIG _trigBelow1600 = new(); + #region PSU2 Output Limit (Obsolete) + + /*private readonly R_TRIG _trigBelow1600 = new(); private readonly R_TRIG _trigAbove1600 = new(); private void MonitorPsu2OutputLimit() @@ -493,7 +497,11 @@ namespace Aitex.Core.RT.Device.Devices } } } - } + }*/ + + #endregion + + private double AETemp {