|
|
@@ -1846,7 +1846,7 @@ namespace TeamAAS_VP.Core
|
|
|
var point = currentProduct.ScrewPoints[0].Clone();
|
|
|
var pn = Vector<double>.Build.Dense(new double[] { upCameraX, upCameraY });
|
|
|
//目标角度:
|
|
|
- double angle = point.U_Position + (DowmCameraResults[1].Z - currentProduct.FixedUpCameraTempletAngle) + (upCameraU - currentProduct.MoveDownCamerTempletAngle);
|
|
|
+ double angle = point.U_Position - (DowmCameraResults[1].Z - currentProduct.FixedUpCameraTempletAngle) - (upCameraU - currentProduct.MoveDownCamerTempletAngle);
|
|
|
|
|
|
var toolCoord = new ToolCoord();
|
|
|
toolCoord.SetTool(DowmCameraResults[1].X, DowmCameraResults[1].Y);
|
|
|
@@ -1951,7 +1951,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
|
|
|
//读取产品结果
|
|
|
- Int16 resultIndex = plc.ReadNode<Int16>(addressConfig.In_Result.Address);
|
|
|
+ Int16 resultIndex = plc.ReadNode<Int16>(string.Format(addressConfig.In_Result.Address, i));
|
|
|
|
|
|
//目前只记录当前站
|
|
|
if (i == 0)
|
|
|
@@ -2265,7 +2265,7 @@ namespace TeamAAS_VP.Core
|
|
|
_pressureLinkedCts[Index]?.Dispose();
|
|
|
_pressureTimeoutCts[Index]?.Dispose();
|
|
|
_pressureCts[Index]?.Dispose();
|
|
|
- _pressureSamples[Index].Clear();
|
|
|
+ _pressureSamples[Index]?.Clear();
|
|
|
}
|
|
|
catch { }
|
|
|
}
|