ll/LL-28
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加连接时读取版本号功能,修改上位机搜索逻辑由固定192.68.1频段广播变为根据本地IP频段进行广播

Browse Source
This commit is contained in:
zhouyunhao
2024-08-16 17:06:38 +08:00
parent 535d80ffc1
commit 901d626629
6 changed files with 135 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
C-Windows-1/Form1.Designer.cs generated
View File

@@ -182,12 +182,16 @@
this.BtnCon1 = new System.Windows.Forms.Button(); this.BtnCon1 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.labelyinjian = new System.Windows.Forms.Label();
this.labelruanjian = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).BeginInit();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.myGroupBox4.SuspendLayout(); this.myGroupBox4.SuspendLayout();
this.myGroupBox3.SuspendLayout(); this.myGroupBox3.SuspendLayout();
this.myGroupBox1.SuspendLayout(); this.myGroupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// SerialPort1 // SerialPort1
@@ -566,7 +570,7 @@
this.帮助ToolStripMenuItem}); this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1034, 25); this.menuStrip1.Size = new System.Drawing.Size(1045, 25);
this.menuStrip1.TabIndex = 126; this.menuStrip1.TabIndex = 126;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
@@ -753,7 +757,7 @@
// checkBox1 // checkBox1
// //
this.checkBox1.AutoSize = true; this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(889, 83); this.checkBox1.Location = new System.Drawing.Point(900, 83);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(96, 16); this.checkBox1.Size = new System.Drawing.Size(96, 16);
this.checkBox1.TabIndex = 141; this.checkBox1.TabIndex = 141;
@@ -764,7 +768,7 @@
// codecheck // codecheck
// //
this.codecheck.Enabled = false; this.codecheck.Enabled = false;
this.codecheck.Location = new System.Drawing.Point(885, 56); this.codecheck.Location = new System.Drawing.Point(896, 56);
this.codecheck.Name = "codecheck"; this.codecheck.Name = "codecheck";
this.codecheck.ReadOnly = true; this.codecheck.ReadOnly = true;
this.codecheck.Size = new System.Drawing.Size(100, 21); this.codecheck.Size = new System.Drawing.Size(100, 21);
@@ -775,7 +779,7 @@
// //
this.label9.AutoSize = true; this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(892, 29); this.label9.Location = new System.Drawing.Point(903, 29);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(87, 16); this.label9.Size = new System.Drawing.Size(87, 16);
this.label9.TabIndex = 143; this.label9.TabIndex = 143;
@@ -801,12 +805,13 @@
this.groupBox1.Controls.Add(this.label34); this.groupBox1.Controls.Add(this.label34);
this.groupBox1.Controls.Add(this.Sunzong); this.groupBox1.Controls.Add(this.Sunzong);
this.groupBox1.Controls.Add(this.label28); this.groupBox1.Controls.Add(this.label28);
this.groupBox1.Location = new System.Drawing.Point(822, 127); this.groupBox1.Location = new System.Drawing.Point(1140, 127);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(200, 161); this.groupBox1.Size = new System.Drawing.Size(200, 161);
this.groupBox1.TabIndex = 145; this.groupBox1.TabIndex = 145;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "产测计数"; this.groupBox1.Text = "产测计数";
this.groupBox1.Visible = false;
// //
// button1 // button1
// //
@@ -1547,11 +1552,43 @@
this.label6.TabIndex = 15; this.label6.TabIndex = 15;
this.label6.Text = "9999"; this.label6.Text = "9999";
// //
// groupBox2
//
this.groupBox2.Controls.Add(this.labelyinjian);
this.groupBox2.Controls.Add(this.labelruanjian);
this.groupBox2.Location = new System.Drawing.Point(816, 108);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(174, 184);
this.groupBox2.TabIndex = 149;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "设备信息";
//
// labelyinjian
//
this.labelyinjian.AutoSize = true;
this.labelyinjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labelyinjian.Location = new System.Drawing.Point(6, 140);
this.labelyinjian.Name = "labelyinjian";
this.labelyinjian.Size = new System.Drawing.Size(95, 16);
this.labelyinjian.TabIndex = 24;
this.labelyinjian.Text = "硬件版本号:";
//
// labelruanjian
//
this.labelruanjian.AutoSize = true;
this.labelruanjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labelruanjian.Location = new System.Drawing.Point(6, 71);
this.labelruanjian.Name = "labelruanjian";
this.labelruanjian.Size = new System.Drawing.Size(95, 16);
this.labelruanjian.TabIndex = 23;
this.labelruanjian.Text = "软件版本号:";
//
// Form1 // Form1
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1034, 617); this.ClientSize = new System.Drawing.Size(1045, 617);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.zhanhao); this.Controls.Add(this.zhanhao);
this.Controls.Add(this.button2); this.Controls.Add(this.button2);
this.Controls.Add(this.progressBar1); this.Controls.Add(this.progressBar1);
@@ -1614,6 +1651,8 @@
this.myGroupBox3.PerformLayout(); this.myGroupBox3.PerformLayout();
this.myGroupBox1.ResumeLayout(false); this.myGroupBox1.ResumeLayout(false);
this.myGroupBox1.PerformLayout(); this.myGroupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@@ -1772,5 +1811,8 @@
public System.Windows.Forms.Button BtnBreak; public System.Windows.Forms.Button BtnBreak;
public System.Windows.Forms.ComboBox UDPResults; public System.Windows.Forms.ComboBox UDPResults;
public System.Windows.Forms.Button TCPconnect; public System.Windows.Forms.Button TCPconnect;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label labelyinjian;
private System.Windows.Forms.Label labelruanjian;
} }
} }

