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/MainFrom.Designer.cs
Generated
+40 -12
View File
@@ -140,6 +140,8 @@
this.btnEnable = new System.Windows.Forms.Button();
this.btnDisable = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.rdoTCP = new System.Windows.Forms.RadioButton();
this.rdoSimu = new System.Windows.Forms.RadioButton();
this.lamp_acs = new HexcalMC.Lamp();
this.txtPort = new System.Windows.Forms.TextBox();
this.txtIP = new System.Windows.Forms.TextBox();
@@ -855,9 +857,9 @@
this.grpSafety.Controls.Add(this.label20);
this.grpSafety.Controls.Add(this.label19);
this.grpSafety.Controls.Add(this.label17);
this.grpSafety.Location = new System.Drawing.Point(516, 15);
this.grpSafety.Location = new System.Drawing.Point(569, 15);
this.grpSafety.Name = "grpSafety";
this.grpSafety.Size = new System.Drawing.Size(199, 133);
this.grpSafety.Size = new System.Drawing.Size(146, 133);
this.grpSafety.TabIndex = 12;
this.grpSafety.TabStop = false;
this.grpSafety.Text = "安全限位";
@@ -1009,7 +1011,7 @@
this.grpMst.Controls.Add(this.lblAcc0);
this.grpMst.Controls.Add(this.lblMoving0);
this.grpMst.Controls.Add(this.label13);
this.grpMst.Location = new System.Drawing.Point(332, 15);
this.grpMst.Location = new System.Drawing.Point(381, 15);
this.grpMst.Name = "grpMst";
this.grpMst.Size = new System.Drawing.Size(178, 133);
this.grpMst.TabIndex = 11;
@@ -1188,7 +1190,7 @@
//
this.groupBox6.Controls.Add(this.btnEnable);
this.groupBox6.Controls.Add(this.btnDisable);
this.groupBox6.Location = new System.Drawing.Point(233, 15);
this.groupBox6.Location = new System.Drawing.Point(283, 15);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(93, 133);
this.groupBox6.TabIndex = 10;
@@ -1217,6 +1219,8 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.rdoTCP);
this.groupBox2.Controls.Add(this.rdoSimu);
this.groupBox2.Controls.Add(this.lamp_acs);
this.groupBox2.Controls.Add(this.txtPort);
this.groupBox2.Controls.Add(this.txtIP);
@@ -1226,15 +1230,37 @@
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Location = new System.Drawing.Point(14, 15);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(209, 133);
this.groupBox2.Size = new System.Drawing.Size(263, 133);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "通讯状态";
//
// rdoTCP
//
this.rdoTCP.AutoSize = true;
this.rdoTCP.Checked = true;
this.rdoTCP.Location = new System.Drawing.Point(6, 25);
this.rdoTCP.Name = "rdoTCP";
this.rdoTCP.Size = new System.Drawing.Size(43, 17);
this.rdoTCP.TabIndex = 32;
this.rdoTCP.TabStop = true;
this.rdoTCP.Text = "TCP";
this.rdoTCP.UseVisualStyleBackColor = true;
//
// rdoSimu
//
this.rdoSimu.AutoSize = true;
this.rdoSimu.Location = new System.Drawing.Point(6, 48);
this.rdoSimu.Name = "rdoSimu";
this.rdoSimu.Size = new System.Drawing.Size(64, 17);
this.rdoSimu.TabIndex = 31;
this.rdoSimu.Text = "模拟器";
this.rdoSimu.UseVisualStyleBackColor = true;
//
// lamp_acs
//
this.lamp_acs.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
this.lamp_acs.Location = new System.Drawing.Point(57, 50);
this.lamp_acs.Location = new System.Drawing.Point(120, 42);
this.lamp_acs.LText = "";
this.lamp_acs.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.lamp_acs.Name = "lamp_acs";
@@ -1245,7 +1271,7 @@
//
// txtPort
//
this.txtPort.Location = new System.Drawing.Point(103, 52);
this.txtPort.Location = new System.Drawing.Point(166, 44);
this.txtPort.Name = "txtPort";
this.txtPort.Size = new System.Drawing.Size(91, 21);
this.txtPort.TabIndex = 21;
@@ -1253,7 +1279,7 @@
//
// txtIP
//
this.txtIP.Location = new System.Drawing.Point(103, 29);
this.txtIP.Location = new System.Drawing.Point(166, 21);
this.txtIP.Name = "txtIP";
this.txtIP.Size = new System.Drawing.Size(91, 21);
this.txtIP.TabIndex = 22;
@@ -1261,7 +1287,7 @@
//
// btn_ACSStop
//
this.btn_ACSStop.Location = new System.Drawing.Point(113, 84);
this.btn_ACSStop.Location = new System.Drawing.Point(176, 76);
this.btn_ACSStop.Name = "btn_ACSStop";
this.btn_ACSStop.Size = new System.Drawing.Size(81, 30);
this.btn_ACSStop.TabIndex = 20;
@@ -1271,7 +1297,7 @@
//
// btn_ACSStart
//
this.btn_ACSStart.Location = new System.Drawing.Point(18, 84);
this.btn_ACSStart.Location = new System.Drawing.Point(81, 76);
this.btn_ACSStart.Name = "btn_ACSStart";
this.btn_ACSStart.Size = new System.Drawing.Size(81, 30);
this.btn_ACSStart.TabIndex = 19;
@@ -1282,7 +1308,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(18, 56);
this.label2.Location = new System.Drawing.Point(81, 48);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(33, 13);
this.label2.TabIndex = 17;
@@ -1291,7 +1317,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(18, 33);
this.label1.Location = new System.Drawing.Point(81, 25);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 13);
this.label1.TabIndex = 18;
@@ -1497,5 +1523,7 @@
private Telerik.WinControls.UI.RadButtonElement rtb_home;
private Telerik.WinControls.UI.RadRibbonBarGroup radRibbonBarGroup9;
private Telerik.WinControls.UI.RadButtonElement rtb_etalon;
private System.Windows.Forms.RadioButton rdoTCP;
private System.Windows.Forms.RadioButton rdoSimu;
}
}