diff --git a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs index 5cfd300..6df8eb7 100644 --- a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs +++ b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs @@ -62,9 +62,9 @@ namespace Rs.MotionPlat.Flow.SafePosFlow targetPosY = SysConfigParam.GetValue("PressY"); break; case EExceptionSafePos.SocketFrom9ToSixteen: - //targetPosX = SysConfigParam.GetValue("TurnoverTakeX"); - targetPosX = TrayPointManager.GetExceptiontTrayPoint(2).X; - targetPosY = SysConfigParam.GetValue("PressY"); + targetPosX = SysConfigParam.GetValue("Socket9_16ExceptionX"); + //targetPosX = TrayPointManager.GetExceptiontTrayPoint(2).X; + targetPosY = SysConfigParam.GetValue("Socket9_16ExceptionY"); break; case EExceptionSafePos.TransitNozzle: targetPosX = GlobalVar.TransitNozzleExceptionSafePosX; diff --git a/Rs.SkyLine/SysConfig/TurnoverConfig.Designer.cs b/Rs.SkyLine/SysConfig/TurnoverConfig.Designer.cs index 8dc0f50..83051e1 100644 --- a/Rs.SkyLine/SysConfig/TurnoverConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/TurnoverConfig.Designer.cs @@ -119,6 +119,14 @@ this.label26 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.label24 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); + this.btnTeachSocket9_16ExceptionX = new System.Windows.Forms.Button(); + this.label31 = new System.Windows.Forms.Label(); + this.btnTeachSocket9_16ExceptionY = new System.Windows.Forms.Button(); + this.btnMoveSocket9_16ExceptionX = new System.Windows.Forms.Button(); + this.txtSocket9_16ExceptionX = new System.Windows.Forms.TextBox(); + this.btnMoveSocket9_16ExceptionY = new System.Windows.Forms.Button(); + this.txtSocket9_16ExceptionY = new System.Windows.Forms.TextBox(); this.groupBox1.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -136,30 +144,38 @@ this.groupBox1.ForeColor = System.Drawing.Color.White; this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(401, 615); + this.groupBox1.Size = new System.Drawing.Size(401, 673); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "位置"; // // groupBox4 // + this.groupBox4.Controls.Add(this.txtSocket9_16ExceptionY); this.groupBox4.Controls.Add(this.txtTransitNozzleExceptionSafePosY); this.groupBox4.Controls.Add(this.txtTurnoverSafeZ); + this.groupBox4.Controls.Add(this.btnMoveSocket9_16ExceptionY); + this.groupBox4.Controls.Add(this.txtSocket9_16ExceptionX); this.groupBox4.Controls.Add(this.btnMoveTransitNozzleExceptionSafePosY); + this.groupBox4.Controls.Add(this.btnMoveSocket9_16ExceptionX); this.groupBox4.Controls.Add(this.txtTransitNozzleExceptionSafePosX); + this.groupBox4.Controls.Add(this.btnTeachSocket9_16ExceptionY); this.groupBox4.Controls.Add(this.btnMoveTransitNozzleExceptionSafePosX); + this.groupBox4.Controls.Add(this.label31); this.groupBox4.Controls.Add(this.btnTeachTransitNozzleExceptionSafePosY); this.groupBox4.Controls.Add(this.label33); + this.groupBox4.Controls.Add(this.btnTeachSocket9_16ExceptionX); this.groupBox4.Controls.Add(this.btnMoveTurnoverSafeZ); this.groupBox4.Controls.Add(this.btnTeachTransitNozzleExceptionSafePosX); this.groupBox4.Controls.Add(this.label4); + this.groupBox4.Controls.Add(this.label30); this.groupBox4.Controls.Add(this.btnTeachTurnoverSafeZ); this.groupBox4.Controls.Add(this.label32); this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox4.ForeColor = System.Drawing.Color.White; this.groupBox4.Location = new System.Drawing.Point(3, 486); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(395, 126); + this.groupBox4.Size = new System.Drawing.Size(395, 184); this.groupBox4.TabIndex = 49; this.groupBox4.TabStop = false; this.groupBox4.Text = "安全位"; @@ -1102,9 +1118,9 @@ this.groupBox3.Controls.Add(this.label24); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox3.ForeColor = System.Drawing.Color.White; - this.groupBox3.Location = new System.Drawing.Point(0, 615); + this.groupBox3.Location = new System.Drawing.Point(0, 673); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(401, 230); + this.groupBox3.Size = new System.Drawing.Size(401, 172); this.groupBox3.TabIndex = 5; this.groupBox3.TabStop = false; this.groupBox3.Text = "真空"; @@ -1115,7 +1131,7 @@ this.txtTurnoverTrayCloseVacBreakDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtTurnoverTrayCloseVacBreakDelaytime.Font = new System.Drawing.Font("宋体", 9F); this.txtTurnoverTrayCloseVacBreakDelaytime.ForeColor = System.Drawing.Color.White; - this.txtTurnoverTrayCloseVacBreakDelaytime.Location = new System.Drawing.Point(316, 153); + this.txtTurnoverTrayCloseVacBreakDelaytime.Location = new System.Drawing.Point(319, 135); this.txtTurnoverTrayCloseVacBreakDelaytime.Name = "txtTurnoverTrayCloseVacBreakDelaytime"; this.txtTurnoverTrayCloseVacBreakDelaytime.Size = new System.Drawing.Size(50, 21); this.txtTurnoverTrayCloseVacBreakDelaytime.TabIndex = 49; @@ -1130,7 +1146,7 @@ this.txtTurnoverTrayOpenVacBreakDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtTurnoverTrayOpenVacBreakDelaytime.Font = new System.Drawing.Font("宋体", 9F); this.txtTurnoverTrayOpenVacBreakDelaytime.ForeColor = System.Drawing.Color.White; - this.txtTurnoverTrayOpenVacBreakDelaytime.Location = new System.Drawing.Point(131, 153); + this.txtTurnoverTrayOpenVacBreakDelaytime.Location = new System.Drawing.Point(134, 135); this.txtTurnoverTrayOpenVacBreakDelaytime.Name = "txtTurnoverTrayOpenVacBreakDelaytime"; this.txtTurnoverTrayOpenVacBreakDelaytime.Size = new System.Drawing.Size(50, 21); this.txtTurnoverTrayOpenVacBreakDelaytime.TabIndex = 49; @@ -1142,7 +1158,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(372, 157); + this.label16.Location = new System.Drawing.Point(375, 139); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(17, 12); this.label16.TabIndex = 47; @@ -1151,7 +1167,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(187, 157); + this.label12.Location = new System.Drawing.Point(190, 139); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(17, 12); this.label12.TabIndex = 47; @@ -1163,7 +1179,7 @@ this.txtTurnoverTrayCloseVacSuctionDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtTurnoverTrayCloseVacSuctionDelaytime.Font = new System.Drawing.Font("宋体", 9F); this.txtTurnoverTrayCloseVacSuctionDelaytime.ForeColor = System.Drawing.Color.White; - this.txtTurnoverTrayCloseVacSuctionDelaytime.Location = new System.Drawing.Point(316, 120); + this.txtTurnoverTrayCloseVacSuctionDelaytime.Location = new System.Drawing.Point(319, 102); this.txtTurnoverTrayCloseVacSuctionDelaytime.Name = "txtTurnoverTrayCloseVacSuctionDelaytime"; this.txtTurnoverTrayCloseVacSuctionDelaytime.Size = new System.Drawing.Size(50, 21); this.txtTurnoverTrayCloseVacSuctionDelaytime.TabIndex = 49; @@ -1178,7 +1194,7 @@ this.txtTurnoverTrayOpenVacSuctionDelaytime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtTurnoverTrayOpenVacSuctionDelaytime.Font = new System.Drawing.Font("宋体", 9F); this.txtTurnoverTrayOpenVacSuctionDelaytime.ForeColor = System.Drawing.Color.White; - this.txtTurnoverTrayOpenVacSuctionDelaytime.Location = new System.Drawing.Point(131, 120); + this.txtTurnoverTrayOpenVacSuctionDelaytime.Location = new System.Drawing.Point(134, 102); this.txtTurnoverTrayOpenVacSuctionDelaytime.Name = "txtTurnoverTrayOpenVacSuctionDelaytime"; this.txtTurnoverTrayOpenVacSuctionDelaytime.Size = new System.Drawing.Size(50, 21); this.txtTurnoverTrayOpenVacSuctionDelaytime.TabIndex = 49; @@ -1190,7 +1206,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(372, 124); + this.label15.Location = new System.Drawing.Point(375, 106); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(17, 12); this.label15.TabIndex = 47; @@ -1199,7 +1215,7 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(187, 124); + this.label11.Location = new System.Drawing.Point(190, 106); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(17, 12); this.label11.TabIndex = 47; @@ -1313,7 +1329,7 @@ // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(203, 155); + this.label29.Location = new System.Drawing.Point(206, 137); this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(119, 12); this.label29.TabIndex = 48; @@ -1322,7 +1338,7 @@ // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(203, 124); + this.label27.Location = new System.Drawing.Point(206, 106); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(119, 12); this.label27.TabIndex = 48; @@ -1331,7 +1347,7 @@ // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(12, 157); + this.label28.Location = new System.Drawing.Point(15, 139); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(107, 12); this.label28.TabIndex = 48; @@ -1349,7 +1365,7 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(12, 126); + this.label26.Location = new System.Drawing.Point(15, 108); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(107, 12); this.label26.TabIndex = 48; @@ -1373,6 +1389,114 @@ this.label24.TabIndex = 48; this.label24.Text = "吸头真空吸时间:"; // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(6, 127); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(77, 12); + this.label30.TabIndex = 48; + this.label30.Text = "9-16处理位X:"; + // + // btnTeachSocket9_16ExceptionX + // + this.btnTeachSocket9_16ExceptionX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.btnTeachSocket9_16ExceptionX.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.btnTeachSocket9_16ExceptionX.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnTeachSocket9_16ExceptionX.ForeColor = System.Drawing.Color.White; + this.btnTeachSocket9_16ExceptionX.Location = new System.Drawing.Point(195, 124); + this.btnTeachSocket9_16ExceptionX.Name = "btnTeachSocket9_16ExceptionX"; + this.btnTeachSocket9_16ExceptionX.Size = new System.Drawing.Size(79, 25); + this.btnTeachSocket9_16ExceptionX.TabIndex = 45; + this.btnTeachSocket9_16ExceptionX.Tag = "TurnoverX"; + this.btnTeachSocket9_16ExceptionX.Text = "示教"; + this.btnTeachSocket9_16ExceptionX.UseVisualStyleBackColor = false; + this.btnTeachSocket9_16ExceptionX.Click += new System.EventHandler(this.Teach_Click); + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(6, 157); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(77, 12); + this.label31.TabIndex = 47; + this.label31.Text = "9-16处理位Y:"; + // + // btnTeachSocket9_16ExceptionY + // + this.btnTeachSocket9_16ExceptionY.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.btnTeachSocket9_16ExceptionY.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.btnTeachSocket9_16ExceptionY.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnTeachSocket9_16ExceptionY.ForeColor = System.Drawing.Color.White; + this.btnTeachSocket9_16ExceptionY.Location = new System.Drawing.Point(195, 153); + this.btnTeachSocket9_16ExceptionY.Name = "btnTeachSocket9_16ExceptionY"; + this.btnTeachSocket9_16ExceptionY.Size = new System.Drawing.Size(79, 25); + this.btnTeachSocket9_16ExceptionY.TabIndex = 45; + this.btnTeachSocket9_16ExceptionY.Tag = "TurnoverY"; + this.btnTeachSocket9_16ExceptionY.Text = "示教"; + this.btnTeachSocket9_16ExceptionY.UseVisualStyleBackColor = false; + this.btnTeachSocket9_16ExceptionY.Click += new System.EventHandler(this.Teach_Click); + // + // btnMoveSocket9_16ExceptionX + // + this.btnMoveSocket9_16ExceptionX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.btnMoveSocket9_16ExceptionX.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.btnMoveSocket9_16ExceptionX.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMoveSocket9_16ExceptionX.ForeColor = System.Drawing.Color.White; + this.btnMoveSocket9_16ExceptionX.Location = new System.Drawing.Point(304, 124); + this.btnMoveSocket9_16ExceptionX.Name = "btnMoveSocket9_16ExceptionX"; + this.btnMoveSocket9_16ExceptionX.Size = new System.Drawing.Size(79, 25); + this.btnMoveSocket9_16ExceptionX.TabIndex = 44; + this.btnMoveSocket9_16ExceptionX.Tag = "TurnoverX"; + this.btnMoveSocket9_16ExceptionX.Text = "运动到此"; + this.btnMoveSocket9_16ExceptionX.UseVisualStyleBackColor = false; + this.btnMoveSocket9_16ExceptionX.Click += new System.EventHandler(this.Move_Click); + // + // txtSocket9_16ExceptionX + // + this.txtSocket9_16ExceptionX.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtSocket9_16ExceptionX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSocket9_16ExceptionX.Font = new System.Drawing.Font("宋体", 9F); + this.txtSocket9_16ExceptionX.ForeColor = System.Drawing.Color.White; + this.txtSocket9_16ExceptionX.Location = new System.Drawing.Point(86, 123); + this.txtSocket9_16ExceptionX.Name = "txtSocket9_16ExceptionX"; + this.txtSocket9_16ExceptionX.Size = new System.Drawing.Size(85, 21); + this.txtSocket9_16ExceptionX.TabIndex = 61; + this.txtSocket9_16ExceptionX.Tag = "TurnoverX"; + this.txtSocket9_16ExceptionX.Text = "0.01"; + this.txtSocket9_16ExceptionX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtSocket9_16ExceptionX.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + // + // btnMoveSocket9_16ExceptionY + // + this.btnMoveSocket9_16ExceptionY.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); + this.btnMoveSocket9_16ExceptionY.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.btnMoveSocket9_16ExceptionY.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMoveSocket9_16ExceptionY.ForeColor = System.Drawing.Color.White; + this.btnMoveSocket9_16ExceptionY.Location = new System.Drawing.Point(304, 153); + this.btnMoveSocket9_16ExceptionY.Name = "btnMoveSocket9_16ExceptionY"; + this.btnMoveSocket9_16ExceptionY.Size = new System.Drawing.Size(79, 25); + this.btnMoveSocket9_16ExceptionY.TabIndex = 44; + this.btnMoveSocket9_16ExceptionY.Tag = "TurnoverY"; + this.btnMoveSocket9_16ExceptionY.Text = "运动到此"; + this.btnMoveSocket9_16ExceptionY.UseVisualStyleBackColor = false; + this.btnMoveSocket9_16ExceptionY.Click += new System.EventHandler(this.Move_Click); + // + // txtSocket9_16ExceptionY + // + this.txtSocket9_16ExceptionY.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); + this.txtSocket9_16ExceptionY.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSocket9_16ExceptionY.Font = new System.Drawing.Font("宋体", 9F); + this.txtSocket9_16ExceptionY.ForeColor = System.Drawing.Color.White; + this.txtSocket9_16ExceptionY.Location = new System.Drawing.Point(86, 153); + this.txtSocket9_16ExceptionY.Name = "txtSocket9_16ExceptionY"; + this.txtSocket9_16ExceptionY.Size = new System.Drawing.Size(85, 21); + this.txtSocket9_16ExceptionY.TabIndex = 59; + this.txtSocket9_16ExceptionY.Tag = "TurnoverY"; + this.txtSocket9_16ExceptionY.Text = "0.01"; + this.txtSocket9_16ExceptionY.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtSocket9_16ExceptionY.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp); + // // TurnoverConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1489,5 +1613,13 @@ private System.Windows.Forms.Button btnMoveTransitNozzleExceptionSafePosX; private System.Windows.Forms.Button btnTeachTransitNozzleExceptionSafePosY; private System.Windows.Forms.Button btnTeachTransitNozzleExceptionSafePosX; + private System.Windows.Forms.TextBox txtSocket9_16ExceptionY; + private System.Windows.Forms.Button btnMoveSocket9_16ExceptionY; + private System.Windows.Forms.TextBox txtSocket9_16ExceptionX; + private System.Windows.Forms.Button btnMoveSocket9_16ExceptionX; + private System.Windows.Forms.Button btnTeachSocket9_16ExceptionY; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.Button btnTeachSocket9_16ExceptionX; + private System.Windows.Forms.Label label30; } } \ No newline at end of file