116
C-Windows-1/Form1.cs
View File

@@ -57,7 +57,7 @@ namespace C_Windows_1
private UdpClient udpClient; private UdpClient udpClient;
private const int Port = 9999; // 监听端口号 private const int Port = 9999; // 监听端口号
private const int ReceiveTimeout = 5000; // 超时时间（毫秒） private const int ReceiveTimeout = 3000; // 超时时间（毫秒）
private bool isListening = false; // 监听标志位,控制是否继续监听 private bool isListening = false; // 监听标志位,控制是否继续监听
private Timer timeoutTimer; // 定时器用于控制超时 private Timer timeoutTimer; // 定时器用于控制超时
@@ -301,7 +301,7 @@ namespace C_Windows_1
int i = 0; int progressvalue = 0;
public void ModbusRtuint(ModbusRtu X, byte station, string COM, int Bund, int numberbit, StopBits stopbit, Parity parity) public void ModbusRtuint(ModbusRtu X, byte station, string COM, int Bund, int numberbit, StopBits stopbit, Parity parity)
{ {
@@ -399,16 +399,16 @@ namespace C_Windows_1
case (int)yiqi.test://读取检测数据以及判断仪器是否结束 case (int)yiqi.test://读取检测数据以及判断仪器是否结束
//operateResult21=Modbusread(170, 23, ReadData); //operateResult21=Modbusread(170, 23, ReadData);
Booltomath(2, ReadData); Booltomath(2, ReadData);
progressBar2.Value = i; progressBar2.Value = progressvalue;
i++; progressvalue += 2;
Modbusread(1013, 16, ReadData);//各项参数 Modbusread(1013, 16, ReadData);//各项参数
Modbusread(1034, 26, ReadData); Modbusread(1034, 26, ReadData);
//Modbusread(25, 24, ReadData); //Modbusread(25, 24, ReadData);
//test(ReadData); //test(ReadData);
//int ba = progressBar2.Value + 2; //int ba = progressBar2.Value + 2;
//if (ba >= progressBar2.Maximum) if (progressvalue >= progressBar2.Maximum)
// ba = progressBar2.Maximum; progressvalue = progressBar2.Maximum;
//progressBar2.Value = ba; progressBar2.Value = progressvalue;
//if (!(grovalue > 99.8)) //if (!(grovalue > 99.8))
//{ //{
@@ -467,13 +467,14 @@ namespace C_Windows_1
timerbar.Stop(); timerbar.Stop();
DataGridView1.Invoke(new System.Action(Display)); DataGridView1.Invoke(new System.Action(Display));
CreateFile(); CreateFile();
Passzong.Text = ChanPass.ToString(); //Passzong.Text = ChanPass.ToString();
Sunzong.Text = ChanSum.ToString(); //Sunzong.Text = ChanSum.ToString();
string path = System.Environment.CurrentDirectory + "\\Config\\Config.ini"; //string path = System.Environment.CurrentDirectory + "\\Config\\Config.ini";
ConfigINI config = new ConfigINI(path); //ConfigINI config = new ConfigINI(path);
config.IniWriteValue("Config", "Passzong", Passzong.Text); //config.IniWriteValue("Config", "Passzong", Passzong.Text);
config.IniWriteValue("Config", "Sunzong", Sunzong.Text); //config.IniWriteValue("Config", "Sunzong", Sunzong.Text);
Code.Clear(); Code.Clear();
progressvalue = 0;
workstation = (int)yiqi.standby; workstation = (int)yiqi.standby;
@@ -1011,15 +1012,15 @@ namespace C_Windows_1
if (ReadData[1041] == 2) if (ReadData[1041] == 2)
{ {
ChanSum++; //ChanSum++;
Tlight.Text = "NG"; Tlight.Text = "NG";
Tlight.ForeColor = Color.Red; Tlight.ForeColor = Color.Red;
} }
if (ReadData[1041] == 1) if (ReadData[1041] == 1)
{ {
ChanPass++; //ChanPass++;
ChanSum++; //ChanSum++;
Tlight.Text = "OK"; Tlight.Text = "OK";
Tlight.ForeColor = Color.Green; Tlight.ForeColor = Color.Green;
} }
@@ -1141,42 +1142,42 @@ namespace C_Windows_1
workstation = (int)yiqi.standby; workstation = (int)yiqi.standby;
while (true) while (true)
{ {
//Thread.Sleep(500); Thread.Sleep(500);
//if (connectflag==1) if (connectflag == 1)
//{ {
// connect = modbusClient.Read("1006", 1);//判断连接是否正常 connect = modbusClient.Read("1006", 1);//判断连接是否正常
// if (connect.IsSuccess) if (connect.IsSuccess)
// { {
// TCPconnect.Enabled = false; TCPconnect.Enabled = false;
// PortNum.Text = modbusClient.IpAddress; PortNum.Text = modbusClient.IpAddress;
// label6.Text = modbusClient.Port.ToString(); label6.Text = modbusClient.Port.ToString();
// label6.ForeColor = Color.Green; label6.ForeColor = Color.Green;
// //Code.Focus(); //Code.Focus();
// } }
// else else
// { {
// connectflag = 0; connectflag = 0;
// TCPconnect.Enabled = true; TCPconnect.Enabled = true;
// PortNum.Text = ""; PortNum.Text = "";
// label6.Text = "未连接"; label6.Text = "未连接";
// label6.ForeColor = Color.Red; label6.ForeColor = Color.Red;
// } }
// machine2();//仪器读取线程 machine2();//仪器读取线程
// MachineDisplay();//仪器显示线程 MachineDisplay();//仪器显示线程
// //if (MachineStatus.Text == "待机中" && connect.IsSuccess) // //if (MachineStatus.Text == "待机中" && connect.IsSuccess)
// //{ // //{
// // Thread.Sleep(3000); // // Thread.Sleep(3000);
// // workstation = (int)yiqi.start; // // workstation = (int)yiqi.start;
// // MachineStatus.Text = ""; // // MachineStatus.Text = "";
// //} // //}
//} }
} }
} }
); );
@@ -1184,14 +1185,30 @@ namespace C_Windows_1
} }
public string GetLocalIPAddress()
{
string localIP = "";
foreach (var addr in Dns.GetHostAddresses(Dns.GetHostName()))
{
if (addr.AddressFamily == AddressFamily.InterNetwork) // 选择 IPv4 地址
{
localIP = addr.ToString();
break;
}
}
return localIP;
}
//点击“连接串口”按钮，连接串口 //点击“连接串口”按钮，连接串口
private void BtnCon1_Click(object sender, EventArgs e) private void BtnCon1_Click(object sender, EventArgs e)
{ {
UDPResults.Items.Clear(); UDPResults.Items.Clear();
byte[] data = Encoding.ASCII.GetBytes("hello,udp server"); byte[] data = Encoding.ASCII.GetBytes("hello,udp server");
System.Net.IPAddress ip; System.Net.IPAddress ip;
ip = System.Net.IPAddress.Parse("192.168.1.255"); string localip=GetLocalIPAddress();
// 广播到 192.168.1.255 localip = localip.Substring(0, 10) + "255";
ip = System.Net.IPAddress.Parse(localip);
// 获本机IP频段广播到 .255
IPEndPoint endPoint = new IPEndPoint(ip, Port); IPEndPoint endPoint = new IPEndPoint(ip, Port);
try try
@@ -3115,6 +3132,9 @@ namespace C_Windows_1
label6.ForeColor = Color.Green; label6.ForeColor = Color.Green;
station2 = Convert.ToUInt16(stationIP); station2 = Convert.ToUInt16(stationIP);
station = station2.ToString("X2"); 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");
} }

17
C-Windows-1/TestPara.cs
View File

@@ -123,11 +123,20 @@ namespace C_Windows_1
short g = Convert.ToInt16(Convert.ToDouble(DelayTime2.Text) * 10);//延时2 short g = Convert.ToInt16(Convert.ToDouble(DelayTime2.Text) * 10);//延时2
Form1.f1.modbusClient.Write("1012", g); Form1.f1.modbusClient.Write("1012", g);
short h = Convert.ToInt16(Convert.ToDouble(BLeakTPre.Text));//平衡压差上限
Form1.f1.modbusClient.Write("1017", h); List<byte> bigleakmax = new List<byte>();//压差上限
short i = Convert.ToInt16(Convert.ToDouble(BLeakLPre.Text));//平衡压差下限 bigleakmax.AddRange(XdrFloat(Convert.ToSingle(BLeakTPre.Text)));
Form1.f1.modbusClient.Write("1019", i); byte[] bigleakda = bigleakmax.ToArray();
Form1.f1.modbusClient.Write("1017", bigleakda);
List<byte> bigleakmin = new List<byte>();//压差下限
bigleakmin.AddRange(XdrFloat(Convert.ToSingle(BLeakLPre.Text)));
byte[] bigleakxiao = bigleakmin.ToArray();
Form1.f1.modbusClient.Write("1019", bigleakxiao);
//BLeakLPre //BLeakLPre
List<byte> parmEvolume = new List<byte>();//等效容积 List<byte> parmEvolume = new List<byte>();//等效容积
parmEvolume.AddRange(XdrFloat(Convert.ToSingle(Evolume.Text))); parmEvolume.AddRange(XdrFloat(Convert.ToSingle(Evolume.Text)));
byte[] pEvolume = parmEvolume.ToArray(); byte[] pEvolume = parmEvolume.ToArray();

4
C-Windows-1/bin/Debug/Config/Config.ini
View File

@@ -1,3 +1,3 @@
[Config] [Config]
Passzong=2810 Passzong=2812
Sunzong=3039 Sunzong=3041

BIN
C-Windows-1/bin/Debug/LL28-Control.exe
View File

Binary file not shown.

BIN
C-Windows-1/obj/Debug/LL28-Control.exe
View File

Binary file not shown.