Skip to content

刘韬 / MIMO

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

1

1 个父辈 8e960c4a
内嵌 并排
正在显示 5 个修改的文件 包含 24 行增加 和 23 行删除
DeviceLibrary/theMachine/BoxTransport.cs
......@@ -301,12 +301,12 @@ namespace DeviceLibrary
//RobotManage.UserPause("入库后料叉X30上任然检测到物料,请检查");
}
else
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
MoveInfo.NextMoveStep(MoveStep.StoreTS16);
MoveInfo.log($"{storeMoveType}:安全检查");
InOutEndProcess(StoreMoveType.InStore, To.posid);
}
break;
case MoveStep.StoreTS16:
......@@ -330,10 +330,9 @@ namespace DeviceLibrary
case MoveStep.StoreTS17:
//MoveInfo.NextMoveStep(MoveStep.StoreTS16);
MoveInfo.log($"{storeMoveType}:转移料盘完成");
MoveInfo.EndMove();
ErrMsgTxt = "";
MoveInfo.EndMove();
ErrMsgTxt = "";
To.posid = "";
InOutEndProcess(StoreMoveType.InStore, To.posid);
storeMoveType = StoreMoveType.None;
break;
case MoveStep.StoreTS_WaitOutProcess:
......
DeviceLibrary/theMachine/MainMachine_Clamp.cs
......@@ -104,8 +104,9 @@ namespace DeviceLibrary
break;
case MoveStep.ReelClamp_04:
ClampMoveInfo.NextMoveStep(MoveStep.ReelClamp_05);
ClampMoveInfo.log($"检测盘宽");
ClampMoveInfo.MoveParam.PlateW = GetWidth();
int width = GetWidth();
ClampMoveInfo.log($"检测盘宽={width}");
ClampMoveInfo.MoveParam.PlateW = width;
break;
case MoveStep.ReelClamp_05:
ClampMoveInfo.NextMoveStep(MoveStep.ReelClamp_WaitGaugeHeight);
......@@ -114,6 +115,7 @@ namespace DeviceLibrary
ClampErrorCount++;
ClampMoveInfo.MoveParam.IsNg = true;
ClampMoveInfo.MoveParam.NgMsg = crc.GetString(L.not_detect_reel_height, "未检测到盘宽");
ClampMoveInfo.log($"未检测到盘宽");
ReelGetted(false);
//RobotManage.UserPause("未检测到盘", true);
}
......
DeviceLibrary/theMachine/MainMachine_String.cs
......@@ -242,7 +242,7 @@ namespace DeviceLibrary
StringMoveInfo.NextMoveStep(MoveStep.StringLoad_03);
break;
case MoveStep.StringReelGetFail:
StringMoveInfo.log($"料已取走失败,料盘下降");
StringMoveInfo.log($"料盘取走失败,料盘下降");
ReelGetFail++;
StringMoveInfo.NextMoveStep(MoveStep.StringReelGet);
var tpos1 = Batch_Axis.GetAclPosition() - Config.Batch_PoToMM * 20;
......
TheMachine/IOControls.Designer.cs
......@@ -44,9 +44,9 @@ namespace TheMachine
this.cylinderButton4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton4.IO_HIGH = "Clamping_Work";
this.cylinderButton4.IO_LOW = "Clamping_Relax";
this.cylinderButton4.Location = new System.Drawing.Point(566, 284);
this.cylinderButton4.Location = new System.Drawing.Point(566, 395);
this.cylinderButton4.Name = "cylinderButton4";
this.cylinderButton4.Size = new System.Drawing.Size(224, 23);
this.cylinderButton4.Size = new System.Drawing.Size(224, 45);
this.cylinderButton4.TabIndex = 1;
this.cylinderButton4.Tag = "not";
this.cylinderButton4.Text = "Clamping_Work";
......@@ -58,9 +58,9 @@ namespace TheMachine
this.cylinderButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton7.IO_HIGH = "Device_Led";
this.cylinderButton7.IO_LOW = "";
this.cylinderButton7.Location = new System.Drawing.Point(566, 168);
this.cylinderButton7.Location = new System.Drawing.Point(566, 155);
this.cylinderButton7.Name = "cylinderButton7";
this.cylinderButton7.Size = new System.Drawing.Size(224, 23);
this.cylinderButton7.Size = new System.Drawing.Size(224, 45);
this.cylinderButton7.TabIndex = 1;
this.cylinderButton7.Tag = "not";
this.cylinderButton7.Text = "Device_Led";
......@@ -72,9 +72,9 @@ namespace TheMachine
this.cylinderButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton6.IO_HIGH = "Camera_Led";
this.cylinderButton6.IO_LOW = "";
this.cylinderButton6.Location = new System.Drawing.Point(566, 197);
this.cylinderButton6.Location = new System.Drawing.Point(566, 215);
this.cylinderButton6.Name = "cylinderButton6";
this.cylinderButton6.Size = new System.Drawing.Size(224, 23);
this.cylinderButton6.Size = new System.Drawing.Size(224, 45);
this.cylinderButton6.TabIndex = 1;
this.cylinderButton6.Tag = "not";
this.cylinderButton6.Text = "Camera_Led";
......@@ -86,9 +86,9 @@ namespace TheMachine
this.cylinderButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton1.IO_HIGH = "NGDoor_Open";
this.cylinderButton1.IO_LOW = "NGDoor_Close";
this.cylinderButton1.Location = new System.Drawing.Point(566, 226);
this.cylinderButton1.Location = new System.Drawing.Point(566, 275);
this.cylinderButton1.Name = "cylinderButton1";
this.cylinderButton1.Size = new System.Drawing.Size(224, 23);
this.cylinderButton1.Size = new System.Drawing.Size(224, 45);
this.cylinderButton1.TabIndex = 1;
this.cylinderButton1.Tag = "not";
this.cylinderButton1.Text = "NGDoor_Open";
......@@ -112,9 +112,9 @@ namespace TheMachine
this.cylinderButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton2.IO_HIGH = "BatchDoor_Open";
this.cylinderButton2.IO_LOW = "BatchDoor_Close";
this.cylinderButton2.Location = new System.Drawing.Point(566, 255);
this.cylinderButton2.Location = new System.Drawing.Point(566, 335);
this.cylinderButton2.Name = "cylinderButton2";
this.cylinderButton2.Size = new System.Drawing.Size(224, 23);
this.cylinderButton2.Size = new System.Drawing.Size(224, 45);
this.cylinderButton2.TabIndex = 1;
this.cylinderButton2.Tag = "not";
this.cylinderButton2.Text = "BatchDoor_Open";
......@@ -126,9 +126,9 @@ namespace TheMachine
this.cylinderButton3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton3.IO_HIGH = "ClampingDisc_Up";
this.cylinderButton3.IO_LOW = "ClampingDisc_Down";
this.cylinderButton3.Location = new System.Drawing.Point(566, 313);
this.cylinderButton3.Location = new System.Drawing.Point(566, 455);
this.cylinderButton3.Name = "cylinderButton3";
this.cylinderButton3.Size = new System.Drawing.Size(224, 23);
this.cylinderButton3.Size = new System.Drawing.Size(224, 45);
this.cylinderButton3.TabIndex = 1;
this.cylinderButton3.Tag = "not";
this.cylinderButton3.Text = "ClampingDisc_Up";
......
TheMachine/Properties/AssemblyInfo.cs
......@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("MIMO_PLUS")]
[assembly: AssemblyTitle("MIMO")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("上海挚锦科技有限公司")]
[assembly: AssemblyProduct("MIMO_PLUS")]
[assembly: AssemblyProduct("MIMO")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!