1

source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv

@@ -3,13 +3,13 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 ,,,,,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
 PRO,0,移栽上下移动料盘高度对应的上升位置,UpDownPositions,12=1000;16=1300;20=2000;24=2000;36=3000;,,,,,
-AXIS,0,移栽上下轴,UpDown_Axis,2,COM1,0,,,
-PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
-PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
-PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
-PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,,,,
-PRO,0,移栽上下轴原点低速度,UpdownAxis_HomeLowSpeed,100,,,,,
-PRO,0,移栽上下轴原点高速,UpdownAxis_HomeHighSpeed,200,,,,,
-PRO,0,移栽上下轴原点加速度,UpdownAxis_HomeAddSpeed,200,,,,,
+AXIS,0,批量上料轴,UpDown_Axis,2,COM1,0,,,
+PRO,0,批量上料轴待机点 P1,BatchAxisP1,2000,,,,,
+PRO,0,批量上料轴目标速度,BatchAxis_TargetSpeed,150,,,,,
+PRO,0,批量上料轴加速度,BatchAxis_AddSpeed,400,,,,,
+PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,,
+PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,,
+PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,,
+PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,,
 ,,,,,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,

source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs

@@ -39,68 +39,68 @@ namespace OnlineStore.LoadCSVLibrary
         [ConfigProAttribute("UpDownUseAxis")]
         public int UpDownUseAxis { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴在移栽上下降的位置 UpDownPositions	0=180000
+        ///  PRO	0	批量上料轴在移栽上下降的位置 UpDownPositions	0=180000
         /// </summary>
         [ConfigProAttribute("UpDownPositions",false) ]
         public string UpDownPositions { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴在料仓门口下降的位置 UpDownBoxPositions	0=116000
+        ///  PRO	0	批量上料轴在料仓门口下降的位置 UpDownBoxPositions	0=116000
         /// </summary>
         [ConfigProAttribute("UpDownBoxPositions", false)]
         public string UpDownBoxPositions { get; set; }
         /// <summary>
-        ///  AXIS	0	移栽上下轴 UpDown_Axis	2
+        ///  AXIS	0	批量上料轴 UpDown_Axis	2
         /// </summary>
         [ConfigProAttribute("UpDown_Axis", false)]
         public ConfigMoveAxis UpDown_Axis { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴待机点 P1 UpDownAxisP1	403000
+        ///  PRO	0	批量上料轴待机点 P1 BatchAxisP1	403000
         /// </summary>
-        [ConfigProAttribute("UpDownAxisP1", false)]
-        public int UpDownAxisP1 { get; set; }
+        [ConfigProAttribute("BatchAxisP1", false)]
+        public int BatchAxisP1 { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴目标速度 UpdownAxis_TargetSpeed	150
+        ///  PRO	0	批量上料轴目标速度 BatchAxis_TargetSpeed	150
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_TargetSpeed", false)]
-        public int UpdownAxis_TargetSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_TargetSpeed", false)]
+        public int BatchAxis_TargetSpeed { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴加速度 UpdownAxis_AddSpeed	400
+        ///  PRO	0	批量上料轴加速度 BatchAxis_AddSpeed	400
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_AddSpeed", false)]
-        public short UpdownAxis_AddSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_AddSpeed", false)]
+        public short BatchAxis_AddSpeed { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴减速度 UpdownAxis_DelSpeed	400
+        ///  PRO	0	批量上料轴减速度 BatchAxis_DelSpeed	400
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_DelSpeed", false)]
-        public short UpdownAxis_DelSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_DelSpeed", false)]
+        public short BatchAxis_DelSpeed { get; set; }
         /// <summary>
-        ///  PRO	0	移栽上下轴原点低速度 UpdownAxis_HomeLowSpeed	100
+        ///  PRO	0	批量上料轴原点低速度 BatchAxis_HomeLowSpeed	100
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_HomeLowSpeed", false)]
-        public int UpdownAxis_HomeLowSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_HomeLowSpeed", false)]
+        public int BatchAxis_HomeLowSpeed { get; set; }
         /// <summary>
-        /// PRO	0	移栽上下轴原点高速 UpdownAxis_HomeHighSpeed	200
+        /// PRO	0	批量上料轴原点高速 BatchAxis_HomeHighSpeed	200
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_HomeHighSpeed", false)]
-        public int UpdownAxis_HomeHighSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_HomeHighSpeed", false)]
+        public int BatchAxis_HomeHighSpeed { get; set; }
         /// <summary>
-        /// PRO	0	移栽上下轴原点加速度 UpdownAxis_HomeAddSpeed	200
+        /// PRO	0	批量上料轴原点加速度 BatchAxis_HomeAddSpeed	200
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_HomeAddSpeed", false)]
-        public int UpdownAxis_HomeAddSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_HomeAddSpeed", false)]
+        public int BatchAxis_HomeAddSpeed { get; set; }
 
 
 
         /// <summary>
-        ///   PRO,0,移栽上下轴走到待机点速度,UpdownAxis_P1Speed,400,,,,,
+        ///   PRO,0,批量上料轴走到待机点速度,BatchAxis_P1Speed,400,,,,,
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_P1Speed", false)]
-        public int UpdownAxis_P1Speed { get; set; }
+        [ConfigProAttribute("BatchAxis_P1Speed", false)]
+        public int BatchAxis_P1Speed { get; set; }
         /// <summary>
-        /// PRO,0,移栽上下轴下降速度,UpdownAxis_DownSpeed,500,,,,,
+        /// PRO,0,批量上料轴下降速度,BatchAxis_DownSpeed,500,,,,,
         /// </summary>
-        [ConfigProAttribute("UpdownAxis_DownSpeed", false)]
-        public int UpdownAxis_DownSpeed { get; set; }
+        [ConfigProAttribute("BatchAxis_DownSpeed", false)]
+        public int BatchAxis_DownSpeed { get; set; }
         private Dictionary<int, int> UpDownPositionMap = null; 
         public int GetUpdownPosition(int trayHeight)
         {