xhouse/LM-Middleware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#0014：修复 etalon 接口，连续运动超过队列，更换了另一种方式

Browse Source
This commit is contained in:
zhengxuan.zhang
2024-09-20 17:06:36 +08:00
parent 8093dcd4a4
commit 9133577da0
15 changed files with 2378 additions and 1972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HexcalMC/Motion/Motion.Designer.cs
Generated
+35 -8
View File
@@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Motion));
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtPort = new System.Windows.Forms.TextBox();
@@ -37,7 +36,7 @@
this.btnOpen = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tmrMonitor = new System.Windows.Forms.Timer(this.components);
this.tmrMonitor = new System.Windows.Forms.Timer();
this.grpMotionTest = new System.Windows.Forms.GroupBox();
this.btnHallAll = new System.Windows.Forms.Button();
this.btnHalt = new System.Windows.Forms.Button();
@@ -200,6 +199,8 @@
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.btn_home = new System.Windows.Forms.Button();
this.rdoSimu = new System.Windows.Forms.RadioButton();
this.rdoTCP = new System.Windows.Forms.RadioButton();
this.groupBox1.SuspendLayout();
this.grpMotionTest.SuspendLayout();
this.grpMst.SuspendLayout();
@@ -221,6 +222,8 @@
//
// groupBox1
//
this.groupBox1.Controls.Add(this.rdoTCP);
this.groupBox1.Controls.Add(this.rdoSimu);
this.groupBox1.Controls.Add(this.txtPort);
this.groupBox1.Controls.Add(this.txtIP);
this.groupBox1.Controls.Add(this.btnClose);
@@ -236,7 +239,7 @@
//
// txtPort
//
this.txtPort.Location = new System.Drawing.Point(103, 37);
this.txtPort.Location = new System.Drawing.Point(171, 37);
this.txtPort.Name = "txtPort";
this.txtPort.Size = new System.Drawing.Size(91, 21);
this.txtPort.TabIndex = 15;
@@ -244,7 +247,7 @@
//
// txtIP
//
this.txtIP.Location = new System.Drawing.Point(103, 14);
this.txtIP.Location = new System.Drawing.Point(171, 14);
this.txtIP.Name = "txtIP";
this.txtIP.Size = new System.Drawing.Size(91, 21);
this.txtIP.TabIndex = 16;
@@ -252,7 +255,7 @@
//
// btnClose
//
this.btnClose.Location = new System.Drawing.Point(113, 62);
this.btnClose.Location = new System.Drawing.Point(181, 62);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(81, 23);
this.btnClose.TabIndex = 14;
@@ -262,7 +265,7 @@
//
// btnOpen
//
this.btnOpen.Location = new System.Drawing.Point(7, 62);
this.btnOpen.Location = new System.Drawing.Point(75, 62);
this.btnOpen.Name = "btnOpen";
this.btnOpen.Size = new System.Drawing.Size(81, 23);
this.btnOpen.TabIndex = 13;
@@ -273,7 +276,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(15, 41);
this.label2.Location = new System.Drawing.Point(83, 41);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 11;
@@ -282,7 +285,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(15, 18);
this.label1.Location = new System.Drawing.Point(83, 18);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 12);
this.label1.TabIndex = 12;
@@ -1964,6 +1967,28 @@
this.btn_home.UseVisualStyleBackColor = true;
this.btn_home.Click += new System.EventHandler(this.btn_home_Click);
//
// rdoSimu
//
this.rdoSimu.AutoSize = true;
this.rdoSimu.Location = new System.Drawing.Point(6, 40);
this.rdoSimu.Name = "rdoSimu";
this.rdoSimu.Size = new System.Drawing.Size(59, 16);
this.rdoSimu.TabIndex = 10;
this.rdoSimu.TabStop = true;
this.rdoSimu.Text = "模拟器";
this.rdoSimu.UseVisualStyleBackColor = true;
//
// rdoTCP
//
this.rdoTCP.AutoSize = true;
this.rdoTCP.Location = new System.Drawing.Point(6, 17);
this.rdoTCP.Name = "rdoTCP";
this.rdoTCP.Size = new System.Drawing.Size(41, 16);
this.rdoTCP.TabIndex = 17;
this.rdoTCP.TabStop = true;
this.rdoTCP.Text = "TCP";
this.rdoTCP.UseVisualStyleBackColor = true;
//
// Motion
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2188,6 +2213,8 @@
private System.Windows.Forms.Button btn_Z_Down;
private System.Windows.Forms.Button btn_Z_Up;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.RadioButton rdoSimu;
private System.Windows.Forms.RadioButton rdoTCP;
}
}