Commit b9302332 LN

删除不需要代码及中英文

1 个父辈 cd5b2e02
......@@ -26,8 +26,6 @@
this.btnDisDoorOpen = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.btnSXil = new System.Windows.Forms.Button();
this.btnSXi = new System.Windows.Forms.Button();
this.btnDClose = new System.Windows.Forms.Button();
......@@ -36,26 +34,20 @@
this.btnSuckingDiscUp = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.txtSlaveId = new System.Windows.Forms.TextBox();
this.btnOpenLed = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.btnCloseAxisBreak = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label();
this.btnReadIO = new System.Windows.Forms.Button();
this.btnOpenAxisBreak = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.btnReadAllDi = new System.Windows.Forms.Button();
this.btnReadAllDo = new System.Windows.Forms.Button();
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnOpenDoor = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.chbAutoRead = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox3 = new System.Windows.Forms.GroupBox();
......@@ -83,8 +75,6 @@
this.groupBox1.Controls.Add(this.btnDisDoorOpen);
this.groupBox1.Controls.Add(this.button4);
this.groupBox1.Controls.Add(this.button5);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button3);
this.groupBox1.Controls.Add(this.btnSXil);
this.groupBox1.Controls.Add(this.btnSXi);
this.groupBox1.Controls.Add(this.btnDClose);
......@@ -93,21 +83,16 @@
this.groupBox1.Controls.Add(this.btnSuckingDiscUp);
this.groupBox1.Controls.Add(this.btnCloseLed);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.btnOpenLed);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.btnCloseAxisBreak);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.btnReadIO);
this.groupBox1.Controls.Add(this.btnOpenAxisBreak);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.btnWriteSingleDO);
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.btnReadAllDi);
this.groupBox1.Controls.Add(this.btnReadAllDo);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Controls.Add(this.btnCloseDoor);
this.groupBox1.Controls.Add(this.btnOpenDoor);
......@@ -144,7 +129,7 @@
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Location = new System.Drawing.Point(294, 114);
this.radioButton2.Location = new System.Drawing.Point(331, 91);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(50, 21);
this.radioButton2.TabIndex = 270;
......@@ -155,7 +140,7 @@
//
this.radioButton1.AutoSize = true;
this.radioButton1.Checked = true;
this.radioButton1.Location = new System.Drawing.Point(212, 114);
this.radioButton1.Location = new System.Drawing.Point(249, 91);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(50, 21);
this.radioButton1.TabIndex = 269;
......@@ -188,7 +173,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(143, 359);
this.button4.Location = new System.Drawing.Point(280, 271);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(134, 34);
this.button4.TabIndex = 266;
......@@ -199,7 +184,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(143, 322);
this.button5.Location = new System.Drawing.Point(280, 234);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(134, 34);
this.button5.TabIndex = 265;
......@@ -207,28 +192,6 @@
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// button2
//
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(280, 271);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(134, 34);
this.button2.TabIndex = 264;
this.button2.Text = "关闭运转ON";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// button3
//
this.button3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.Location = new System.Drawing.Point(280, 234);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(134, 34);
this.button3.TabIndex = 263;
this.button3.Text = "打开运转ON";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// btnSXil
//
this.btnSXil.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -254,7 +217,7 @@
// btnDClose
//
this.btnDClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDClose.Location = new System.Drawing.Point(280, 359);
this.btnDClose.Location = new System.Drawing.Point(146, 359);
this.btnDClose.Name = "btnDClose";
this.btnDClose.Size = new System.Drawing.Size(134, 34);
this.btnDClose.TabIndex = 260;
......@@ -265,7 +228,7 @@
// btnDOpen
//
this.btnDOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDOpen.Location = new System.Drawing.Point(280, 322);
this.btnDOpen.Location = new System.Drawing.Point(146, 322);
this.btnDOpen.Name = "btnDOpen";
this.btnDOpen.Size = new System.Drawing.Size(134, 34);
this.btnDOpen.TabIndex = 259;
......@@ -310,23 +273,13 @@
//
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(5, 85);
this.label3.Location = new System.Drawing.Point(7, 33);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(103, 17);
this.label3.TabIndex = 247;
this.label3.Text = "选择DO:";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtSlaveId
//
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(276, 51);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(74, 23);
this.txtSlaveId.TabIndex = 246;
this.txtSlaveId.Text = "0";
//
// btnOpenLed
//
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -338,22 +291,10 @@
this.btnOpenLed.UseVisualStyleBackColor = true;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(196, 53);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(75, 17);
this.label2.TabIndex = 245;
this.label2.Text = "SlaveId";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Visible = false;
//
// txtDOIndex
//
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(113, 51);
this.txtDOIndex.Location = new System.Drawing.Point(323, 58);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(74, 23);
......@@ -363,10 +304,10 @@
// txtDoName
//
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(113, 22);
this.txtDoName.Location = new System.Drawing.Point(115, 58);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(237, 23);
this.txtDoName.Size = new System.Drawing.Size(92, 23);
this.txtDoName.TabIndex = 241;
this.txtDoName.Text = "0";
//
......@@ -385,24 +326,13 @@
//
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(5, 25);
this.label17.Location = new System.Drawing.Point(7, 61);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(103, 17);
this.label17.TabIndex = 240;
this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnReadIO
//
this.btnReadIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadIO.Location = new System.Drawing.Point(95, 153);
this.btnReadIO.Name = "btnReadIO";
this.btnReadIO.Size = new System.Drawing.Size(115, 34);
this.btnReadIO.TabIndex = 243;
this.btnReadIO.Text = "读取IO状态";
this.btnReadIO.UseVisualStyleBackColor = true;
this.btnReadIO.Click += new System.EventHandler(this.btnReadIO_Click);
//
// btnOpenAxisBreak
//
this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -418,7 +348,7 @@
//
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(5, 54);
this.label14.Location = new System.Drawing.Point(215, 61);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(103, 17);
this.label14.TabIndex = 239;
......@@ -428,7 +358,7 @@
// btnWriteSingleDO
//
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(212, 153);
this.btnWriteSingleDO.Location = new System.Drawing.Point(249, 134);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(115, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -439,10 +369,10 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(113, 113);
this.txtWriteTime.Location = new System.Drawing.Point(115, 90);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(53, 23);
this.txtWriteTime.Size = new System.Drawing.Size(92, 23);
this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0";
//
......@@ -450,35 +380,13 @@
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(5, 116);
this.label5.Location = new System.Drawing.Point(7, 93);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(103, 17);
this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnReadAllDi
//
this.btnReadAllDi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDi.Location = new System.Drawing.Point(95, 188);
this.btnReadAllDi.Name = "btnReadAllDi";
this.btnReadAllDi.Size = new System.Drawing.Size(115, 34);
this.btnReadAllDi.TabIndex = 244;
this.btnReadAllDi.Text = "读取所有DI";
this.btnReadAllDi.UseVisualStyleBackColor = true;
this.btnReadAllDi.Click += new System.EventHandler(this.btnReadAllDi_Click);
//
// btnReadAllDo
//
this.btnReadAllDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDo.Location = new System.Drawing.Point(212, 188);
this.btnReadAllDo.Name = "btnReadAllDo";
this.btnReadAllDo.Size = new System.Drawing.Size(115, 34);
this.btnReadAllDo.TabIndex = 245;
this.btnReadAllDo.Text = "读取所有DO";
this.btnReadAllDo.UseVisualStyleBackColor = true;
this.btnReadAllDo.Click += new System.EventHandler(this.btnReadAllDo_Click);
//
// cmbWriteIO
//
this.cmbWriteIO.DisplayMember = "ProName";
......@@ -486,7 +394,7 @@
this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(113, 80);
this.cmbWriteIO.Location = new System.Drawing.Point(115, 28);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(282, 24);
this.cmbWriteIO.TabIndex = 234;
......@@ -527,20 +435,6 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// chbAutoRead
//
this.chbAutoRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chbAutoRead.AutoSize = true;
this.chbAutoRead.Checked = true;
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.Location = new System.Drawing.Point(637, 677);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244;
this.chbAutoRead.Text = "自动读取";
this.chbAutoRead.UseVisualStyleBackColor = true;
//
// groupBox4
//
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......@@ -606,7 +500,6 @@
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.chbAutoRead);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmIOStatus";
......@@ -619,7 +512,6 @@
this.groupBox4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
......@@ -638,12 +530,6 @@
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Button btnWriteSingleDO;
private System.Windows.Forms.ComboBox cmbWriteIO;
private System.Windows.Forms.Button btnReadIO;
private System.Windows.Forms.CheckBox chbAutoRead;
private System.Windows.Forms.TextBox txtSlaveId;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btnReadAllDi;
private System.Windows.Forms.Button btnReadAllDo;
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnCloseDoor;
......@@ -659,8 +545,6 @@
private System.Windows.Forms.Button btnDOpen;
private System.Windows.Forms.Button btnSuckingDiscDown;
private System.Windows.Forms.Button btnSuckingDiscUp;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button btnDisDoorClose;
......
......@@ -102,7 +102,7 @@ namespace OnlineStore.AutoInOutStore
//IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex;
IO_VALUE value = radioButton1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW;
int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId);
int slaveId = 0;
if (time > 0)
{
IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value, time);
......@@ -134,7 +134,7 @@ namespace OnlineStore.AutoInOutStore
// txtIp.Text = io.DeviceName;
txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.DeviceName;
txtSlaveId.Text = io.SlaveID.ToString();
//txtSlaveId.Text = io.SlaveID.ToString();
IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue;
......@@ -210,7 +210,7 @@ namespace OnlineStore.AutoInOutStore
string deviceName = txtDoName.Text;
//IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex;
int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId);
int slaveId = 0;
KNDManager.ReadMultipleDI(deviceName, (byte)slaveId, (ushort)KNDManager.DIStartAddress, 16);
}
private void btnReadAllDo_Click(object sender, EventArgs e)
......@@ -219,7 +219,7 @@ namespace OnlineStore.AutoInOutStore
//IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex;
int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId);
int slaveId = 0;
KNDManager.ReadMultipleDO(deviceName, (byte)slaveId, (ushort)KNDManager.DoStartAddress, 16);
}
private void btnOpenDoor_Click(object sender, EventArgs e)
......
......@@ -61,19 +61,14 @@
this.btnClearLog = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupAxis = new System.Windows.Forms.GroupBox();
this.btnUpdateSpeed = new System.Windows.Forms.Button();
this.btnUpdateStatus = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
this.label26 = new System.Windows.Forms.Label();
this.btnReadLimit2 = new System.Windows.Forms.Button();
this.txtLimit2 = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.btnReadLimit1 = new System.Windows.Forms.Button();
this.txtLimit1 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.btnReadHomeSingle = new System.Windows.Forms.Button();
this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.chbAutoRead = new System.Windows.Forms.CheckBox();
this.label16 = new System.Windows.Forms.Label();
......@@ -81,10 +76,8 @@
this.label14 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox();
this.button2 = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.btnReadBusy = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.btnGetAlarm = new System.Windows.Forms.Button();
......@@ -101,7 +94,6 @@
this.btnAxisRMove = new System.Windows.Forms.Button();
this.btnAxisReturnHome = new System.Windows.Forms.Button();
this.btnAxisAMove = new System.Windows.Forms.Button();
this.Bt_ClearCounter = new System.Windows.Forms.Button();
this.btnComAlarmClear = new System.Windows.Forms.Button();
this.txtAPosition = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
......@@ -113,29 +105,6 @@
this.cmbAxisList = new System.Windows.Forms.ComboBox();
this.label49 = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblAxisStatus = new System.Windows.Forms.Label();
this.button3 = new System.Windows.Forms.Button();
this.txtBatchTarget = new System.Windows.Forms.TextBox();
this.lblCountPulse5 = new System.Windows.Forms.TextBox();
this.lblOutPulse5 = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label();
this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox();
this.txtUpdownTarget = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.lblCountPulse1 = new System.Windows.Forms.TextBox();
this.lblOutPulse1 = new System.Windows.Forms.TextBox();
this.lblCountPulse3 = new System.Windows.Forms.TextBox();
this.lblOutPulse3 = new System.Windows.Forms.TextBox();
this.lblCountPulse2 = new System.Windows.Forms.TextBox();
this.lblOutPulse2 = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.btnSelTemp = new System.Windows.Forms.Button();
......@@ -250,8 +219,6 @@
this.tabPage4.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupAxis.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -272,24 +239,24 @@
this.toolStripSeparator21,
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(107, 58);
this.contextMenuStrip1.Size = new System.Drawing.Size(135, 58);
//
// 显示ToolStripMenuItem
//
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(106, 24);
this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.显示ToolStripMenuItem.Text = "显示界面";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
//
// toolStripSeparator21
//
this.toolStripSeparator21.Name = "toolStripSeparator21";
this.toolStripSeparator21.Size = new System.Drawing.Size(103, 6);
this.toolStripSeparator21.Size = new System.Drawing.Size(131, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(106, 24);
this.toolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
......@@ -318,7 +285,7 @@
this.groupAuto.Size = new System.Drawing.Size(573, 187);
this.groupAuto.TabIndex = 303;
this.groupAuto.TabStop = false;
this.groupAuto.Text = "自动出入库";
this.groupAuto.Text = "出入库测试";
//
// btnCycleOut
//
......@@ -338,7 +305,7 @@
this.btnSaveSinglePosId.Name = "btnSaveSinglePosId";
this.btnSaveSinglePosId.Size = new System.Drawing.Size(189, 38);
this.btnSaveSinglePosId.TabIndex = 284;
this.btnSaveSinglePosId.Text = "保存为单盘入库库位";
this.btnSaveSinglePosId.Text = "设为参考库位";
this.btnSaveSinglePosId.UseVisualStyleBackColor = true;
this.btnSaveSinglePosId.Click += new System.EventHandler(this.btnSaveSinglePosId_Click);
//
......@@ -348,9 +315,9 @@
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(6, 153);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(87, 21);
this.checkBox1.Size = new System.Drawing.Size(75, 21);
this.checkBox1.TabIndex = 283;
this.checkBox1.Text = "手动出入库";
this.checkBox1.Text = "手动模式";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
......@@ -361,7 +328,7 @@
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(189, 38);
this.btnSave.TabIndex = 279;
this.btnSave.Text = "保存为模拟入库库位";
this.btnSave.Text = "设为起始库位";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
......@@ -397,7 +364,7 @@
this.label30.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label30.Size = new System.Drawing.Size(168, 28);
this.label30.TabIndex = 281;
this.label30.Text = "自动出入口间隔:";
this.label30.Text = "入库存料库位间隔:";
this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnBatchOutTest
......@@ -498,7 +465,7 @@
// btnSingleTrayIn
//
this.btnSingleTrayIn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSingleTrayIn.Location = new System.Drawing.Point(487, 177);
this.btnSingleTrayIn.Location = new System.Drawing.Point(487, 175);
this.btnSingleTrayIn.Name = "btnSingleTrayIn";
this.btnSingleTrayIn.Size = new System.Drawing.Size(155, 38);
this.btnSingleTrayIn.TabIndex = 236;
......@@ -534,9 +501,9 @@
this.lblWaitTragGo.ForeColor = System.Drawing.Color.Red;
this.lblWaitTragGo.Location = new System.Drawing.Point(171, 99);
this.lblWaitTragGo.Name = "lblWaitTragGo";
this.lblWaitTragGo.Size = new System.Drawing.Size(298, 22);
this.lblWaitTragGo.Size = new System.Drawing.Size(270, 22);
this.lblWaitTragGo.TabIndex = 231;
this.lblWaitTragGo.Text = "请拿走或放入料盘,并点击左侧按钮确认";
this.lblWaitTragGo.Text = "请处理料盘,并点击 关闭仓门1 按钮";
//
// btnWaitTrgGo
//
......@@ -545,7 +512,7 @@
this.btnWaitTrgGo.Name = "btnWaitTrgGo";
this.btnWaitTrgGo.Size = new System.Drawing.Size(155, 38);
this.btnWaitTrgGo.TabIndex = 230;
this.btnWaitTrgGo.Text = "料盘已拿出/放入";
this.btnWaitTrgGo.Text = "关闭仓门1";
this.btnWaitTrgGo.UseVisualStyleBackColor = true;
this.btnWaitTrgGo.Click += new System.EventHandler(this.btnWaitTrgGo_Click);
//
......@@ -556,9 +523,9 @@
this.lblBatchStatus.ForeColor = System.Drawing.Color.Green;
this.lblBatchStatus.Location = new System.Drawing.Point(19, 25);
this.lblBatchStatus.Name = "lblBatchStatus";
this.lblBatchStatus.Size = new System.Drawing.Size(65, 19);
this.lblBatchStatus.Size = new System.Drawing.Size(79, 19);
this.lblBatchStatus.TabIndex = 229;
this.lblBatchStatus.Text = "等待启动";
this.lblBatchStatus.Text = "设备未启动";
//
// btnCloseDoor
//
......@@ -578,7 +545,7 @@
this.btnGetOutTray.Name = "btnGetOutTray";
this.btnGetOutTray.Size = new System.Drawing.Size(155, 38);
this.btnGetOutTray.TabIndex = 225;
this.btnGetOutTray.Text = "取出出库料盘";
this.btnGetOutTray.Text = "取出批量出库料盘";
this.btnGetOutTray.UseVisualStyleBackColor = true;
this.btnGetOutTray.Click += new System.EventHandler(this.btnGetOutTray_Click);
//
......@@ -612,7 +579,7 @@
this.lblOutInfo.Name = "lblOutInfo";
this.lblOutInfo.Size = new System.Drawing.Size(631, 22);
this.lblOutInfo.TabIndex = 234;
this.lblOutInfo.Text = "累积出库信息";
this.lblOutInfo.Text = "出库计数";
this.lblOutInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// tabControl1
......@@ -681,19 +648,14 @@
//
this.groupAxis.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupAxis.Controls.Add(this.btnUpdateSpeed);
this.groupAxis.Controls.Add(this.btnUpdateStatus);
this.groupAxis.Controls.Add(this.label24);
this.groupAxis.Controls.Add(this.label26);
this.groupAxis.Controls.Add(this.btnReadLimit2);
this.groupAxis.Controls.Add(this.txtLimit2);
this.groupAxis.Controls.Add(this.label22);
this.groupAxis.Controls.Add(this.label23);
this.groupAxis.Controls.Add(this.btnReadLimit1);
this.groupAxis.Controls.Add(this.txtLimit1);
this.groupAxis.Controls.Add(this.label6);
this.groupAxis.Controls.Add(this.label5);
this.groupAxis.Controls.Add(this.btnReadHomeSingle);
this.groupAxis.Controls.Add(this.txtHomeSingle);
this.groupAxis.Controls.Add(this.chbAutoRead);
this.groupAxis.Controls.Add(this.label16);
......@@ -701,10 +663,8 @@
this.groupAxis.Controls.Add(this.label14);
this.groupAxis.Controls.Add(this.label11);
this.groupAxis.Controls.Add(this.txtHomeStatus);
this.groupAxis.Controls.Add(this.button2);
this.groupAxis.Controls.Add(this.label10);
this.groupAxis.Controls.Add(this.txtBusyStatus);
this.groupAxis.Controls.Add(this.btnReadBusy);
this.groupAxis.Controls.Add(this.label2);
this.groupAxis.Controls.Add(this.txtAlarmStatus);
this.groupAxis.Controls.Add(this.btnGetAlarm);
......@@ -721,7 +681,6 @@
this.groupAxis.Controls.Add(this.btnAxisRMove);
this.groupAxis.Controls.Add(this.btnAxisReturnHome);
this.groupAxis.Controls.Add(this.btnAxisAMove);
this.groupAxis.Controls.Add(this.Bt_ClearCounter);
this.groupAxis.Controls.Add(this.btnComAlarmClear);
this.groupAxis.Controls.Add(this.txtAPosition);
this.groupAxis.Controls.Add(this.label48);
......@@ -736,40 +695,10 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(6, 2);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(641, 455);
this.groupAxis.Size = new System.Drawing.Size(641, 429);
this.groupAxis.TabIndex = 216;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
//
// btnUpdateSpeed
//
this.btnUpdateSpeed.BackColor = System.Drawing.SystemColors.Control;
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, 157);
this.btnUpdateSpeed.Name = "btnUpdateSpeed";
this.btnUpdateSpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdateSpeed.Size = new System.Drawing.Size(133, 33);
this.btnUpdateSpeed.TabIndex = 310;
this.btnUpdateSpeed.Text = "更改速度";
this.btnUpdateSpeed.UseVisualStyleBackColor = true;
this.btnUpdateSpeed.Click += new System.EventHandler(this.btnUpdateSpeed_Click);
//
// btnUpdateStatus
//
this.btnUpdateStatus.BackColor = System.Drawing.SystemColors.Control;
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, 157);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdateStatus.Size = new System.Drawing.Size(133, 33);
this.btnUpdateStatus.TabIndex = 309;
this.btnUpdateStatus.Text = "读取所有状态";
this.btnUpdateStatus.UseVisualStyleBackColor = true;
this.btnUpdateStatus.Click += new System.EventHandler(this.btnUpdateStatus_Click);
this.groupAxis.Text = "伺服调试";
//
// label24
//
......@@ -789,16 +718,6 @@
this.label26.TabIndex = 307;
this.label26.Text = "1=ON,0=OFF";
//
// btnReadLimit2
//
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;
this.btnReadLimit2.Text = "读负极限信号";
this.btnReadLimit2.UseVisualStyleBackColor = true;
this.btnReadLimit2.Click += new System.EventHandler(this.btnReadLimit2_Click);
//
// txtLimit2
//
this.txtLimit2.Enabled = false;
......@@ -825,16 +744,6 @@
this.label23.TabIndex = 303;
this.label23.Text = "1=ON,0=OFF";
//
// btnReadLimit1
//
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;
this.btnReadLimit1.Text = "读正极限信号";
this.btnReadLimit1.UseVisualStyleBackColor = true;
this.btnReadLimit1.Click += new System.EventHandler(this.btnReadLimit1_Click);
//
// txtLimit1
//
this.txtLimit1.Enabled = false;
......@@ -861,16 +770,6 @@
this.label5.TabIndex = 299;
this.label5.Text = "1=ON,0=OFF";
//
// btnReadHomeSingle
//
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;
this.btnReadHomeSingle.Text = "读原点信号";
this.btnReadHomeSingle.UseVisualStyleBackColor = true;
this.btnReadHomeSingle.Click += new System.EventHandler(this.btnReadHomeSingle_Click);
//
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
......@@ -886,7 +785,7 @@
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(99, 21);
this.chbAutoRead.TabIndex = 296;
this.chbAutoRead.Text = "自动读取位置";
this.chbAutoRead.Text = "位置自动更新";
this.chbAutoRead.UseVisualStyleBackColor = true;
//
// label16
......@@ -933,16 +832,6 @@
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// button2
//
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;
this.button2.Text = "读HOME状态";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// label10
//
this.label10.Location = new System.Drawing.Point(22, 251);
......@@ -960,16 +849,6 @@
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// btnReadBusy
//
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;
this.btnReadBusy.Text = "读BUSY状态";
this.btnReadBusy.UseVisualStyleBackColor = true;
this.btnReadBusy.Click += new System.EventHandler(this.button1_Click_1);
//
// label2
//
this.label2.Location = new System.Drawing.Point(22, 219);
......@@ -993,7 +872,7 @@
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(150, 33);
this.btnGetAlarm.TabIndex = 284;
this.btnGetAlarm.Text = "读报警状态";
this.btnGetAlarm.Text = "读取伺服状态";
this.btnGetAlarm.UseVisualStyleBackColor = true;
this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click);
//
......@@ -1161,21 +1040,6 @@
this.btnAxisAMove.UseVisualStyleBackColor = true;
this.btnAxisAMove.Click += new System.EventHandler(this.btnAxisAMove_Click);
//
// Bt_ClearCounter
//
this.Bt_ClearCounter.BackColor = System.Drawing.SystemColors.Control;
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, 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);
this.Bt_ClearCounter.TabIndex = 170;
this.Bt_ClearCounter.Text = "重置位置";
this.Bt_ClearCounter.UseVisualStyleBackColor = true;
this.Bt_ClearCounter.Click += new System.EventHandler(this.Bt_ClearCounter_Click);
//
// btnComAlarmClear
//
this.btnComAlarmClear.Location = new System.Drawing.Point(237, 123);
......@@ -1294,12 +1158,11 @@
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(121, 17);
this.label49.TabIndex = 233;
this.label49.Text = "AC伺服:";
this.label49.Text = "选择伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.groupBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(655, 431);
......@@ -1307,242 +1170,6 @@
this.tabPage3.Text = "伺服状态";
this.tabPage3.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.lblAxisStatus);
this.groupBox1.Controls.Add(this.button3);
this.groupBox1.Controls.Add(this.txtBatchTarget);
this.groupBox1.Controls.Add(this.lblCountPulse5);
this.groupBox1.Controls.Add(this.lblOutPulse5);
this.groupBox1.Controls.Add(this.label20);
this.groupBox1.Controls.Add(this.label38);
this.groupBox1.Controls.Add(this.txtMiddleTarget);
this.groupBox1.Controls.Add(this.txtInoutTarget);
this.groupBox1.Controls.Add(this.txtUpdownTarget);
this.groupBox1.Controls.Add(this.label12);
this.groupBox1.Controls.Add(this.lblCountPulse1);
this.groupBox1.Controls.Add(this.lblOutPulse1);
this.groupBox1.Controls.Add(this.lblCountPulse3);
this.groupBox1.Controls.Add(this.lblOutPulse3);
this.groupBox1.Controls.Add(this.lblCountPulse2);
this.groupBox1.Controls.Add(this.lblOutPulse2);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42);
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(8, 10);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(640, 235);
this.groupBox1.TabIndex = 217;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
//
// lblAxisStatus
//
this.lblAxisStatus.AutoSize = true;
this.lblAxisStatus.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAxisStatus.ForeColor = System.Drawing.Color.Green;
this.lblAxisStatus.Location = new System.Drawing.Point(309, 197);
this.lblAxisStatus.Name = "lblAxisStatus";
this.lblAxisStatus.Size = new System.Drawing.Size(152, 17);
this.lblAxisStatus.TabIndex = 280;
this.lblAxisStatus.Text = "点击按钮可读取轴实时状态";
//
// button3
//
this.button3.BackColor = System.Drawing.SystemColors.Control;
this.button3.Cursor = System.Windows.Forms.Cursors.Default;
this.button3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.ForeColor = System.Drawing.SystemColors.ControlText;
this.button3.Location = new System.Drawing.Point(137, 189);
this.button3.Name = "button3";
this.button3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button3.Size = new System.Drawing.Size(169, 33);
this.button3.TabIndex = 279;
this.button3.Text = "读取位置";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// txtBatchTarget
//
this.txtBatchTarget.Location = new System.Drawing.Point(434, 156);
this.txtBatchTarget.Name = "txtBatchTarget";
this.txtBatchTarget.ReadOnly = true;
this.txtBatchTarget.Size = new System.Drawing.Size(97, 23);
this.txtBatchTarget.TabIndex = 270;
//
// lblCountPulse5
//
this.lblCountPulse5.Location = new System.Drawing.Point(434, 129);
this.lblCountPulse5.Name = "lblCountPulse5";
this.lblCountPulse5.ReadOnly = true;
this.lblCountPulse5.Size = new System.Drawing.Size(97, 23);
this.lblCountPulse5.TabIndex = 269;
//
// lblOutPulse5
//
this.lblOutPulse5.Location = new System.Drawing.Point(434, 102);
this.lblOutPulse5.Name = "lblOutPulse5";
this.lblOutPulse5.ReadOnly = true;
this.lblOutPulse5.Size = new System.Drawing.Size(97, 23);
this.lblOutPulse5.TabIndex = 268;
//
// label20
//
this.label20.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label20.Location = new System.Drawing.Point(431, 14);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(102, 43);
this.label20.TabIndex = 267;
this.label20.Text = "批量出入料轴";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label38
//
this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label38.Location = new System.Drawing.Point(6, 54);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(115, 17);
this.label38.TabIndex = 263;
this.label38.Text = "ALM:";
this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtMiddleTarget
//
this.txtMiddleTarget.Location = new System.Drawing.Point(133, 156);
this.txtMiddleTarget.Name = "txtMiddleTarget";
this.txtMiddleTarget.ReadOnly = true;
this.txtMiddleTarget.Size = new System.Drawing.Size(97, 23);
this.txtMiddleTarget.TabIndex = 262;
//
// txtInoutTarget
//
this.txtInoutTarget.Location = new System.Drawing.Point(334, 156);
this.txtInoutTarget.Name = "txtInoutTarget";
this.txtInoutTarget.ReadOnly = true;
this.txtInoutTarget.Size = new System.Drawing.Size(97, 23);
this.txtInoutTarget.TabIndex = 260;
//
// txtUpdownTarget
//
this.txtUpdownTarget.Location = new System.Drawing.Point(234, 156);
this.txtUpdownTarget.Name = "txtUpdownTarget";
this.txtUpdownTarget.ReadOnly = true;
this.txtUpdownTarget.Size = new System.Drawing.Size(97, 23);
this.txtUpdownTarget.TabIndex = 259;
//
// label12
//
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(6, 159);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(115, 17);
this.label12.TabIndex = 258;
this.label12.Text = "出入库目标值:";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblCountPulse1
//
this.lblCountPulse1.Location = new System.Drawing.Point(133, 129);
this.lblCountPulse1.Name = "lblCountPulse1";
this.lblCountPulse1.ReadOnly = true;
this.lblCountPulse1.Size = new System.Drawing.Size(97, 23);
this.lblCountPulse1.TabIndex = 257;
//
// lblOutPulse1
//
this.lblOutPulse1.Location = new System.Drawing.Point(133, 102);
this.lblOutPulse1.Name = "lblOutPulse1";
this.lblOutPulse1.ReadOnly = true;
this.lblOutPulse1.Size = new System.Drawing.Size(97, 23);
this.lblOutPulse1.TabIndex = 256;
//
// lblCountPulse3
//
this.lblCountPulse3.Location = new System.Drawing.Point(334, 129);
this.lblCountPulse3.Name = "lblCountPulse3";
this.lblCountPulse3.ReadOnly = true;
this.lblCountPulse3.Size = new System.Drawing.Size(97, 23);
this.lblCountPulse3.TabIndex = 178;
//
// lblOutPulse3
//
this.lblOutPulse3.Location = new System.Drawing.Point(334, 102);
this.lblOutPulse3.Name = "lblOutPulse3";
this.lblOutPulse3.ReadOnly = true;
this.lblOutPulse3.Size = new System.Drawing.Size(97, 23);
this.lblOutPulse3.TabIndex = 177;
//
// lblCountPulse2
//
this.lblCountPulse2.Location = new System.Drawing.Point(235, 129);
this.lblCountPulse2.Name = "lblCountPulse2";
this.lblCountPulse2.ReadOnly = true;
this.lblCountPulse2.Size = new System.Drawing.Size(97, 23);
this.lblCountPulse2.TabIndex = 176;
//
// lblOutPulse2
//
this.lblOutPulse2.Location = new System.Drawing.Point(234, 102);
this.lblOutPulse2.Name = "lblOutPulse2";
this.lblOutPulse2.ReadOnly = true;
this.lblOutPulse2.Size = new System.Drawing.Size(97, 23);
this.lblOutPulse2.TabIndex = 175;
//
// label4
//
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(331, 14);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(93, 43);
this.label4.TabIndex = 100;
this.label4.Text = "轴三:进出轴";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label3
//
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(232, 14);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(93, 43);
this.label3.TabIndex = 99;
this.label3.Text = "轴二:上下轴";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label1
//
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(134, 14);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(93, 43);
this.label1.TabIndex = 97;
this.label1.Text = "轴一:旋转轴";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label43
//
this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label43.Location = new System.Drawing.Point(6, 104);
this.label43.Name = "label43";
this.label43.Size = new System.Drawing.Size(115, 17);
this.label43.TabIndex = 23;
this.label43.Text = "输出脉冲值:";
this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label42
//
this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label42.Location = new System.Drawing.Point(6, 130);
this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(115, 17);
this.label42.TabIndex = 24;
this.label42.Text = "编码器计数:";
this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox7);
......@@ -1572,7 +1199,7 @@
this.groupBox7.Size = new System.Drawing.Size(549, 134);
this.groupBox7.TabIndex = 90;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温器调试";
this.groupBox7.Text = "温湿度控制器调试";
//
// btnSelTemp
//
......@@ -1580,7 +1207,7 @@
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(100, 33);
this.btnSelTemp.TabIndex = 248;
this.btnSelTemp.Text = "查询";
this.btnSelTemp.Text = "读取";
this.btnSelTemp.UseVisualStyleBackColor = true;
this.btnSelTemp.Click += new System.EventHandler(this.btnSelTemp_Click);
//
......@@ -1663,7 +1290,7 @@
this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(100, 33);
this.btnTempInit.TabIndex = 88;
this.btnTempInit.Text = "初始化";
this.btnTempInit.Text = "连接";
this.btnTempInit.UseVisualStyleBackColor = true;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click);
//
......@@ -1722,9 +1349,9 @@
this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(14, 33);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.Size = new System.Drawing.Size(79, 19);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.Text = "设备未启动";
//
// chbAuto
//
......@@ -1792,7 +1419,7 @@
this.groupInout.Size = new System.Drawing.Size(573, 389);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "出入库操作";
this.groupInout.Text = "位置操作";
//
// txtInoutP4
//
......@@ -2370,73 +1997,73 @@
this.toolStripSeparator4,
this.退出ToolStripMenuItem});
this.料仓操作ToolStripMenuItem.Name = "料仓操作ToolStripMenuItem";
this.料仓操作ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.料仓操作ToolStripMenuItem.Text = "料仓操作";
this.料仓操作ToolStripMenuItem.Size = new System.Drawing.Size(54, 25);
this.料仓操作ToolStripMenuItem.Text = "设备";
//
// 启动ToolStripMenuItem
//
this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem";
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.启动ToolStripMenuItem.Text = "启动";
this.启动ToolStripMenuItem.Click += new System.EventHandler(this.启动ToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
//
// 停止ToolStripMenuItem
//
this.停止ToolStripMenuItem.Name = "停止ToolStripMenuItem";
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.停止ToolStripMenuItem.Text = "停止";
this.停止ToolStripMenuItem.Click += new System.EventHandler(this.停止ToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
//
// 复位ToolStripMenuItem
//
this.复位ToolStripMenuItem.Name = "复位ToolStripMenuItem";
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复位ToolStripMenuItem.Text = "复位";
this.复位ToolStripMenuItem.Click += new System.EventHandler(this.复位ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(141, 6);
//
// 上料模块复位ToolStripMenuItem
//
this.上料模块复位ToolStripMenuItem.Name = "上料模块复位ToolStripMenuItem";
this.上料模块复位ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.上料模块复位ToolStripMenuItem.Text = "上料模块复位";
this.上料模块复位ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.上料模块复位ToolStripMenuItem.Text = "轴五复位";
this.上料模块复位ToolStripMenuItem.Click += new System.EventHandler(this.上料模块复位ToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
//
// 回待机点ToolStripMenuItem
//
this.回待机点ToolStripMenuItem.Name = "回待机点ToolStripMenuItem";
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.回待机点ToolStripMenuItem.Text = "回待机点";
this.回待机点ToolStripMenuItem.Click += new System.EventHandler(this.回待机点ToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.退出ToolStripMenuItem.Text = "退出系统";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
......@@ -2465,134 +2092,134 @@
this.toolStripSeparator13,
this.批量上下轴OFFToolStripMenuItem});
this.iO状态查看ToolStripMenuItem.Name = "iO状态查看ToolStripMenuItem";
this.iO状态查看ToolStripMenuItem.Size = new System.Drawing.Size(104, 25);
this.iO状态查看ToolStripMenuItem.Text = "IO状态调试";
this.iO状态查看ToolStripMenuItem.Size = new System.Drawing.Size(72, 25);
this.iO状态查看ToolStripMenuItem.Text = "IO调试";
//
// 查看IOToolStripMenuItem
//
this.查看IOToolStripMenuItem.Name = "查看IOToolStripMenuItem";
this.查看IOToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.查看IOToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.查看IOToolStripMenuItem.Text = "查看IO";
this.查看IOToolStripMenuItem.Click += new System.EventHandler(this.查看IOToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(205, 6);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(191, 26);
this.toolStripMenuItem2.Text = "打开照明";
this.toolStripMenuItem2.Size = new System.Drawing.Size(208, 26);
this.toolStripMenuItem2.Text = "打开相机辅助光源";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator17.Size = new System.Drawing.Size(205, 6);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(191, 26);
this.toolStripMenuItem3.Text = "关闭照明";
this.toolStripMenuItem3.Size = new System.Drawing.Size(208, 26);
this.toolStripMenuItem3.Text = "关闭相机辅助光源";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator16.Size = new System.Drawing.Size(205, 6);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(191, 26);
this.toolStripMenuItem4.Size = new System.Drawing.Size(208, 26);
this.toolStripMenuItem4.Text = "门禁功能屏蔽";
this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
//
// toolStripSeparator18
//
this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator18.Size = new System.Drawing.Size(205, 6);
//
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(191, 26);
this.toolStripMenuItem5.Size = new System.Drawing.Size(208, 26);
this.toolStripMenuItem5.Text = "门禁功能打开";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator19.Size = new System.Drawing.Size(205, 6);
//
// 打开舱门ToolStripMenuItem
//
this.打开舱门ToolStripMenuItem.Name = "打开舱门ToolStripMenuItem";
this.打开舱门ToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.打开舱门ToolStripMenuItem.Text = "打开仓门";
this.打开舱门ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.打开舱门ToolStripMenuItem.Text = "打开仓门1";
this.打开舱门ToolStripMenuItem.Click += new System.EventHandler(this.打开舱门ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(205, 6);
//
// 关闭仓门ToolStripMenuItem
//
this.关闭仓门ToolStripMenuItem.Name = "关闭仓门ToolStripMenuItem";
this.关闭仓门ToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.关闭仓门ToolStripMenuItem.Text = "关闭仓门";
this.关闭仓门ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.关闭仓门ToolStripMenuItem.Text = "关闭仓门1";
this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(205, 6);
//
// 料仓运转ONToolStripMenuItem
//
this.料仓运转ONToolStripMenuItem.Name = "料仓运转ONToolStripMenuItem";
this.料仓运转ONToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.料仓运转ONToolStripMenuItem.Text = "料仓运转ON";
this.料仓运转ONToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.料仓运转ONToolStripMenuItem.Text = "打开伺服";
this.料仓运转ONToolStripMenuItem.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(205, 6);
//
// 料仓运转OFFToolStripMenuItem
//
this.料仓运转OFFToolStripMenuItem.Name = "料仓运转OFFToolStripMenuItem";
this.料仓运转OFFToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.料仓运转OFFToolStripMenuItem.Text = "料仓运转OFF";
this.料仓运转OFFToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.料仓运转OFFToolStripMenuItem.Text = "关闭伺服";
this.料仓运转OFFToolStripMenuItem.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(205, 6);
//
// 批量上下轴ONToolStripMenuItem
//
this.批量上下轴ONToolStripMenuItem.Name = "批量上下轴ONToolStripMenuItem";
this.批量上下轴ONToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.批量上下轴ONToolStripMenuItem.Text = "批量上下轴ON";
this.批量上下轴ONToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.批量上下轴ONToolStripMenuItem.Text = "打开轴五";
this.批量上下轴ONToolStripMenuItem.Click += new System.EventHandler(this.批量上下轴ONToolStripMenuItem_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(188, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(205, 6);
//
// 批量上下轴OFFToolStripMenuItem
//
this.批量上下轴OFFToolStripMenuItem.Name = "批量上下轴OFFToolStripMenuItem";
this.批量上下轴OFFToolStripMenuItem.Size = new System.Drawing.Size(191, 26);
this.批量上下轴OFFToolStripMenuItem.Text = "批量上下轴OFF";
this.批量上下轴OFFToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.批量上下轴OFFToolStripMenuItem.Text = "关闭轴五";
this.批量上下轴OFFToolStripMenuItem.Click += new System.EventHandler(this.批量上下轴OFFToolStripMenuItem_Click);
//
// 设备调试ToolStripMenuItem
......@@ -2611,72 +2238,72 @@
this.打开日志ToolStripMenuItem});
this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem";
this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.设备调试ToolStripMenuItem.Text = "设备调试";
this.设备调试ToolStripMenuItem.Text = "功能调试";
//
// 轴卡点动ToolStripMenuItem
//
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(176, 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(189, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6);
//
// 升降轴位置调试ToolStripMenuItem
//
this.升降轴位置调试ToolStripMenuItem.Name = "升降轴位置调试ToolStripMenuItem";
this.升降轴位置调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.升降轴位置调试ToolStripMenuItem.Text = "升降轴位置调试";
this.升降轴位置调试ToolStripMenuItem.Size = new System.Drawing.Size(176, 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(189, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(173, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(176, 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(189, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(173, 6);
//
// 摄像机调试ToolStripMenuItem
//
this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.摄像机调试ToolStripMenuItem.Text = "二维码学习";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.摄像机调试ToolStripMenuItem.Text = "码学习";
this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click);
//
// toolStripSeparator20
//
this.toolStripSeparator20.Name = "toolStripSeparator20";
this.toolStripSeparator20.Size = new System.Drawing.Size(189, 6);
this.toolStripSeparator20.Size = new System.Drawing.Size(173, 6);
//
// 出入库调试ToolStripMenuItem
//
this.出入库调试ToolStripMenuItem.Name = "出入库调试ToolStripMenuItem";
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.出入库调试ToolStripMenuItem.Text = "启用调试";
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.出入库调试ToolStripMenuItem.Text = "启用调试模式";
this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click);
//
// toolStripSeparator23
//
this.toolStripSeparator23.Name = "toolStripSeparator23";
this.toolStripSeparator23.Size = new System.Drawing.Size(189, 6);
this.toolStripSeparator23.Size = new System.Drawing.Size(173, 6);
//
// 打开日志ToolStripMenuItem
//
this.打开日志ToolStripMenuItem.Name = "打开日志ToolStripMenuItem";
this.打开日志ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.打开日志ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.打开日志ToolStripMenuItem.Text = "打开日志";
this.打开日志ToolStripMenuItem.Click += new System.EventHandler(this.打开日志ToolStripMenuItem_Click);
//
......@@ -2738,7 +2365,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Name = "FrmStoreBox";
this.Text = "料仓_批量上下料";
this.Text = "云料仓-MIMO";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmStoreBox_FormClosed);
......@@ -2754,9 +2381,6 @@
this.tabPage2.ResumeLayout(false);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox7.ResumeLayout(false);
......@@ -2784,9 +2408,6 @@
public System.Windows.Forms.Button btnUpDownP4;
public System.Windows.Forms.Label label21;
private System.Windows.Forms.ComboBox cmbPosition;
public System.Windows.Forms.Button Bt_ClearCounter;
private System.Windows.Forms.Label label43;
private System.Windows.Forms.Label label42;
private System.Windows.Forms.TextBox lblOutPulse;
private System.Windows.Forms.TextBox lblCountPulse;
private System.Windows.Forms.Button btnComAlarmClear;
......@@ -2813,10 +2434,6 @@
public System.Windows.Forms.TextBox txtUpDownP5;
public System.Windows.Forms.Button btnUpDownP6;
public System.Windows.Forms.TextBox txtUpDownP6;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtAxisValue;
private System.Windows.Forms.TextBox txtAxisDeviceName;
private System.Windows.Forms.Label label45;
......@@ -2836,20 +2453,8 @@
private System.Windows.Forms.Button btnSavePosition;
public System.Windows.Forms.Button btnCloseAxis;
public System.Windows.Forms.Button btnOpenAxis;
private System.Windows.Forms.TextBox lblCountPulse3;
private System.Windows.Forms.TextBox lblOutPulse3;
private System.Windows.Forms.TextBox lblCountPulse2;
private System.Windows.Forms.TextBox lblOutPulse2;
private System.Windows.Forms.TextBox lblCountPulse1;
private System.Windows.Forms.TextBox lblOutPulse1;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox txtMiddleTarget;
private System.Windows.Forms.TextBox txtInoutTarget;
private System.Windows.Forms.TextBox txtUpdownTarget;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem 料仓操作ToolStripMenuItem;
......@@ -2866,7 +2471,6 @@
private UserFromControl.IOStatusControl axis_3_Alarm;
private UserFromControl.IOStatusControl axis_2_Alarm;
private UserFromControl.IOStatusControl axis_1_Alarm;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.Label lblWarnMsg;
private System.Windows.Forms.Button btnClearLog;
private System.Windows.Forms.ToolStripMenuItem 料仓运转ONToolStripMenuItem;
......@@ -2881,10 +2485,8 @@
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox txtHomeStatus;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox txtBusyStatus;
private System.Windows.Forms.Button btnReadBusy;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm;
......@@ -2910,7 +2512,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.Button btnReadHomeSingle;
private System.Windows.Forms.TextBox txtHomeSingle;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
......@@ -2926,21 +2527,12 @@
private System.Windows.Forms.Button btnBatchOutTest;
private System.Windows.Forms.Label lblBatchStatus;
private UserFromControl.IOStatusControl axis_5_Alarm;
private System.Windows.Forms.TextBox txtBatchTarget;
private System.Windows.Forms.TextBox lblCountPulse5;
private System.Windows.Forms.TextBox lblOutPulse5;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label lblAxisStatus;
public System.Windows.Forms.Button button3;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.Button btnReadLimit2;
private System.Windows.Forms.TextBox txtLimit2;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Button btnReadLimit1;
private System.Windows.Forms.TextBox txtLimit1;
public System.Windows.Forms.Button btnUpdateStatus;
private System.Windows.Forms.ToolStripMenuItem 批量上下轴ONToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 批量上下轴OFFToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
......@@ -2965,7 +2557,6 @@
public System.Windows.Forms.Button btnUpdownP8;
public System.Windows.Forms.TextBox txtUpdownP2;
public System.Windows.Forms.Button btnUpdownP2;
public System.Windows.Forms.Button btnUpdateSpeed;
private System.Windows.Forms.Label lblOutInfo;
public System.Windows.Forms.TextBox txtInoutP4;
public System.Windows.Forms.Button btnInOutP4;
......
......@@ -88,14 +88,7 @@ namespace OnlineStore.AutoInOutStore
txtInoutP4.Text = Position.InOutAxis_DoorOutPosition_P4.ToString();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString();
}
//txtSpeed.Text = store.Config.CompressAxis_EndSpeed.ToString();
//List<string> port = new List<string>(SerialPort.GetPortNames());
//comboBoxPortName.DataSource = port;
//if (port.IndexOf(store.Config.CompressAxis_PortName) >= 0)
//{
// comboBoxPortName.SelectedIndex = port.IndexOf(store.Config.CompressAxis_PortName);
//}
//cmbHomeType.SelectedIndex = 0;
timer1.Enabled = true;
}
#endregion
......@@ -106,7 +99,7 @@ namespace OnlineStore.AutoInOutStore
private string StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库");
private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库:");
private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库:");
public static string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端,不能移动进出轴");
//public static string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端,不能移动进出轴");
public static string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
private string StartCycle = ResourceCulture.GetString(ResourceCulture.StartCycle, "开始循环出库");
private string StopCycle = ResourceCulture.GetString(ResourceCulture.StopCycle, "停止循环出库");
......@@ -118,7 +111,7 @@ namespace OnlineStore.AutoInOutStore
string className = this.ClassName;
CurrLanguage = ResourceCulture.CurrLanguage;
ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端,不能移动进出轴");
//ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端,不能移动进出轴");
warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
......@@ -436,7 +429,7 @@ namespace OnlineStore.AutoInOutStore
//lblWarnMsg.Text = "";
btnStart.Text = StartAuto;
lblDoorStatus.Text = ResourceCulture.GetString(ResourceCulture.NoDoorStatus, "仓门状态未知");
//lblDoorStatus.Text = ResourceCulture.GetString(ResourceCulture.NoDoorStatus, "仓门状态未知");
}
}
catch (Exception ex)
......@@ -476,85 +469,7 @@ namespace OnlineStore.AutoInOutStore
btnTempClose.Enabled = isRun;
btnTempInit.Enabled = !isRun;
}
private void ReadPosistion()
{
string portName = GetPortName();
int SlvAddr = GetSlaveAddr();
//判断私服是否打开、
if (ACServerManager.ServerOnStatus(portName, SlvAddr))
{
lblServerOn.Text =ResourceCulture.GetString("伺服ON", "伺服ON");
}
else
{
lblServerOn.Text = ResourceCulture.GetString("伺服OFF", "伺服OFF");
}
string deviceName = GetPortName();
if (ACServerManager.ServerOnStatus(store.Config.Middle_Axis.DeviceName, store.Config.Middle_Axis.GetAxisValue()))
{
axis_1_Alarm.IOValue = ACServerManager.GetAlarmStatus(store.Config.Middle_Axis.DeviceName, store.Config.Middle_Axis.GetAxisValue());
axis_1_Alarm.ShowData();
int lOutPulse1 = ACServerManager.GetTargetPosition(store.Config.Middle_Axis.DeviceName, store.Config.Middle_Axis.GetAxisValue());
lblOutPulse1.Text = string.Format("{0:d}", lOutPulse1);
int lCountPulse1 = ACServerManager.GetActualtPosition(store.Config.Middle_Axis.DeviceName, store.Config.Middle_Axis.GetAxisValue());
lblCountPulse1.Text = string.Format("{0:d}", lCountPulse1);
txtMiddleTarget.Text = store.Config.Middle_Axis.TargetPosition.ToString();
//if (deviceName.Equals(store.Config.Middle_Axis.DeviceName))
if(store.Config.Middle_Axis.IsSameAxis(deviceName,SlvAddr))
{
lblOutPulse.Text = lblOutPulse1.Text;
lblCountPulse.Text = lblCountPulse1.Text;
}
}
if (ACServerManager.ServerOnStatus(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue()))
{
axis_2_Alarm.IOValue = ACServerManager.GetAlarmStatus(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue());
axis_2_Alarm.ShowData();
int lOutPulse2 = ACServerManager.GetTargetPosition(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue());
lblOutPulse2.Text = string.Format("{0:d}", lOutPulse2);
int lCountPulse2 = ACServerManager.GetActualtPosition(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue());
lblCountPulse2.Text = string.Format("{0:d}", lCountPulse2);
txtUpdownTarget.Text = store.Config.UpDown_Axis.TargetPosition.ToString();
//if (deviceName.Equals(store.Config.UpDown_Axis.DeviceName))
if (store.Config.UpDown_Axis.IsSameAxis(deviceName, SlvAddr))
{
lblOutPulse.Text = lblOutPulse2.Text;
lblCountPulse.Text = lblCountPulse2.Text;
}
}
if (ACServerManager.ServerOnStatus(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue()))
{
axis_3_Alarm.IOValue = ACServerManager.GetAlarmStatus(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue());
int lOutPulse3 = ACServerManager.GetTargetPosition(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue());
lblOutPulse3.Text = string.Format("{0:d}", lOutPulse3);
int lCountPulse3 = ACServerManager.GetActualtPosition(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue());
lblCountPulse3.Text = string.Format("{0:d}", lCountPulse3);
txtInoutTarget.Text = store.Config.InOut_Axis.TargetPosition.ToString();
//if (deviceName.Equals(store.Config.InOut_Axis.DeviceName))
if (store.Config.InOut_Axis.IsSameAxis(deviceName, SlvAddr))
{
lblOutPulse.Text = lblOutPulse3.Text;
lblCountPulse.Text = lblCountPulse3.Text;
}
}
if (ACServerManager.ServerOnStatus(store.Config.Batch_Axis.DeviceName, store.Config.Batch_Axis.GetAxisValue()))
{
axis_5_Alarm.IOValue = ACServerManager.GetAlarmStatus(store.Config.Batch_Axis.DeviceName, store.Config.Batch_Axis.GetAxisValue());
int lOutPulse5 = ACServerManager.GetTargetPosition(store.Config.Batch_Axis.DeviceName, store.Config.Batch_Axis.GetAxisValue());
lblOutPulse5.Text = string.Format("{0:d}", lOutPulse5);
int lCountPulse5 = ACServerManager.GetActualtPosition(store.Config.Batch_Axis.DeviceName, store.Config.Batch_Axis.GetAxisValue());
lblCountPulse5.Text = string.Format("{0:d}", lCountPulse5);
txtBatchTarget.Text = store.Config.Batch_Axis.TargetPosition.ToString();
//if (deviceName.Equals(store.Config.Batch_Axis.DeviceName))
if (store.Config.Batch_Axis.IsSameAxis(deviceName, SlvAddr))
{
lblOutPulse.Text = lblOutPulse5.Text;
lblCountPulse.Text = lblCountPulse5.Text;
}
}
lblAxisStatus.Text = ":" + DateTime.Now.ToLongTimeString();
}
private void Bt_ClearCounter_Click(object sender, EventArgs e)
{
......@@ -688,17 +603,7 @@ namespace OnlineStore.AutoInOutStore
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
//if (axisC.PositionIsHasLimit() && (axisC.PositionMin > position || axisC.PositionMax < position))
//{
// MessageBox.Show("位置超出" + axisC.Explain + "上下限(" + axisC.PositionMin + "-" + axisC.PositionMax + ")");
// return;
//}
if (store.Config.InOut_Axis.IsSameAxis(portName,SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if ( store.Config.Middle_Axis.IsSameAxis(portName,SlvAddr ) || store.Config.UpDown_Axis.IsSameAxis(portName,SlvAddr))
if ( store.Config.Middle_Axis.IsSameAxis(portName,SlvAddr ) || store.Config.UpDown_Axis.IsSameAxis(portName,SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -714,12 +619,7 @@ namespace OnlineStore.AutoInOutStore
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int speed = FormUtil.GetIntValue(txtASpeed);
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -737,20 +637,7 @@ namespace OnlineStore.AutoInOutStore
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
//int currPositon = ACServerManager.GetActualtPosition(portName, SlvAddr);
// int newPosition = position + currPositon;
// if (axisC.PositionIsHasLimit() && (axisC.PositionMin > newPosition || axisC.PositionMax < newPosition))
//{
// MessageBox.Show("位置超出"+axisC.Explain+"上下限(" + axisC.PositionMin + "-" + axisC.PositionMax + ")");
// return;
//}
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -864,27 +751,13 @@ namespace OnlineStore.AutoInOutStore
{
store.Config.UpDownAxis_OutHigh_P2 = FormUtil.GetIntValue(txtUpdownP2);
needUpdate = true;
}
//if (store.Config.UpDownAxis_DoorOBPosition_P7 != FormUtil.GetIntValue(txtUpDownP7))
//{
// store.Config.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
// needUpdate = true;
//}
}
if (store.Config.UpDownAxis_OutLow_P8 != FormUtil.GetIntValue(txtUpdownP8))
{
store.Config.UpDownAxis_OutLow_P8 = FormUtil.GetIntValue(txtUpdownP8);
needUpdate = true;
}
//if (store.Config.InOutAxis_DoorPosition_P2 != FormUtil.GetIntValue(txtInOutP2))
//{
// store.Config.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2);
// needUpdate = true;
//}
//if (store.Config.UpDownAxis_DoorOPosition_P1 != FormUtil.GetIntValue(txtUpDownP1))
//{
// store.Config.UpDownAxis_DoorOPosition_P1 = FormUtil.GetIntValue(txtUpDownP1);
// needUpdate = true;
//}
if (needUpdate)
{
//更新缓存
......@@ -1026,34 +899,19 @@ namespace OnlineStore.AutoInOutStore
}
private void btnInOutP1_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
{
int value = FormUtil.GetIntValue(txtInOutP1);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P1_Speed);
}
private void btnInOutP3_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
{
int value = FormUtil.GetIntValue(txtInOutP3);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P3_Speed);
}
private void btnInOutP2_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
{
int value = FormUtil.GetIntValue(txtInOutP2);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P2_Speed);
}
......@@ -1286,12 +1144,8 @@ namespace OnlineStore.AutoInOutStore
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -1303,29 +1157,21 @@ namespace OnlineStore.AutoInOutStore
LogUtil.info("点击【原点返回】,端口号【" + portName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
ACServerManager.HomeMove(portName, SlvAddr, speed);
}
private void btnReadPosition_Click(object sender, EventArgs e)
{
ReadPosistion();
}
private void btnGetAlarm_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetAlarmStatus(GetPortName(), GetSlaveAddr());
this.txtAlarmStatus.Text = value.ToString();
}
private void button1_Click_1(object sender, EventArgs e)
{
int value = ACServerManager.GetBusyStatus(GetPortName(), GetSlaveAddr());
value = ACServerManager.GetBusyStatus(GetPortName(), GetSlaveAddr());
this.txtBusyStatus.Text = value.ToString();
value = ACServerManager.GetHomeEndStatus(GetPortName(), GetSlaveAddr());
this.txtHomeStatus.Text = value.ToString();
btnReadHomeSingle_Click(null, null);
btnReadLimit1_Click(null, null);
btnReadLimit2_Click(null, null);
}
private void button2_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetHomeEndStatus(GetPortName(), GetSlaveAddr());
this.txtHomeStatus.Text = value.ToString();
}
private void chbAuto_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
......@@ -1517,14 +1363,7 @@ namespace OnlineStore.AutoInOutStore
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓!"));
}
}
private void button3_Click(object sender, EventArgs e)
{
ReadPosistion();
}
private void btnReadLimit1_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetLimitPositiveSingle(GetPortName(), GetSlaveAddr());
......@@ -1536,16 +1375,7 @@ namespace OnlineStore.AutoInOutStore
int value = ACServerManager.GetLimitNegativeSingle(GetPortName(), GetSlaveAddr());
this.txtLimit2.Text = value.ToString();
}
private void btnUpdateStatus_Click(object sender, EventArgs e)
{
btnGetAlarm_Click(null, null);
button1_Click_1(null, null);
button2_Click(null, null);
btnReadHomeSingle_Click(null, null);
btnReadLimit1_Click(null, null);
btnReadLimit2_Click(null, null);
}
private void 批量上下轴ONToolStripMenuItem_Click(object sender, EventArgs e)
{
......@@ -1675,12 +1505,7 @@ namespace OnlineStore.AutoInOutStore
}
private void btnInOutP4_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
{
int value = FormUtil.GetIntValue(txtInoutP4);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P2_Speed);
}
......
......@@ -238,10 +238,10 @@ namespace OnlineStore.AutoInOutStore
/// 请先启动料仓
/// </summary>
public static string PleaseStartStore = "PleaseStartStore";
/// <summary>
/// 定位气缸不在下降端,不能移动进出轴
/// </summary>
public static string CannotMove = "CannotMove";
///// <summary>
///// 定位气缸不在下降端,不能移动进出轴
///// </summary>
//public static string CannotMove = "CannotMove";
/// <summary>
/// 警告
/// </summary>
......@@ -384,10 +384,10 @@ namespace OnlineStore.AutoInOutStore
///等待送料结束
/// </summary>
public static string WaitEnd = "WaitEnd";
/// <summary>
///吸盘吸料失败
/// </summary>
public static string XiLiaoError = "XiLiaoError";
///// <summary>
/////吸盘吸料失败
///// </summary>
//public static string XiLiaoError = "XiLiaoError";
/// <summary>
///伺服OFF
......@@ -397,10 +397,10 @@ namespace OnlineStore.AutoInOutStore
///伺服ON
/// </summary>
public static string servoON = "servoON";
/// <summary>
///仓门状态未知
/// </summary>
public static string NoDoorStatus = "NoDoorStatus";
///// <summary>
/////仓门状态未知
///// </summary>
//public static string NoDoorStatus = "NoDoorStatus";
/// <summary>
///批量出入库信息: 入库:
/// </summary>
......

