diff --git a/Rs.DeweyTester/Flow/SubFlow/ProductLocationFlow.cs b/Rs.DeweyTester/Flow/SubFlow/ProductLocationFlow.cs index f5115f7..6e5b852 100644 --- a/Rs.DeweyTester/Flow/SubFlow/ProductLocationFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/ProductLocationFlow.cs @@ -112,7 +112,7 @@ namespace Rs.MotionPlat.Flow.SubFlow { triggerPos[i] = sp.Y + (i * 5); } - AxisControl.LoadY2.SetPosCompare(1, triggerPos); + AxisControl.LoadY2.SetPosCompare((ushort)GlobalVar.HightChannel, triggerPos); AxisPosPrint.PrintXY1Y2CurrentPos("已运动到料仓拍照位上方", GetClassName()); flowStep = EProductLocationFlowStep.到料仓拍照结束位; } diff --git a/Rs.DeweyTester/Flow/SubFlow/StockLocationFlow.cs b/Rs.DeweyTester/Flow/SubFlow/StockLocationFlow.cs index 427b86b..1348da3 100644 --- a/Rs.DeweyTester/Flow/SubFlow/StockLocationFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/StockLocationFlow.cs @@ -101,7 +101,7 @@ namespace Rs.MotionPlat.Flow.SubFlow { triggerPos[i] = sp.Y + (i * 5); } - AxisControl.LoadY2.SetPosCompare(1, triggerPos); + AxisControl.LoadY2.SetPosCompare((ushort)GlobalVar.HightChannel, triggerPos); AxisPosPrint.PrintXY1Y2CurrentPos("已运动到料仓拍照位上方", GetClassName()); flowStep = EStockLocationFlowStep.到料仓拍照结束位; } diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index 4a98fc3..6849adf 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //通过使用 "*",如下所示: - [assembly: AssemblyVersion("1.20.25.10")] + [assembly: AssemblyVersion("1.20.25.12")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]