配置更新

source/AssemblyLineClient/App.config

@@ -5,22 +5,22 @@
   </configSections>
   <appSettings>
     <!--是否开机自动启动料仓-->
-    <add key="App_AutoRun" value="0" />
+    <add key="App_AutoRun" value="1" />
     <add key="App_Title" value="流水线客户端" />
     <!--Server address-->
     <!--<add key="http.server" value="http://localhost/myproject/service/store/emptyPosForPutin"/>-->
-    <add key="http.server" value="http://192.168.101.11/myproject/"/>
+    <add key="http.server" value="http://192.168.101.11/myproject/" />
     <!--storeType-->
     <add key="Line_moveEquip_count" value="18" />
     <add key="Line_feedingEquip_count" value="4" />
     <add key="Line_providingEquip_count" value="4" />
-    <add key ="Line_dischargeLine_count" value ="2"/>
+    <add key="Line_dischargeLine_count" value="2" />
     <!--start one store config-->
     <add key="ConfigPath_Line" value="\LineConfig\Config_Line.csv" />
     <add key="ConfigPath_MoveEquip" value="\LineConfig\MoveEquip\Config_MoveEquip.csv" />
     <add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" />
     <add key="ConfigPath_ProvidingEquip" value="\LineConfig\Config_ProvidingEquip.csv" />
-    <add key ="ConfigPath_DischargeLine" value ="\LineConfig\Config_DischargeLine.csv"/>
+    <add key="ConfigPath_DischargeLine" value="\LineConfig\Config_DischargeLine.csv" />
     <add key="Line_Type" value="Line" />
     <add key="Line_CID" value="rc1250" />
     <!--end one store config-->
@@ -41,23 +41,21 @@
     <!--AGV调度服务器地址-->
     <add key="AgvServerIp" value="10.85.160.20" />
     <!--IO配置-->
-    <add key ="DIMS" value ="60"/>
-    <add key ="DOMS" value ="300"/>
-    <add key ="LineRunTest" value ="1"/>
+    <add key="DIMS" value="60" />
+    <add key="DOMS" value="300" />
+    <add key="LineRunTest" value="1" />
     <!--ABB机器人服务器-->
-    <add key ="ABBServerPort" value ="21"/>
+    <add key="ABBServerPort" value="21" />
     <!--是否打开托盘编码界面-->
-    <add key ="OpenRFIDWrite" value ="1"/>
-    <add key="DefaultPWD" value ="123456"/>
+    <add key="OpenRFIDWrite" value="1" />
+    <add key="DefaultPWD" value="123456" />
     <!--当前调试的设备ID，分号分割-->
-    <add key ="DebugDeviceId" value ="302"/>
-    <add key ="Server_Log_Open" value ="0"/>
-    <add key ="CodeCount" value ="3"/>
-    <add key ="DefaultTrayNum" value ="0"/>
-    <add key ="NeedScanCode" value ="1"/>
-    <add key ="Agv_Log_Open" value ="0"/>
-    <add key ="MaxTrayNum" value ="30"/>
-    <add key ="UseBuzzer" value ="0"/>
+    <add key="DebugDeviceId" value="0" />
+    <add key="Server_Log_Open" value="0" />
+    <add key="CodeCount" value="3" />
+    <add key="DefaultTrayNum" value="0" />
+    <add key="NeedScanCode" value="1" />
+    <add key="Agv_Log_Open" value="0" />
   </appSettings>
   <!-- <log4net> -->
   <!-- <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> -->
@@ -87,16 +85,15 @@
       </layout>
     </appender>
     <appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
-      <file value="logs/TheRFID-line.log"/>
+      <file value="logs/TheRFID-line.log" />
       <param name="Encoding" value="UTF-8" />
-      <appendToFile value="true"/>
-      <rollingStyle value="Date"/>
-      <datePattern value="yyyy-MM-dd"/>
+      <appendToFile value="true" />
+      <rollingStyle value="Date" />
+      <datePattern value="yyyy-MM-dd" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="[%date][%t]%-5p %m%n" />
       </layout>
     </appender>
-
     <logger name="RollingLogFileAppender">
       <level value="Info" />
       <appender-ref ref="RollingLogFileAppender" />
@@ -113,5 +110,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
-
 </configuration>
\ No newline at end of file

source/DeviceLibrary/LineConfig/Config_DischargeLine_2.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,, 
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, 
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D76546876),,,,,
 ,,,,,,,,,
 DI,0,出料皮带线体2急停,DLine_SuddenStop,0,PRO_AOI_IP_3,0,出料皮带线体2急停,X041,X041

source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv

@@ -8,7 +8,7 @@ PRO,0,上料流水线入口AGV小车站号名称,AgvInName,C1,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C2,,,,,
 ,,,,,,,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,5,COM6,0,,,
-PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6488350,,,,,
+PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6495000,,,,,
 PRO,0,提升上料轴下降位置P2,BatchAxisP2,0,,,,,
 PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,6011072,,,,,
 PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,1500,,,,,
@@ -25,7 +25,7 @@ PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,11000,,,,,
 AXIS,0,轴一移栽上下轴,UpDown_Axis,6,COM6,0,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,126100,,,,,
 PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=138340;8=142000;12=116000;16=108000;24=97000;32=73000;44=49000;48=34800;56=32674,,,,,
-PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,315000,,,,,
+PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,313000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
 PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,,,,

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -520,7 +520,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                         second = 30;
                     }
-                    second = (int)(MoveInfo.TimeOutSeconds / span.TotalSeconds)*10;
+                    second = (int)(moveInfo.TimeOutSeconds / span.TotalSeconds)*10;
                     if (second > 120)
                     {
                         second = 120;