Skip to content

孙克 / RC1250-AssemblyLine

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

增加分流功能

1 个父辈 aa9883bd
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 234 行增加 和 118 行删除
source/AssemblyLineClient/FrmIOStatus.Designer.cs
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(926, 3); this.groupBox1.Location = new System.Drawing.Point(926, 3);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(404, 120); this.groupBox1.Size = new System.Drawing.Size(377, 120);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
this.chbAutoRead.Checked = true; this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(335, 20); this.chbAutoRead.Location = new System.Drawing.Point(308, 20);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21); this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244; this.chbAutoRead.TabIndex = 244;
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Location = new System.Drawing.Point(926, 126); this.groupBox5.Location = new System.Drawing.Point(926, 126);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(404, 437); this.groupBox5.Size = new System.Drawing.Size(383, 437);
this.groupBox5.TabIndex = 246; this.groupBox5.TabIndex = 246;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1334, 571); this.panel1.Size = new System.Drawing.Size(1316, 571);
this.panel1.TabIndex = 248; this.panel1.TabIndex = 248;
// //
// tabControl1 // tabControl1
...@@ -560,7 +560,7 @@ ...@@ -560,7 +560,7 @@
this.tabControl1.Location = new System.Drawing.Point(924, 129); this.tabControl1.Location = new System.Drawing.Point(924, 129);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(407, 434); this.tabControl1.Size = new System.Drawing.Size(380, 434);
this.tabControl1.TabIndex = 288; this.tabControl1.TabIndex = 288;
// //
// tabPage1 // tabPage1
...@@ -586,7 +586,7 @@ ...@@ -586,7 +586,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(399, 404); this.tabPage1.Size = new System.Drawing.Size(372, 404);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO操作测试 "; this.tabPage1.Text = " IO操作测试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(399, 404); this.tabPage2.Size = new System.Drawing.Size(372, 404);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 分流横移操作 "; this.tabPage2.Text = " 分流横移操作 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -613,7 +613,7 @@ ...@@ -613,7 +613,7 @@
this.btnShuntClose.BackColor = System.Drawing.Color.White; this.btnShuntClose.BackColor = System.Drawing.Color.White;
this.btnShuntClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnShuntClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShuntClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnShuntClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShuntClose.Location = new System.Drawing.Point(183, 184); this.btnShuntClose.Location = new System.Drawing.Point(183, 194);
this.btnShuntClose.Name = "btnShuntClose"; this.btnShuntClose.Name = "btnShuntClose";
this.btnShuntClose.Size = new System.Drawing.Size(153, 37); this.btnShuntClose.Size = new System.Drawing.Size(153, 37);
this.btnShuntClose.TabIndex = 294; this.btnShuntClose.TabIndex = 294;
...@@ -725,7 +725,7 @@ ...@@ -725,7 +725,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1334, 571); this.ClientSize = new System.Drawing.Size(1316, 571);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
......
source/AssemblyLineClient/FrmIOStatus.cs
...@@ -63,7 +63,7 @@ namespace OnlineStore.AssemblyLine ...@@ -63,7 +63,7 @@ namespace OnlineStore.AssemblyLine
roleindex++; roleindex++;
DIControlList.Add(ioValue.ProName, control); DIControlList.Add(ioValue.ProName, control);
} }
count = 19;
tableLayoutPanel2.RowStyles.Clear(); tableLayoutPanel2.RowStyles.Clear();
this.tableLayoutPanel2.RowCount = count; this.tableLayoutPanel2.RowCount = count;
this.tableLayoutPanel4.RowStyles.Clear(); this.tableLayoutPanel4.RowStyles.Clear();
...@@ -188,7 +188,7 @@ namespace OnlineStore.AssemblyLine ...@@ -188,7 +188,7 @@ namespace OnlineStore.AssemblyLine
private void FrmStoreIOStatus_Load(object sender, EventArgs e) private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{ {
// KNDAIManager.NeedShow = true; // KNDAIManager.NeedShow = true;
tabControl1.TabPages.RemoveAt(1); //tabControl1.TabPages.RemoveAt(1);
} }
private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e) private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
...@@ -368,24 +368,24 @@ namespace OnlineStore.AssemblyLine ...@@ -368,24 +368,24 @@ namespace OnlineStore.AssemblyLine
private void btnShuntStop1_Click(object sender, EventArgs e) private void btnShuntStop1_Click(object sender, EventArgs e)
{ {
BtnMove(btnShuntStop1, "分流前端阻挡下降", "分流前端阻挡上升", IO_Type.Shunt_StopDown_Front); BtnMove(btnShuntStop1, "分流前端阻挡下降", "分流前端阻挡上升", IO_Type.Shunt_StopDown1_Front);
} }
private void btnShuntStop2_Click(object sender, EventArgs e) private void btnShuntStop2_Click(object sender, EventArgs e)
{ {
BtnMove(btnShuntStop2, "分流后端阻挡下降", "分流后端阻挡上升", IO_Type.Shunt_StopDown_Back); BtnMove(btnShuntStop2, "分流后端阻挡下降", "分流后端阻挡上升", IO_Type.Shunt_StopDown2_Back);
} }
private void btnShuntupdown1_Click(object sender, EventArgs e) private void btnShuntupdown1_Click(object sender, EventArgs e)
{ {
BtnMove(btnShuntupdown1 , "分流横移机构1上升", "分流横移机构1下降", IO_Type.Shunt_UpdownCylinder_Down1, IO_Type.Shunt_UpdownCylinder_Up1); BtnMove(btnShuntupdown1 , "分流横移机构1上升", "分流横移机构1下降", IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1);
} }
private void btnShuntupdown2_Click(object sender, EventArgs e) private void btnShuntupdown2_Click(object sender, EventArgs e)
{ {
BtnMove(btnShuntupdown2, "分流横移机构2上升", "分流横移机构2下降", IO_Type.Shunt_UpdownCylinder_Down2, IO_Type.Shunt_UpdownCylinder_Up2); BtnMove(btnShuntupdown2, "分流横移机构2上升", "分流横移机构2下降", IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
} }
private void btnShuntRun1_Click(object sender, EventArgs e) private void btnShuntRun1_Click(object sender, EventArgs e)
...@@ -400,12 +400,12 @@ namespace OnlineStore.AssemblyLine ...@@ -400,12 +400,12 @@ namespace OnlineStore.AssemblyLine
private void btnShuntClose_Click(object sender, EventArgs e) private void btnShuntClose_Click(object sender, EventArgs e)
{ {
IOManager.IOMove(IO_Type.Shunt_StopDown_Front, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_StopDown1_Front, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_StopDown_Back, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_StopDown2_Back, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Down1, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_TopCylinder_Down1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Up1, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_TopCylinder_Up1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Down2, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_UpdownCylinder_Up2, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_TopCylinder_Up2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_MotorRun1, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_MotorRun1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_MotorRun2, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Shunt_MotorRun2, IO_VALUE.LOW);
} }
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -34,10 +34,11 @@ ...@@ -34,10 +34,11 @@
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.listView1 = new System.Windows.Forms.ListView(); this.listView1 = new System.Windows.Forms.ListView();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.chbShunt = new System.Windows.Forms.CheckBox();
this.btnShuntReset = new System.Windows.Forms.Button();
this.chbTrayCheck = new System.Windows.Forms.CheckBox(); this.chbTrayCheck = new System.Windows.Forms.CheckBox();
this.chbBuzzer = new System.Windows.Forms.CheckBox(); this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.chbAGV = new System.Windows.Forms.CheckBox(); this.chbAGV = new System.Windows.Forms.CheckBox();
this.btnTrayInfo = new System.Windows.Forms.Button();
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.chkDebug = new System.Windows.Forms.CheckBox(); this.chkDebug = new System.Windows.Forms.CheckBox();
this.btnClearLog = new System.Windows.Forms.Button(); this.btnClearLog = new System.Windows.Forms.Button();
...@@ -164,20 +165,45 @@ ...@@ -164,20 +165,45 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.chbShunt);
this.groupBox2.Controls.Add(this.btnShuntReset);
this.groupBox2.Controls.Add(this.chbTrayCheck); this.groupBox2.Controls.Add(this.chbTrayCheck);
this.groupBox2.Controls.Add(this.chbBuzzer); this.groupBox2.Controls.Add(this.chbBuzzer);
this.groupBox2.Controls.Add(this.chbAGV); this.groupBox2.Controls.Add(this.chbAGV);
this.groupBox2.Controls.Add(this.btnTrayInfo);
this.groupBox2.Controls.Add(this.chbAutoRun); this.groupBox2.Controls.Add(this.chbAutoRun);
this.groupBox2.Controls.Add(this.chkDebug); this.groupBox2.Controls.Add(this.chkDebug);
this.groupBox2.Controls.Add(this.btnClearLog); this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(720, 7); this.groupBox2.Location = new System.Drawing.Point(720, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(321, 127); this.groupBox2.Size = new System.Drawing.Size(308, 157);
this.groupBox2.TabIndex = 196; this.groupBox2.TabIndex = 196;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
// chbShunt
//
this.chbShunt.AutoSize = true;
this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt.Location = new System.Drawing.Point(8, 77);
this.chbShunt.Name = "chbShunt";
this.chbShunt.Size = new System.Drawing.Size(140, 24);
this.chbShunt.TabIndex = 200;
this.chbShunt.Text = "禁用分流横移功能";
this.chbShunt.UseVisualStyleBackColor = true;
this.chbShunt.CheckedChanged += new System.EventHandler(this.chbShunt_CheckedChanged);
//
// btnShuntReset
//
this.btnShuntReset.BackColor = System.Drawing.Color.White;
this.btnShuntReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShuntReset.Location = new System.Drawing.Point(16, 112);
this.btnShuntReset.Name = "btnShuntReset";
this.btnShuntReset.Size = new System.Drawing.Size(118, 35);
this.btnShuntReset.TabIndex = 199;
this.btnShuntReset.Text = "分流横移模块复位";
this.btnShuntReset.UseVisualStyleBackColor = false;
this.btnShuntReset.Click += new System.EventHandler(this.btnShuntReset_Click);
//
// chbTrayCheck // chbTrayCheck
// //
this.chbTrayCheck.AutoSize = true; this.chbTrayCheck.AutoSize = true;
...@@ -194,7 +220,7 @@ ...@@ -194,7 +220,7 @@
// //
this.chbBuzzer.AutoSize = true; this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(20, 52); this.chbBuzzer.Location = new System.Drawing.Point(8, 47);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24); this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 196; this.chbBuzzer.TabIndex = 196;
...@@ -206,7 +232,7 @@ ...@@ -206,7 +232,7 @@
// //
this.chbAGV.AutoSize = true; this.chbAGV.AutoSize = true;
this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAGV.Location = new System.Drawing.Point(20, 87); this.chbAGV.Location = new System.Drawing.Point(154, 47);
this.chbAGV.Name = "chbAGV"; this.chbAGV.Name = "chbAGV";
this.chbAGV.Size = new System.Drawing.Size(138, 24); this.chbAGV.Size = new System.Drawing.Size(138, 24);
this.chbAGV.TabIndex = 198; this.chbAGV.TabIndex = 198;
...@@ -214,24 +240,11 @@ ...@@ -214,24 +240,11 @@
this.chbAGV.UseVisualStyleBackColor = true; this.chbAGV.UseVisualStyleBackColor = true;
this.chbAGV.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); this.chbAGV.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
// //
// btnTrayInfo
//
this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(27, 76);
this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195;
this.btnTrayInfo.Text = "托盘信息";
this.btnTrayInfo.UseVisualStyleBackColor = false;
this.btnTrayInfo.Visible = false;
this.btnTrayInfo.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// chbAutoRun // chbAutoRun
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(20, 17); this.chbAutoRun.Location = new System.Drawing.Point(8, 17);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(112, 24); this.chbAutoRun.Size = new System.Drawing.Size(112, 24);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
...@@ -243,7 +256,7 @@ ...@@ -243,7 +256,7 @@
// //
this.chkDebug.AutoSize = true; this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(154, 47); this.chkDebug.Location = new System.Drawing.Point(154, 77);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24); this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -254,9 +267,9 @@ ...@@ -254,9 +267,9 @@
// //
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(189, 82); this.btnClearLog.Location = new System.Drawing.Point(154, 112);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(118, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
this.btnClearLog.Text = "清空日志"; this.btnClearLog.Text = "清空日志";
this.btnClearLog.UseVisualStyleBackColor = false; this.btnClearLog.UseVisualStyleBackColor = false;
...@@ -268,9 +281,9 @@ ...@@ -268,9 +281,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(720, 139); this.logBox.Location = new System.Drawing.Point(720, 167);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(600, 467); this.logBox.Size = new System.Drawing.Size(600, 439);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -408,7 +421,7 @@ ...@@ -408,7 +421,7 @@
// //
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(1056, 7); this.lblMoveInfo.Location = new System.Drawing.Point(1034, 21);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17); this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196; this.lblMoveInfo.TabIndex = 196;
...@@ -874,7 +887,6 @@ ...@@ -874,7 +887,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.Label lblMoveInfo; private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnTrayInfo;
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox chbInStoNG; private System.Windows.Forms.CheckBox chbInStoNG;
private System.Windows.Forms.ComboBox cmbTrayType; private System.Windows.Forms.ComboBox cmbTrayType;
...@@ -921,6 +933,8 @@ ...@@ -921,6 +933,8 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripMenuItem 版本号ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 版本号ToolStripMenuItem;
private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.Button btnShuntReset;
private System.Windows.Forms.CheckBox chbShunt;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -991,5 +991,30 @@ namespace OnlineStore.AssemblyLine ...@@ -991,5 +991,30 @@ namespace OnlineStore.AssemblyLine
LogUtil.info("勾选：启用托盘顺序检测 NeedCheckTray =" + TrayManager.NeedCheckTray); LogUtil.info("勾选：启用托盘顺序检测 NeedCheckTray =" + TrayManager.NeedCheckTray);
ConfigAppSettings.SaveValue(Setting_Init.NeedCheckTray, (TrayManager.NeedCheckTray ? 1 : 0)); ConfigAppSettings.SaveValue(Setting_Init.NeedCheckTray, (TrayManager.NeedCheckTray ? 1 : 0));
} }
private void btnShuntReset_Click(object sender, EventArgs e)
{
if (lineBean.runStatus.Equals(LineRunStatus.Wait))
{
MessageBox.Show(lineBean.Name + "流水线未启动，无法复位");
return;
}
LogUtil.info(Name + "点击 分流模块复位 按钮复位");
lineBean.ShuntStop();
}
private void chbShunt_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (chbShunt.Checked.Equals(lineBean.DisableShunt))
{
return;
}
lineBean.DisableShunt = (chbShunt.Checked);
LogUtil.info("勾选 禁用分流横移功能：lineBean.DisableShunt =" + lineBean.DisableShunt);
}
} }
} }
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -254,6 +254,7 @@ ...@@ -254,6 +254,7 @@
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.tableLayoutPanel2.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)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14); this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
...@@ -281,6 +282,7 @@ ...@@ -281,6 +282,7 @@
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.tableLayoutPanel1.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)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
......
source/DeviceLibrary/LineConfig/Config_Line.csv
...@@ -67,8 +67,8 @@ PRO,0,入料流水线4-上料模块-RFID-IP,PRO_RFIP_104-1,192.168.210.118,,,,, ...@@ -67,8 +67,8 @@ PRO,0,入料流水线4-上料模块-RFID-IP,PRO_RFIP_104-1,192.168.210.118,,,,,
PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,,,, PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,,,,
PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,,,, PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,,,,
PRO,0,IO信号超时时间（秒）,IOSingle_TimerOut,15,,,,, PRO,0,IO信号超时时间（秒）,IOSingle_TimerOut,15,,,,,
PRO,0,IO模块对应的DI数量,IO_DILength,192.168.111.33#8;192.168.111.35#8;192.168.111.37#8;192.168.111.39#8;192.168.111.41#8;,,,,, PRO,0,IO模块对应的DI数量,IO_DILength,192.168.111.33#8;192.168.111.35#8;192.168.111.37#8;192.168.111.39#8;192.168.111.41#16;,,,,,
PRO,0,模块对应的DO数量,IO_DOLength,192.168.111.33#8;192.168.111.35#8;192.168.111.37#8;192.168.111.39#8;192.168.111.41#8;,,,,, PRO,0,模块对应的DO数量,IO_DOLength,192.168.111.33#8;192.168.111.35#8;192.168.111.37#8;192.168.111.39#8;192.168.111.41#16;,,,,,
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001 DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
...@@ -37,11 +37,19 @@ DI,10,进仓10夹料放松端,ClampCylinder_Tighten,15,PRO_AOI_IP_27,0,进仓10夹料放松端 ...@@ -37,11 +37,19 @@ DI,10,进仓10夹料放松端,ClampCylinder_Tighten,15,PRO_AOI_IP_27,0,进仓10夹料放松端
DI,9,进仓09料盘检测,TrayCheck,0,PRO_AOI_IP_28,0,进仓09料盘检测,X401,X401 DI,9,进仓09料盘检测,TrayCheck,0,PRO_AOI_IP_28,0,进仓09料盘检测,X401,X401
DI,10,进仓10料盘检测,TrayCheck,1,PRO_AOI_IP_28,0,进仓10料盘检测,X402,X402 DI,10,进仓10料盘检测,TrayCheck,1,PRO_AOI_IP_28,0,进仓10料盘检测,X402,X402
,,环形线横移2阻挡检测,,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403 ,,环形线横移2阻挡检测,,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403
,,,,3,PRO_AOI_IP_28,0,,X404,X404 DI,1000,分流前端托盘检测,Shunt_Check1_Front,3,PRO_AOI_IP_28,0,分流前端托盘检测,X404,X404
,,,,4,PRO_AOI_IP_28,0,,X405,X405 DI,1000,分流中间托盘检测,Shunt_Check2_Middle,4,PRO_AOI_IP_28,0,分流中间托盘检测,X405,X405
,,,,5,PRO_AOI_IP_28,0,,X406,X406 DI,1000,分流后端托盘检测,Shunt_Check3_Back,5,PRO_AOI_IP_28,0,分流后端托盘检测,X406,X406
,,,,6,PRO_AOI_IP_28,0,,X407,X407 DI,1000,分流后端阻挡托盘检测,Shunt_Check4_BStop,6,PRO_AOI_IP_28,0,分流后端阻挡托盘检测,X407,X407
,,,,7,PRO_AOI_IP_28,0,,X408,X408 DI,1000,分流横移机构1上升端,Shunt_TopCylinder_Up1,7,PRO_AOI_IP_28,0,分流横移机构1上升端,X408,X408
DI,1000,分流横移机构1下降端,Shunt_TopCylinder_Down1,8,PRO_AOI_IP_28,0,分流横移机构1下降端,X409,X409
DI,1000,分流横移机构2上升端,Shunt_TopCylinder_Up2,9,PRO_AOI_IP_28,0,分流横移机构2上升端,X410,X410
DI,1000,分流横移机构2下降端,Shunt_TopCylinder_Down2,10,PRO_AOI_IP_28,0,分流横移机构2下降端,X411,X411
,,,,11,PRO_AOI_IP_28,0,,X412,X412
,,,,12,PRO_AOI_IP_28,0,,X413,X413
,,,,13,PRO_AOI_IP_28,0,,X414,X414
,,,,14,PRO_AOI_IP_28,0,,X415,X415
,,,,15,PRO_AOI_IP_28,0,,X416,X416
,,,,,,,,, ,,,,,,,,,
DO,9,进仓09阻挡1下降SOL,StopCylinder_Down1,0,PRO_AOI_IP_27,0,进仓09阻挡1下降SOL,Y381,Y381 DO,9,进仓09阻挡1下降SOL,StopCylinder_Down1,0,PRO_AOI_IP_27,0,进仓09阻挡1下降SOL,Y381,Y381
DO,9,进仓09阻挡2下降SOL,StopCylinder_Down2,1,PRO_AOI_IP_27,0,进仓09阻挡2下降SOL,Y382,Y382 DO,9,进仓09阻挡2下降SOL,StopCylinder_Down2,1,PRO_AOI_IP_27,0,进仓09阻挡2下降SOL,Y382,Y382
...@@ -64,6 +72,14 @@ DO,10,进仓10伺服刹车ON,UpDownAxis_BreakOn,1,PRO_AOI_IP_28,0,进仓10伺服刹车ON,Y40 ...@@ -64,6 +72,14 @@ DO,10,进仓10伺服刹车ON,UpDownAxis_BreakOn,1,PRO_AOI_IP_28,0,进仓10伺服刹车ON,Y40
DO,9,进仓09伺服运转ON,UpDownAxis_ServoOn,2,PRO_AOI_IP_28,0,进仓09伺服运转ON,Y403,Y403 DO,9,进仓09伺服运转ON,UpDownAxis_ServoOn,2,PRO_AOI_IP_28,0,进仓09伺服运转ON,Y403,Y403
DO,10,进仓10伺服运转ON,UpDownAxis_ServoOn,3,PRO_AOI_IP_28,0,进仓10伺服运转ON,Y404,Y404 DO,10,进仓10伺服运转ON,UpDownAxis_ServoOn,3,PRO_AOI_IP_28,0,进仓10伺服运转ON,Y404,Y404
,,环形线横移2阻挡下降SOL,,4,PRO_AOI_IP_28,0,环形线横移2阻挡下降SOL,Y405,Y405 ,,环形线横移2阻挡下降SOL,,4,PRO_AOI_IP_28,0,环形线横移2阻挡下降SOL,Y405,Y405
,,,,5,PRO_AOI_IP_28,0,,Y406,Y406 DO,1000,分流前端阻挡下降SOL,Shunt_StopDown1_Front,5,PRO_AOI_IP_28,0,分流前端阻挡下降SOL,Y406,Y406
,,,,6,PRO_AOI_IP_28,0,,Y407,Y407 DO,1000,分流后端阻挡下降SOL,Shunt_StopDown2_Back,6,PRO_AOI_IP_28,0,分流后端阻挡下降SOL,Y407,Y407
,,,,7,PRO_AOI_IP_28,0,,Y408,Y408 DO,1000,分流横移机构1上升SOL,Shunt_TopCylinder_Up1,7,PRO_AOI_IP_28,0,分流横移机构1上升SOL,Y408,Y408
DO,1000,分流横移机构1下降SOL,Shunt_TopCylinder_Down1,8,PRO_AOI_IP_28,0,分流横移机构1下降SOL,Y409,Y409
DO,1000,分流横移机构2上升SOL,Shunt_TopCylinder_Up2,9,PRO_AOI_IP_28,0,分流横移机构2上升SOL,Y410,Y410
DO,1000,分流横移机构2下降SOL,Shunt_TopCylinder_Down2,10,PRO_AOI_IP_28,0,分流横移机构2下降SOL,Y411,Y411
DO,1000,分流横移机构1皮带运行,Shunt_MotorRun1,11,PRO_AOI_IP_28,0,分流横移机构1皮带运行,Y412,Y412
DO,1000,分流横移机构2皮带运行,Shunt_MotorRun2,12,PRO_AOI_IP_28,0,分流横移机构2皮带运行,Y413,Y413
,,,,13,PRO_AOI_IP_28,0,,Y414,Y414
,,,,14,PRO_AOI_IP_28,0,,Y415,Y415
,,,,15,PRO_AOI_IP_28,0,,Y416,Y416
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -52,11 +52,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -52,11 +52,11 @@ namespace OnlineStore.DeviceLibrary
{ {
if (moveInfo.MoveStep.Equals(LineMoveStep.FI_18_WaitNoLocationCheck) && alarmType.Equals(LineAlarmType.IoSingleTimeOut)) if (moveInfo.MoveStep.Equals(LineMoveStep.FI_18_WaitNoLocationCheck) && alarmType.Equals(LineAlarmType.IoSingleTimeOut))
{ {
string code = CodeManager.ProcessCode(LastCodeList); string code = CodeManager.ProcessCode(NextCodeList);
if (!String.IsNullOrEmpty(code)) if (!String.IsNullOrEmpty(code))
{ {
LogUtil.error(moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待 SL_AxisLocationCheck=LOW 超时，清空缓存条码：" + code); LogUtil.error(moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待 SL_AxisLocationCheck=LOW 超时，清空缓存预条码：" + code);
LastCodeList = new List<string>(); NextCodeList = new List<string>();
} }
} }
} }
...@@ -898,13 +898,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -898,13 +898,13 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_BatchAxisDown)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_BatchAxisDown))
{ {
if (Config.DIList.ContainsKey(IO_Type.ReelCheck) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.LOW)) //if (Config.DIList.ContainsKey(IO_Type.ReelCheck) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.LOW))
{ //{
MoveInfo.NextMoveStep(LineMoveStep.FI_23_WaitReelCheck); // MoveInfo.NextMoveStep(LineMoveStep.FI_23_WaitReelCheck);
InLog(" " + MoveInfo.SLog + " 等待料盘检测信号：ReelCheck"); // InLog(" " + MoveInfo.SLog + " 等待料盘检测信号：ReelCheck");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck, IO_VALUE.HIGH)); // MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck, IO_VALUE.HIGH));
} //}
else //else
{ {
FI_24_GetPosID(); FI_24_GetPosID();
} }
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -66,6 +66,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -66,6 +66,7 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = lineConfig.Id; this.DeviceID = lineConfig.Id;
SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41"); SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41");
SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23"); SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23");
Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移");
MoveInfo = new LineMoveInfo(DeviceID, "[流水线-Move] "); MoveInfo = new LineMoveInfo(DeviceID, "[流水线-Move] ");
Name = (" 流水线_" + Config.CID + " ").ToUpper(); Name = (" 流水线_" + Config.CID + " ").ToUpper();
...@@ -358,6 +359,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -358,6 +359,12 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.SW1_TopCylinder_Up, IO_Type.SW1_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.SW1_TopCylinder_Up, IO_Type.SW1_TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down);
//分流模块复位
ShuntStop();
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
} }
public override bool Reset() public override bool Reset()
...@@ -456,7 +463,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -456,7 +463,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW); IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
SideWayStop(); SideWayStop();
ShuntStop();
runStatus = LineRunStatus.Wait; runStatus = LineRunStatus.Wait;
ledProcessTimer.Enabled = false; ledProcessTimer.Enabled = false;
...@@ -501,6 +508,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -501,6 +508,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW); IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
SideWayStop(); SideWayStop();
ShuntStop();
foreach (EquipBase equip in this.AllEquipMap.Values) foreach (EquipBase equip in this.AllEquipMap.Values)
{ {
if (equip.runStatus>LineRunStatus.Wait) if (equip.runStatus>LineRunStatus.Wait)
...@@ -804,7 +812,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -804,7 +812,9 @@ namespace OnlineStore.DeviceLibrary
default: break; default: break;
} }
SideWayTimerProcess(); SideWayTimerProcess();
ShuntTimerProcess();
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -898,9 +908,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -898,9 +908,9 @@ namespace OnlineStore.DeviceLibrary
WriteDrivetMotorRun(IO_VALUE.LOW); WriteDrivetMotorRun(IO_VALUE.LOW);
IOMove(IO_Type.SW4_MotorRun, IO_VALUE.LOW); IOMove(IO_Type.SW4_MotorRun, IO_VALUE.LOW);
IOMove(IO_Type.SW4_TopCylinder_Down, IO_VALUE.LOW); IOMove(IO_Type.SW4_TopCylinder_Down, IO_VALUE.LOW);
IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW); IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
SideWayStop(); SideWayStop();
ShuntStop();
} }
protected override void ResetProcess() protected override void ResetProcess()
...@@ -998,14 +1008,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -998,14 +1008,18 @@ namespace OnlineStore.DeviceLibrary
{ {
string msg = ""; string msg = "";
// int tLength = 20; // int tLength = 20;
msg += "横移41托盘： " + Sw41TrayNum + "\n"; //msg += "横移41托盘：" + Sw41TrayNum + "\n";
msg += "横移23托盘：" + Sw23TrayNum + "\n"; //msg += "横移23托盘：" + Sw23TrayNum + "\n";
msg += "runS： "+ runStatus + " "; msg += "状态： " + runStatus + "\t ";
msg += "lineS： "+ lineStatus + "\n"; msg += " " + lineStatus + "\n";
msg += "alarm： " + alarmType + "\n"; msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.SLog + "\n"; msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.SLog + "\n";
msg += "SW41： "+ SW41_MoveInfo.MoveType + " "+ SW41_MoveInfo.MoveStep + "\n"; msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + " " + SW41_MoveInfo.MoveStep + "\n";
msg += "SW23： " + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n"; msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n";
msg += "分流托盘： " + ShuntTrayNum + " (" + ShuntWaitTrayNum + ")\n";
msg += "分流横移： " + Shunt_MoveInfo.MoveType + " " + Shunt_MoveInfo.MoveStep + "\n";
return msg; return msg;
} }
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -466,58 +466,49 @@ namespace OnlineStore.DeviceLibrary ...@@ -466,58 +466,49 @@ namespace OnlineStore.DeviceLibrary
#region 分流横移处理 6000 开始 #region 分流横移处理 6000 开始
Shunt00_Wait = 6000,
/// <summary>
/// 阻挡气缸下降
/// </summary>
Shunt01_StopDown = 6001,
/// <summary>
/// 等待到托盘信号后，需要持续一段时间
/// </summary>
Shunt02_WaitCheckTime = 6002,
/// <summary>
/// 等待到托盘信号后，需要持续一段时间
/// </summary>
Shunt03_WaitTime = 6003,
/// <summary> /// <summary>
/// 等待轨道1夹具检测信号，等待横移3或横移1无托盘 /// 分流横移：等待Shunt_Check1_Front亮
/// </summary> /// </summary>
Shunt04_WaitCanUp = 6004, Shunt01_WaitTime = 6001,
/// <summary> /// <summary>
/// 定位气缸下降 /// 分流横移：托盘不需要横移，阻挡1下降1200,
/// </summary> /// </summary>
Shunt05_LocationDown = 6005, Shunt02_Stop1Down ,
/// <summary> /// <summary>
/// 横移轨道顶升气缸上升 /// 分流横移：等待检测1信号消失
/// </summary> /// </summary>
Shunt06_TopCylinderUp = 6006, Shunt03_WaitCheck1Low,
/// <summary> /// <summary>
/// 等待第二个横移没有托盘 /// 分流横移：阻挡1上升，升降1上升，等待升降2是否可上升
/// </summary> /// </summary>
Shunt07_WaitNoTray = 6007, Shunt05_Top1Up,
///// <summary>
///// 分流横移：等待升降2是否可上升
///// </summary>
//Shunt06_WaitUpdown2CanUp,
/// <summary> /// <summary>
/// 横移轨道点击转动 /// 分流横移：升降2开始上升
/// </summary> /// </summary>
Shunt08_DriveMotorMove = 6008, Shunt07_Top2Up,
/// <summary> /// <summary>
/// 收到横移轨道2夹具检测信号 /// 分流横移：两边皮带线开始转动
/// </summary> /// </summary>
Shunt09_WaitOutCheck = 6009, Shunt08_DriveMotorMove,
/// <summary> /// <summary>
/// 等待出口信号持续一段时间 /// 分流横移：等待检测2信号消失
/// </summary> /// </summary>
Shunt10_WatOutFixture2 = 6010, Shunt09_Top1Down,
/// <summary> /// <summary>
/// 停止横移轨道转动，横移轨道顶升气缸下降 /// 分流横移：升降1先下降，皮带1停止，等待检测4信号亮
/// </summary> /// </summary>
Shunt11_TopDown = 6011, Shunt10_WaitCheck,
/// <summary> /// <summary>
/// 等待托盘流出，上升阻挡气缸 /// 分流横移：升降2下降，皮带线停止
/// </summary> /// </summary>
Shunt12_WaitTrayGo = 6012, Shunt11_TopDown ,
#endregion #endregion
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -460,10 +460,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -460,10 +460,10 @@ namespace OnlineStore.LoadCSVLibrary
/// DI FL1托盘检测 FL_TrayCheck X171 /// DI FL1托盘检测 FL_TrayCheck X171
/// </summary> /// </summary>
public static string FL_TrayCheck = "FL_TrayCheck"; public static string FL_TrayCheck = "FL_TrayCheck";
/// <summary> ///// <summary>
/// DI FL1料盘检测1 FL_ReelCheck X172 ///// DI FL1料盘检测1 FL_ReelCheck X172
/// </summary> ///// </summary>
public static string FL_ReelCheck = "FL_ReelCheck"; //public static string FL_ReelCheck = "FL_ReelCheck";
/// <summary> /// <summary>
/// DI /DO FL1顶升上升端 FL_TopCylinder_Up X173 /// DI /DO FL1顶升上升端 FL_TopCylinder_Up X173
/// </summary> /// </summary>
...@@ -688,7 +688,61 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -688,7 +688,61 @@ namespace OnlineStore.LoadCSVLibrary
/// DO 0 皮带线2滚刷电机运行 DLine_Brush2 12 PRO_AOI_IP_2 0 皮带线2滚刷电机运行 Y033 Y033 /// DO 0 皮带线2滚刷电机运行 DLine_Brush2 12 PRO_AOI_IP_2 0 皮带线2滚刷电机运行 Y033 Y033
/// </summary> /// </summary>
public static string DLine_Brush2 = "DLine_Brush2"; public static string DLine_Brush2 = "DLine_Brush2";
#region 20200715 新增分流横移装置
/// <summary>
/// DI,1000,分流前端托盘检测,Shunt_Check1_Front,3,PRO_AOI_IP_28,0,分流前端托盘检测,X404,X404
/// </summary>
public static string Shunt_Check1_Front = "Shunt_Check1_Front";
/// <summary>
/// DI,1000, 分流中间托盘检测, Shunt_Check2_Middle,4, PRO_AOI_IP_28,0, 分流中间托盘检测, X405, X405
/// </summary>
public static string Shunt_Check2_Middle = "Shunt_Check2_Middle";
/// <summary>
/// DI,1000,分流后端托盘检测,Shunt_Check3_Back,5,PRO_AOI_IP_28,0,分流后端托盘检测,X406,X406
/// </summary>
public static string Shunt_Check3_Back = "Shunt_Check3_Back";
/// <summary>
///DI,1000, 分流后端阻挡托盘检测, Shunt_Check4_BStop,6, PRO_AOI_IP_28,0, 分流后端阻挡托盘检测, X407, X407
/// </summary>
public static string Shunt_Check4_BStop = "Shunt_Check4_BStop";
/// <summary>
/// DI,1000,分流横移机构1上升端,Shunt_TopCylinder_Up1,7,PRO_AOI_IP_28,0,分流横移机构1上升端,X408,X408
/// </summary>
public static string Shunt_TopCylinder_Up1 = "Shunt_TopCylinder_Up1";
/// <summary>
/// DI,1000, 分流横移机构1下降端, Shunt_TopCylinder_Down1,8, PRO_AOI_IP_28,0, 分流横移机构1下降端, X409, X409
/// </summary>
public static string Shunt_TopCylinder_Down1 = "Shunt_TopCylinder_Down1";
/// <summary>
/// DI,1000,分流横移机构2上升端,Shunt_TopCylinder_Up2,9,PRO_AOI_IP_28,0,分流横移机构2上升端,X410,X410
/// </summary>
public static string Shunt_TopCylinder_Up2 = "Shunt_TopCylinder_Up2";
/// <summary>
/// DI,1000, 分流横移机构2下降端, Shunt_TopCylinder_Down2,10, PRO_AOI_IP_28,0, 分流横移机构2下降端, X411, X411
/// </summary>
public static string Shunt_TopCylinder_Down2 = "Shunt_TopCylinder_Down2";
/// <summary>
/// DO,1000,分流前端阻挡下降SOL,Shunt_StopDown1_Front,5,PRO_AOI_IP_28,0,分流前端阻挡下降SOL,Y406,Y406
/// </summary>
public static string Shunt_StopDown1_Front = "Shunt_StopDown1_Front";
/// <summary>
/// DO,1000, 分流后端阻挡下降SOL, Shunt_StopDown2_Back,6, PRO_AOI_IP_28,0, 分流后端阻挡下降SOL, Y407, Y407
/// </summary>
public static string Shunt_StopDown2_Back = "Shunt_StopDown2_Back";
/// <summary>
/// DO,1000,分流横移机构1皮带运行,Shunt_MotorRun1,11,PRO_AOI_IP_28,0,分流横移机构1皮带运行,Y412,Y412
/// </summary>
public static string Shunt_MotorRun1 = "Shunt_MotorRun1";
/// <summary>
/// DO,1000, 分流横移机构2皮带运行, Shunt_MotorRun2,12, PRO_AOI_IP_28,0, 分流横移机构2皮带运行, Y413, Y413
/// </summary>
public static string Shunt_MotorRun2 = "Shunt_MotorRun2";
#endregion
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!