提升轴第一次和第二次速度不一样设置、添加配置以是否使用信号

source/DeviceLibrary/DeviceLibrary.csproj

@@ -51,6 +51,9 @@
     <Reference Include="CodeLibrary">
     <Reference Include="CodeLibrary">
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="ConfigHelper">
+      <HintPath>..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
+    </Reference>
     <Reference Include="halcondotnet">
     <Reference Include="halcondotnet">
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
     </Reference>
     </Reference>

source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs

@@ -529,7 +529,11 @@ namespace OnlineStore.DeviceLibrary
         /// <param name="hasTray">true：有抽屉</param>
         /// <param name="hasTray">true：有抽屉</param>
         private void AddHookCheck(bool hasTray)
         private void AddHookCheck(bool hasTray)
         {
         {
-            return;//暂时屏蔽
+            if (ignoreHook)
+            {
+                return;//暂时屏蔽
+            }
+
             if (CheckASide())
             if (CheckASide())
             {
             {
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Hook_A_Check, hasTray ? IO_VALUE.HIGH : IO_VALUE.LOW));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Hook_A_Check, hasTray ? IO_VALUE.HIGH : IO_VALUE.LOW));
@@ -539,9 +543,21 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Hook_B_Check, hasTray ? IO_VALUE.HIGH : IO_VALUE.LOW));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Hook_B_Check, hasTray ? IO_VALUE.HIGH : IO_VALUE.LOW));
             }
             }
         }
         }
+        bool ignoreFork
+        {
+            get { return ConfigHelper.Config.Get("IgnoreForkSig", false); }
+        }
+        bool ignoreHook
+        {
+            get { return ConfigHelper.Config.Get("IgnoreHookSig", true); }
+        }
         private void AddReelCheck(bool hasReel)
         private void AddReelCheck(bool hasReel)
         {
         {
-            return;//暂时屏蔽
+            if (ignoreFork)
+            {
+                return;//暂时屏蔽
+            }
+
             if (CheckASide())
             if (CheckASide())
             {
             {
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ForkA_Tray_Check, hasReel ? IO_VALUE.HIGH : IO_VALUE.LOW));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ForkA_Tray_Check, hasReel ? IO_VALUE.HIGH : IO_VALUE.LOW));

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs

@@ -340,9 +340,8 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         targetP2 = Config.BatchAxisP2;
                         targetP2 = Config.BatchAxisP2;
                     }
                     }
-                    LogUtil.info(Name + " BatchAxisToP2 目标P2: " + targetP2 + "(" + currPosition + ")");
                 }
                 }
-                //targetSpeed = Config.BatchAxis_P3Speed / 2;
+                targetSpeed = Robot.Config.BatchAxis_P3Speed/2;
             }
             }
             //  需要增加定时器，获取验证信号并停止伺服
             //  需要增加定时器，获取验证信号并停止伺服
             StartMovePosition = BatchAxis.GetAclPosition();
             StartMovePosition = BatchAxis.GetAclPosition();
@@ -357,6 +356,7 @@ namespace OnlineStore.DeviceLibrary
             //开始检测信号
             //开始检测信号
             BatchAxis.BatchAxisStartCheck(Config.IO_ReelCheck, IO_VALUE.HIGH);
             BatchAxis.BatchAxisStartCheck(Config.IO_ReelCheck, IO_VALUE.HIGH);
             LastMoveIsTest = IsTest;
             LastMoveIsTest = IsTest;
+            LogUtil.info(Name + " BatchAxisToP2 目标P2: " + targetP2 + "(" + targetSpeed + ")");
         }
         }
         #endregion
         #endregion
 
 

source/XLRStoreClient/FrmAbout.cs

@@ -40,7 +40,7 @@ namespace OnlineStore.XLRStore
 
 
         private void lblVersion_Click(object sender, EventArgs e)
         private void lblVersion_Click(object sender, EventArgs e)
         {
         {
-
+            ConfigHelper.AdvanceConfigForm.ShowEditDialog(this);
         }
         }
     }
     }
 }
 }

source/XLRStoreClient/XLRStore.csproj

@@ -66,6 +66,9 @@
     <Reference Include="CodeLibrary">
     <Reference Include="CodeLibrary">
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="ConfigHelper">
+      <HintPath>..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
+    </Reference>
     <Reference Include="halcondotnet">
     <Reference Include="halcondotnet">
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
     </Reference>
     </Reference>