From 59c443ac9b5cd87910cce5a0bde47ef7e2ab4571 Mon Sep 17 00:00:00 2001
From: "LAPTOP-9VQH4NI5\\LCR" <1625932291@qq.com>
Date: Wed, 26 Apr 2023 13:17:19 +0800
Subject: [PATCH] =?UTF-8?q?1.IoConfiementRing=E8=BE=93=E5=87=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Devices/IoConfinementRing.cs              | 44 +++++++++++++++----
 .../Properties/AssemblyInfo.cs                |  2 +-
 .../ReleaseNotes.txt                          | 10 +++++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoConfinementRing.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoConfinementRing.cs
index 07176ee..457d069 100644
--- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoConfinementRing.cs
+++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoConfinementRing.cs
@@ -304,9 +304,16 @@ namespace Aitex.Core.RT.Device.Devices
 
         public bool JogUp(float relativeDis,out string reason)
         {
-            if (_diRingBusy.Value || _diRingServoError.Value)
+            if (_diRingBusy.Value)
             {
-                reason = "ConfinementRing is Busy or Error";
+                reason = "Before JogUp , ConfinementRing is Busy";
+                EV.PostAlarmLog(Module, reason);
+                return false;
+            }
+
+            if (_diRingServoError.Value)
+            {
+                reason = "Before JogUp , ConfinementRing is Error";
                 EV.PostAlarmLog(Module, reason);
                 return false;
             }
@@ -325,9 +332,16 @@ namespace Aitex.Core.RT.Device.Devices
 
         public bool JogDown(float relativeDis, out string reason)
         {
-            if (_diRingBusy.Value || _diRingServoError.Value)
+            if (_diRingBusy.Value)
             {
-                reason = "ConfinementRing is Busy or Error";
+                reason = "Before JogDown , ConfinementRing is Busy";
+                EV.PostAlarmLog(Module, reason);
+                return false;
+            }
+
+            if (_diRingServoError.Value)
+            {
+                reason = "Before JogDown , ConfinementRing is Error";
                 EV.PostAlarmLog(Module, reason);
                 return false;
             }
@@ -346,9 +360,16 @@ namespace Aitex.Core.RT.Device.Devices
 
         public bool MoveUpPos(out string reason)
         {
-            if (_diRingBusy.Value || _diRingServoError.Value)
+            if (_diRingBusy.Value)
             {
-                reason = "ConfinementRing is Busy or Error";
+                reason = "Before MoveUpPos , ConfinementRing is Busy";
+                EV.PostAlarmLog(Module, reason);
+                return false;
+            }
+
+            if (_diRingServoError.Value)
+            {
+                reason = "Before MoveUpPos , ConfinementRing is Error";
                 EV.PostAlarmLog(Module, reason);
                 return false;
             }
@@ -375,9 +396,16 @@ namespace Aitex.Core.RT.Device.Devices
 
         public bool MoveDownPos(out string reason)
         {
-            if (_diRingBusy.Value || _diRingServoError.Value)
+            if (_diRingBusy.Value)
             {
-                reason = "ConfinementRing is Busy or Error";
+                reason = "Before MoveDownPos , ConfinementRing is Busy";
+                EV.PostAlarmLog(Module, reason);
+                return false;
+            }
+
+            if (_diRingServoError.Value)
+            {
+                reason = "Before MoveDownPos , ConfinementRing is Error";
                 EV.PostAlarmLog(Module, reason);
                 return false;
             }
diff --git a/MECF.Framework.RT.EquipmentLibrary/Properties/AssemblyInfo.cs b/MECF.Framework.RT.EquipmentLibrary/Properties/AssemblyInfo.cs
index e286175..800d24a 100644
--- a/MECF.Framework.RT.EquipmentLibrary/Properties/AssemblyInfo.cs
+++ b/MECF.Framework.RT.EquipmentLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.3.3")]
+[assembly: AssemblyVersion("2.0.3.4")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MECF.Framework.RT.EquipmentLibrary/ReleaseNotes.txt b/MECF.Framework.RT.EquipmentLibrary/ReleaseNotes.txt
index 4ceb586..1edc080 100644
--- a/MECF.Framework.RT.EquipmentLibrary/ReleaseNotes.txt
+++ b/MECF.Framework.RT.EquipmentLibrary/ReleaseNotes.txt
@@ -1,6 +1,16 @@
 # 各种电子元器件，接口定义 和具体 实现
 
+## Version 2.0.3.4
 
+***2023-04-26***
+
+- Bug
+
+  - 无
+
+- 新特性
+
+  - IoConfiementRing输出信息修改
 
 ## Version 2.0.2.2