固定气缸定义和逻辑修改

source/AssemblyLineClient/记录.txt

-20200316
+20210322
+固定气缸DI修改
+
+DI	101	T1固定气缸上升端	SL_FixedCylinder_Up	89	HC	X89
+DI	101	T1固定气缸下降端	SL_FixedCylinder_Down	90	HC	X90
+
+
+
+20200316
 环形线RFID用12001
 出料机构RFID用13000
 

source/DeviceLibrary/LineConfig/Config_Line.csv

@@ -124,8 +124,8 @@ DI,101,T1定位气缸1上升端,SL_LocationCylinder_Up1,85,HC,X85,,,,,
 DI,101,T1定位气缸1下降端,SL_LocationCylinder_Down1,86,HC,X86,,,,,
 DI,101,T1定位气缸2上升端,SL_LocationCylinder_Up2,87,HC,X87,,,,,
 DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,88,HC,X88,,,,,
-DI,101,T1固定气缸1上升端,SL_FixedCylinder_Up1,89,HC,X89,,,,,
-DI,101,T1固定气缸2上升端,SL_FixedCylinder_Up2,90,HC,X90,,,,,
+DI,101,T1固定气缸上升端,SL_FixedCylinder_Up,89,HC,X89,,,,,
+DI,101,T1固定气缸下降端,SL_FixedCylinder_Down,90,HC,X90,,,,,
 DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,91,HC,X91,,,,,
 DI,101,T1定位工位顶升下降端,SL_TopCylinder_Down,92,HC,X92,,,,,
 DI,101,T1出口顶升上升端,SL_OutTopCylinder_Up,93,HC,X93,,,,,

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -572,25 +572,27 @@ namespace OnlineStore.DeviceLibrary
         } 
         public void FixedCylinderUp(LineMoveInfo moveinfo = null)
         {
-            IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.LOW);
-            IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.HIGH);
-            if (moveinfo != null)
-            {
-                moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.HIGH));
-                moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.HIGH));
-            }
+            CylinderMove(moveinfo, IO_Type.SL_FixedCylinder_Down, IO_Type.SL_FixedCylinder_Up);
+            //IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.LOW);
+            //IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.HIGH);
+            //if (moveinfo != null)
+            //{
+            //    moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.HIGH));
+            //    moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.HIGH));
+            //}
         }
 
         public void FixedCylinderDown(LineMoveInfo moveinfo = null)
         {
-            IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.LOW);
-            IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.HIGH);
-            if (moveinfo != null)
-            {
-                moveinfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
-                moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.LOW));
-                moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.LOW));
-            } 
+            CylinderMove(moveinfo, IO_Type.SL_FixedCylinder_Up, IO_Type.SL_FixedCylinder_Down);
+            //IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.LOW);
+            //IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.HIGH);
+            //if (moveinfo != null)
+            //{
+            //    moveinfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
+            //    moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.LOW));
+            //    moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.LOW));
+            //} 
         }
 
         public void TrayLCylinderBefore(LineMoveInfo moveinfo = null)
@@ -663,8 +665,13 @@ namespace OnlineStore.DeviceLibrary
 
         public bool IsFixedCylinderUp()
         {
-            if (IOValue(IO_Type.SL_FixedCylinder_Up1).Equals(IO_VALUE.HIGH) &&
-                IOValue(IO_Type.SL_FixedCylinder_Up2).Equals(IO_VALUE.HIGH))
+            //if (IOValue(IO_Type.SL_FixedCylinder_Up1).Equals(IO_VALUE.HIGH) &&
+            //    IOValue(IO_Type.SL_FixedCylinder_Up2).Equals(IO_VALUE.HIGH))
+            //{
+            //    return true;
+            //}
+            if (IOValue(IO_Type.SL_FixedCylinder_Up).Equals(IO_VALUE.HIGH) &&
+               IOValue(IO_Type.SL_FixedCylinder_Down).Equals(IO_VALUE.LOW))
             {
                 return true;
             }

source/LoadCVSLibrary/storeConfig/config/IO_Type.cs

@@ -146,14 +146,14 @@ namespace OnlineStore.LoadCSVLibrary
         ///  DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,88,HC,X88
         /// </summary>
         public static string SL_LocationCylinder_Down2 = "SL_LocationCylinder_Down2";
-        /// <summary>
-        ///  DI,101,T1固定气缸1上升端,SL_FixedCylinder_Up1,89,HC,X89
-        /// </summary>
-        public static string SL_FixedCylinder_Up1 = "SL_FixedCylinder_Up1";
-        /// <summary>
-        ///  DI,101,T1固定气缸2上升端,SL_FixedCylinder_Up2,90,HC,X90
-        /// </summary>
-        public static string SL_FixedCylinder_Up2 = "SL_FixedCylinder_Up2";
+         ///// <summary>
+        /////  DI,101,T1固定气缸上升端 SL_FixedCylinder_Up,89,HC,X89
+        ///// </summary>
+        //public static string SL_FixedCylinder_Up = "SL_FixedCylinder_Up";
+        ///// <summary>
+        /////  DI,101,T1固定气缸2上升端,SL_FixedCylinder_Down,90,HC,X90
+        ///// </summary>
+        //public static string SL_FixedCylinder_Down = "SL_FixedCylinder_Down";
         /// <summary>
         ///  DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,91,HC,X91
         /// </summary>