|
@@ -265,7 +265,7 @@ namespace TeamAAS_VP.Core.Robots
|
|
|
if (Plc == null || !Plc.IsConnected) return null;
|
|
if (Plc == null || !Plc.IsConnected) return null;
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- var nodeIds = Axes.Where(a => !string.IsNullOrWhiteSpace(a.State.HmiPositionNode)).Select(a => a.State.HmiPositionNode).ToArray();
|
|
|
|
|
|
|
+ var nodeIds = Axes.Where(a => !string.IsNullOrWhiteSpace(a.State.ActPositionNode)).Select(a => a.State.ActPositionNode).ToArray();
|
|
|
var data = Plc.ReadNodes(nodeIds);
|
|
var data = Plc.ReadNodes(nodeIds);
|
|
|
if (data == null || data.Count == 0) return null;
|
|
if (data == null || data.Count == 0) return null;
|
|
|
|
|
|
|
@@ -543,9 +543,9 @@ namespace TeamAAS_VP.Core.Robots
|
|
|
{
|
|
{
|
|
|
nodeIds.Add(axis.State.PosOKNode);
|
|
nodeIds.Add(axis.State.PosOKNode);
|
|
|
}
|
|
}
|
|
|
- if (!string.IsNullOrWhiteSpace(axis.State.HmiPositionNode))
|
|
|
|
|
|
|
+ if (!string.IsNullOrWhiteSpace(axis.State.ActPositionNode))
|
|
|
{
|
|
{
|
|
|
- nodeIds.Add(axis.State.HmiPositionNode);
|
|
|
|
|
|
|
+ nodeIds.Add(axis.State.ActPositionNode);
|
|
|
}
|
|
}
|
|
|
if (!string.IsNullOrWhiteSpace(axis.State.ErrorNode))
|
|
if (!string.IsNullOrWhiteSpace(axis.State.ErrorNode))
|
|
|
{
|
|
{
|
|
@@ -565,9 +565,9 @@ namespace TeamAAS_VP.Core.Robots
|
|
|
{
|
|
{
|
|
|
posOk = (bool)res[axis.State.PosOKNode];
|
|
posOk = (bool)res[axis.State.PosOKNode];
|
|
|
}
|
|
}
|
|
|
- if (res.ContainsKey(axis.State.HmiPositionNode))
|
|
|
|
|
|
|
+ if (res.ContainsKey(axis.State.ActPositionNode))
|
|
|
{
|
|
{
|
|
|
- try { actualPos = Convert.ToSingle(res[axis.State.HmiPositionNode]); } catch { }
|
|
|
|
|
|
|
+ try { actualPos = Convert.ToSingle(res[axis.State.ActPositionNode]); } catch { }
|
|
|
}
|
|
}
|
|
|
if (res.ContainsKey(axis.State.ErrorNode))
|
|
if (res.ContainsKey(axis.State.ErrorNode))
|
|
|
{
|
|
{
|