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

1、修复在于Hexcal 补偿过程中的通讯问题；2、改变监听端口方式，改为监听所有端口，不在固定 测量机默认IP 100.0.0.1 ;

Browse Source
This commit is contained in:
zhengxuan.zhang
2024-03-11 10:37:51 +08:00
parent 8e15635264
commit 92705068f7
8 changed files with 207 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HexcalMC/MainFrom.Designer.cs
Generated
+43 -116
View File
@@ -50,6 +50,7 @@
this.radRibbonBarGroup5 = new Telerik.WinControls.UI.RadRibbonBarGroup();
this.radRibbonBarButtonGroup7 = new Telerik.WinControls.UI.RadRibbonBarButtonGroup();
this.rtb_demo = new Telerik.WinControls.UI.RadButtonElement();
this.radRibbonBarGroup6 = new Telerik.WinControls.UI.RadRibbonBarGroup();
this.ribbonTab2 = new Telerik.WinControls.UI.RibbonTab();
this.radRibbonBarGroup2 = new Telerik.WinControls.UI.RadRibbonBarGroup();
this.rtb_about = new Telerik.WinControls.UI.RadButtonElement();
@@ -87,28 +88,21 @@
this.elementHost1 = new System.Windows.Forms.Integration.ElementHost();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lamp_hexcal = new HexcalMC.Lamp();
this.Btn_StopServer = new System.Windows.Forms.Button();
this.Btn_StartServer = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.grpSafety = new System.Windows.Forms.GroupBox();
this.lblEMG = new System.Windows.Forms.Label();
this.lblRL3 = new System.Windows.Forms.Label();
this.lblLL3 = new System.Windows.Forms.Label();
this.lblRL2 = new System.Windows.Forms.Label();
this.lblLL2 = new System.Windows.Forms.Label();
this.lblRL1 = new System.Windows.Forms.Label();
this.lblRL4 = new System.Windows.Forms.Label();
this.lblLL1 = new System.Windows.Forms.Label();
this.lblLL4 = new System.Windows.Forms.Label();
this.lblRL0 = new System.Windows.Forms.Label();
this.lblLL0 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label();
this.label26 = new System.Windows.Forms.Label();
this.label25 = new System.Windows.Forms.Label();
this.label33 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
@@ -128,7 +122,6 @@
this.btnEnable = new System.Windows.Forms.Button();
this.btnDisable = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lamp_acs = new HexcalMC.Lamp();
this.txtPort = new System.Windows.Forms.TextBox();
this.txtIP = new System.Windows.Forms.TextBox();
this.btn_ACSStop = new System.Windows.Forms.Button();
@@ -139,7 +132,8 @@
this.TextBoxMsg = new System.Windows.Forms.RichTextBox();
this.tmrMonitor = new System.Windows.Forms.Timer(this.components);
this.timer_RefreshUI = new System.Windows.Forms.Timer(this.components);
this.radRibbonBarGroup6 = new Telerik.WinControls.UI.RadRibbonBarGroup();
this.lamp_hexcal = new HexcalMC.Lamp();
this.lamp_acs = new HexcalMC.Lamp();
((System.ComponentModel.ISupportInitialize)(this.radRibbonBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radRibbonBarBackstageView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radStatusStrip1)).BeginInit();
@@ -335,6 +329,11 @@
this.rtb_demo.TextAlignment = System.Drawing.ContentAlignment.BottomLeft;
this.rtb_demo.Click += new System.EventHandler(this.rtb_demo_Click);
//
// radRibbonBarGroup6
//
this.radRibbonBarGroup6.Name = "radRibbonBarGroup6";
this.radRibbonBarGroup6.Text = "快速定位";
//
// ribbonTab2
//
this.ribbonTab2.AutoEllipsis = false;
@@ -404,7 +403,7 @@
//
this.radRibbonBar1.RootElement.AutoSizeMode = Telerik.WinControls.RadAutoSizeMode.WrapAroundChildren;
this.radRibbonBar1.ShowExpandButton = false;
this.radRibbonBar1.Size = new System.Drawing.Size(1192, 176);
this.radRibbonBar1.Size = new System.Drawing.Size(1192, 173);
this.radRibbonBar1.StartButtonImage = global::HexcalMC.Properties.Resources.Hexagon;
this.radRibbonBar1.StartMenuItems.AddRange(new Telerik.WinControls.RadItem[] {
this.radMenuItem2});
@@ -610,7 +609,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 176);
this.splitContainer1.Location = new System.Drawing.Point(0, 173);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -624,7 +623,7 @@
//
this.splitContainer1.Panel2.BackColor = System.Drawing.SystemColors.Control;
this.splitContainer1.Panel2.Controls.Add(this.groupBox3);
this.splitContainer1.Size = new System.Drawing.Size(1192, 693);
this.splitContainer1.Size = new System.Drawing.Size(1192, 696);
this.splitContainer1.SplitterDistance = 760;
this.splitContainer1.TabIndex = 2;
//
@@ -718,23 +717,11 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "通讯状态";
//
// lamp_hexcal
//
this.lamp_hexcal.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
this.lamp_hexcal.Location = new System.Drawing.Point(57, 23);
this.lamp_hexcal.LText = "";
this.lamp_hexcal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.lamp_hexcal.Name = "lamp_hexcal";
this.lamp_hexcal.Shadow = false;
this.lamp_hexcal.Size = new System.Drawing.Size(24, 24);
this.lamp_hexcal.State = -1;
this.lamp_hexcal.TabIndex = 29;
//
// Btn_StopServer
//
this.Btn_StopServer.Location = new System.Drawing.Point(113, 79);
this.Btn_StopServer.Name = "Btn_StopServer";
this.Btn_StopServer.Size = new System.Drawing.Size(81, 23);
this.Btn_StopServer.Size = new System.Drawing.Size(81, 30);
this.Btn_StopServer.TabIndex = 26;
this.Btn_StopServer.Text = "关闭服务";
this.Btn_StopServer.UseVisualStyleBackColor = true;
@@ -744,7 +731,7 @@
//
this.Btn_StartServer.Location = new System.Drawing.Point(18, 79);
this.Btn_StartServer.Name = "Btn_StartServer";
this.Btn_StartServer.Size = new System.Drawing.Size(81, 23);
this.Btn_StartServer.Size = new System.Drawing.Size(81, 30);
this.Btn_StartServer.TabIndex = 25;
this.Btn_StartServer.Text = "开启服务";
this.Btn_StartServer.UseVisualStyleBackColor = true;
@@ -775,21 +762,15 @@
// grpSafety
//
this.grpSafety.Controls.Add(this.lblEMG);
this.grpSafety.Controls.Add(this.lblRL3);
this.grpSafety.Controls.Add(this.lblLL3);
this.grpSafety.Controls.Add(this.lblRL2);
this.grpSafety.Controls.Add(this.lblLL2);
this.grpSafety.Controls.Add(this.lblRL1);
this.grpSafety.Controls.Add(this.lblRL4);
this.grpSafety.Controls.Add(this.lblLL1);
this.grpSafety.Controls.Add(this.lblLL4);
this.grpSafety.Controls.Add(this.lblRL0);
this.grpSafety.Controls.Add(this.lblLL0);
this.grpSafety.Controls.Add(this.label18);
this.grpSafety.Controls.Add(this.label27);
this.grpSafety.Controls.Add(this.label26);
this.grpSafety.Controls.Add(this.label25);
this.grpSafety.Controls.Add(this.label33);
this.grpSafety.Controls.Add(this.label24);
this.grpSafety.Controls.Add(this.label20);
this.grpSafety.Controls.Add(this.label19);
@@ -809,24 +790,6 @@
this.lblEMG.Size = new System.Drawing.Size(19, 17);
this.lblEMG.TabIndex = 5;
//
// lblRL3
//
this.lblRL3.Image = ((System.Drawing.Image)(resources.GetObject("lblRL3.Image")));
this.lblRL3.Location = new System.Drawing.Point(142, 67);
this.lblRL3.Name = "lblRL3";
this.lblRL3.Size = new System.Drawing.Size(19, 17);
this.lblRL3.TabIndex = 5;
this.lblRL3.Tag = "13";
//
// lblLL3
//
this.lblLL3.Image = ((System.Drawing.Image)(resources.GetObject("lblLL3.Image")));
this.lblLL3.Location = new System.Drawing.Point(142, 45);
this.lblLL3.Name = "lblLL3";
this.lblLL3.Size = new System.Drawing.Size(19, 17);
this.lblLL3.TabIndex = 5;
this.lblLL3.Tag = "3";
//
// lblRL2
//
this.lblRL2.Image = ((System.Drawing.Image)(resources.GetObject("lblRL2.Image")));
@@ -854,15 +817,6 @@
this.lblRL1.TabIndex = 5;
this.lblRL1.Tag = "11";
//
// lblRL4
//
this.lblRL4.Image = ((System.Drawing.Image)(resources.GetObject("lblRL4.Image")));
this.lblRL4.Location = new System.Drawing.Point(164, 67);
this.lblRL4.Name = "lblRL4";
this.lblRL4.Size = new System.Drawing.Size(19, 17);
this.lblRL4.TabIndex = 5;
this.lblRL4.Tag = "14";
//
// lblLL1
//
this.lblLL1.Image = ((System.Drawing.Image)(resources.GetObject("lblLL1.Image")));
@@ -872,15 +826,6 @@
this.lblLL1.TabIndex = 5;
this.lblLL1.Tag = "1";
//
// lblLL4
//
this.lblLL4.Image = ((System.Drawing.Image)(resources.GetObject("lblLL4.Image")));
this.lblLL4.Location = new System.Drawing.Point(164, 45);
this.lblLL4.Name = "lblLL4";
this.lblLL4.Size = new System.Drawing.Size(19, 17);
this.lblLL4.TabIndex = 5;
this.lblLL4.Tag = "4";
//
// lblRL0
//
this.lblRL0.Image = ((System.Drawing.Image)(resources.GetObject("lblRL0.Image")));
@@ -917,15 +862,6 @@
this.label27.Text = "急停";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label26
//
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(146, 21);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(13, 13);
this.label26.TabIndex = 5;
this.label26.Text = "3";
//
// label25
//
this.label25.AutoSize = true;
@@ -933,16 +869,7 @@
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(13, 13);
this.label25.TabIndex = 5;
this.label25.Text = "2";
//
// label33
//
this.label33.AutoSize = true;
this.label33.Location = new System.Drawing.Point(168, 21);
this.label33.Name = "label33";
this.label33.Size = new System.Drawing.Size(13, 13);
this.label33.TabIndex = 5;
this.label33.Text = "4";
this.label25.Text = "8";
//
// label24
//
@@ -1005,8 +932,8 @@
this.cboAxisNo.FormattingEnabled = true;
this.cboAxisNo.Items.AddRange(new object[] {
"1",
"2",
"4"});
"0",
"8"});
this.cboAxisNo.Location = new System.Drawing.Point(88, 17);
this.cboAxisNo.Name = "cboAxisNo";
this.cboAxisNo.Size = new System.Drawing.Size(60, 20);
@@ -1104,7 +1031,7 @@
//
this.btnEnable.Location = new System.Drawing.Point(6, 23);
this.btnEnable.Name = "btnEnable";
this.btnEnable.Size = new System.Drawing.Size(75, 23);
this.btnEnable.Size = new System.Drawing.Size(75, 30);
this.btnEnable.TabIndex = 9;
this.btnEnable.Text = "3轴使能";
this.btnEnable.UseVisualStyleBackColor = true;
@@ -1112,9 +1039,9 @@
//
// btnDisable
//
this.btnDisable.Location = new System.Drawing.Point(6, 52);
this.btnDisable.Location = new System.Drawing.Point(6, 53);
this.btnDisable.Name = "btnDisable";
this.btnDisable.Size = new System.Drawing.Size(75, 23);
this.btnDisable.Size = new System.Drawing.Size(75, 30);
this.btnDisable.TabIndex = 8;
this.btnDisable.Text = "3轴取消";
this.btnDisable.UseVisualStyleBackColor = true;
@@ -1136,18 +1063,6 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "通讯状态";
//
// 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.LText = "";
this.lamp_acs.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.lamp_acs.Name = "lamp_acs";
this.lamp_acs.Shadow = false;
this.lamp_acs.Size = new System.Drawing.Size(24, 24);
this.lamp_acs.State = -1;
this.lamp_acs.TabIndex = 30;
//
// txtPort
//
this.txtPort.Location = new System.Drawing.Point(103, 52);
@@ -1168,7 +1083,7 @@
//
this.btn_ACSStop.Location = new System.Drawing.Point(113, 84);
this.btn_ACSStop.Name = "btn_ACSStop";
this.btn_ACSStop.Size = new System.Drawing.Size(81, 23);
this.btn_ACSStop.Size = new System.Drawing.Size(81, 30);
this.btn_ACSStop.TabIndex = 20;
this.btn_ACSStop.Text = "断开";
this.btn_ACSStop.UseVisualStyleBackColor = true;
@@ -1178,7 +1093,7 @@
//
this.btn_ACSStart.Location = new System.Drawing.Point(18, 84);
this.btn_ACSStart.Name = "btn_ACSStart";
this.btn_ACSStart.Size = new System.Drawing.Size(81, 23);
this.btn_ACSStart.Size = new System.Drawing.Size(81, 30);
this.btn_ACSStart.TabIndex = 19;
this.btn_ACSStart.Text = "连接";
this.btn_ACSStart.UseVisualStyleBackColor = true;
@@ -1225,7 +1140,6 @@
//
// tmrMonitor
//
this.tmrMonitor.Interval = 50;
this.tmrMonitor.Tick += new System.EventHandler(this.TmrMonitor_Tick);
//
// timer_RefreshUI
@@ -1233,10 +1147,29 @@
this.timer_RefreshUI.Interval = 1000;
this.timer_RefreshUI.Tick += new System.EventHandler(this.Timer_RefreshUI_Tick);
//
// radRibbonBarGroup6
// lamp_hexcal
//
this.radRibbonBarGroup6.Name = "radRibbonBarGroup6";
this.radRibbonBarGroup6.Text = "快速定位";
this.lamp_hexcal.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
this.lamp_hexcal.Location = new System.Drawing.Point(57, 23);
this.lamp_hexcal.LText = "";
this.lamp_hexcal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.lamp_hexcal.Name = "lamp_hexcal";
this.lamp_hexcal.Shadow = false;
this.lamp_hexcal.Size = new System.Drawing.Size(24, 24);
this.lamp_hexcal.State = -1;
this.lamp_hexcal.TabIndex = 29;
//
// 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.LText = "";
this.lamp_acs.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.lamp_acs.Name = "lamp_acs";
this.lamp_acs.Shadow = false;
this.lamp_acs.Size = new System.Drawing.Size(24, 24);
this.lamp_acs.State = -1;
this.lamp_acs.TabIndex = 30;
//
// MainFrom
//
@@ -1360,21 +1293,15 @@
private System.Windows.Forms.Label label13;
private System.Windows.Forms.GroupBox grpSafety;
private System.Windows.Forms.Label lblEMG;
private System.Windows.Forms.Label lblRL3;
private System.Windows.Forms.Label lblLL3;
private System.Windows.Forms.Label lblRL2;
private System.Windows.Forms.Label lblLL2;
private System.Windows.Forms.Label lblRL1;
private System.Windows.Forms.Label lblRL4;
private System.Windows.Forms.Label lblLL1;
private System.Windows.Forms.Label lblLL4;
private System.Windows.Forms.Label lblRL0;
private System.Windows.Forms.Label lblLL0;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.Label label27;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.Label label25;
private System.Windows.Forms.Label label33;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label19;