1.进度修改
This commit is contained in:
parent
932385bde5
commit
ccf8d7e4d8
|
@ -701,9 +701,9 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (data.Length <=10)
|
else
|
||||||
{
|
{
|
||||||
if (data == "LOAD A ON")
|
if (data.Contains("LOAD A ON"))
|
||||||
{
|
{
|
||||||
if (Module=="WaferRobot" && !WaferManager.Instance.CheckHasWafer(ModuleHelper.Converter(Module), 0))
|
if (Module=="WaferRobot" && !WaferManager.Instance.CheckHasWafer(ModuleHelper.Converter(Module), 0))
|
||||||
{
|
{
|
||||||
|
@ -715,7 +715,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
|
||||||
WaferManager.Instance.CreateTray(ModuleHelper.Converter(Module), 0, TrayStatus.Normal);
|
WaferManager.Instance.CreateTray(ModuleHelper.Converter(Module), 0, TrayStatus.Normal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (data == "LOAD A OFF")
|
else if (data.Contains("LOAD A OFF"))
|
||||||
{
|
{
|
||||||
if (Module == "WaferRobot" && WaferManager.Instance.CheckHasWafer(ModuleHelper.Converter(Module), 0))
|
if (Module == "WaferRobot" && WaferManager.Instance.CheckHasWafer(ModuleHelper.Converter(Module), 0))
|
||||||
{
|
{
|
||||||
|
@ -812,6 +812,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
|
||||||
lock (_locker)
|
lock (_locker)
|
||||||
{
|
{
|
||||||
//Robot Home指令包含了清除报警,电机使能,Home动作
|
//Robot Home指令包含了清除报警,电机使能,Home动作
|
||||||
|
_lstHandler.AddLast(new SunwayRobotSetEchoHandler(this, false));
|
||||||
_lstHandler.AddLast(new SunwayRobotHomeHandler(this, _scMotionTimeout.IntValue));
|
_lstHandler.AddLast(new SunwayRobotHomeHandler(this, _scMotionTimeout.IntValue));
|
||||||
_lstHandler.AddLast(new SunwayRobotRQLoadHandler(this));
|
_lstHandler.AddLast(new SunwayRobotRQLoadHandler(this));
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,7 +158,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
|
||||||
};
|
};
|
||||||
|
|
||||||
ResponseMessage = msg;
|
ResponseMessage = msg;
|
||||||
//Device.NoteActionCompleted();
|
Device.IsBusy = false;
|
||||||
handled = true;
|
handled = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -590,6 +590,39 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class SunwayRobotSetEchoHandler : SunwayRobotHandler
|
||||||
|
{
|
||||||
|
//SET IO ECHO Y|N
|
||||||
|
public SunwayRobotSetEchoHandler(SunwayRobot device, bool isOpen, int timeout = 5)
|
||||||
|
: base(device, $"SET IO ECHO {(isOpen ? "Y" : "N")}")
|
||||||
|
{
|
||||||
|
AckTimeout = TimeSpan.FromSeconds(timeout);
|
||||||
|
CompleteTimeout = TimeSpan.FromSeconds(timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMessage(MessageBase msg, out bool handled)
|
||||||
|
{
|
||||||
|
var result = msg as SunwayRobotMessage;
|
||||||
|
handled = false;
|
||||||
|
if (!result.IsResponse)
|
||||||
|
{
|
||||||
|
Device.NoteError("Robot Set IO Echo Command Timeout");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.Data.Contains("ERR"))
|
||||||
|
{
|
||||||
|
Device.NoteError("Robot Set IO Echo Command Error");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ResponseMessage = msg;
|
||||||
|
Device.IsBusy = false;
|
||||||
|
handled = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public class SunwayRobotSTATHandler : SunwayRobotHandler
|
public class SunwayRobotSTATHandler : SunwayRobotHandler
|
||||||
{
|
{
|
||||||
|
@ -1533,9 +1566,6 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public class SunwayRobotMTCSPHandler : SunwayRobotHandler
|
public class SunwayRobotMTCSPHandler : SunwayRobotHandler
|
||||||
{
|
{
|
||||||
//前往位置
|
//前往位置
|
||||||
|
|
|
@ -61,6 +61,7 @@ namespace MECF.Framework.Simulator.Core.Robots.Sunway
|
||||||
AddCommandHandler("PICK", HandleHome);
|
AddCommandHandler("PICK", HandleHome);
|
||||||
AddCommandHandler("PLACE", HandleHome);
|
AddCommandHandler("PLACE", HandleHome);
|
||||||
AddCommandHandler("VAC", HandleHome);
|
AddCommandHandler("VAC", HandleHome);
|
||||||
|
AddCommandHandler("SET", HandleHome);
|
||||||
|
|
||||||
AddCommandHandler("SVON", HandleHome);
|
AddCommandHandler("SVON", HandleHome);
|
||||||
|
|
||||||
|
@ -120,7 +121,7 @@ namespace MECF.Framework.Simulator.Core.Robots.Sunway
|
||||||
lastMsg = msg;
|
lastMsg = msg;
|
||||||
operateEnum = OperateEnum.Null;
|
operateEnum = OperateEnum.Null;
|
||||||
|
|
||||||
OnWriteMessage("LOAD A ON");
|
OnWriteMessage($"LOAD A OFF/r/n_RDY");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue