diff --git a/C-Windows-1/Form1.Designer.cs b/C-Windows-1/Form1.Designer.cs index d674cf1..9045828 100644 --- a/C-Windows-1/Form1.Designer.cs +++ b/C-Windows-1/Form1.Designer.cs @@ -883,7 +883,7 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(925, 351); + this.button2.Location = new System.Drawing.Point(926, 457); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(84, 38); this.button2.TabIndex = 147; @@ -893,7 +893,7 @@ // // zhanhao // - this.zhanhao.Location = new System.Drawing.Point(909, 319); + this.zhanhao.Location = new System.Drawing.Point(920, 408); this.zhanhao.Name = "zhanhao"; this.zhanhao.Size = new System.Drawing.Size(113, 21); this.zhanhao.TabIndex = 148; @@ -902,7 +902,7 @@ // this.groupBox2.Controls.Add(this.labelyinjian); this.groupBox2.Controls.Add(this.labelruanjian); - this.groupBox2.Location = new System.Drawing.Point(816, 108); + this.groupBox2.Location = new System.Drawing.Point(859, 105); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(174, 184); this.groupBox2.TabIndex = 149; diff --git a/C-Windows-1/Form1.cs b/C-Windows-1/Form1.cs index cc8d9aa..b6859e9 100644 --- a/C-Windows-1/Form1.cs +++ b/C-Windows-1/Form1.cs @@ -3133,8 +3133,8 @@ namespace C_Windows_1 station2 = Convert.ToUInt16(stationIP); station = station2.ToString("X2"); Modbusread(360, 4, ReadData); - labelruanjian.Text = "软件版本号:" + ReadData[360].ToString("X4") + ReadData[361].ToString("X4"); - labelyinjian.Text = "硬件版本号:" + ReadData[362].ToString("X4") + ReadData[363].ToString("X4"); + labelruanjian.Text = "软件版本号:" + ReadData[361].ToString("X4")+ReadData[360].ToString("X4") ; + labelyinjian.Text = "硬件版本号:" + ReadData[363].ToString("X4")+ ReadData[362].ToString("X4") ; } diff --git a/C-Windows-1/bin/Debug/LL28-Control.exe b/C-Windows-1/bin/Debug/LL28-Control.exe index f88e6a8..2945528 100644 Binary files a/C-Windows-1/bin/Debug/LL28-Control.exe and b/C-Windows-1/bin/Debug/LL28-Control.exe differ diff --git a/C-Windows-1/bin/28修改站号IP.rar b/C-Windows-1/bin/新28.zip similarity index 56% rename from C-Windows-1/bin/28修改站号IP.rar rename to C-Windows-1/bin/新28.zip index 2de08b4..a2824cd 100644 Binary files a/C-Windows-1/bin/28修改站号IP.rar and b/C-Windows-1/bin/新28.zip differ diff --git a/C-Windows-1/obj/Debug/LL28-Control.exe b/C-Windows-1/obj/Debug/LL28-Control.exe index f88e6a8..2945528 100644 Binary files a/C-Windows-1/obj/Debug/LL28-Control.exe and b/C-Windows-1/obj/Debug/LL28-Control.exe differ