Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cf871036 由 LN
选项

1

1 个父辈 e77d9cb0
内嵌 并排
正在显示 8 个修改的文件 包含 76 行增加 和 13 行删除
source/AssemblyLineClient/FrmIOStatus.Designer.cs
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.button2 = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -297,6 +298,7 @@ ...@@ -297,6 +298,7 @@
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Controls.Add(this.button2);
this.groupBox5.Controls.Add(this.btnsw2StopDown); this.groupBox5.Controls.Add(this.btnsw2StopDown);
this.groupBox5.Controls.Add(this.chbAutoRead); this.groupBox5.Controls.Add(this.chbAutoRead);
this.groupBox5.Controls.Add(this.btnSw3Location); this.groupBox5.Controls.Add(this.btnSw3Location);
...@@ -326,7 +328,7 @@ ...@@ -326,7 +328,7 @@
// //
this.btnsw2StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsw2StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnsw2StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnsw2StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnsw2StopDown.Location = new System.Drawing.Point(185, 60); this.btnsw2StopDown.Location = new System.Drawing.Point(22, 60);
this.btnsw2StopDown.Name = "btnsw2StopDown"; this.btnsw2StopDown.Name = "btnsw2StopDown";
this.btnsw2StopDown.Size = new System.Drawing.Size(140, 34); this.btnsw2StopDown.Size = new System.Drawing.Size(140, 34);
this.btnsw2StopDown.TabIndex = 286; this.btnsw2StopDown.TabIndex = 286;
...@@ -571,6 +573,18 @@ ...@@ -571,6 +573,18 @@
this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 569); this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 569);
this.tableLayoutPanel4.TabIndex = 103; this.tableLayoutPanel4.TabIndex = 103;
// //
// button2
//
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(185, 60);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(140, 34);
this.button2.TabIndex = 287;
this.button2.Text = "环形线横移4阻挡下降";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// FrmIOStatus // FrmIOStatus
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -639,6 +653,7 @@ ...@@ -639,6 +653,7 @@
private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
private System.Windows.Forms.Button btnsw2StopDown; private System.Windows.Forms.Button btnsw2StopDown;
private System.Windows.Forms.Button button2;
} }
} }
source/AssemblyLineClient/FrmIOStatus.cs
...@@ -346,7 +346,12 @@ namespace OnlineStore.AssemblyLine ...@@ -346,7 +346,12 @@ namespace OnlineStore.AssemblyLine
private void btnsw2StopDown_Click(object sender, EventArgs e) private void btnsw2StopDown_Click(object sender, EventArgs e)
{ {
BtnMove(btnSw4Top, "环形线横移2阻挡下降", "环形线横移2阻挡上升", IO_Type.SW2_StopDown); BtnMove(btnsw2StopDown, "环形线横移2阻挡下降", "环形线横移2阻挡上升", IO_Type.SW2_StopDown);
}
private void button2_Click(object sender, EventArgs e)
{
BtnMove(button2, "环形线横移4阻挡下降", "环形线横移4阻挡上升", IO_Type.SW4_StopDown);
} }
} }
} }
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_17.csv
...@@ -86,4 +86,7 @@ DI,1000,环形线横移4顶升上升端,SW4_TopCylinder_Up,7,PRO_AOI_IP_36,0,环形线横移4顶 ...@@ -86,4 +86,7 @@ DI,1000,环形线横移4顶升上升端,SW4_TopCylinder_Up,7,PRO_AOI_IP_36,0,环形线横移4顶
DI,1000,环形线横移4顶升下降端,SW4_TopCylinder_Down,8,PRO_AOI_IP_36,0,环形线横移4顶升下降端,X559,X559 DI,1000,环形线横移4顶升下降端,SW4_TopCylinder_Down,8,PRO_AOI_IP_36,0,环形线横移4顶升下降端,X559,X559
,,,,,,,,, ,,,,,,,,,
DO,1000,环形线横移4顶升上升SOL,SW4_TopCylinder_Up,6,PRO_AOI_IP_36,0,环形线横移4顶升上升SOL,Y557,Y557 DO,1000,环形线横移4顶升上升SOL,SW4_TopCylinder_Up,6,PRO_AOI_IP_36,0,环形线横移4顶升上升SOL,Y557,Y557
DO,1000,环形线横移4顶升下降SOL,SW4_TopCylinder_Down,7,PRO_AOI_IP_36,0,环形线横移4顶升下降SOL,Y558,Y558 DO,1000,环形线横移4顶升下降SOL,SW4_TopCylinder_Down,7,PRO_AOI_IP_36,0,环形线横移4顶升下降SOL,Y558,Y558
,,,,,,,,,
DI,1000,环形线横移4阻挡检测,SW4_StopCheck,6,PRO_AOI_IP_36,0,环形线横移4阻挡检测,X557,X557
DO,1000,环形线横移4阻挡下降SOL,SW4_StopDown,4,PRO_AOI_IP_36,0,环形线横移4阻挡下降,Y555,Y555
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -247,7 +247,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -247,7 +247,8 @@ namespace OnlineStore.DeviceLibrary
{ {
CylinderMove(null, IO_Type.FL_TopCylinder_Up, IO_Type.FL_TopCylinder_Down); CylinderMove(null, IO_Type.FL_TopCylinder_Up, IO_Type.FL_TopCylinder_Down);
} }
CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
} }
} }
internal virtual void CloseCylinderStop() internal virtual void CloseCylinderStop()
...@@ -255,6 +256,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -255,6 +256,7 @@ namespace OnlineStore.DeviceLibrary
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.ProvidingEquip)) if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.ProvidingEquip))
{ {
LogInfo("CloseCylinderStop: 上升阻挡气缸，关闭上下气缸，顶升气缸IO"); LogInfo("CloseCylinderStop: 上升阻挡气缸，关闭上下气缸，顶升气缸IO");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
//上下气缸上升 //上下气缸上升
...@@ -276,6 +278,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -276,6 +278,8 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.FL_TopCylinder_Up, IO_VALUE.LOW); IOMove(IO_Type.FL_TopCylinder_Up, IO_VALUE.LOW);
IOMove(IO_Type.FL_TopCylinder_Down, IO_VALUE.LOW); IOMove(IO_Type.FL_TopCylinder_Down, IO_VALUE.LOW);
} }
IOMove(IO_Type.SL_MoveCylinder_Down, IO_VALUE.LOW);
IOMove(IO_Type.SL_MoveCylinder_Up, IO_VALUE.LOW);
} }
} }
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -334,6 +334,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -334,6 +334,7 @@ namespace OnlineStore.DeviceLibrary
SideWayStop(); SideWayStop();
IOMove(IO_Type.SW2_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
//定位下降 //定位下降
CylinderMove(MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down); CylinderMove(MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -446,6 +446,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -446,6 +446,30 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down); CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down); CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
} }
else if (IOValue(IO_Type.SW4_StopCheck).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW) &&
TrayManager.CanMoveSidesWay(4) && TrayManager.CanMoveSidesWay(1))
{
TimeSpan span14 = DateTime.Now - SideWay41Ntime;
if (SideWay41IsWait && span14.TotalSeconds > 1)
{
// TrayManager.UpdateSWState(4, 4);
//TrayManager.UpdateSWState(1, 4);
SW41_MoveInfo.NewMove(LineMoveType.InStore);
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopDown);
SWLog("横移轨道41：检测到SW4_StopCheck， 等待1000，定位气缸下降 ");
IOMove(IO_Type.SW4_StopDown, IO_VALUE.HIGH);
// SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
}
else if (!SideWay41IsWait)
{
SideWay41IsWait = true;
SideWay41Ntime = DateTime.Now;
}
}
else if (!SideWay41IsWait) else if (!SideWay41IsWait)
{ {
SideWay41IsWait = true; SideWay41IsWait = true;
...@@ -500,7 +524,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -500,7 +524,7 @@ namespace OnlineStore.DeviceLibrary
// TrayManager.UpdateSWState(2, 2); // TrayManager.UpdateSWState(2, 2);
//TrayManager.UpdateSWState(3, 2); //TrayManager.UpdateSWState(3, 2);
SW23_MoveInfo.NewMove(LineMoveType.InStore); SW23_MoveInfo.NewMove(LineMoveType.InStore);
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW01_SW2_StopDown); SW23_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopDown);
SWLog("横移轨道23：检测到SW2_StopCheck， 等待1000，定位气缸下降 "); SWLog("横移轨道23：检测到SW2_StopCheck， 等待1000，定位气缸下降 ");
IOMove(IO_Type.SW2_StopDown, IO_VALUE.HIGH); IOMove(IO_Type.SW2_StopDown, IO_VALUE.HIGH);
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH)); // SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH));
...@@ -542,16 +566,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -542,16 +566,18 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_SW2_StopDown)) if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopDown))
{ {
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck); SW41_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
SWLog("横移轨道41： 等待横移4托盘检测信号 "); SWLog("横移轨道41： 等待横移4托盘检测信号 ,SW4_StopDown上升 ");
IOMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH)); SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
} }
else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW02_WaitFixtureCheck)) else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW02_WaitFixtureCheck))
{ {
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp); SW41_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp);
SWLog("横移轨道41：顶升气缸上升 ,至少等待1000 "); SWLog("横移轨道41：顶升气缸上升 ,至少等待1000 ");
IOMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
CylinderMove(SW41_MoveInfo, IO_Type.SW4_TopCylinder_Down, IO_Type.SW4_TopCylinder_Up); CylinderMove(SW41_MoveInfo, IO_Type.SW4_TopCylinder_Down, IO_Type.SW4_TopCylinder_Up);
CylinderMove(SW41_MoveInfo, IO_Type.SW1_TopCylinder_Down, IO_Type.SW1_TopCylinder_Up); CylinderMove(SW41_MoveInfo, IO_Type.SW1_TopCylinder_Down, IO_Type.SW1_TopCylinder_Up);
...@@ -653,10 +679,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -653,10 +679,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_SW2_StopDown)) if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopDown))
{ {
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck); SW23_MoveInfo.NextMoveStep(LineMoveStep.SW02_WaitFixtureCheck);
SWLog("横移轨道23：SW2阻挡上升 等待横移3托盘检测信号 "); SWLog("横移轨道23：SW2_StopDown上升 等待横移3托盘检测信号 ");
IOMove(IO_Type.SW2_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH)); SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH));
} }
...@@ -664,6 +690,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -664,6 +690,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp); SW23_MoveInfo.NextMoveStep(LineMoveStep.SW03_TopCylinderUp);
SWLog("横移轨道23：顶升气缸上升 ,至少等待1000 "); SWLog("横移轨道23：顶升气缸上升 ,至少等待1000 ");
IOMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
CylinderMove(SW23_MoveInfo, IO_Type.SW2_TopCylinder_Down, IO_Type.SW2_TopCylinder_Up); CylinderMove(SW23_MoveInfo, IO_Type.SW2_TopCylinder_Down, IO_Type.SW2_TopCylinder_Up);
CylinderMove(SW23_MoveInfo, IO_Type.SW3_TopCylinder_Down, IO_Type.SW3_TopCylinder_Up); CylinderMove(SW23_MoveInfo, IO_Type.SW3_TopCylinder_Down, IO_Type.SW3_TopCylinder_Up);
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -427,9 +427,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -427,9 +427,9 @@ namespace OnlineStore.DeviceLibrary
#region 横移轨道处理 5000 开始 #region 横移轨道处理 5000 开始
SW00_Wait = 5000, SW00_Wait = 5000,
/// <summary> /// <summary>
/// 定位气缸下降 /// 阻挡气缸下降
/// </summary> /// </summary>
SW01_SW2_StopDown=5001, SW01_StopDown=5001,
/// <summary> /// <summary>
/// 等待轨道1夹具检测信号 /// 等待轨道1夹具检测信号
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -704,8 +704,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -704,8 +704,6 @@ namespace OnlineStore.LoadCSVLibrary
public static string SW4_MotorRun = "SW4_MotorRun"; public static string SW4_MotorRun = "SW4_MotorRun";
/// <summary> /// <summary>
/// DI,0,环形线横移2阻挡检测,SW2_StopCheck,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403 /// DI,0,环形线横移2阻挡检测,SW2_StopCheck,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403
/// </summary> /// </summary>
...@@ -714,6 +712,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -714,6 +712,16 @@ namespace OnlineStore.LoadCSVLibrary
/// DO,0, 环形线横移2阻挡下降SOL, SW2_StopDown,4, PRO_AOI_IP_28,0, 环形线横移2阻挡下降SOL, Y405, Y405 /// DO,0, 环形线横移2阻挡下降SOL, SW2_StopDown,4, PRO_AOI_IP_28,0, 环形线横移2阻挡下降SOL, Y405, Y405
/// </summary> /// </summary>
public static string SW2_StopDown = "SW2_StopDown"; public static string SW2_StopDown = "SW2_StopDown";
/// <summary>
/// DI,1000,环形线横移4阻挡检测,SW4_StopCheck,6,PRO_AOI_IP_36,0,环形线横移4阻挡检测,X557,X557
/// </summary>
public static string SW4_StopCheck = "SW4_StopCheck";
/// <summary>
/// DO,204, 环形线横移4阻挡下降SOL, SW4_StopDown,4, PRO_AOI_IP_36,0, 环形线横移4阻挡下降, Y555, Y555
/// </summary>
public static string SW4_StopDown = "SW4_StopDown";
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!