Commit ecba5851 几米阳光

移动到高位,调试状态增加判断

1 个父辈 08566aa2
......@@ -198,16 +198,21 @@ namespace URSoldering.DeviceLibrary
}
if (WeldMoveStep.CurrPoint.pointType.Equals(0))
{
//普通焊点先移动至高位
WeldMoveStep.NextMoveStep(MoveStep.W01_RobotToHighPoint);
LogUtil.info(" 新" + WeldMoveStep.CurrPoint.TypeValue + "【" + WeldMoveStep.CurrPoint.pointName + "】移动至焊点高处");
MoveToHighPoint(WeldMoveStep.CurrPoint );
if (ZUpLiftValue>0)
{
//普通焊点先移动至高位
WeldMoveStep.NextMoveStep(MoveStep.W01_RobotToHighPoint);
LogUtil.info(" 新" + WeldMoveStep.CurrPoint.TypeValue + "【" + WeldMoveStep.CurrPoint.pointName + "】移动至焊点高处");
MoveToHighPoint(WeldMoveStep.CurrPoint);
}
else
{
LogUtil.info(" 新" + WeldMoveStep.CurrPoint.TypeValue + "【" + WeldMoveStep.CurrPoint.pointName + "】预热" + WeldMoveStep.CurrPoint.preheatTemperature + "度,送丝下降,移动机械臂");
MoveToPoint(WeldMoveStep.CurrPoint);
WeldMoveStep.IsSlowSendWire = true;
SlowSendWire();
}
WorkCountManager.AddWeldPint();
//LogUtil.info(" 新" + WeldMoveStep.CurrPoint.TypeValue + "【" + WeldMoveStep.CurrPoint.pointName + "】预热" + WeldMoveStep.CurrPoint.preheatTemperature + "度,送丝下降,移动机械臂");
//MoveToPoint(WeldMoveStep.CurrPoint, false);
//WorkCountManager.AddWeldPint();
//WeldMoveStep.IsSlowSendWire = true;
//SlowSendWire();
}
else if (WeldMoveStep.CurrPoint.pointType.Equals(2))
{
......
......@@ -135,7 +135,10 @@ namespace URSoldering.DeviceLibrary
}
public static bool IsFixtureClamp()
{
return true;
if (ConfigAppSettings.GetBoolValue(Setting_Init.ISDebug))
{
return true;
}
if (KNDIOValue(IO_Type.Fixture_Clamp).Equals(IO_VALUE.HIGH) && KNDIOValue(IO_Type.Fixture_Relax).Equals(IO_VALUE.LOW))
{
return true;
......@@ -148,7 +151,10 @@ namespace URSoldering.DeviceLibrary
}
public static bool ShuddenOK()
{
return true;
if (ConfigAppSettings.GetBoolValue(Setting_Init.ISDebug))
{
return true;
}
if (!baseConfig.RobotDIList.ContainsKey(IO_Type.SuddenStop_Single))
{
return false;
......
......@@ -502,6 +502,11 @@ namespace URSoldering.DeviceLibrary
{
moveCmd = "movep(p[" + x + spiltStr + y + spiltStr + z + spiltStr + point.RX + spiltStr + point.RY + spiltStr + point.RZ + "],a=1.0, v=1.0, r=0)";
}
//string moveCmd = "movel(p[" + x + spiltStr + y + spiltStr + z + spiltStr + point.RX + spiltStr + point.RY + spiltStr + point.RZ + "],a=0.1, v=0.1,t=0, r=0)";
//if (isHigh)
//{
// moveCmd = "movel(p[" + x + spiltStr + y + spiltStr + z + spiltStr + point.RX + spiltStr + point.RY + spiltStr + point.RZ + "],a=1.0, v=1.0,t=0, r=0)";
//}
ClearPreCMD();
URRobotClient.LastMoveCMD = moveCmd;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!