Skip to content

孙克 / RC30-AutoInOutStore

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

吸料改为夹紧气缸

1 个父辈 9a5953e1
内嵌 并排
正在显示 14 个修改的文件 包含 905 行增加 和 147 行删除
source/ACSingleStore/FrmIOStatus.Designer.cs
......@@ -140,9 +140,9 @@
// btnDisDoorClose
//
this.btnDisDoorClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDisDoorClose.Location = new System.Drawing.Point(294, 449);
this.btnDisDoorClose.Location = new System.Drawing.Point(297, 470);
this.btnDisDoorClose.Name = "btnDisDoorClose";
this.btnDisDoorClose.Size = new System.Drawing.Size(134, 34);
this.btnDisDoorClose.Size = new System.Drawing.Size(134, 52);
this.btnDisDoorClose.TabIndex = 268;
this.btnDisDoorClose.Text = "门禁功能打开";
this.btnDisDoorClose.UseVisualStyleBackColor = true;
......@@ -151,9 +151,9 @@
// btnDisDoorOpen
//
this.btnDisDoorOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDisDoorOpen.Location = new System.Drawing.Point(294, 412);
this.btnDisDoorOpen.Location = new System.Drawing.Point(297, 412);
this.btnDisDoorOpen.Name = "btnDisDoorOpen";
this.btnDisDoorOpen.Size = new System.Drawing.Size(134, 34);
this.btnDisDoorOpen.Size = new System.Drawing.Size(134, 52);
this.btnDisDoorOpen.TabIndex = 267;
this.btnDisDoorOpen.Text = "门禁功能屏蔽";
this.btnDisDoorOpen.UseVisualStyleBackColor = true;
......@@ -162,7 +162,7 @@
// button4
//
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(154, 449);
this.button4.Location = new System.Drawing.Point(154, 359);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(134, 34);
this.button4.TabIndex = 266;
......@@ -173,7 +173,7 @@
// button5
//
this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.Location = new System.Drawing.Point(154, 412);
this.button5.Location = new System.Drawing.Point(154, 322);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(134, 34);
this.button5.TabIndex = 265;
......@@ -206,11 +206,11 @@
// btnSXil
//
this.btnSXil.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSXil.Location = new System.Drawing.Point(13, 449);
this.btnSXil.Location = new System.Drawing.Point(13, 470);
this.btnSXil.Name = "btnSXil";
this.btnSXil.Size = new System.Drawing.Size(134, 34);
this.btnSXil.Size = new System.Drawing.Size(134, 52);
this.btnSXil.TabIndex = 262;
this.btnSXil.Text = "停止吸料";
this.btnSXil.Text = "夹爪放松";
this.btnSXil.UseVisualStyleBackColor = true;
this.btnSXil.Click += new System.EventHandler(this.btnSXil_Click);
//
......@@ -219,9 +219,9 @@
this.btnSXi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSXi.Location = new System.Drawing.Point(13, 412);
this.btnSXi.Name = "btnSXi";
this.btnSXi.Size = new System.Drawing.Size(134, 34);
this.btnSXi.Size = new System.Drawing.Size(134, 52);
this.btnSXi.TabIndex = 261;
this.btnSXi.Text = "开始吸料";
this.btnSXi.Text = "夹爪夹紧";
this.btnSXi.UseVisualStyleBackColor = true;
this.btnSXi.Click += new System.EventHandler(this.btnSXi_Click);
//
......@@ -250,22 +250,22 @@
// btnSuckingDiscDown
//
this.btnSuckingDiscDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSuckingDiscDown.Location = new System.Drawing.Point(154, 359);
this.btnSuckingDiscDown.Location = new System.Drawing.Point(154, 470);
this.btnSuckingDiscDown.Name = "btnSuckingDiscDown";
this.btnSuckingDiscDown.Size = new System.Drawing.Size(134, 34);
this.btnSuckingDiscDown.Size = new System.Drawing.Size(134, 52);
this.btnSuckingDiscDown.TabIndex = 258;
this.btnSuckingDiscDown.Text = "吸盘下降";
this.btnSuckingDiscDown.Text = "夹爪下降";
this.btnSuckingDiscDown.UseVisualStyleBackColor = true;
this.btnSuckingDiscDown.Click += new System.EventHandler(this.btnSuckingDiscDown_Click);
//
// btnSuckingDiscUp
//
this.btnSuckingDiscUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSuckingDiscUp.Location = new System.Drawing.Point(154, 322);
this.btnSuckingDiscUp.Location = new System.Drawing.Point(154, 412);
this.btnSuckingDiscUp.Name = "btnSuckingDiscUp";
this.btnSuckingDiscUp.Size = new System.Drawing.Size(134, 34);
this.btnSuckingDiscUp.Size = new System.Drawing.Size(134, 52);
this.btnSuckingDiscUp.TabIndex = 257;
this.btnSuckingDiscUp.Text = "吸盘上升";
this.btnSuckingDiscUp.Text = "夹爪上升";
this.btnSuckingDiscUp.UseVisualStyleBackColor = true;
this.btnSuckingDiscUp.Click += new System.EventHandler(this.btnSuckingDiscUp_Click);
//
......
source/ACSingleStore/FrmIOStatus.cs
......@@ -50,7 +50,7 @@ namespace OnlineStore.AutoInOutStore
foreach (ConfigIO ioValue in boxBean.Config.StoreDIList.Values)
{
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName,240);
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain), ioValue.ProName,240);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
DIControlList.Add(ioValue.ProName, control);
......@@ -62,7 +62,7 @@ namespace OnlineStore.AutoInOutStore
foreach (ConfigIO ioValue in boxBean.Config.StoreDOList.Values)
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName, 240);
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain), ioValue.ProName, 240);
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++;
DOControlList.Add(ioValue.ProName, control);
......@@ -295,12 +295,14 @@ namespace OnlineStore.AutoInOutStore
private void btnSXi_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.HIGH);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.HIGH);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Relax, IO_Type.Clamping_Work);
}
private void btnSXil_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax);
}
private void button3_Click(object sender, EventArgs e)
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -712,7 +712,7 @@
this.btnUpdateSpeed.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdateSpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateSpeed.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnUpdateSpeed.Location = new System.Drawing.Point(373, 152);
this.btnUpdateSpeed.Location = new System.Drawing.Point(373, 157);
this.btnUpdateSpeed.Name = "btnUpdateSpeed";
this.btnUpdateSpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdateSpeed.Size = new System.Drawing.Size(133, 33);
......@@ -727,7 +727,7 @@
this.btnUpdateStatus.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdateStatus.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateStatus.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnUpdateStatus.Location = new System.Drawing.Point(237, 152);
this.btnUpdateStatus.Location = new System.Drawing.Point(237, 157);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdateStatus.Size = new System.Drawing.Size(133, 33);
......@@ -738,7 +738,7 @@
//
// label24
//
this.label24.Location = new System.Drawing.Point(22, 370);
this.label24.Location = new System.Drawing.Point(22, 379);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(141, 17);
this.label24.TabIndex = 308;
......@@ -748,7 +748,7 @@
// label26
//
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(209, 370);
this.label26.Location = new System.Drawing.Point(209, 379);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(94, 17);
this.label26.TabIndex = 307;
......@@ -756,7 +756,7 @@
//
// btnReadLimit2
//
this.btnReadLimit2.Location = new System.Drawing.Point(404, 366);
this.btnReadLimit2.Location = new System.Drawing.Point(404, 375);
this.btnReadLimit2.Name = "btnReadLimit2";
this.btnReadLimit2.Size = new System.Drawing.Size(150, 33);
this.btnReadLimit2.TabIndex = 306;
......@@ -767,14 +767,14 @@
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(176, 367);
this.txtLimit2.Location = new System.Drawing.Point(176, 376);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 305;
//
// label22
//
this.label22.Location = new System.Drawing.Point(22, 338);
this.label22.Location = new System.Drawing.Point(22, 347);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(141, 17);
this.label22.TabIndex = 304;
......@@ -784,7 +784,7 @@
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(209, 338);
this.label23.Location = new System.Drawing.Point(209, 347);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(94, 17);
this.label23.TabIndex = 303;
......@@ -792,7 +792,7 @@
//
// btnReadLimit1
//
this.btnReadLimit1.Location = new System.Drawing.Point(404, 331);
this.btnReadLimit1.Location = new System.Drawing.Point(404, 340);
this.btnReadLimit1.Name = "btnReadLimit1";
this.btnReadLimit1.Size = new System.Drawing.Size(150, 33);
this.btnReadLimit1.TabIndex = 302;
......@@ -803,14 +803,14 @@
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(176, 335);
this.txtLimit1.Location = new System.Drawing.Point(176, 344);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 301;
//
// label6
//
this.label6.Location = new System.Drawing.Point(22, 306);
this.label6.Location = new System.Drawing.Point(22, 315);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(141, 17);
this.label6.TabIndex = 300;
......@@ -820,7 +820,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(209, 306);
this.label5.Location = new System.Drawing.Point(209, 315);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(94, 17);
this.label5.TabIndex = 299;
......@@ -828,7 +828,7 @@
//
// btnReadHomeSingle
//
this.btnReadHomeSingle.Location = new System.Drawing.Point(404, 297);
this.btnReadHomeSingle.Location = new System.Drawing.Point(404, 306);
this.btnReadHomeSingle.Name = "btnReadHomeSingle";
this.btnReadHomeSingle.Size = new System.Drawing.Size(150, 33);
this.btnReadHomeSingle.TabIndex = 298;
......@@ -839,7 +839,7 @@
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(176, 303);
this.txtHomeSingle.Location = new System.Drawing.Point(176, 312);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
......@@ -847,7 +847,7 @@
// chbAutoRead
//
this.chbAutoRead.AutoSize = true;
this.chbAutoRead.Location = new System.Drawing.Point(47, 167);
this.chbAutoRead.Location = new System.Drawing.Point(47, 172);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(99, 21);
this.chbAutoRead.TabIndex = 296;
......@@ -857,7 +857,7 @@
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(209, 274);
this.label16.Location = new System.Drawing.Point(209, 283);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(112, 17);
this.label16.TabIndex = 295;
......@@ -866,7 +866,7 @@
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(209, 242);
this.label15.Location = new System.Drawing.Point(209, 251);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(124, 17);
this.label15.TabIndex = 294;
......@@ -875,7 +875,7 @@
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(209, 210);
this.label14.Location = new System.Drawing.Point(209, 219);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(100, 17);
this.label14.TabIndex = 293;
......@@ -883,7 +883,7 @@
//
// label11
//
this.label11.Location = new System.Drawing.Point(22, 274);
this.label11.Location = new System.Drawing.Point(22, 283);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(141, 17);
this.label11.TabIndex = 292;
......@@ -893,14 +893,14 @@
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(176, 271);
this.txtHomeStatus.Location = new System.Drawing.Point(176, 280);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// button2
//
this.button2.Location = new System.Drawing.Point(404, 263);
this.button2.Location = new System.Drawing.Point(404, 272);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(150, 33);
this.button2.TabIndex = 290;
......@@ -910,7 +910,7 @@
//
// label10
//
this.label10.Location = new System.Drawing.Point(22, 242);
this.label10.Location = new System.Drawing.Point(22, 251);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(141, 17);
this.label10.TabIndex = 289;
......@@ -920,14 +920,14 @@
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(176, 239);
this.txtBusyStatus.Location = new System.Drawing.Point(176, 248);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// btnReadBusy
//
this.btnReadBusy.Location = new System.Drawing.Point(404, 230);
this.btnReadBusy.Location = new System.Drawing.Point(404, 239);
this.btnReadBusy.Name = "btnReadBusy";
this.btnReadBusy.Size = new System.Drawing.Size(150, 33);
this.btnReadBusy.TabIndex = 287;
......@@ -937,7 +937,7 @@
//
// label2
//
this.label2.Location = new System.Drawing.Point(22, 210);
this.label2.Location = new System.Drawing.Point(22, 219);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(141, 17);
this.label2.TabIndex = 286;
......@@ -947,14 +947,14 @@
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(176, 207);
this.txtAlarmStatus.Location = new System.Drawing.Point(176, 216);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
//
// btnGetAlarm
//
this.btnGetAlarm.Location = new System.Drawing.Point(404, 197);
this.btnGetAlarm.Location = new System.Drawing.Point(404, 206);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(150, 33);
this.btnGetAlarm.TabIndex = 284;
......@@ -967,7 +967,7 @@
this.lblServerOn.AutoSize = true;
this.lblServerOn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblServerOn.ForeColor = System.Drawing.Color.Red;
this.lblServerOn.Location = new System.Drawing.Point(522, 160);
this.lblServerOn.Location = new System.Drawing.Point(522, 165);
this.lblServerOn.Name = "lblServerOn";
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268;
......@@ -975,7 +975,7 @@
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(-1, 107);
this.label7.Location = new System.Drawing.Point(-1, 112);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(121, 17);
this.label7.TabIndex = 254;
......@@ -985,7 +985,7 @@
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(-1, 136);
this.label8.Location = new System.Drawing.Point(-1, 141);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(121, 17);
this.label8.TabIndex = 255;
......@@ -1013,7 +1013,7 @@
this.btnCloseAxis.Cursor = System.Windows.Forms.Cursors.Default;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(509, 50);
this.btnCloseAxis.Location = new System.Drawing.Point(509, 55);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(133, 33);
......@@ -1024,7 +1024,7 @@
//
// lblCountPulse
//
this.lblCountPulse.Location = new System.Drawing.Point(127, 131);
this.lblCountPulse.Location = new System.Drawing.Point(127, 136);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(87, 23);
......@@ -1037,7 +1037,7 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(280, 79);
this.txtASpeed.Location = new System.Drawing.Point(280, 84);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1047,7 +1047,7 @@
//
// lblOutPulse
//
this.lblOutPulse.Location = new System.Drawing.Point(127, 100);
this.lblOutPulse.Location = new System.Drawing.Point(127, 105);
this.lblOutPulse.Name = "lblOutPulse";
this.lblOutPulse.ReadOnly = true;
this.lblOutPulse.Size = new System.Drawing.Size(87, 23);
......@@ -1058,7 +1058,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(218, 80);
this.label47.Location = new System.Drawing.Point(218, 85);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17);
......@@ -1072,7 +1072,7 @@
this.btnAxisVMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(373, 50);
this.btnAxisVMove.Location = new System.Drawing.Point(373, 55);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(133, 33);
......@@ -1087,7 +1087,7 @@
this.btnAxisRMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(373, 84);
this.btnAxisRMove.Location = new System.Drawing.Point(373, 89);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(133, 33);
......@@ -1102,7 +1102,7 @@
this.btnAxisReturnHome.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(509, 118);
this.btnAxisReturnHome.Location = new System.Drawing.Point(509, 123);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(133, 33);
......@@ -1132,7 +1132,7 @@
this.Bt_ClearCounter.Cursor = System.Windows.Forms.Cursors.Default;
this.Bt_ClearCounter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Bt_ClearCounter.ForeColor = System.Drawing.SystemColors.ControlText;
this.Bt_ClearCounter.Location = new System.Drawing.Point(373, 118);
this.Bt_ClearCounter.Location = new System.Drawing.Point(373, 123);
this.Bt_ClearCounter.Name = "Bt_ClearCounter";
this.Bt_ClearCounter.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.Bt_ClearCounter.Size = new System.Drawing.Size(133, 33);
......@@ -1143,7 +1143,7 @@
//
// btnComAlarmClear
//
this.btnComAlarmClear.Location = new System.Drawing.Point(237, 118);
this.btnComAlarmClear.Location = new System.Drawing.Point(237, 123);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(133, 33);
this.btnComAlarmClear.TabIndex = 50;
......@@ -1157,7 +1157,7 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(280, 47);
this.txtAPosition.Location = new System.Drawing.Point(280, 52);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1170,7 +1170,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(218, 50);
this.label48.Location = new System.Drawing.Point(218, 55);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17);
......@@ -1184,7 +1184,7 @@
this.btnAxisStop.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(509, 84);
this.btnAxisStop.Location = new System.Drawing.Point(509, 89);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(133, 33);
......@@ -1196,7 +1196,7 @@
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(127, 73);
this.txtAxisValue.Location = new System.Drawing.Point(127, 78);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.Size = new System.Drawing.Size(87, 23);
......@@ -1206,7 +1206,7 @@
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(127, 46);
this.txtAxisDeviceName.Location = new System.Drawing.Point(127, 51);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.Size = new System.Drawing.Size(87, 23);
......@@ -1217,7 +1217,7 @@
//
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(-1, 49);
this.label45.Location = new System.Drawing.Point(-1, 54);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(121, 17);
this.label45.TabIndex = 240;
......@@ -1228,7 +1228,7 @@
//
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(-1, 78);
this.label46.Location = new System.Drawing.Point(-1, 83);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(121, 17);
this.label46.TabIndex = 239;
......@@ -1242,9 +1242,10 @@
this.cmbAxisList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxisList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxisList.FormattingEnabled = true;
this.cmbAxisList.ItemHeight = 22;
this.cmbAxisList.Location = new System.Drawing.Point(127, 18);
this.cmbAxisList.Name = "cmbAxisList";
this.cmbAxisList.Size = new System.Drawing.Size(220, 24);
this.cmbAxisList.Size = new System.Drawing.Size(220, 28);
this.cmbAxisList.TabIndex = 234;
this.cmbAxisList.ValueMember = "ProName";
this.cmbAxisList.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbAxisList_DrawItem);
......@@ -2620,43 +2621,43 @@
// 轴卡点动ToolStripMenuItem
//
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(157, 6);
//
// 摄像机调试ToolStripMenuItem
//
this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.摄像机调试ToolStripMenuItem.Text = "二维码学习";
this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(157, 6);
//
// 出入库调试ToolStripMenuItem
//
this.出入库调试ToolStripMenuItem.Name = "出入库调试ToolStripMenuItem";
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.出入库调试ToolStripMenuItem.Text = "启用调试";
this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click);
//
......@@ -2673,19 +2674,19 @@
// 清理日志ToolStripMenuItem
//
this.清理日志ToolStripMenuItem.Name = "清理日志ToolStripMenuItem";
this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.清理日志ToolStripMenuItem.Text = "中文";
this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(109, 6);
//
// 英文ToolStripMenuItem
//
this.英文ToolStripMenuItem.Name = "英文ToolStripMenuItem";
this.英文ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.英文ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.英文ToolStripMenuItem.Text = "英文";
this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
//
......
source/ACSingleStore/Properties/Resource.en-US.resx
......@@ -800,10 +800,10 @@
<value>Portal descent position</value>
</data>
<data name="X07" xml:space="preserve">
<value>Chuck cylinder ascent position</value>
<value>Clamping jaw ascent position</value>
</data>
<data name="X08" xml:space="preserve">
<value>Chuck cylinder descent position</value>
<value>Clamping jaw descent position</value>
</data>
<data name="X09" xml:space="preserve">
<value>Reel width detection1</value>
......@@ -860,10 +860,10 @@
<value>Portal descent SOL</value>
</data>
<data name="Y11" xml:space="preserve">
<value>Chuck cylinder ascent SOL</value>
<value>Clamping jaw ascent SOL</value>
</data>
<data name="Y12" xml:space="preserve">
<value>Chuck cylinder descent SOL</value>
<value>Clamping jaw descent SOL</value>
</data>
<data name="Y13" xml:space="preserve">
<value>Doorlock cylinder open SOL</value>
......@@ -884,10 +884,10 @@
<value>Pressure detection</value>
</data>
<data name="X23" xml:space="preserve">
<value>Confirm sucker pressure signal</value>
<value>left door limit</value>
</data>
<data name="X24" xml:space="preserve">
<value>door limit</value>
<value>right door limit</value>
</data>
<data name="Batch_Axis" xml:space="preserve">
<value>(Axis 5) Batch loading axis</value>
......@@ -1127,10 +1127,10 @@
<value>Start operation ON</value>
</data>
<data name="FrmIOStatus_btnSXil_Text" xml:space="preserve">
<value>Stop grip material</value>
<value>The Clamping jaw relax</value>
</data>
<data name="FrmIOStatus_btnSXi_Text" xml:space="preserve">
<value>Start grip material</value>
<value>The Clamping jaw clamping</value>
</data>
<data name="FrmIOStatus_btnDClose_Text" xml:space="preserve">
<value>Door lock close</value>
......@@ -1139,10 +1139,10 @@
<value>Door lock open</value>
</data>
<data name="FrmIOStatus_btnSuckingDiscDown_Text" xml:space="preserve">
<value>Sucker descent</value>
<value>Clamping jaw descent</value>
</data>
<data name="FrmIOStatus_btnSuckingDiscUp_Text" xml:space="preserve">
<value>Sucker ascent</value>
<value>Clamping jaw ascent</value>
</data>
<data name="PreConnectFail" xml:space="preserve">
<value>Startup failure: compression shaft connection failed</value>
......@@ -1246,4 +1246,16 @@
<data name="NoCodeMsg" xml:space="preserve">
<value>If the qr code is not scanned, please put it back into the material tray</value>
</data>
<data name="X29" xml:space="preserve">
<value>Clamping end of cylinder clamping jaw</value>
</data>
<data name="X30" xml:space="preserve">
<value>Loosen end of gripper cylinder</value>
</data>
<data name="Y21" xml:space="preserve">
<value>Clamping jaw cylinder clamping SOL</value>
</data>
<data name="Y22" xml:space="preserve">
<value>Loosen the clamping cylinder SOL</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
......@@ -670,7 +670,7 @@
<value>料仓运转ON</value>
</data>
<data name="FrmStoreBox_显示ToolStripMenuItem_Text" xml:space="preserve">
<value>显示(&amp;S)</value>
<value>显示</value>
</data>
<data name="FrmStoreBox_查看IOToolStripMenuItem_Text" xml:space="preserve">
<value>查看IO</value>
......@@ -796,10 +796,10 @@
<value>进料口门下降端</value>
</data>
<data name="X07" xml:space="preserve">
<value>吸盘气缸上升端</value>
<value>夹爪气缸上升端</value>
</data>
<data name="X08" xml:space="preserve">
<value>吸盘气缸下降端</value>
<value>夹爪气缸下降端</value>
</data>
<data name="X09" xml:space="preserve">
<value>料盘宽度检测1</value>
......@@ -856,10 +856,10 @@
<value>进料口门下降SOL</value>
</data>
<data name="Y11" xml:space="preserve">
<value>吸盘气缸上升SOL</value>
<value>夹爪气缸上升SOL</value>
</data>
<data name="Y12" xml:space="preserve">
<value>吸盘气缸下降SOL</value>
<value>夹爪气缸下降SOL</value>
</data>
<data name="Y13" xml:space="preserve">
<value>门锁气缸打开SOL</value>
......@@ -880,10 +880,10 @@
<value>气压检测</value>
</data>
<data name="X23" xml:space="preserve">
<value>吸盘压力确认信号</value>
<value>左侧门关闭</value>
</data>
<data name="X24" xml:space="preserve">
<value>左侧门关闭</value>
<value />
</data>
<data name="Batch_Axis" xml:space="preserve">
<value>(轴五）批量上下料轴</value>
......@@ -1126,10 +1126,10 @@
<value>打开运转ON</value>
</data>
<data name="FrmIOStatus_btnSXil_Text" xml:space="preserve">
<value>停止吸料</value>
<value>夹爪放松</value>
</data>
<data name="FrmIOStatus_btnSXi_Text" xml:space="preserve">
<value>开始吸料</value>
<value>夹爪夹紧</value>
</data>
<data name="FrmIOStatus_btnDClose_Text" xml:space="preserve">
<value>门锁关闭</value>
......@@ -1138,10 +1138,10 @@
<value>门锁打开</value>
</data>
<data name="FrmIOStatus_btnSuckingDiscDown_Text" xml:space="preserve">
<value>吸盘下降</value>
<value>夹爪下降</value>
</data>
<data name="FrmIOStatus_btnSuckingDiscUp_Text" xml:space="preserve">
<value>吸盘上升</value>
<value>夹爪上升</value>
</data>
<data name="PreConnectFail" xml:space="preserve">
<value>启动失败：压紧轴连接失败</value>
......@@ -1195,10 +1195,10 @@
<value>门锁气缸关闭端2</value>
</data>
<data name="X27" xml:space="preserve">
<value>批量轴极限信号</value>
<value>上料机构上极限</value>
</data>
<data name="X28" xml:space="preserve">
<value>仓门料盘检测信号</value>
<value>入料口料盘检测</value>
</data>
<data name="FrmIOStatus_radioButton2_Text" xml:space="preserve">
<value>关闭</value>
......@@ -1245,4 +1245,16 @@
<data name="NoCodeMsg" xml:space="preserve">
<value>未扫到二维码，请重新放入料盘</value>
</data>
<data name="X29" xml:space="preserve">
<value>夹爪气缸夹紧端</value>
</data>
<data name="X30" xml:space="preserve">
<value>夹爪气缸放松端</value>
</data>
<data name="Y21" xml:space="preserve">
<value>夹爪气缸夹紧SOL</value>
</data>
<data name="Y22" xml:space="preserve">
<value>夹爪气缸放松SOL</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs 0 → 100644
namespace OnlineStore.ACSingleStore
{
partial class FrmPositionTool
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows 窗体设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtPortName = new System.Windows.Forms.TextBox();
this.txtIOIndex = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.txtIoIp = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.txtActualPosition = new System.Windows.Forms.TextBox();
this.btnGetActualPosition = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.txtTargetPosition = new System.Windows.Forms.TextBox();
this.btnServoOff = new System.Windows.Forms.Button();
this.btnServoOn = new System.Windows.Forms.Button();
this.btnSdStop = new System.Windows.Forms.Button();
this.btnHomeMove = new System.Windows.Forms.Button();
this.btnClear = new System.Windows.Forms.Button();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.txtAddr = new System.Windows.Forms.TextBox();
this.label18 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.txtPosition = new System.Windows.Forms.TextBox();
this.btnAbsMove = new System.Windows.Forms.Button();
this.label8 = new System.Windows.Forms.Label();
this.txtSpeed = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox6.SuspendLayout();
this.SuspendLayout();
//
// groupBox6
//
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.textBox1);
this.groupBox6.Controls.Add(this.label3);
this.groupBox6.Controls.Add(this.txtPortName);
this.groupBox6.Controls.Add(this.txtIOIndex);
this.groupBox6.Controls.Add(this.label2);
this.groupBox6.Controls.Add(this.txtIoIp);
this.groupBox6.Controls.Add(this.label1);
this.groupBox6.Controls.Add(this.label7);
this.groupBox6.Controls.Add(this.txtActualPosition);
this.groupBox6.Controls.Add(this.btnGetActualPosition);
this.groupBox6.Controls.Add(this.label6);
this.groupBox6.Controls.Add(this.txtTargetPosition);
this.groupBox6.Controls.Add(this.btnServoOff);
this.groupBox6.Controls.Add(this.btnServoOn);
this.groupBox6.Controls.Add(this.btnSdStop);
this.groupBox6.Controls.Add(this.btnHomeMove);
this.groupBox6.Controls.Add(this.btnClear);
this.groupBox6.Controls.Add(this.richTextBox1);
this.groupBox6.Controls.Add(this.txtAddr);
this.groupBox6.Controls.Add(this.label18);
this.groupBox6.Controls.Add(this.label13);
this.groupBox6.Controls.Add(this.txtPosition);
this.groupBox6.Controls.Add(this.btnAbsMove);
this.groupBox6.Controls.Add(this.label8);
this.groupBox6.Controls.Add(this.txtSpeed);
this.groupBox6.Controls.Add(this.label12);
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(14, 10);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(994, 646);
this.groupBox6.TabIndex = 250;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "伺服运动测试";
//
// textBox1
//
this.textBox1.Enabled = false;
this.textBox1.Location = new System.Drawing.Point(132, 185);
this.textBox1.MaxLength = 30;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(131, 26);
this.textBox1.TabIndex = 278;
this.textBox1.Text = "position.csv";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(14, 188);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(107, 20);
this.label3.TabIndex = 277;
this.label3.Text = "保存文件名称：";
//
// txtPortName
//
this.txtPortName.Enabled = false;
this.txtPortName.Location = new System.Drawing.Point(132, 41);
this.txtPortName.MaxLength = 30;
this.txtPortName.Name = "txtPortName";
this.txtPortName.Size = new System.Drawing.Size(131, 26);
this.txtPortName.TabIndex = 276;
this.txtPortName.Text = "COM1";
//
// txtIOIndex
//
this.txtIOIndex.Enabled = false;
this.txtIOIndex.Location = new System.Drawing.Point(132, 149);
this.txtIOIndex.MaxLength = 30;
this.txtIOIndex.Name = "txtIOIndex";
this.txtIOIndex.Size = new System.Drawing.Size(131, 26);
this.txtIOIndex.TabIndex = 275;
this.txtIOIndex.Text = "1";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(14, 152);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(107, 20);
this.label2.TabIndex = 274;
this.label2.Text = "检测信号地址：";
//
// txtIoIp
//
this.txtIoIp.Enabled = false;
this.txtIoIp.Location = new System.Drawing.Point(132, 113);
this.txtIoIp.MaxLength = 30;
this.txtIoIp.Name = "txtIoIp";
this.txtIoIp.Size = new System.Drawing.Size(131, 26);
this.txtIoIp.TabIndex = 273;
this.txtIoIp.Text = "192.168.201.11";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(42, 116);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(79, 20);
this.label1.TabIndex = 272;
this.label1.Text = "IO模块IP：";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(42, 366);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(79, 20);
this.label7.TabIndex = 271;
this.label7.Text = "实际位置：";
//
// txtActualPosition
//
this.txtActualPosition.Enabled = false;
this.txtActualPosition.Location = new System.Drawing.Point(132, 363);
this.txtActualPosition.MaxLength = 30;
this.txtActualPosition.Name = "txtActualPosition";
this.txtActualPosition.Size = new System.Drawing.Size(131, 26);
this.txtActualPosition.TabIndex = 270;
//
// btnGetActualPosition
//
this.btnGetActualPosition.Location = new System.Drawing.Point(284, 345);
this.btnGetActualPosition.Name = "btnGetActualPosition";
this.btnGetActualPosition.Size = new System.Drawing.Size(111, 36);
this.btnGetActualPosition.TabIndex = 269;
this.btnGetActualPosition.Text = "读取位置";
this.btnGetActualPosition.UseVisualStyleBackColor = true;
this.btnGetActualPosition.Click += new System.EventHandler(this.btnGetActualPosition_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(42, 332);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(79, 20);
this.label6.TabIndex = 268;
this.label6.Text = "目标位置：";
//
// txtTargetPosition
//
this.txtTargetPosition.Enabled = false;
this.txtTargetPosition.Location = new System.Drawing.Point(132, 329);
this.txtTargetPosition.MaxLength = 30;
this.txtTargetPosition.Name = "txtTargetPosition";
this.txtTargetPosition.Size = new System.Drawing.Size(131, 26);
this.txtTargetPosition.TabIndex = 267;
//
// btnServoOff
//
this.btnServoOff.Location = new System.Drawing.Point(284, 80);
this.btnServoOff.Name = "btnServoOff";
this.btnServoOff.Size = new System.Drawing.Size(111, 36);
this.btnServoOff.TabIndex = 259;
this.btnServoOff.Text = "关闭伺服";
this.btnServoOff.UseVisualStyleBackColor = true;
this.btnServoOff.Click += new System.EventHandler(this.btnServoOff_Click);
//
// btnServoOn
//
this.btnServoOn.Location = new System.Drawing.Point(284, 41);
this.btnServoOn.Name = "btnServoOn";
this.btnServoOn.Size = new System.Drawing.Size(111, 36);
this.btnServoOn.TabIndex = 258;
this.btnServoOn.Text = "打开伺服";
this.btnServoOn.UseVisualStyleBackColor = true;
this.btnServoOn.Click += new System.EventHandler(this.btnServoOn_Click);
//
// btnSdStop
//
this.btnSdStop.Location = new System.Drawing.Point(284, 271);
this.btnSdStop.Name = "btnSdStop";
this.btnSdStop.Size = new System.Drawing.Size(111, 36);
this.btnSdStop.TabIndex = 257;
this.btnSdStop.Text = "停止";
this.btnSdStop.UseVisualStyleBackColor = true;
this.btnSdStop.Click += new System.EventHandler(this.btnSdStop_Click);
//
// btnHomeMove
//
this.btnHomeMove.Location = new System.Drawing.Point(284, 129);
this.btnHomeMove.Name = "btnHomeMove";
this.btnHomeMove.Size = new System.Drawing.Size(111, 36);
this.btnHomeMove.TabIndex = 110;
this.btnHomeMove.Text = "原点返回";
this.btnHomeMove.UseVisualStyleBackColor = true;
this.btnHomeMove.Click += new System.EventHandler(this.btnHomeMove_Click);
//
// btnClear
//
this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClear.Location = new System.Drawing.Point(867, 607);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 32);
this.btnClear.TabIndex = 106;
this.btnClear.Text = "清理";
this.btnClear.UseVisualStyleBackColor = true;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// richTextBox1
//
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Location = new System.Drawing.Point(423, 20);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(565, 581);
this.richTextBox1.TabIndex = 105;
this.richTextBox1.Text = "";
//
// txtAddr
//
this.txtAddr.Enabled = false;
this.txtAddr.Location = new System.Drawing.Point(132, 77);
this.txtAddr.MaxLength = 30;
this.txtAddr.Name = "txtAddr";
this.txtAddr.Size = new System.Drawing.Size(131, 26);
this.txtAddr.TabIndex = 95;
this.txtAddr.Text = "1";
//
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(70, 80);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(51, 20);
this.label18.TabIndex = 94;
this.label18.Text = "地址：";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(70, 279);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(51, 20);
this.label13.TabIndex = 90;
this.label13.Text = "位置：";
//
// txtPosition
//
this.txtPosition.Location = new System.Drawing.Point(132, 276);
this.txtPosition.MaxLength = 30;
this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(131, 26);
this.txtPosition.TabIndex = 89;
this.txtPosition.Text = "5000";
//
// btnAbsMove
//
this.btnAbsMove.Location = new System.Drawing.Point(284, 233);
this.btnAbsMove.Name = "btnAbsMove";
this.btnAbsMove.Size = new System.Drawing.Size(111, 36);
this.btnAbsMove.TabIndex = 88;
this.btnAbsMove.Text = "开始运动";
this.btnAbsMove.UseVisualStyleBackColor = true;
this.btnAbsMove.Click += new System.EventHandler(this.btnAbsMove_Click);
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(70, 241);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(51, 20);
this.label8.TabIndex = 84;
this.label8.Text = "速度：";
//
// txtSpeed
//
this.txtSpeed.Location = new System.Drawing.Point(132, 238);
this.txtSpeed.MaxLength = 30;
this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(131, 26);
this.txtSpeed.TabIndex = 83;
this.txtSpeed.Text = "20";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(56, 44);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(65, 20);
this.label12.TabIndex = 1;
this.label12.Text = "端口号：";
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// FrmPositionTool
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1020, 668);
this.Controls.Add(this.groupBox6);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "FrmPositionTool";
this.Text = "升降轴位置测试";
this.Load += new System.EventHandler(this.Form1_Load);
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.TextBox txtAddr;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.TextBox txtPosition;
private System.Windows.Forms.Button btnAbsMove;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox txtSpeed;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.Button btnHomeMove;
private System.Windows.Forms.Button btnSdStop;
private System.Windows.Forms.Button btnServoOff;
private System.Windows.Forms.Button btnServoOn;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtTargetPosition;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtActualPosition;
private System.Windows.Forms.Button btnGetActualPosition;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.TextBox txtIOIndex;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtIoIp;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtPortName;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label3;
}
}
source/ACSingleStore/positionTool/FrmPositionTool.cs 0 → 100644

