进出轴取料点增加7寸13寸位置配置

DeviceLibrary/theMachine/LabelParam.cs

@@ -68,7 +68,26 @@ namespace DeviceLibrary
             Comp_PL = Comp_PL < 0 ? 0 : Comp_PL;
             Comp_PL = Comp_PL < 0 ? 0 : Comp_PL;
             posid = aCStorePosition.PositionNum;
             posid = aCStorePosition.PositionNum;
             Reel = reel.clone();
             Reel = reel.clone();
-            LogUtil.info($"BSP:{posid},Comp_PH:{Comp_PH}={Config.Comp_P2}-({BagHigh}-{8}+{Config.Comp_PH_MM})*{Config.Comp_PoToMM},Comp_PL:{Comp_PL}={ReelHeight},{JsonHelper.SerializeObject(this)}");
+
+            if (aCStorePosition.PosType.Equals(1))
+            {
+                if (reel.PlateW <= 7   )
+                { 
+                    if (Config.InOut_P5 != 0)
+                    { 
+                        InOut_P2 = Config.InOut_P5;
+                    }
+                }
+                else
+                {
+                    if (Config.InOut_P6 != 0)
+                    { 
+                        InOut_P2 = Config.InOut_P6;
+                    }
+                }
+            }
+
+            LogUtil.info($"BSP:{posid} ,PosNum:{aCStorePosition.PositionNum} , {reel.PlateW}X{reel.PlateH} , InOut_P2:{InOut_P2}  ,Comp_PH:{Comp_PH}={Config.Comp_P2}-({BagHigh}-{8}+{Config.Comp_PH_MM})*{Config.Comp_PoToMM},Comp_PL:{Comp_PL}={ReelHeight},{JsonHelper.SerializeObject(this)}");
         }
         }
         //public const string ngdoor = "单料口";
         //public const string ngdoor = "单料口";
 
 

LoadCVSLibrary/Config/Config.csv

@@ -73,6 +73,8 @@ PRO,11,升降轴待机点P1,UpDown_P1,703196,,,50000,,,,,,,,,
 PRO,11,升降轴低速,UpDown_S1_Speed,50000,,,,,,,,,,,,
 PRO,11,升降轴低速,UpDown_S1_Speed,50000,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 PRO,12,进出轴待机点P1,InOut_P1,0,,,80000,,,,,,,,,
 PRO,12,进出轴待机点P1,InOut_P1,0,,,80000,,,,,,,,,
+PRO,12,进出轴入口取料点_7寸P5,InOut_P5,0,,,80000,,,,,,,,,
+PRO,12,进出轴入口取料点_13寸P6,InOut_P6,0,,,80000,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 PRO,13,压紧轴待机点P1,Comp_P1,0,,,50000,,,,,,,,,
 PRO,13,压紧轴待机点P1,Comp_P1,0,,,50000,,,,,,,,,
 PRO,13,压紧轴8mm压紧点P2,Comp_P2,49570,,,50000,,,,,,,,,
 PRO,13,压紧轴8mm压紧点P2,Comp_P2,49570,,,50000,,,,,,,,,

LoadCVSLibrary/storeConfig/config/Robot_Config.cs

@@ -145,7 +145,27 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         [ConfigProAttribute("Comp_P2_speed")]
         [ConfigProAttribute("Comp_P2_speed")]
         public int Comp_P2_speed { get; set; }
         public int Comp_P2_speed { get; set; }
+        /// <summary>
+        ///  PRO,12,进出轴取料点_7寸P5,InOut_P5,0,,,80000,,,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("InOut_P5")]
+        public int InOut_P5 { get; set; }
+        /// <summary>
+        ///  PRO,12,进出轴取料点_13寸P6,InOut_P6,0,,,80000,,,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("InOut_P6")]
+        public int InOut_P6 { get; set; }
 
 
+        /// <summary>
+        ///  PRO,12,进出轴取料点_7寸P5,InOut_P5,0,,,80000,,,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("InOut_P5_speed")]
+        public int InOut_P5_speed { get; set; }
+        /// <summary>
+        ///  PRO,12,进出轴取料点_13寸P6,InOut_P6,0,,,80000,,,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("InOut_P6_speed")]
+        public int InOut_P6_speed { get; set; }
 
 
     }
     }
 }
 }