diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs
index dc8e17a..e7c60c9 100644
--- a/Rs.DeweyTester/Properties/AssemblyInfo.cs
+++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("20.25.19.1")]
+ [assembly: AssemblyVersion("20.25.20.1")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Rs.DeweyTester/SysConfig/FixtureConfig.Designer.cs b/Rs.DeweyTester/SysConfig/FixtureConfig.Designer.cs
index a6b75a3..5a9dcb0 100644
--- a/Rs.DeweyTester/SysConfig/FixtureConfig.Designer.cs
+++ b/Rs.DeweyTester/SysConfig/FixtureConfig.Designer.cs
@@ -150,6 +150,12 @@
this.button5 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.txtIntervalTime = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.btnEnd = new System.Windows.Forms.Button();
+ this.btnStart = new System.Windows.Forms.Button();
this.panel2.SuspendLayout();
this.groupBox22.SuspendLayout();
this.groupBox27.SuspendLayout();
@@ -164,6 +170,7 @@
this.groupBox15.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// panel2
@@ -1410,10 +1417,62 @@
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.btnTake_Click);
//
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.txtIntervalTime);
+ this.groupBox3.Controls.Add(this.label4);
+ this.groupBox3.Controls.Add(this.label3);
+ this.groupBox3.Controls.Add(this.btnEnd);
+ this.groupBox3.Controls.Add(this.btnStart);
+ resources.ApplyResources(this.groupBox3, "groupBox3");
+ this.groupBox3.ForeColor = System.Drawing.Color.White;
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.TabStop = false;
+ //
+ // txtIntervalTime
+ //
+ resources.ApplyResources(this.txtIntervalTime, "txtIntervalTime");
+ this.txtIntervalTime.Name = "txtIntervalTime";
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // btnEnd
+ //
+ this.btnEnd.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+ this.btnEnd.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnEnd.FlatAppearance.BorderColor = System.Drawing.Color.White;
+ resources.ApplyResources(this.btnEnd, "btnEnd");
+ this.btnEnd.ForeColor = System.Drawing.Color.White;
+ this.btnEnd.Name = "btnEnd";
+ this.btnEnd.Tag = "6";
+ this.btnEnd.UseVisualStyleBackColor = false;
+ this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
+ //
+ // btnStart
+ //
+ this.btnStart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+ this.btnStart.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnStart.FlatAppearance.BorderColor = System.Drawing.Color.White;
+ resources.ApplyResources(this.btnStart, "btnStart");
+ this.btnStart.ForeColor = System.Drawing.Color.White;
+ this.btnStart.Name = "btnStart";
+ this.btnStart.Tag = "6";
+ this.btnStart.UseVisualStyleBackColor = false;
+ this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+ //
// FixtureConfig
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.groupBox3);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel3);
this.Controls.Add(this.panel2);
@@ -1441,6 +1500,8 @@
this.panel1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
this.ResumeLayout(false);
}
@@ -1567,5 +1628,11 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtFixtureTakePicDelaytime;
+ private System.Windows.Forms.GroupBox groupBox3;
+ private System.Windows.Forms.TextBox txtIntervalTime;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Button btnStart;
+ private System.Windows.Forms.Button btnEnd;
}
}
\ No newline at end of file
diff --git a/Rs.DeweyTester/SysConfig/FixtureConfig.cs b/Rs.DeweyTester/SysConfig/FixtureConfig.cs
index 408db83..fce4766 100644
--- a/Rs.DeweyTester/SysConfig/FixtureConfig.cs
+++ b/Rs.DeweyTester/SysConfig/FixtureConfig.cs
@@ -11,6 +11,7 @@ using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
@@ -217,5 +218,37 @@ namespace Rs.MotionPlat.SysConfig
DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
});
}
+
+ static bool stop = false;
+ private void btnStart_Click(object sender, EventArgs e)
+ {
+ stop = false;
+ if(int.TryParse(txtIntervalTime.Text, out int interval))
+ {
+ Task.Run(() => {
+ while (true)
+ {
+ if (stop)
+ break;
+ for (int i = 1; i <= 6; i++)
+ {
+ Ops.On($"治具夹{i}");
+ }
+ Thread.Sleep(interval);
+ for (int i = 1; i <= 6; i++)
+ {
+ Ops.Off($"治具夹{i}");
+ }
+ Thread.Sleep(interval);
+ }
+ });
+ }
+
+ }
+
+ private void btnEnd_Click(object sender, EventArgs e)
+ {
+ stop = true;
+ }
}
}
diff --git a/Rs.DeweyTester/SysConfig/FixtureConfig.resx b/Rs.DeweyTester/SysConfig/FixtureConfig.resx
index ea13327..36dad05 100644
--- a/Rs.DeweyTester/SysConfig/FixtureConfig.resx
+++ b/Rs.DeweyTester/SysConfig/FixtureConfig.resx
@@ -2494,7 +2494,7 @@
$this
- 2
+ 3
宋体, 9pt
@@ -3112,7 +3112,7 @@
$this
- 1
+ 2
17, 17
@@ -3670,6 +3670,180 @@
$this
+ 1
+
+
+ 113, 51
+
+
+ 97, 21
+
+
+ 1
+
+
+ 50
+
+
+ txtIntervalTime
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox3
+
+
+ 0
+
+
+ True
+
+
+ NoControl
+
+
+ 216, 54
+
+
+ 17, 12
+
+
+ 0
+
+
+ ms
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox3
+
+
+ 1
+
+
+ True
+
+
+ 24, 54
+
+
+ 83, 12
+
+
+ 0
+
+
+ IntervalTime:
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox3
+
+
+ 2
+
+
+ Flat
+
+
+ 宋体, 10pt
+
+
+ NoControl
+
+
+ 202, 106
+
+
+ 104, 38
+
+
+ 46
+
+
+ End
+
+
+ btnEnd
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox3
+
+
+ 3
+
+
+ Flat
+
+
+ 宋体, 10pt
+
+
+ NoControl
+
+
+ 26, 102
+
+
+ 104, 38
+
+
+ 46
+
+
+ Start
+
+
+ btnStart
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox3
+
+
+ 4
+
+
+ Left
+
+
+ 1242, 0
+
+
+ 358, 865
+
+
+ 5
+
+
+ Aging test
+
+
+ groupBox3
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
0
@@ -3694,6 +3868,6 @@
FixtureConfig
- Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.25.9, Culture=neutral, PublicKeyToken=null
+ Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=20.25.20.1, Culture=neutral, PublicKeyToken=null
\ No newline at end of file