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/EtalonForm.Designer.cs
Generated
+15 -7
View File
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EtalonForm));
this.btn_draw_test = new System.Windows.Forms.Button();
this.checkMirrorY = new System.Windows.Forms.CheckBox();
@@ -47,8 +48,9 @@
this.btn_startmove = new System.Windows.Forms.Button();
this.btn_stop = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.text_etalon_info = new System.Windows.Forms.RichTextBox();
this.label1 = new System.Windows.Forms.Label();
this.timer_move = new System.Windows.Forms.Timer(this.components);
this.editor3D = new Plot3D.Editor3D();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -260,6 +262,14 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "etalon操作";
//
// text_etalon_info
//
this.text_etalon_info.Location = new System.Drawing.Point(6, 249);
this.text_etalon_info.Name = "text_etalon_info";
this.text_etalon_info.Size = new System.Drawing.Size(440, 361);
this.text_etalon_info.TabIndex = 50;
this.text_etalon_info.Text = "";
//
// label1
//
this.label1.AutoSize = true;
@@ -269,13 +279,10 @@
this.label1.TabIndex = 49;
this.label1.Text = "输出";
//
// text_etalon_info
// timer_move
//
this.text_etalon_info.Location = new System.Drawing.Point(6, 249);
this.text_etalon_info.Name = "text_etalon_info";
this.text_etalon_info.Size = new System.Drawing.Size(440, 361);
this.text_etalon_info.TabIndex = 50;
this.text_etalon_info.Text = "";
this.timer_move.Interval = 500;
this.timer_move.Tick += new System.EventHandler(this.timer_move_Tick);
//
// editor3D
//
@@ -335,5 +342,6 @@
private System.Windows.Forms.Button btn_clear;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RichTextBox text_etalon_info;
private System.Windows.Forms.Timer timer_move;
}
}
HexcalMC/Motion/EtalonForm.cs
+680 -538
View File
File diff suppressed because it is too large Load Diff
HexcalMC/Motion/EtalonForm.resx
+3
View File
@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer_move.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 4</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
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;
}
}
HexcalMC/Motion/Motion.cs
+1 -7
View File
@@ -292,13 +292,7 @@ namespace HexcalMC
{
DebugDfn.AddLogText("运动平台已连接");
}
else
{
// TCP/IP (Ethernet)
_acs.OpenCommEthernetTCP(
txtIP.Text, // IP Address (Default : 10.0.0.100)
Convert.ToInt32(txtPort.Text.Trim())); // TCP/IP Port nubmer (default : 701)
}
InitMotion();
_mBConnected = true;