1

LN
Commit 8674874d 由 LN 编写于 2019-06-10 15:17:21 +0800
source/ACSingleStore/Properties/Resource.en-US.resx
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
--- a/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @8674874
+++ b/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @8674874
@@ -893,7 +893,7 @@
    <value>(Axis 5) Batch loading axis</value>
  </data>
  <data name="FrmStoreBox_groupBox6_Text" xml:space="preserve">
-    <value>Batch storing info: saving:</value>
+    <value>Batch storing operation </value>
  </data>
  <data name="FrmStoreBox_btnOpenDoor_Text" xml:space="preserve">
    <value>Open doorlock</value>

--- a/source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @8674874
+++ b/source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @8674874
@@ -53,11 +53,11 @@ PRO,升降轴  仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,345000,,,,,,,
 PRO,升降轴 出库高点P2,UpDownAxis_OutHigh_P2,247000,,,,,,,
 PRO,升降轴 出库低点P8,UpDownAxis_OutLow_P8,225000,,,,,,,
 PRO,升降轴从吸盘下方接料后下降的高度,UpDownAxis_DownValue,10000,,,,,,,
-PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#388000;12#385000;16#380000;20#380000;24#375000;28#370000;32#370000;36#370000;40#370000;52#370000;75#345000;,,,,,,,
+PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#385000;12#385000;16#380000;20#380000;24#375000;28#370000;32#370000;36#370000;40#370000;52#370000;75#345000;,,,,,,,
-PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,218900,,,,,,,
+PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,218700,,,,,,,
 PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,,
 PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,-25000,,,,,,,
-PRO,压紧轴（轴4）P2压紧点集合,CompressAxis_P2_List,8#-650000;12#-650000;16#-630000;20#-610000;24#-175000;28#-140000;32#-130000;36#-120000;40#-120000;44#-120000;48#-120000;52#-120000;75#-154000;,,,,,,,
+PRO,压紧轴（轴4）P2压紧点集合,CompressAxis_P2_List,8#-215000;12#-215000;16#-205000;20#-200000;24#-185000;28#-170000;32#-160000;36#-150000;40#-140000;44#-130000;48#-120000;52#-120000;75#-50000;,,,,,,,
 PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
 PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
 PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,,,,
@@ -68,35 +68,35 @@ PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,, ,,
 PRO,预警温度,WarnTemperate,80,,,,,,,
 PRO,预警湿度,WarnHumidity,80,,,,,,,
 PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,1000,,,,,,,
-PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,1000,,,,,,,
+PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,2000,,,,,,,
-PRO,(轴一)旋转轴减速度,MiddleAxis_DelSpeed,1000,,,,,,,
+PRO,(轴一)旋转轴减速度,MiddleAxis_DelSpeed,2000,,,,,,,
 PRO,(轴一)旋转轴原点低速度,MiddleAxis_HomeLowSpeed,1000,,,,,,,
 PRO,(轴一)旋转轴原点高速,MiddleAxis_HomeHighSpeed,1000,,,,,,,
-PRO,(轴一)旋转轴原点加速度,MiddleAxis_HomeAddSpeed,1000,,,,,,,
+PRO,(轴一)旋转轴原点加速度,MiddleAxis_HomeAddSpeed,2000,,,,,,,
 PRO,(轴二)升降轴轴目标速度,UpdownAxis_TargetSpeed,200,,,,,,,
-PRO,(轴二)升降轴轴加速度,UpdownAxis_AddSpeed,150,,,,,,,
+PRO,(轴二)升降轴轴加速度,UpdownAxis_AddSpeed,2000,,,,,,,
-PRO,(轴二)升降轴轴减速度,UpdownAxis_DelSpeed,150,,,,,,,
+PRO,(轴二)升降轴轴减速度,UpdownAxis_DelSpeed,2000,,,,,,,
 PRO,(轴二)升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,200,,,,,,,
 PRO,(轴二)升降轴轴原点高速,UpdownAxis_HomeHighSpeed,200,,,,,,,
-PRO,(轴二)升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,200,,,,,,,
+PRO,(轴二)升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,2000,,,,,,,
 PRO,(轴三)进出轴目标速度,InoutAxis_TargetSpeed,200,,,,,,,
-PRO,(轴三)进出轴加速度,InoutAxis_AddSpeed,200,,,,,,,
+PRO,(轴三)进出轴加速度,InoutAxis_AddSpeed,2000,,,,,,,
-PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,200,,,,,,,
+PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,2000,,,,,,,
 PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,200,,,,,,,
 PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,200,,,,,,,
-PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,200,,,,,,,
+PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,2000,,,,,,,
 PRO,升降轴(轴二)到仓门速度,UpDownAxis_Door_Speed,1000,,,,,,,
 PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,2500,,,,,,,
 PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,2500,,,,,,,
 PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,2500,,,,,,,
-PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,400,,,,,,,
+PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,,
 PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,2500,,,,,,,
-PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,400,,,,,,,
+PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,150,,,,,,,
 PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,2000,,,,,,,
-PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,400,,,,,,,
+PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,,
 PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,1200,,,,,,,
 PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,1200,,,,,,,
-PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,1000,,,,,,,
+PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,800,,,,,,,
 PRO,进出轴(轴三)P2速度,InOutAxis_P2_Speed,1000,,,,,,,
 PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1000,,,,,,,
 PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,10,,,,,, ,
@@ -125,11 +125,11 @@ PRO,硕科步进电机(压紧轴)控制端口号,CompressAxis_PortName,COM6,,,,,,,
 PRO,硕科步进电机(压紧轴)控制波特率,CompressAxis_PortBaudrate,9600,,,,,,,
 PRO,硕科步进电机(压紧轴)控制奇偶校验,CompressAxis_PortParity,0,,,,,,,
 PRO,硕科步进电机(压紧轴)控制停止位,CompressAxis_StopBits,1,,,,,,,
-PRO,硕科步进电机(压紧轴)控制初速度,CompressAxis_StartSpeed,40000,,,,,,,
+PRO,硕科步进电机(压紧轴)控制初速度,CompressAxis_StartSpeed,50000,,,,,,,
-PRO,硕科步进电机(压紧轴)控制最大速度,CompressAxis_MaxSpeed,70000,,,,,,,
+PRO,硕科步进电机(压紧轴)控制最大速度,CompressAxis_MaxSpeed,100000,,,,,,,
-PRO,硕科步进电机(压紧轴)控制末速度,CompressAxis_EndSpeed,70000,,,,,,,
+PRO,硕科步进电机(压紧轴)控制末速度,CompressAxis_EndSpeed,100000,,,,,,,
-PRO,硕科步进电机(压紧轴)控制加速度,CompressAxis_AddSpeed,40000,,,,,,,
+PRO,硕科步进电机(压紧轴)控制加速度,CompressAxis_AddSpeed,60000,,,,,,,
-PRO,硕科步进电机(压紧轴)控制减速度,CompressAxis_DelSpeed,40000,,,,,,, 
+PRO,硕科步进电机(压紧轴)控制减速度,CompressAxis_DelSpeed,60000,,,,,,, 
 PRO,硕科步进电机(压紧轴)原点返回速度,CompressAxis_HomeSpeed,30000,,,,,,,
 PRO,硕科步进电机轴地址(压紧轴),CompressAxis_Slv,1,,,,,, ,
 ,,,,,,,,,,
@@ -139,7 +139,7 @@ PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,300,,,,,,,
 PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,300,,,,,,,
 PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20,,,,,,,
 PRO,(轴五)上料轴原点高速,BatchAxis_HomeHighSpeed,60,,,,,,,
-PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,,,,
+PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,2000,,,,,,,
 PRO,(轴五)上料轴P1点（出库时接料盘的位置）,BatchAxis_P1,1700000,,,,,, ,
 PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,30000,,,,,, ,
 PRO,(轴五)上料轴P2速度,BatchAxis_P2_Speed,2000,,,,,,,
@@ -150,10 +150,10 @@ PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,,
 PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,2000,,,,,,,
 PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,100000,,,,,,,
 PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
-PRO,最后一盘料需要补充的高度,LastTrayAddHeight,4,,,,,,,
+PRO,最后一盘料需要补充的高度,LastTrayAddHeight,0,,,,,,,
 ,,,,,,,,,,
 ,,,,,,,,,,
 PRO,IO模块对应的DI数量,IO_DILength,192.168.200.21#16;192.168.200.22#4,,,,,, ,
 PRO,模块对应的DO数量,IO_DOLength,192.168.200.21#16;192.168.200.22#4,,,,,,,
 PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
-PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1500000,,,,,,,
+PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1610000,,,,,,,
--- a/source/DeviceLibrary/StoreConfig/AC/linePositions.csv
查看文件 @8674874
+++ b/source/DeviceLibrary/StoreConfig/AC/linePositions.csv
查看文件 @8674874
--- a/source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
查看文件 @8674874
+++ b/source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
查看文件 @8674874
@@ -724,7 +724,7 @@ namespace OnlineStore.DeviceLibrary
                }
            }else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O06_WaitDI12Low))
            {
-                StoreMove.NextMoveStep(StoreMoveStep.AUTO_O06_WaitDI12Low);
+                StoreMove.NextMoveStep(StoreMoveStep.AUTO_O07_WaitDown);
                LogUtil.info(Name + " 出料,等待1秒后批量轴回P2点"); 
                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
            }