软件升降轴调试增加图示
升降轴 调试界面日志默认隐藏。
位置点放一张图,都只显示p点
读取伺服状态改为1个按钮
伺服位置读取删掉
X16删掉
20181107
1.出库时等待10秒钟,或等待拿走料盘(高度=0)才算出库结束
......
......@@ -96,10 +96,7 @@ namespace OnlineStore.DeviceLibrary
///"入库执行中"
/// </summary>
public static string InStoreExecute = "InStoreExecute";
/// <summary>
///"故障中"
/// </summary>
public static string InTrouble = "InTrouble";
/// <summary>
///"料盘出仓位完成"
/// </summary>
......@@ -128,10 +125,7 @@ namespace OnlineStore.DeviceLibrary
///"出库失败"
/// </summary>
public static string OutStoreFailed = "OutStoreFailed";
/// <summary>
///"等待信号"
/// </summary>
public static string WaitSingle = "WaitSingle";
/// <summary>
///"超时"
/// </summary>
......@@ -156,10 +150,7 @@ namespace OnlineStore.DeviceLibrary
///"收到复位信号,自动复位"
/// </summary>
public static string AutoReset = "AutoReset";
/// <summary>
///"运动轴"
/// </summary>
public static string MoveAxis = "MoveAxis";
/// <summary>
///"报警"
/// </summary>
......@@ -194,14 +185,7 @@ namespace OnlineStore.DeviceLibrary
///"时间等待:"
/// </summary>
public static string WaitTime = "WaitTime";
/// <summary>
///"电钢目标位置:"
/// </summary>
public static string TargetPosition = "TargetPosition";
/// <summary>
/// 此设备不支持单个入库
/// </summary>
public static string CanotSingleInStore = "CanotSingleInStore";
/// <summary>
///叉子不在待机位,请先将叉子退回待机位
/// </summary>
......@@ -254,10 +238,7 @@ namespace OnlineStore.DeviceLibrary
///未检测到气压信号
/// </summary>
public static string NoAIr = "NoAIr";
/// <summary>
///料盘高度
/// </summary>
public static string trayHeight = "trayHeight";
/// <summary>
///负限位
/// </summary>
......@@ -299,15 +280,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
///伺服ON
/// </summary>
public static string servoON = "servoON";
/// <summary>
///仓门状态未知
/// </summary>
public static string NoDoorStatus = "NoDoorStatus";
/// <summary>
///批量出入库信息: 入库:
/// </summary>
public static string InstoreInfo = "InstoreInfo";
public static string servoON = "servoON";
/// <summary>
///出库
/// </summary>
......@@ -320,12 +293,7 @@ namespace OnlineStore.DeviceLibrary
///门锁打开
/// </summary>
public static string doorOpen = "doorOpen";
/// <summary>
///启动失败:压紧轴连接失败
/// </summary>
public static string PreConnectFail = "PreConnectFail";
/// <summary>
///启动失败:急停未开
/// </summary>
......
......@@ -14,7 +14,7 @@ DI,上料机构出料检测,OutCheck,11,192.168.200.11,0,上料机构出料检测,X12,DI-12,0,
DI,门锁气缸打开端,BatchDoor_Open,12,192.168.200.11,0,门锁气缸打开端,X13,DI-13,0,
DI,门锁气缸关闭端,BatchDoor_Close,13,192.168.200.11,0,门锁气缸关闭端,X14,DI-14,0,
DI,料盘检测2(料叉机构),TrayCheck_Fixture,14,192.168.200.11,0,料盘检测2(料叉机构),X15,DI-15,0,
DI,压紧机构计量检测,CompressAxis_Check,15,192.168.200.11,0,压紧机构计量检测,X16,DI-16,0,
,压紧机构计量检测,CompressAxis_Check,15,192.168.200.11,0,压紧机构计量检测,X16,DI-16,0,
DO,自动指示灯,AutoRun_HddLed,0,192.168.200.11,0,自动指示灯,Y01,DO-01,0,
DO,故障指示灯,Alarm_HddLed,1,192.168.200.11,0,故障指示灯,Y02,DO-02,0,
DO,待机指示灯,RunSign_HddLed,2,192.168.200.11,0,待机指示灯,Y03,DO-03,0,
......
......@@ -315,7 +315,7 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库:SI_01 定位气缸下降");
StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown);
LocationDownAndWait();
//LocationDownAndWait();
}
return true;
}
......@@ -471,7 +471,7 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库:SI_08 定位气缸伸出 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_08_LocationCylinder_Up);
LocationUpAndWait();
//LocationUpAndWait();
}
}
}
......@@ -488,7 +488,7 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库:SI_08 定位气缸伸出 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_08_LocationCylinder_Up);
LocationUpAndWait();
//LocationUpAndWait();
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_08_LocationCylinder_Up)
......@@ -510,7 +510,7 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库:SI_10 定位气缸退回 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_10_LocationCylinder_Down);
LocationDownAndWait();
//LocationDownAndWait();
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down)
......@@ -838,7 +838,7 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_01_LocationCylinderDown);
OutStoreLog("出库:SO_01 定位气缸下降");
LocationDownAndWait();
//LocationDownAndWait();
}
CodeOrInoutMsg = "";
return true;
......@@ -964,7 +964,7 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_07_LocationCylinder_Up);
OutStoreLog("出库:SO_07 定位气缸伸出 ");
LocationUpAndWait();
//LocationUpAndWait();
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up)
......@@ -989,7 +989,7 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_10_LocationCylinder_Down);
OutStoreLog("出库:SO_10 定位气缸退回 ");
LocationDownAndWait();
//LocationDownAndWait();
}
}
}
......@@ -1003,7 +1003,7 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_10_LocationCylinder_Down);
OutStoreLog("出库:SO_10 定位气缸退回 ");
LocationDownAndWait();
//LocationDownAndWait();
}
}
//此处需要等待移栽没有工作,才能把盘放入出料口
......@@ -1029,7 +1029,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog("出库:SO_21打开仓门,压紧轴至P3(压紧前点),定位气缸下降");
ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed);
OpenDoorAndWait();
LocationDownAndWait();
//LocationDownAndWait();
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_21_OpenDoor)
......@@ -1210,46 +1210,6 @@ namespace OnlineStore.DeviceLibrary
//WarnMsg = Msg;
LogUtil.error(Msg);
}
public bool InOutAxisCanMove()
{
if (StoreManager.Store.Config.IsHasLocationCylinder.Equals(0))
{
return true;
}
if (IOManager.IOValue(IO_Type.LocationCylinder_Down).Equals(IO_VALUE.HIGH)
&& IOManager.IOValue(IO_Type.LocationCylinder_Up).Equals(IO_VALUE.LOW)
&& IOManager.IOValue(IO_Type.LocationCylinder2_Down).Equals(IO_VALUE.HIGH)
&& IOManager.IOValue(IO_Type.LocationCylinder2_Up).Equals(IO_VALUE.LOW))
{
return true;
}
return false;
}
private void LocationUpAndWait()
{
if (Config.IsHasLocationCylinder >= 1)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Down, IO_VALUE.LOW));
IOManager.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
}
}
private void LocationDownAndWait()
{
if (Config.IsHasLocationCylinder >= 1)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Up, IO_VALUE.LOW));
IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
}
}
public List<FixtureCodeInfo> waitOutStoreList = new List<FixtureCodeInfo>();
public object waitOutListLock = "";
......
......@@ -158,10 +158,10 @@ namespace OnlineStore.LoadCSVLibrary
/// 料盘检测2(料叉机构) TrayCheck_Fixture X15 DI-15
/// </summary>
public static string TrayCheck_Fixture = "TrayCheck_Fixture";
/// <summary>
/// 压紧机构计量检测 CompressAxis_Check X16 DI-16
/// </summary>
public static string CompressAxis_Check = "CompressAxis_Check";
///// <summary>
///// 压紧机构计量检测 CompressAxis_Check X16 DI-16
///// </summary>
//public static string CompressAxis_Check = "CompressAxis_Check";
/// <summary>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!