Merge branch 'master' of https://gitee.com/ln0816/ACSingleStore

source/ACSingleStore/FrmStoreBox.cs

@@ -854,7 +854,8 @@ namespace OnlineStore.ACSingleStore
 
 
         private void btnClearLog_Click(object sender, EventArgs e)
         private void btnClearLog_Click(object sender, EventArgs e)
         {
         {
-            this.richTextBox1.Text = "";
+            //this.richTextBox1.Text = "";
+            LogUtil.ClearLogBoxText();
         }
         }
 
 
         private void btnRelMove_Click(object sender, EventArgs e)
         private void btnRelMove_Click(object sender, EventArgs e)

source/Common/util/LogUtil.cs

@@ -167,6 +167,7 @@ namespace OnlineStore.Common
             if (logBox != null)
             if (logBox != null)
             {
             {
                 logBox.Text = "";
                 logBox.Text = "";
+                count = 0;
             }
             }
         } 
         } 
     }
     }

source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv

@@ -11,8 +11,8 @@ DI,定位气缸上升端,LocationCylinder_Up,208,192.168.200.10,0,定位气缸上升端,X09,DI
 DI,定位气缸下降端,LocationCylinder_Down,209,192.168.200.10,0,定位气缸下降端,X10,DI-10,0
 DI,定位气缸下降端,LocationCylinder_Down,209,192.168.200.10,0,定位气缸下降端,X10,DI-10,0
 DI,左侧门限位,Left_Door_LimitSingle,210,192.168.200.10,0,左侧门限位,X11,DI-11,0
 DI,左侧门限位,Left_Door_LimitSingle,210,192.168.200.10,0,左侧门限位,X11,DI-11,0
 DI,右侧门限位,Right_Door_LimitSingle,211,192.168.200.10,0,右侧门限位,X12,DI-12,0
 DI,右侧门限位,Right_Door_LimitSingle,211,192.168.200.10,0,右侧门限位,X12,DI-12,0
-DI,料盘检测3,TrayCheck_3,212,192.168.200.10,0,料盘检测3,X13,DI-13,0
-DI,料盘检测4,TrayCheck_4,213,192.168.200.10,0,料盘检测4,X14,DI-14,0
+,料盘检测3,TrayCheck_3,212,192.168.200.10,0,料盘检测3,X13,DI-13,0
+,料盘检测4,TrayCheck_4,213,192.168.200.10,0,料盘检测4,X14,DI-14,0
 DO,自动指示灯,AutoRun_HddLed,100,192.168.200.10,0,自动指示灯,Y01,DO-01,0
 DO,自动指示灯,AutoRun_HddLed,100,192.168.200.10,0,自动指示灯,Y01,DO-01,0
 DO,故障指示灯,Alarm_HddLed,101,192.168.200.10,0,故障指示灯,Y02,DO-02,0
 DO,故障指示灯,Alarm_HddLed,101,192.168.200.10,0,故障指示灯,Y02,DO-02,0
 DO,待机指示灯,RunSign_HddLed,102,192.168.200.10,0,待机指示灯,Y03,DO-03,0
 DO,待机指示灯,RunSign_HddLed,102,192.168.200.10,0,待机指示灯,Y03,DO-03,0