Skip to content

刘韬 / 1053_SBSH

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 52ae7858 由 刘韬
选项

1

1 个父辈 526b022f
内嵌 并排
正在显示 4 个修改的文件 包含 16 行增加 和 12 行删除
DeviceLibrary/theMachine/MainMachine.cs
...@@ -49,7 +49,7 @@ namespace DeviceLibrary ...@@ -49,7 +49,7 @@ namespace DeviceLibrary
internal AxisBean InOut_Axis; internal AxisBean InOut_Axis;
internal AxisBean Comp_Axis; internal AxisBean Comp_Axis;
public DoorControl SingleDoor; public LiftMonitor SingleDoor;
ReelTransport boxTransport; ReelTransport boxTransport;
public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; } public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; }
...@@ -109,7 +109,7 @@ namespace DeviceLibrary ...@@ -109,7 +109,7 @@ namespace DeviceLibrary
Comp_Axis = new AxisBean(Config.Comp_Axis, Name); Comp_Axis = new AxisBean(Config.Comp_Axis, Name);
Crc_LanguageChangeEvent(null, EventArgs.Empty); Crc_LanguageChangeEvent(null, EventArgs.Empty);
#endregion #endregion
SingleDoor = new DoorControl(Name, Config); SingleDoor = new LiftMonitor(IO_Type.Door_Up, IO_Type.Door_Down, "", new AxisBean(Config.Door_Axis, Name), Config.Door_Length, Config.Door_Length_speed);// new DoorControl(Name, Config);
boxTransport = new ReelTransport(Config, this); boxTransport = new ReelTransport(Config, this);
boxTransport.DoorControl += BoxTransport_DoorControl; boxTransport.DoorControl += BoxTransport_DoorControl;
boxTransport.InOutEndProcessEvent += delegate (string posid, StoreMoveType storeMoveType, bool arg4) boxTransport.InOutEndProcessEvent += delegate (string posid, StoreMoveType storeMoveType, bool arg4)
...@@ -162,21 +162,21 @@ namespace DeviceLibrary ...@@ -162,21 +162,21 @@ namespace DeviceLibrary
{ {
if (arg) if (arg)
{ {
if (SingleDoor.DoorIsOpen()) if (SingleDoor.isAtTOP)
return true; return true;
else else
{ {
SingleDoor.OpenDoor(null); SingleDoor.LiftUp(null);
return false; return false;
} }
} }
else else
{ {
if (SingleDoor.DoorIsClose()) if (SingleDoor.isAtBOTTOM)
return true; return true;
else else
{ {
SingleDoor.CloseDoor(null); SingleDoor.LiftDown(null);
return false; return false;
} }
} }
...@@ -308,6 +308,7 @@ namespace DeviceLibrary ...@@ -308,6 +308,7 @@ namespace DeviceLibrary
} }
public void Stop() { public void Stop() {
mstart = false; mstart = false;
SafetyDevice.PauseAll();
AutoInOutTest = false; AutoInOutTest = false;
ServerCM.StopConnectServer(); ServerCM.StopConnectServer();
Thread.Sleep(300); Thread.Sleep(300);
...@@ -349,10 +350,10 @@ namespace DeviceLibrary ...@@ -349,10 +350,10 @@ namespace DeviceLibrary
ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset); ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset);
ResetMoveInfo.log("进出轴,批量轴回原,料串检测杆退回避让端"); ResetMoveInfo.log("进出轴,批量轴回原,料串检测杆退回避让端");
InOut_Axis.HomeMove(ResetMoveInfo, forceHome); InOut_Axis.HomeMove(ResetMoveInfo, forceHome);
SingleDoor.CloseDoor(ResetMoveInfo);
break; break;
case MoveStep.H02_HomeReset: case MoveStep.H02_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H03_HomeReset); ResetMoveInfo.NextMoveStep(MoveStep.H03_HomeReset);
SingleDoor.LiftDown(ResetMoveInfo);
break; break;
case MoveStep.H03_HomeReset: case MoveStep.H03_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H04_HomeReset); ResetMoveInfo.NextMoveStep(MoveStep.H04_HomeReset);
...@@ -576,7 +577,7 @@ namespace DeviceLibrary ...@@ -576,7 +577,7 @@ namespace DeviceLibrary
RobotManage.UserPause("压紧轴报警", true); RobotManage.UserPause("压紧轴报警", true);
AxisManager.AlarmClear(configMoveAxis.DeviceName, configMoveAxis.GetAxisValue()); AxisManager.AlarmClear(configMoveAxis.DeviceName, configMoveAxis.GetAxisValue());
Thread.Sleep(2000); Thread.Sleep(2000);
SingleDoor.OpenDoor(null); SingleDoor.LiftUp(null);
} }
} }
else else
......
DeviceLibrary/theMachine/MainMachine_Store.cs
...@@ -131,7 +131,9 @@ namespace DeviceLibrary ...@@ -131,7 +131,9 @@ namespace DeviceLibrary
if (StoreMoveInfo.IsTimeOut(10)) if (StoreMoveInfo.IsTimeOut(10))
{ {
StoreMoveInfo.log("入口料盘,获取库位失败"); StoreMoveInfo.log("入口料盘,获取库位失败");
StoreMoveInfo.NewMove(MoveStep.Wait); StoreMoveInfo.MoveParam.IsNg = true;
StoreMoveInfo.MoveParam.NgMsg = $"[{CID}]" + "无信息物料";
StoreMoveInfo.NextMoveStep(MoveStep.StoreOut_WaitMT);
} }
break; break;
case MoveStep.StoreIn01: case MoveStep.StoreIn01:
......
DeviceLibrary/theMachine/RobotManage.cs
...@@ -140,9 +140,10 @@ namespace DeviceLibrary ...@@ -140,9 +140,10 @@ namespace DeviceLibrary
LogUtil.info("开始关闭系统."); LogUtil.info("开始关闭系统.");
IOManager.CloseAllConnection(); IOManager.CloseAllConnection();
CameraA.stopCamera(); CameraA.stopCamera();
if (mainMachine != null) if (mainMachine != null)
{ {
mainMachine.SingleDoor.Dispose(); // mainMachine.SingleDoor.Dispose();
} }
} }
public static void UserPause(bool userpause) public static void UserPause(bool userpause)
......
TheMachine/IOControls.cs
...@@ -38,12 +38,12 @@ namespace TheMachine ...@@ -38,12 +38,12 @@ namespace TheMachine
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
RobotManage.mainMachine.SingleDoor.OpenDoor(null); RobotManage.mainMachine.SingleDoor.LiftUp(null);
} }
private void btn_singledoorckise_Click(object sender, EventArgs e) private void btn_singledoorckise_Click(object sender, EventArgs e)
{ {
RobotManage.mainMachine.SingleDoor.CloseDoor(null); RobotManage.mainMachine.SingleDoor.LiftDown(null);
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!