送出料架时多等待5秒钟再停止链条转动

LN
Commit 38e092d1 由 LN 编写于 2020-09-07 13:15:18 +0800
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
RC1266-AutoCountMachine/source/Common/util/MyWebClient.cs
RC1266-AutoCountMachine/source/DeviceLibrary/RobotConfig/Config_Robot.csv
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Shelf.cs
RC1266-AutoCountMachine/source/LoadCVSLibrary/storeConfig/config/AIO_Type.cs
--- a/RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
查看文件 @38e092d
+++ b/RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
查看文件 @38e092d
@@ -356,43 +356,43 @@
            // 元器件学习ToolStripMenuItem
            // 
            this.元器件学习ToolStripMenuItem.Name = "元器件学习ToolStripMenuItem";
-            this.元器件学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.元器件学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
            this.元器件学习ToolStripMenuItem.Text = "元器件学习";
            this.元器件学习ToolStripMenuItem.Click += new System.EventHandler(this.元器件学习ToolStripMenuItem_Click);
            // 
            // toolStripSeparator17
            // 
            this.toolStripSeparator17.Name = "toolStripSeparator17";
-            this.toolStripSeparator17.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator17.Size = new System.Drawing.Size(157, 6);
            // 
            // 二维码学习ToolStripMenuItem
            // 
            this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
-            this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
            this.二维码学习ToolStripMenuItem.Text = "二维码学习";
            this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
            // 
            // toolStripSeparator7
            // 
            this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(157, 6);
            // 
            // toolStripMenuItem2
            // 
            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(160, 26);
            this.toolStripMenuItem2.Text = "AGV调试";
            this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
            // 
            // toolStripSeparator6
            // 
            this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator6.Size = new System.Drawing.Size(157, 6);
            // 
            // 标签编辑ToolStripMenuItem
            // 
            this.标签编辑ToolStripMenuItem.Name = "标签编辑ToolStripMenuItem";
-            this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
            this.标签编辑ToolStripMenuItem.Text = "标签编辑";
            this.标签编辑ToolStripMenuItem.Click += new System.EventHandler(this.标签编辑ToolStripMenuItem_Click);
            // 

