Commit d0edb096 LN

1

1 个父辈 5dfc728d
此文件类型无法预览
此文件太大,无法显示。
...@@ -50,15 +50,6 @@ ...@@ -50,15 +50,6 @@
this.btnSotreReset = new System.Windows.Forms.Button(); this.btnSotreReset = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnSaveCom = new System.Windows.Forms.Button();
this.txtComMax = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label();
this.txtComMin = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
this.btnCMove = new System.Windows.Forms.Button();
this.cmbPlateH = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.groupBox7 = new System.Windows.Forms.GroupBox();
...@@ -71,6 +62,16 @@ ...@@ -71,6 +62,16 @@
this.label27 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label();
this.btnTempClose = new System.Windows.Forms.Button(); this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button(); this.btnTempInit = new System.Windows.Forms.Button();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnSaveCom = new System.Windows.Forms.Button();
this.txtComMax = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label();
this.txtComMin = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
this.btnCMove = new System.Windows.Forms.Button();
this.cmbPlateH = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblMoveEquipInfo = new System.Windows.Forms.Label(); this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
...@@ -114,17 +115,16 @@ ...@@ -114,17 +115,16 @@
this.btnUpDownP6 = new System.Windows.Forms.Button(); this.btnUpDownP6 = new System.Windows.Forms.Button();
this.btnUpDownP3 = new System.Windows.Forms.Button(); this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button(); this.btnUpDownP4 = new System.Windows.Forms.Button();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupShelf.SuspendLayout(); this.groupShelf.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
this.tabPage3.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -476,139 +476,6 @@ ...@@ -476,139 +476,6 @@
this.tabPage1.Text = " 伺服调试 "; this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// groupBox1
//
this.groupBox1.Controls.Add(this.btnSaveCom);
this.groupBox1.Controls.Add(this.txtComMax);
this.groupBox1.Controls.Add(this.label47);
this.groupBox1.Controls.Add(this.txtComMin);
this.groupBox1.Controls.Add(this.label48);
this.groupBox1.Controls.Add(this.btnCMove);
this.groupBox1.Controls.Add(this.cmbPlateH);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false;
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(6, 504);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(742, 63);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置";
//
// btnSaveCom
//
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(617, 19);
this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256;
this.btnSaveCom.Text = "保存位置";
this.btnSaveCom.UseVisualStyleBackColor = false;
this.btnSaveCom.Click += new System.EventHandler(this.btnSaveCom_Click);
//
// txtComMax
//
this.txtComMax.AcceptsReturn = true;
this.txtComMax.BackColor = System.Drawing.SystemColors.Window;
this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(341, 27);
this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMax.Size = new System.Drawing.Size(82, 23);
this.txtComMax.TabIndex = 255;
this.txtComMax.Text = "1000";
//
// label47
//
this.label47.AutoSize = true;
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(318, 30);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17);
this.label47.TabIndex = 254;
this.label47.Text = "-";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtComMin
//
this.txtComMin.BackColor = System.Drawing.SystemColors.Window;
this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(226, 27);
this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMin.Size = new System.Drawing.Size(82, 23);
this.txtComMin.TabIndex = 253;
this.txtComMin.Text = "1000";
//
// label48
//
this.label48.AutoSize = true;
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(133, 30);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17);
this.label48.TabIndex = 252;
this.label48.Text = "压紧位置范围:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCMove
//
this.btnCMove.AutoSize = true;
this.btnCMove.BackColor = System.Drawing.SystemColors.Control;
this.btnCMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnCMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(433, 22);
this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(174, 33);
this.btnCMove.TabIndex = 215;
this.btnCMove.Text = "移动至压紧点P2:";
this.btnCMove.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.UseVisualStyleBackColor = false;
this.btnCMove.Click += new System.EventHandler(this.btnCMove_Click);
//
// cmbPlateH
//
this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(59, 24);
this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(64, 28);
this.cmbPlateH.TabIndex = 176;
this.cmbPlateH.SelectedIndexChanged += new System.EventHandler(this.cmbPlateH_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Cursor = System.Windows.Forms.Cursors.Default;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(14, 30);
this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(35, 17);
this.label1.TabIndex = 175;
this.label1.Text = "盘高:";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Enabled = false; this.axisMoveControl1.Enabled = false;
...@@ -623,7 +490,7 @@ ...@@ -623,7 +490,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(565, 482); this.tabPage2.Size = new System.Drawing.Size(553, 482);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 温湿度 "; this.tabPage2.Text = " 温湿度 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -742,6 +609,149 @@ ...@@ -742,6 +609,149 @@
this.btnTempInit.UseVisualStyleBackColor = true; this.btnTempInit.UseVisualStyleBackColor = true;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click); this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click);
// //
// tabPage3
//
this.tabPage3.Controls.Add(this.groupShelf);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(553, 482);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 料架位置 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.btnSaveCom);
this.groupBox1.Controls.Add(this.txtComMax);
this.groupBox1.Controls.Add(this.label47);
this.groupBox1.Controls.Add(this.txtComMin);
this.groupBox1.Controls.Add(this.label48);
this.groupBox1.Controls.Add(this.btnCMove);
this.groupBox1.Controls.Add(this.cmbPlateH);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false;
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(6, 492);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(742, 74);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置";
//
// btnSaveCom
//
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(617, 24);
this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256;
this.btnSaveCom.Text = "保存位置";
this.btnSaveCom.UseVisualStyleBackColor = false;
this.btnSaveCom.Click += new System.EventHandler(this.btnSaveCom_Click);
//
// txtComMax
//
this.txtComMax.AcceptsReturn = true;
this.txtComMax.BackColor = System.Drawing.SystemColors.Window;
this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(341, 32);
this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMax.Size = new System.Drawing.Size(82, 23);
this.txtComMax.TabIndex = 255;
this.txtComMax.Text = "1000";
//
// label47
//
this.label47.AutoSize = true;
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(318, 35);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17);
this.label47.TabIndex = 254;
this.label47.Text = "-";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtComMin
//
this.txtComMin.BackColor = System.Drawing.SystemColors.Window;
this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(226, 32);
this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMin.Size = new System.Drawing.Size(82, 23);
this.txtComMin.TabIndex = 253;
this.txtComMin.Text = "1000";
//
// label48
//
this.label48.AutoSize = true;
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(133, 35);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17);
this.label48.TabIndex = 252;
this.label48.Text = "压紧位置范围:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCMove
//
this.btnCMove.AutoSize = true;
this.btnCMove.BackColor = System.Drawing.SystemColors.Control;
this.btnCMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnCMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(433, 27);
this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(174, 33);
this.btnCMove.TabIndex = 215;
this.btnCMove.Text = "移动至压紧点P2:";
this.btnCMove.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.UseVisualStyleBackColor = false;
this.btnCMove.Click += new System.EventHandler(this.btnCMove_Click);
//
// cmbPlateH
//
this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(59, 29);
this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(64, 28);
this.cmbPlateH.TabIndex = 176;
this.cmbPlateH.SelectedIndexChanged += new System.EventHandler(this.cmbPlateH_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Cursor = System.Windows.Forms.Cursors.Default;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(14, 35);
this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(35, 17);
this.label1.TabIndex = 175;
this.label1.Text = "盘高:";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.lblMoveEquipInfo); this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
...@@ -750,7 +760,7 @@ ...@@ -750,7 +760,7 @@
this.groupBox3.Controls.Add(this.chbDebug); this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Location = new System.Drawing.Point(6, 58); this.groupBox3.Location = new System.Drawing.Point(6, 58);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(742, 125); this.groupBox3.Size = new System.Drawing.Size(742, 112);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
...@@ -760,7 +770,7 @@ ...@@ -760,7 +770,7 @@
this.lblMoveEquipInfo.AutoSize = true; this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Blue; this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Blue;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(221, 27); this.lblMoveEquipInfo.Location = new System.Drawing.Point(221, 21);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo"; this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(65, 19); this.lblMoveEquipInfo.Size = new System.Drawing.Size(65, 19);
this.lblMoveEquipInfo.TabIndex = 272; this.lblMoveEquipInfo.TabIndex = 272;
...@@ -772,9 +782,9 @@ ...@@ -772,9 +782,9 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(12, 61); this.lblWarnMsg.Location = new System.Drawing.Point(5, 50);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(724, 54); this.lblWarnMsg.Size = new System.Drawing.Size(732, 60);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -783,7 +793,7 @@ ...@@ -783,7 +793,7 @@
this.lblThisSta.AutoSize = true; this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(14, 27); this.lblThisSta.Location = new System.Drawing.Point(14, 21);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19); this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
...@@ -794,7 +804,7 @@ ...@@ -794,7 +804,7 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(626, 24); this.chbDebug.Location = new System.Drawing.Point(626, 18);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25); this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -844,7 +854,7 @@ ...@@ -844,7 +854,7 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(6, 184); this.groupInout.Location = new System.Drawing.Point(6, 173);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(742, 316); this.groupInout.Size = new System.Drawing.Size(742, 316);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
...@@ -1422,16 +1432,6 @@ ...@@ -1422,16 +1432,6 @@
this.btnUpDownP4.UseVisualStyleBackColor = false; this.btnUpDownP4.UseVisualStyleBackColor = false;
this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click); this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
// //
// tabPage3
//
this.tabPage3.Controls.Add(this.groupShelf);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(565, 482);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 料架位置 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// FrmBox // FrmBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -1454,16 +1454,16 @@ ...@@ -1454,16 +1454,16 @@
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout(); this.groupBox7.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout(); this.groupBox3.PerformLayout();
this.groupInout.ResumeLayout(false); this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout(); this.groupInout.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
this.txtSlaveId = new System.Windows.Forms.TextBox(); this.txtSlaveId = new System.Windows.Forms.TextBox();
this.btnOpenDo = new System.Windows.Forms.Button(); this.btnOpenDo = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.txtDOIndex = new System.Windows.Forms.TextBox(); this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox(); this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label();
...@@ -87,7 +86,6 @@ ...@@ -87,7 +86,6 @@
this.groupBox1.Controls.Add(this.txtSlaveId); this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.btnOpenDo); this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.txtDOIndex); this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName); this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.label17); this.groupBox1.Controls.Add(this.label17);
...@@ -264,18 +262,6 @@ ...@@ -264,18 +262,6 @@
this.button2.Text = "关闭"; this.button2.Text = "关闭";
this.button2.UseVisualStyleBackColor = false; this.button2.UseVisualStyleBackColor = false;
// //
// label3
//
this.label3.AutoSize = true;
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(12, 23);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(54, 17);
this.label3.TabIndex = 247;
this.label3.Text = "选择DO:";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtDOIndex // txtDOIndex
// //
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -385,9 +371,9 @@ ...@@ -385,9 +371,9 @@
this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(69, 18); this.cmbWriteIO.Location = new System.Drawing.Point(6, 18);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(233, 27); this.cmbWriteIO.Size = new System.Drawing.Size(296, 27);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
...@@ -510,7 +496,6 @@ ...@@ -510,7 +496,6 @@
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.ComboBox cmbWriteIO; private System.Windows.Forms.ComboBox cmbWriteIO;
private System.Windows.Forms.TextBox txtDoName; private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnCloseDoor; private System.Windows.Forms.Button btnCloseDoor;
private System.Windows.Forms.Button btnOpenDoor; private System.Windows.Forms.Button btnOpenDoor;
private System.Windows.Forms.Button btnLocationDown; private System.Windows.Forms.Button btnLocationDown;
......
...@@ -255,18 +255,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -255,18 +255,13 @@ namespace OnlineStore.DeviceLibrary
isNoAirCheck = false; isNoAirCheck = false;
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
//重置灯
IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
//开始复位动作 //开始复位动作
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H01_DoorClose); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H01_DoorClose);
LogInfo(MoveInfo.MoveType + ": 线体停止,入口移门关闭,NG升降门下降"); LogInfo(MoveInfo.MoveType + ": 线体停止,入口移门关闭,NG升降门下降");
IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW); IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
IOMove(IO_Type.Line_Run, IO_VALUE.LOW); IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
CylinderMove(MoveInfo, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down); CylinderMove(MoveInfo, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down);
CylinderMove(MoveInfo, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close); CylinderMove(null, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
} }
/// <summary> /// <summary>
...@@ -287,8 +282,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -287,8 +282,8 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H01_DoorClose: case StoreMoveStep.BOX_H01_DoorClose:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_InOutBack); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_InOutBack);
ACAxisHomeMove(Config.InOut_Axis);
LogInfo(MoveInfo.MoveType + ": 进出轴开始原点返回"); LogInfo(MoveInfo.MoveType + ": 进出轴开始原点返回");
ACAxisHomeMove(Config.InOut_Axis);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
break; break;
case StoreMoveStep.BOX_H03_InOutBack: case StoreMoveStep.BOX_H03_InOutBack:
......
...@@ -87,7 +87,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -87,7 +87,7 @@ namespace OnlineStore.DeviceLibrary
{ {
humidity = param.Humidity; humidity = param.Humidity;
temp = param.Temperate; temp = param.Temperate;
currTempStr = Name + ("当前湿度:" + humidity.ToString() + ",当前温度:" + temp); currTempStr = Name + ("湿度:" + humidity.ToString() + ",温度:" + temp);
} }
//double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList()); //double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList());
double currMaxHumidity = param.Humidity; double currMaxHumidity = param.Humidity;
......
...@@ -15,7 +15,7 @@ DI,L侧线体取料位检测,LineTake_Check,7,PRO_AOI_IP_2,0,L侧线体取料位检测,X28,DI-28 ...@@ -15,7 +15,7 @@ DI,L侧线体取料位检测,LineTake_Check,7,PRO_AOI_IP_2,0,L侧线体取料位检测,X28,DI-28
DI,L侧料叉压紧确认检测,Compress_Check,8,PRO_AOI_IP_2,0,L侧料叉压紧确认检测,X29,DI-29,0, DI,L侧料叉压紧确认检测,Compress_Check,8,PRO_AOI_IP_2,0,L侧料叉压紧确认检测,X29,DI-29,0,
DI,L侧NG料口料盘检测,NGTrayCheck,9,PRO_AOI_IP_2,0,L侧NG料口料盘检测,X30,DI-30,0, DI,L侧NG料口料盘检测,NGTrayCheck,9,PRO_AOI_IP_2,0,L侧NG料口料盘检测,X30,DI-30,0,
DI,L侧NG料口升降门上升端,NGDoowCylinder_Up,10,PRO_AOI_IP_2,0,L侧NG料口升降门上升端,X31,DI-31,0, DI,L侧NG料口升降门上升端,NGDoowCylinder_Up,10,PRO_AOI_IP_2,0,L侧NG料口升降门上升端,X31,DI-31,0,
DI,L侧NG料口升降门上升端,NGDoorCylinder_Down,11,PRO_AOI_IP_2,0,L侧NG料口升降门上升端,X32,DI-32,0, DI,L侧NG料口升降门下降端,NGDoorCylinder_Down,11,PRO_AOI_IP_2,0,L侧NG料口升降门下降端,X32,DI-32,0,
DI,L侧顶升装置上升端,TopCylinder_Up,12,PRO_AOI_IP_2,0,L侧顶升装置上升端,X33,DI-33,0, DI,L侧顶升装置上升端,TopCylinder_Up,12,PRO_AOI_IP_2,0,L侧顶升装置上升端,X33,DI-33,0,
DI,L侧顶升装置下降端,TopCylinder_Down,13,PRO_AOI_IP_2,0,L侧顶升装置下降端,X34,DI-34,0, DI,L侧顶升装置下降端,TopCylinder_Down,13,PRO_AOI_IP_2,0,L侧顶升装置下降端,X34,DI-34,0,
DI,L侧定位装置上升端,LocationCylinder_Up,14,PRO_AOI_IP_2,0,L侧定位装置上升端,X35,DI-35,0, DI,L侧定位装置上升端,LocationCylinder_Up,14,PRO_AOI_IP_2,0,L侧定位装置上升端,X35,DI-35,0,
......
...@@ -15,7 +15,7 @@ DI,R侧线体取料位检测,LineTake_Check,7,PRO_AOI_IP_3,0,R侧线体取料位检测,X48,DI-48 ...@@ -15,7 +15,7 @@ DI,R侧线体取料位检测,LineTake_Check,7,PRO_AOI_IP_3,0,R侧线体取料位检测,X48,DI-48
DI,R侧料叉压紧确认检测,Compress_Check,8,PRO_AOI_IP_3,0,R侧料叉压紧确认检测,X49,DI-49,0, DI,R侧料叉压紧确认检测,Compress_Check,8,PRO_AOI_IP_3,0,R侧料叉压紧确认检测,X49,DI-49,0,
DI,R侧NG料口料盘检测,NGTrayCheck,9,PRO_AOI_IP_3,0,R侧NG料口料盘检测,X50,DI-50,0, DI,R侧NG料口料盘检测,NGTrayCheck,9,PRO_AOI_IP_3,0,R侧NG料口料盘检测,X50,DI-50,0,
DI,R侧NG料口升降门上升端,NGDoowCylinder_Up,10,PRO_AOI_IP_3,0,R侧NG料口升降门上升端,X51,DI-51,0, DI,R侧NG料口升降门上升端,NGDoowCylinder_Up,10,PRO_AOI_IP_3,0,R侧NG料口升降门上升端,X51,DI-51,0,
DI,R侧NG料口升降门上升端,NGDoorCylinder_Down,11,PRO_AOI_IP_3,0,R侧NG料口升降门上升端,X52,DI-52,0, DI,R侧NG料口升降门下降端,NGDoorCylinder_Down,11,PRO_AOI_IP_3,0,R侧NG料口升降门下降端,X52,DI-52,0,
DI,R侧顶升装置上升端,TopCylinder_Up,12,PRO_AOI_IP_3,0,R侧顶升装置上升端,X53,DI-53,0, DI,R侧顶升装置上升端,TopCylinder_Up,12,PRO_AOI_IP_3,0,R侧顶升装置上升端,X53,DI-53,0,
DI,R侧顶升装置下降端,TopCylinder_Down,13,PRO_AOI_IP_3,0,R侧顶升装置下降端,X54,DI-54,0, DI,R侧顶升装置下降端,TopCylinder_Down,13,PRO_AOI_IP_3,0,R侧顶升装置下降端,X54,DI-54,0,
DI,R侧定位装置上升端,LocationCylinder_Up,14,PRO_AOI_IP_3,0,R侧定位装置上升端,X55,DI-55,0, DI,R侧定位装置上升端,LocationCylinder_Up,14,PRO_AOI_IP_3,0,R侧定位装置上升端,X55,DI-55,0,
...@@ -30,7 +30,7 @@ DO,R侧线体正转,Line_Run,5,PRO_AOI_IP_3,0,R侧线体正转,Y46,DO-46,0, ...@@ -30,7 +30,7 @@ DO,R侧线体正转,Line_Run,5,PRO_AOI_IP_3,0,R侧线体正转,Y46,DO-46,0,
DO,R侧线体反转,Line_BackRun,6,PRO_AOI_IP_3,0,R侧线体反转,Y47,DO-47,0, DO,R侧线体反转,Line_BackRun,6,PRO_AOI_IP_3,0,R侧线体反转,Y47,DO-47,0,
DO,R侧料仓吹气SOL,StartOrStopBlow,7,PRO_AOI_IP_3,0,R侧料仓吹气SOL,Y48,DO-48,0, DO,R侧料仓吹气SOL,StartOrStopBlow,7,PRO_AOI_IP_3,0,R侧料仓吹气SOL,Y48,DO-48,0,
DO,R侧NG料口升降门上升SOL,NGDoowCylinder_Up,8,PRO_AOI_IP_3,0,R侧NG料口升降门上升SOL,Y49,DO-49,0, DO,R侧NG料口升降门上升SOL,NGDoowCylinder_Up,8,PRO_AOI_IP_3,0,R侧NG料口升降门上升SOL,Y49,DO-49,0,
DO,R侧NG料口升降门上升SOL,NGDoorCylinder_Down,9,PRO_AOI_IP_3,0,R侧NG料口升降门上升SOL,Y50,DO-50,0, DO,R侧NG料口升降门下降SOL,NGDoorCylinder_Down,9,PRO_AOI_IP_3,0,R侧NG料口升降门下降SOL,Y50,DO-50,0,
DO,R侧顶升装置上升SOL,TopCylinder_Up,10,PRO_AOI_IP_3,0,R侧顶升装置上升SOL,Y51,DO-51,0, DO,R侧顶升装置上升SOL,TopCylinder_Up,10,PRO_AOI_IP_3,0,R侧顶升装置上升SOL,Y51,DO-51,0,
DO,R侧顶升装置下降SOL,TopCylinder_Down,11,PRO_AOI_IP_3,0,R侧顶升装置下降SOL,Y52,DO-52,0, DO,R侧顶升装置下降SOL,TopCylinder_Down,11,PRO_AOI_IP_3,0,R侧顶升装置下降SOL,Y52,DO-52,0,
DO,R侧定位装置上升SOL,LocationCylinder_Up,12,PRO_AOI_IP_3,0,R侧定位装置上升SOL,Y53,DO-53,0, DO,R侧定位装置上升SOL,LocationCylinder_Up,12,PRO_AOI_IP_3,0,R侧定位装置上升SOL,Y53,DO-53,0,
......
...@@ -341,6 +341,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -341,6 +341,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info("轴【" + portName + "_" + slvAddr + "】 相对走" + value + "已等待2分钟,直接停止"); LogUtil.info("轴【" + portName + "_" + slvAddr + "】 相对走" + value + "已等待2分钟,直接停止");
SuddenStop(portName, slvAddr); SuddenStop(portName, slvAddr);
Thread.Sleep(200);
} }
} }
else else
...@@ -354,7 +355,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -354,7 +355,7 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(time); Thread.Sleep(time);
LogUtil.info("轴【" + portName + "_" + slvAddr + "】匀速 已等待" + time + ",直接停止"); LogUtil.info("轴【" + portName + "_" + slvAddr + "】匀速 已等待" + time + ",直接停止");
SuddenStop(portName, slvAddr); SuddenStop(portName, slvAddr);
Thread.Sleep(100); Thread.Sleep(200);
} }
} }
}catch(Exception ex) }catch(Exception ex)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!