|
@@ -179,7 +179,8 @@ namespace Venus_MainPages.ViewModels
|
|
|
set
|
|
|
{
|
|
|
RobotMoveInfoChanged(m_robotMoveInfo, value);
|
|
|
- m_robotMoveInfo = value;
|
|
|
+ //m_robotMoveInfo = value;
|
|
|
+ SetProperty(ref m_robotMoveInfo, value);
|
|
|
}
|
|
|
}
|
|
|
public WaferInfo LLAWafer
|
|
@@ -328,9 +329,11 @@ namespace Venus_MainPages.ViewModels
|
|
|
{
|
|
|
get { return m_EfemRobotMoveInfo; }
|
|
|
set
|
|
|
- {
|
|
|
+ {
|
|
|
EFEMRobotMoveInfoChanged(m_EfemRobotMoveInfo, value);
|
|
|
- m_EfemRobotMoveInfo = value;
|
|
|
+ //m_EfemRobotMoveInfo = value;
|
|
|
+ SetProperty(ref m_EfemRobotMoveInfo, value);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
public RobotPosition CurrentRobotPosition
|
|
@@ -450,7 +453,7 @@ namespace Venus_MainPages.ViewModels
|
|
|
public OperationOverViewModel()
|
|
|
{
|
|
|
DispatcherTimer timer = new DispatcherTimer();
|
|
|
- timer.Interval = TimeSpan.FromSeconds(0.1);
|
|
|
+ timer.Interval = TimeSpan.FromSeconds(0.01);
|
|
|
timer.Tick += Timer_Tick;
|
|
|
timer.Start();
|
|
|
|
|
@@ -699,7 +702,7 @@ namespace Venus_MainPages.ViewModels
|
|
|
}
|
|
|
|
|
|
#region Rotating
|
|
|
- if (oldValue.Action == RobotAction.None && (newValue.Action == RobotAction.Rotating))
|
|
|
+ if ((oldValue.Action == RobotAction.None||oldValue.ArmTarget != newValue.ArmTarget) && (newValue.Action == RobotAction.Rotating))
|
|
|
{
|
|
|
var TMRobotMoveActionBladeTarget = newValue.BladeTarget;
|
|
|
if (TMRobotMoveActionBladeTarget != null)
|
|
@@ -725,7 +728,7 @@ namespace Venus_MainPages.ViewModels
|
|
|
#endregion
|
|
|
|
|
|
#region pick 和 place LL
|
|
|
- else if (oldValue.Action == RobotAction.None && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
|
|
|
+ else if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget != newValue.ArmTarget) && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
|
|
|
{
|
|
|
var TMRobotMoveActionBladeTarget = newValue.BladeTarget;
|
|
|
if (TMRobotMoveActionBladeTarget != null)
|
|
@@ -789,7 +792,7 @@ namespace Venus_MainPages.ViewModels
|
|
|
#endregion
|
|
|
|
|
|
#region pick 和 place pm
|
|
|
- else if (oldValue.Action == RobotAction.None && newValue.Action == RobotAction.Extending)
|
|
|
+ else if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget != newValue.ArmTarget) && newValue.Action == RobotAction.Extending)
|
|
|
{
|
|
|
var TMRobotMoveActionBladeTarget = newValue.BladeTarget;
|
|
|
if (TMRobotMoveActionBladeTarget != null)
|
|
@@ -832,7 +835,7 @@ namespace Venus_MainPages.ViewModels
|
|
|
Robot2XAction = WaferRobotXAction.Extend;
|
|
|
}
|
|
|
}
|
|
|
- else if (oldValue.Action == RobotAction.None && newValue.Action == RobotAction.Retracting)
|
|
|
+ else if ((oldValue.Action == RobotAction.None|| oldValue.ArmTarget != newValue.ArmTarget) && newValue.Action == RobotAction.Retracting)
|
|
|
{
|
|
|
var TMRobotMoveActionBladeTarget = newValue.BladeTarget;
|
|
|
if (TMRobotMoveActionBladeTarget != null)
|
|
@@ -866,7 +869,8 @@ namespace Venus_MainPages.ViewModels
|
|
|
return;
|
|
|
}
|
|
|
#region pick 和 place LL
|
|
|
- if (oldValue.Action == RobotAction.None && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
|
|
|
+
|
|
|
+ if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget!=newValue.ArmTarget) && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
|
|
|
{
|
|
|
var TMRobotMoveActionBladeTarget = newValue.BladeTarget;
|
|
|
if (TMRobotMoveActionBladeTarget != null)
|
|
@@ -990,6 +994,8 @@ namespace Venus_MainPages.ViewModels
|
|
|
#endregion
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
private void addDataKeys()
|
|
|
{
|
|
|
if (PMAIsInstalled == true)
|