增加测高测试按钮

Rs.SkyLine/Flow/SubFlow/LaserFlow.cs

@@ -94,11 +94,11 @@ namespace Rs.MotionPlat.Flow.SubFlow
                             {
                                 if(trayType== ETrayType.Test)
                                 {
-                                    errCode = AxisControl.TurnoverX.MovePos(targetSlot.X - GlobalVar.TestFixtureTrayOffsetHeight, GlobalVar.WholeSpeed);
+                                    errCode = AxisControl.TurnoverX.MovePos(targetSlot.X - GlobalVar.TestFixtureTrayTestHeightOffsetX, GlobalVar.WholeSpeed);
                                 }
                                 else if(trayType== ETrayType.Turnover)
                                 {
-                                    errCode = AxisControl.TurnoverX.MovePos(targetSlot.X +4, GlobalVar.WholeSpeed);
+                                    errCode = AxisControl.TurnoverX.MovePos(targetSlot.X +GlobalVar.TurnoverTrayTestHeightOffsetX, GlobalVar.WholeSpeed);
                                 }
                             }
                             if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis)
@@ -209,11 +209,11 @@ namespace Rs.MotionPlat.Flow.SubFlow
         {
             if (trayType == ETrayType.Test)
             {
-                HasProduct = (Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TestFixtureTrayOffsetHeight)>0.6;
+                HasProduct = Math.Abs(Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TestFixtureTrayOffsetHeight)>0.4;
             }
             else if (trayType == ETrayType.Turnover)
             {
-                HasProduct = Math.Abs((Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TurnoverTrayOffsetHeight))>0.6;
+                HasProduct = Math.Abs((Math.Abs(TestHeight1 - TestHeight2) - GlobalVar.TurnoverTrayOffsetHeight))>0.4;
             }
         }
     }

Rs.SkyLine/TestFrm.Designer.cs

@@ -57,6 +57,7 @@
             this.button21 = new System.Windows.Forms.Button();
             this.button22 = new System.Windows.Forms.Button();
             this.button23 = new System.Windows.Forms.Button();
+            this.button24 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // btnTurnoverSlotException
@@ -349,11 +350,22 @@
             this.button23.UseVisualStyleBackColor = true;
             this.button23.Click += new System.EventHandler(this.button23_Click);
             // 
+            // button24
+            // 
+            this.button24.Location = new System.Drawing.Point(391, 96);
+            this.button24.Name = "button24";
+            this.button24.Size = new System.Drawing.Size(152, 37);
+            this.button24.TabIndex = 2;
+            this.button24.Text = "测试治具测高";
+            this.button24.UseVisualStyleBackColor = true;
+            this.button24.Click += new System.EventHandler(this.button24_Click);
+            // 
             // TestFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1336, 854);
+            this.Controls.Add(this.button24);
             this.Controls.Add(this.button23);
             this.Controls.Add(this.button14);
             this.Controls.Add(this.button12);
@@ -420,5 +432,6 @@
         private System.Windows.Forms.Button button21;
         private System.Windows.Forms.Button button22;
         private System.Windows.Forms.Button button23;
+        private System.Windows.Forms.Button button24;
     }
 }

Rs.SkyLine/TestFrm.cs

@@ -210,5 +210,10 @@ namespace Rs.MotionPlat
                 NgTrayToInputTrayFlow.Instance.MoveToInput();
             });
         }
+
+        private void button24_Click(object sender, EventArgs e)
+        {
+           TestHeightResult thr =  LaserFlow.Instance.HasProduct(ETrayType.Test, 2);
+        }
     }
 }