diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs
index e730f29..368cdb1 100644
--- a/Rs.DeweyTester/Properties/AssemblyInfo.cs
+++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("1.20.24.28")]
+ [assembly: AssemblyVersion("1.20.24.29")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Rs.DeweyTester/TestFrm.Designer.cs b/Rs.DeweyTester/TestFrm.Designer.cs
index 42c97aa..baa2669 100644
--- a/Rs.DeweyTester/TestFrm.Designer.cs
+++ b/Rs.DeweyTester/TestFrm.Designer.cs
@@ -71,10 +71,14 @@
this.label3 = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.btnEnd = new System.Windows.Forms.Button();
+ this.btnStart = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
+ this.groupBox5.SuspendLayout();
this.SuspendLayout();
//
// button24
@@ -417,12 +421,38 @@
this.label5.ForeColor = System.Drawing.Color.White;
this.label5.Name = "label5";
//
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.btnEnd);
+ this.groupBox5.Controls.Add(this.btnStart);
+ this.groupBox5.ForeColor = System.Drawing.Color.White;
+ resources.ApplyResources(this.groupBox5, "groupBox5");
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.TabStop = false;
+ //
+ // btnEnd
+ //
+ this.btnEnd.ForeColor = System.Drawing.Color.Black;
+ resources.ApplyResources(this.btnEnd, "btnEnd");
+ this.btnEnd.Name = "btnEnd";
+ this.btnEnd.UseVisualStyleBackColor = true;
+ this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
+ //
+ // btnStart
+ //
+ this.btnStart.ForeColor = System.Drawing.Color.Black;
+ resources.ApplyResources(this.btnStart, "btnStart");
+ this.btnStart.Name = "btnStart";
+ this.btnStart.UseVisualStyleBackColor = true;
+ this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+ //
// TestFrm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Name = "TestFrm";
@@ -433,6 +463,7 @@
this.groupBox3.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
+ this.groupBox5.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -480,5 +511,8 @@
private System.Windows.Forms.ComboBox comboBox3;
private System.Windows.Forms.ComboBox comboBox2;
private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.GroupBox groupBox5;
+ private System.Windows.Forms.Button btnEnd;
+ private System.Windows.Forms.Button btnStart;
}
}
\ No newline at end of file
diff --git a/Rs.DeweyTester/TestFrm.cs b/Rs.DeweyTester/TestFrm.cs
index 3b79fa5..b1566d2 100644
--- a/Rs.DeweyTester/TestFrm.cs
+++ b/Rs.DeweyTester/TestFrm.cs
@@ -283,5 +283,54 @@ namespace Rs.MotionPlat
}
});
}
+ ///
+ /// 精度验证
+ ///
+ static bool bPrecisionVerify = false;
+ private void btnStart_Click(object sender, EventArgs e)
+ {
+ bPrecisionVerify = true;
+ Task.Run(() => {
+ while (bPrecisionVerify)
+ {
+ TargetPosition targetPos = new TargetPosition();
+ targetPos.X = GlobalVar.Fixture1GrabImageX;
+ targetPos.Y1 = GlobalVar.FixtureSideY1;
+ targetPos.Y2 = GlobalVar.Fixture1GrabImageY2;
+ GroupAxisMove.XY1Y2MovePos(targetPos, GlobalVar.WholeSpeed, EGoWhichSide.StockSide);
+ while (bPrecisionVerify)
+ {
+ if(AxisArrived.LoadXY1Y2IsArrived(targetPos.X,targetPos.Y1,targetPos.Y2))
+ {
+ Thread.Sleep(3000);
+ break;
+ }
+ }
+
+ if(bPrecisionVerify)
+ {
+ SlotPoint sp = TrayPointManager.GetSlotPoint(ETrayType.Grr, 1);
+ targetPos = new TargetPosition();
+ targetPos.X = sp.X;
+ targetPos.Y1 = GlobalVar.StockSideY1;
+ targetPos.Y2 = sp.Y;
+ GroupAxisMove.XY1Y2MovePos(targetPos, GlobalVar.WholeSpeed, EGoWhichSide.StockSide);
+ while (bPrecisionVerify)
+ {
+ if (AxisArrived.LoadXY1Y2IsArrived(targetPos.X, targetPos.Y1, targetPos.Y2))
+ {
+ Thread.Sleep(3000);
+ break;
+ }
+ }
+ }
+ }
+ });
+ }
+
+ private void btnEnd_Click(object sender, EventArgs e)
+ {
+ bPrecisionVerify = false;
+ }
}
}
diff --git a/Rs.DeweyTester/TestFrm.resx b/Rs.DeweyTester/TestFrm.resx
index cb00af8..1ad4ffe 100644
--- a/Rs.DeweyTester/TestFrm.resx
+++ b/Rs.DeweyTester/TestFrm.resx
@@ -242,6 +242,222 @@
16
+
+ radioButton16
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
+
+
+ radioButton6
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 1
+
+
+ radioButton15
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 2
+
+
+ radioButton5
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 3
+
+
+ radioButton14
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 4
+
+
+ radioButton3
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 5
+
+
+ radioButton13
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 6
+
+
+ radioButton8
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 7
+
+
+ radioButton12
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 8
+
+
+ radioButton4
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 9
+
+
+ radioButton11
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 10
+
+
+ radioButton7
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 11
+
+
+ radioButton10
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 12
+
+
+ radioButton2
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 13
+
+
+ radioButton9
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 14
+
+
+ radioButton1
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 15
+
+
+ 840, 12
+
+
+ 336, 187
+
+
+ 31
+
+
+ 飞拍
+
+
+ groupBox1
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 4
+
True
@@ -674,28 +890,79 @@
15
-
- 840, 12
+
+ comboBox1
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 0
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 1
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 2
+
+
+ textBox1
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 3
+
+
+ 415, 25
+
+
+ 362, 174
-
- 336, 187
+
+ 32
-
- 31
+
+ Test
-
- 飞拍
+
+ False
-
- groupBox1
+
+ groupBox2
-
+
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
+
3
@@ -812,33 +1079,6 @@
3
-
- 415, 25
-
-
- 362, 174
-
-
- 32
-
-
- Test
-
-
- False
-
-
- groupBox2
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 2
-
29, 12
@@ -887,6 +1127,174 @@
6
+
+ comboBox3
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 0
+
+
+ comboBox2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 1
+
+
+ label8
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 2
+
+
+ textBox3
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 3
+
+
+ label7
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 4
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 5
+
+
+ textBox6
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 7
+
+
+ textBox2
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 8
+
+
+ label6
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 9
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 10
+
+
+ textBox5
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 11
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 12
+
+
+ 29, 241
+
+
+ 336, 122
+
+
+ 41
+
+
+ 产品搬运
+
+
+ groupBox4
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 0
+
211, 114
@@ -1211,29 +1619,81 @@
12
-
- 29, 241
+
+
+ NoControl
-
- 336, 122
+
+ 211, 46
-
- 41
+
+ 124, 44
-
- 产品搬运
+
+ 0
-
- groupBox4
+
+ 停止
-
+
+ btnEnd
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 0
+
+
+ 35, 46
+
+
+ 124, 44
+
+
+ 0
+
+
+ 开始
+
+
+ btnStart
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 1
+
+
+ 415, 241
+
+
+ 362, 122
+
+
+ 32
+
+
+ 精度验证
+
+
+ groupBox5
+
+
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- 0
+
+ 2
True
@@ -1251,6 +1711,6 @@
TestFrm
- Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.8, Culture=neutral, PublicKeyToken=null
+ Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.29, Culture=neutral, PublicKeyToken=null
\ No newline at end of file