1

source/ACSingleStore/App.config

@@ -22,7 +22,7 @@
     <add key="Store_Position_Config" value="\StoreConfig\AC\linePositions.csv" />
     <add key="Store_Position_Config" value="\StoreConfig\AC\linePositions.csv" />
     <add key="Store_ConfigPath" value="\StoreConfig\AC\StoreConfig.csv" />
     <add key="Store_ConfigPath" value="\StoreConfig\AC\StoreConfig.csv" />
     <add key="Store_Type" value="AUTO_SA_Config" />
     <add key="Store_Type" value="AUTO_SA_Config" />
-    <add key="Store_CID" value="auto1" />
+    <add key="Store_CID" value="rc1252-auto1" />
     <!--end one store config-->
     <!--end one store config-->
     <!--摄像机名称列表配置，用#分割-->
     <!--摄像机名称列表配置，用#分割-->
     <add key="CameraName" value="GigE:MV-CE100-30GC (00C81915560)#GigE:MV-CE100-30GC (00C81915565)" />
     <add key="CameraName" value="GigE:MV-CE100-30GC (00C81915560)#GigE:MV-CE100-30GC (00C81915565)" />
@@ -50,6 +50,7 @@
   <log4net>
   <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
       <file value="logs/AutoStore1.log" />
       <file value="logs/AutoStore1.log" />
+      <param name="Encoding" value="UTF-8" />
       <appendToFile value="true" />
       <appendToFile value="true" />
       <rollingStyle value="Date" />
       <rollingStyle value="Date" />
       <datePattern value="yyyy-MM-dd" />
       <datePattern value="yyyy-MM-dd" />
@@ -63,6 +64,7 @@
     </appender>
     </appender>
     <appender name="AIOBOXLog" type="log4net.Appender.RollingFileAppender">
     <appender name="AIOBOXLog" type="log4net.Appender.RollingFileAppender">
       <file value="logs/AIOBOX1.log" />
       <file value="logs/AIOBOX1.log" />
+      <param name="Encoding" value="UTF-8" />
       <appendToFile value="true" />
       <appendToFile value="true" />
       <rollingStyle value="Date" />
       <rollingStyle value="Date" />
       <datePattern value="yyyy-MM-dd" />
       <datePattern value="yyyy-MM-dd" />

source/ACSingleStore/Properties/Resource.en-US.resx

@@ -285,6 +285,12 @@
   <data name="InOut_Axis" xml:space="preserve">
   <data name="InOut_Axis" xml:space="preserve">
     <value>(Axis 3) in-out axis</value>
     <value>(Axis 3) in-out axis</value>
   </data>
   </data>
+  <data name="Comp_Axis" xml:space="preserve">
+    <value>(Axis 4) compress axis</value>
+  </data>
+  <data name="Batch_Axis" xml:space="preserve">
+    <value>(Axis 5) batch axis</value>
+  </data>
   <data name="FrmStoreBox_Text" xml:space="preserve">
   <data name="FrmStoreBox_Text" xml:space="preserve">
     <value>AC_SA_SMD BOX</value>
     <value>AC_SA_SMD BOX</value>
   </data>
   </data>

source/ACSingleStore/Properties/Resource.zh-CN.resx

@@ -285,6 +285,12 @@
   <data name="InOut_Axis" xml:space="preserve">
   <data name="InOut_Axis" xml:space="preserve">
     <value>（轴三）进出轴</value>
     <value>（轴三）进出轴</value>
   </data>
   </data>
+  <data name="Comp_Axis" xml:space="preserve">
+    <value>（轴四）压紧轴</value>
+  </data>
+  <data name="Batch_Axis" xml:space="preserve">
+    <value>（轴五）批量上下轴</value>
+  </data>
   <data name="FrmStoreBox_Text" xml:space="preserve">
   <data name="FrmStoreBox_Text" xml:space="preserve">
     <value>AC_SA_料仓</value>
     <value>AC_SA_料仓</value>
   </data>
   </data>
@@ -885,9 +891,7 @@
   <data name="X24" xml:space="preserve">
   <data name="X24" xml:space="preserve">
     <value />
     <value />
   </data>
   </data>
-  <data name="Batch_Axis" xml:space="preserve">
-    <value>(轴五）批量上下料轴</value>
-  </data>
+   
   <data name="FrmStoreBox_groupBox6_Text" xml:space="preserve">
   <data name="FrmStoreBox_groupBox6_Text" xml:space="preserve">
     <value>批量上下料操作</value>
     <value>批量上下料操作</value>
   </data>
   </data>

source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv

@@ -110,13 +110,13 @@ PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,200,,,,,,,
 PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,200,,,,,,,
 PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,200,,,,,,,
 PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,2000,,,,,,,
 PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,2000,,,,,,,
 PRO,升降轴(轴二)到仓门速度,UpDownAxis_Door_Speed,1000,,,,,,,
 PRO,升降轴(轴二)到仓门速度,UpDownAxis_Door_Speed,1000,,,,,,,
-PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,2500,,,,,,,
-PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,2500,,,,,,,
-PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,2500,,,,,,,
+PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,1200,,,,,,,
+PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,1200,,,,,,,
+PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,1200,,,,,,,
 PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,,
 PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,,
-PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,2500,,,,,,,
+PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,1200,,,,,,,
 PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,150,,,,,,,
 PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,150,,,,,,,
-PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,2000,,,,,,,
+PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,1200,,,,,,,
 PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,,
 PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,,
 PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,1200,,,,,,,
 PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,1200,,,,,,,
 PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,1200,,,,,,,
 PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,1200,,,,,,,