--- a/RC1266-AutoCountMachine/source/Common/util/MyWebClient.cs
查看文件 @38e092d
+++ b/RC1266-AutoCountMachine/source/Common/util/MyWebClient.cs
查看文件 @38e092d
@@ -90,7 +90,8 @@ namespace OnlineStore.Common
            try
            {
-                var wc = new MyWebClient(10000);
+                using (var wc = new MyWebClient(10000))
+                {
                    if (string.IsNullOrEmpty(wc.Headers["Content-Type"]))
                    {
                        wc.Headers.Add("Content-Type", "application/json;charset=UTF-8");
@@ -99,6 +100,7 @@ namespace OnlineStore.Common
                    wc.Encoding = encoding;
                    result = wc.UploadString(url, "POST", paramData);
+                }
                //LogUtil.info(result);
            }
            catch (Exception e)
@@ -118,7 +120,8 @@ namespace OnlineStore.Common
            try
            {
                LogUtil.debug("HTTP GET FROM: " + url);
-                var wc = new WebClient { Encoding = encoding };
+                using (var wc = new MyWebClient { Encoding = encoding })
+                {
                    var readStream = wc.OpenRead(url);
                    using (var sr = new StreamReader(readStream, encoding))
                    {
@@ -127,6 +130,7 @@ namespace OnlineStore.Common
                        return result;
                    }
                }
+            }
            catch (Exception e)
            {
                LogUtil.error("HTTP GET ERROR:" + e.Message, 102);

--- a/RC1266-AutoCountMachine/source/DeviceLibrary/RobotConfig/Config_Robot.csv
查看文件 @38e092d
+++ b/RC1266-AutoCountMachine/source/DeviceLibrary/RobotConfig/Config_Robot.csv
查看文件 @38e092d
@@ -64,7 +64,7 @@ DI,1,左入料线体定位1上升端,L_LocationUp_1,10,PRO_AOI_IP_2,X21,,,,,,,,,,
 DI,1,左入料线体定位1下降端,L_LocationDown_1,11,PRO_AOI_IP_2,X22,,,,,,,,,,
 DI,1,左入料线体定位2上升端,L_LocationUp_2,12,PRO_AOI_IP_2,X23,,,,,,,,,,
 DI,1,左入料线体定位2下降端,L_LocationDown_2,13,PRO_AOI_IP_2,X24,,,,,,,,,,
-,,,,14,PRO_AOI_IP_2,X25,,,,,,,,,,
+DI,1,上料线体光栅信号,LineIn_GratingSignal,14,PRO_AOI_IP_2,X25,,,,,,,,,,
 ,,,,15,PRO_AOI_IP_2,X26,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DO,1,左线体启动,L_LineRun_Start,0,PRO_AOI_IP_2,Y11,,,,,,,,,,
@@ -132,8 +132,8 @@ DI,3,贴标气缸前进端,PasteCode_Forward,10,PRO_AOI_IP_4,X61,,,,,,,,,,
 DI,3,贴标气缸后退端,PasteCode_Back,11,PRO_AOI_IP_4,X62,,,,,,,,,,
 DI,3,贴标机打码OK信号,PasteCode_OK,12,PRO_AOI_IP_4,X63,,,,,,,,,,
 DI,3,吸嘴压力确认信号,Nozzle_Work,13,PRO_AOI_IP_4,X64,,,,,,,,,,
-,3,,,14,PRO_AOI_IP_4,X65,,,,,,,,,,
+DI,3,入空料串线体光栅信号,O_ELine_GratingSignal,14,PRO_AOI_IP_4,X65,,,,,,,,,,
-,3,,,15,PRO_AOI_IP_4,X66,,,,,,,,,,
+DI,3,出料串线体光栅信号,O_OLine_GratingSignal,15,PRO_AOI_IP_4,X66,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DO,3,自动指示灯,AutoRun_HddLed,0,PRO_AOI_IP_4,Y51,,,,,,,,,,
 DO,3,故障指示灯,Alarm_HddLed,1,PRO_AOI_IP_4,Y52,,,,,,,,,,

--- a/RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Shelf.cs
查看文件 @38e092d
+++ b/RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Shelf.cs
查看文件 @38e092d
@@ -488,9 +488,9 @@ namespace OnlineStore.DeviceLibrary
                        }
                        else
                        {
-                            LogUtil.info(logName + "  已收到 O_WLine_OutCheck=LOW ，等待8000后停止转动 ");
+                            LogUtil.info(logName + "  已收到 O_WLine_OutCheck=LOW ，等待13000后停止转动 ");
                        }
-                        Thread.Sleep(8000);
+                        Thread.Sleep(13000);
                        //停止转动 ,阻挡上升
                        IOMove(IO_Type.O_WLine_OutStop, IO_VALUE.LOW);

--- a/RC1266-AutoCountMachine/source/LoadCVSLibrary/storeConfig/config/AIO_Type.cs
查看文件 @38e092d
+++ b/RC1266-AutoCountMachine/source/LoadCVSLibrary/storeConfig/config/AIO_Type.cs
查看文件 @38e092d
@@ -575,7 +575,18 @@ namespace OnlineStore.LoadCSVLibrary
        #endregion
+        /// <summary>
+        ///  DI,1,上料线体光栅信号,LineIn_GratingSignal,14,PRO_AOI_IP_2,X25,,,,,,,,,,
+        /// </summary>
+        public static string LineIn_GratingSignal = "LineIn_GratingSignal";
+        /// <summary>
+        ///  DI,3,入空料串线体光栅信号,O_ELine_GratingSignal,14,PRO_AOI_IP_4,X65,,,,,,,,,,
+        /// </summary>
+        public static string O_ELine_GratingSignal = "O_ELine_GratingSignal";
+        /// <summary>
+        ///  DI,3,出料串线体光栅信号,O_OLine_GratingSignal,15,PRO_AOI_IP_4,X66,,,,,,,,,,
+        /// </summary>
+        public static string O_OLine_GratingSignal = "O_OLine_GratingSignal";
    }