using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO.Ports;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.ACSingleStore
{
public partial class FrmPositionTool : Form
{
private string PortName = "";
private int SlvAddr = 0;
private string IoIp = "";
private int IoIndex = 0;
private System.Timers.Timer toolTimer = new System.Timers.Timer();
public FrmPositionTool(string protName, int slvAddr,string ioIp, int ioIndex)
{
InitializeComponent();
this.PortName = protName;
this.SlvAddr = slvAddr;
this.IoIp = ioIp;
this.IoIndex = ioIndex;
toolTimer.Enabled = false;
toolTimer.Interval = 300;
toolTimer.AutoReset = true;
toolTimer.Elapsed += ToolTimer_Elapsed;
}
private void Form1_Load(object sender, EventArgs e)
{
ACServerManager.IsShowMsg = true;
LogUtil.logBox = this.richTextBox1;
//ACServerManager.richeBox = this.richTextBox1;
formStatus(false);
CheckForIllegalCrossThreadCalls = false;
txtPortName.Text = PortName;
txtAddr.Text = SlvAddr.ToString();
txtIOIndex .Text= IoIndex.ToString();
txtIoIp.Text = IoIp.ToString();
}
private void btnServoOn_Click(object sender, EventArgs e)
{
this.PortName = txtPortName.Text;
this.SlvAddr = FormUtil.GetIntValue(txtAddr);
bool result = ACServerManager.OpenPort(PortName);
if (!result)
{
MessageBox.Show("打开串口失败！");
return;
}
formStatus(true);
ACServerManager.InitSlvAddr(PortName, SlvAddr);
Thread.Sleep(100);
ACServerManager.AlarmClear(PortName, SlvAddr);
ACServerManager.ServoOn(PortName, SlvAddr);
}
private void btnServoOff_Click(object sender, EventArgs e)
{
toolTimer.Stop();
ACServerManager.SuddenStop(PortName, SlvAddr);
Thread.Sleep(100);
ACServerManager.ServoOff(PortName, SlvAddr);
}
private void formStatus(bool p)
{
txtPortName.Enabled = !p;
txtAddr.Enabled = !p;
txtIOIndex.Enabled = !p;
txtIoIp.Enabled = !p;
btnAbsMove.Enabled = p;
btnSdStop.Enabled = p;
btnHomeMove.Enabled = p;
timer1.Enabled = p;
btnServoOff.Enabled = p;
btnServoOn.Enabled = !p;
btnGetActualPosition.Enabled = p;
}
private void btnClear_Click(object sender, EventArgs e)
{
this.richTextBox1.Text = "";
}
private void btnRelMove_Click(object sender, EventArgs e)
{
int position = Convert.ToInt32(txtPosition.Text);
ACServerManager.RelMove(PortName, SlvAddr, position);
}
private void btnHomeMove_Click(object sender, EventArgs e)
{
int speed = Convert.ToInt32(txtSpeed.Text);
ACServerManager.HomeMove(PortName, SlvAddr, speed);
}
private void btnSpeedMove_Click(object sender, EventArgs e)
{
int speed = Convert.ToInt32(txtSpeed.Text);
ACServerManager.SpeedMove(PortName, SlvAddr, speed);
}
private int TargetPostion = 0;
private void btnAbsMove_Click(object sender, EventArgs e)
{
int speed = Convert.ToInt32(txtSpeed.Text);
int position = Convert.ToInt32(txtPosition.Text.Trim(), 10);
TargetPostion = position;
if (speed<=(0))
{
MessageBox.Show("请输入正确的速度");
txtSpeed.Focus();
return;
}
toolTimer.Start();
ACServerManager.AbsMove(PortName, SlvAddr, position);
}
private void btnSdStop_Click(object sender, EventArgs e)
{
toolTimer.Stop();
ACServerManager.SuddenStop(PortName, SlvAddr);
}
private void btnGetActualPosition_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetTargetPosition(PortName, SlvAddr);
txtTargetPosition.Text = value.ToString();
value = ACServerManager.GetActualtPosition(PortName, SlvAddr);
txtActualPosition.Text = value.ToString();
}
private bool isInProcesss = false;
private void ToolTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
}
private int getDataIndex = 0;
private void timer1_Tick(object sender, EventArgs e)
{
try
{
getDataIndex++;
}
catch (Exception ex)
{
}
try
{
}
catch (Exception ex)
{
}
}
}
}
source/ACSingleStore/positionTool/FrmPositionTool.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
source/ACSingleStore/记录.txt
......@@ -223,4 +223,4 @@ DI9 不要，只判断DI10
压紧轴改为伺服，压紧轴计量检测信号去掉。
IO配置修改，改为新的IO配置。
吸盘改为夹爪，代码逻辑修改。
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -206,7 +206,9 @@ namespace OnlineStore.DeviceLibrary
{
runTimeWatch.Restart();
LogUtil.info(LOGGER, StoreName + "开始启动，启动时间：" + DateTime.Now.ToLongTimeString());
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax, null);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
//if (IsHasCompress_Axis)
//{
// if (ShuoKeControls.isRun == false && (!StoreManager.OpenShuoKe(this)))
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -168,16 +168,16 @@ namespace OnlineStore.DeviceLibrary
{
timeOutMs = 650000;
}
if (!wait.IsEnd && span.TotalSeconds > 2 && wait.IoType.Equals(IO_Type.SuckingDisc_Air))
{
string ioType = IO_Type.SuckingDisc_Work;
IO_VALUE doValue = IOManager.DOValue(ioType);
if (!doValue.Equals(wait.IoValue))
{
LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + ioType + "=" + wait.IoValue + "）");
IOManager.IOMove(ioType, wait.IoValue);
}
}
//if (!wait.IsEnd && span.TotalSeconds > 2 && wait.IoType.Equals(IO_Type.SuckingDisc_Air))
//{
// string ioType = IO_Type.SuckingDisc_Work;
// IO_VALUE doValue = IOManager.DOValue(ioType);
// if (!doValue.Equals(wait.IoValue))
// {
// LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + ioType + "=" + wait.IoValue + "）");
// IOManager.IOMove(ioType, wait.IoValue);
// }
//}
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
{
ConfigIO io = Config.getWaitIO(wait.IoType);
......@@ -410,9 +410,11 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库：SI_05 等待吸盘放下物品");
StoreMove.NextMoveStep(StoreMoveStep.SI_05_DoorWarToDevice);
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.LOW));
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax, StoreMove);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_05_DoorWarToDevice)
{
......@@ -581,6 +583,7 @@ namespace OnlineStore.DeviceLibrary
if (IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH))
{
InStoreLog("送出料盘：SI_13 叉子从库位返回，进出轴到P1(待机点) ");
CodeOrInoutMsg = "";
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中，装置还未恢复原始状态)
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = "";
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
......@@ -141,7 +141,8 @@ namespace OnlineStore.DeviceLibrary
public static void StopRun()
{
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax, null);
ClearInStoreInfo();
ClearOutStoreInfo();
}
......@@ -150,7 +151,8 @@ namespace OnlineStore.DeviceLibrary
BatchAxisController.StopCheck();
StoreMove.EndMove();
ClearInStoreInfo();
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax, null);
CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, false);
BatchDoorClose(false);
}
......@@ -213,7 +215,8 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.AUTO_R01_CloseDoor);
//关闭门，轴回原点，检测
BatchDoorClose(true);
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
AutomaticBaiting.CylinderMove(IO_Type.Clamping_Work, IO_Type.Clamping_Relax, StoreMove);
CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, true);
LogUtil.info(Name + "复位中：关闭门锁");
break;
......@@ -360,12 +363,14 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I05_SuckingDisc_Work))
{
if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
// if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
if (IOManager.IOValue(IO_Type.Clamping_Work).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.Clamping_Relax).Equals(IO_VALUE.LOW))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I06_SuckingDisc_Up);
LogUtil.info(Name + "入料: 吸盘上升");
CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, false );
CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, false);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ClampingDisc_Down, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1500));
......@@ -385,7 +390,8 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I06_SuckingDisc_Up))
{
if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
if (IOManager.IOValue(IO_Type.Clamping_Work).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.Clamping_Relax).Equals(IO_VALUE.LOW))
// if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I07_BatchAxisUp);
LogUtil.info(Name + "入料: 批量轴匀速上升【" + StoreManager.Config.BatchAxis_SlowSpeed + "】");
......@@ -416,7 +422,8 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I07_BatchAxisUp))
{
if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
// if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
if (IOManager.IOValue(IO_Type.Clamping_Work).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.Clamping_Relax).Equals(IO_VALUE.LOW))
{
TimeSpan span = DateTime.Now - StoreMove.LastSetpTime;
......@@ -480,7 +487,9 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I09_WaitTrayLeave);
LogUtil.info(Name + "入料: 开始入库【" + LastPosId + "】，等待料盘拿走");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.LOW));
//StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Clamping_Relax, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Clamping_Work, IO_VALUE.LOW));
}
else
{
......@@ -591,13 +600,15 @@ namespace OnlineStore.DeviceLibrary
private static void SuckingDiscWork()
{
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I05_SuckingDisc_Work);
SuckingDisc_WorkCount++;
LogUtil.info(Name + "入料: 吸盘开始第" + SuckingDisc_WorkCount + "次工作");
IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.HIGH);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(500));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.HIGH));
// IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.HIGH);
// StoreMove.WaitList.Add(WaitResultInfo.WaitTime(500));
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.HIGH));
CylinderMove(IO_Type.Clamping_Relax, IO_Type.Clamping_Work, StoreMove);
StoreMove.OneWaitCanEndStep = true;
}
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
......@@ -131,16 +131,17 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("等待[" + wait.ToStr() + "]，重写气缸DO（" + ioType + "=" + ioValue + "）");
IOManager.IOMove(ioType, ioValue);
}
}else if (wait.IoType.Equals(IO_Type.SuckingDisc_Air))
{
string ioType = IO_Type.SuckingDisc_Work;
IO_VALUE doValue = IOManager.DOValue(ioType);
if (!doValue.Equals(wait.IoValue))
{
LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + ioType + "=" + wait.IoValue + "）");
IOManager.IOMove(ioType, wait.IoValue);
}
}
//else if (wait.IoType.Equals(IO_Type.SuckingDisc_Air))
//{
// string ioType = IO_Type.SuckingDisc_Work;
// IO_VALUE doValue = IOManager.DOValue(ioType);
// if (!doValue.Equals(wait.IoValue))
// {
// LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + ioType + "=" + wait.IoValue + "）");
// IOManager.IOMove(ioType, wait.IoValue);
// }
//}
}
}
else if (wait.WaitType == (int)Wait_Type.Time_3)
......@@ -712,5 +713,16 @@ namespace OnlineStore.DeviceLibrary
}
return "";
}
public static void CylinderMove( string IoLowType, string IoHighType,StoreMoveInfo moveInfo=null)
{
IOManager.IOMove(IoLowType, IO_VALUE.LOW);
IOManager.IOMove(IoHighType, IO_VALUE.HIGH);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
}
}
}
}
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
......@@ -122,11 +122,11 @@ namespace OnlineStore.LoadCSVLibrary
//public static string DoorColse_Single = "DoorColse_Single";
/// <summary>
/// 吸盘气缸上升端 SuckingDisc_Up X07 DI-07
/// 抓取气缸上升端 SuckingDisc_Up X07 DI-07
/// </summary>
public static string ClampingDisc_Up = "SuckingDisc_Up";
/// <summary>
/// 吸盘气缸下降端 SuckingDisc_Down X08 DI-08
/// 抓取气缸下降端 SuckingDisc_Down X08 DI-08
/// </summary>
public static string ClampingDisc_Down = "SuckingDisc_Down";
/// <summary>
......@@ -229,13 +229,13 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
public static string Clamping_Relax = "Clamping_Relax";
/// <summary>
/// 吸盘压力确认信号 SuckingDisc_Air 202 192.168.200.11 0 吸盘压力确认信号 X19 DI-23
/// </summary>
public static string SuckingDisc_Air = "SuckingDisc_Air";
/// <summary>
/// DO 吸盘吸料SOL SuckingDisc_Work 107 192.168.200.10 0 吸盘吸料SOL Y08 DO-08
/// </summary>
public static string SuckingDisc_Work = "SuckingDisc_Work";
///// <summary>
///// 吸盘压力确认信号 SuckingDisc_Air 202 192.168.200.11 0 吸盘压力确认信号 X19 DI-23
///// </summary>
//public static string SuckingDisc_Air = "SuckingDisc_Air";
///// <summary>
///// DO 吸盘吸料SOL SuckingDisc_Work 107 192.168.200.10 0 吸盘吸料SOL Y08 DO-08
///// </summary>
//public static string SuckingDisc_Work = "SuckingDisc_Work";
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!