Skip to content

G
GC_Branch
Commit 5e1bfd33 authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

添加了单次运行调试功能

parent d6c90070
Expand all Show whitespace changes
Inline Side-by-side
Showing with 931 additions and 167 deletions
GcDevicePc/AboutForm.Designer.cs 0 → 100644
View file @ 5e1bfd33
namespace GcDevicePc
{
partial class AboutForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.tempver = new System.Windows.Forms.Label();
this.powerver = new System.Windows.Forms.Label();
this.PCver = new System.Windows.Forms.Label();
this.fid1ver = new System.Windows.Forms.Label();
this.fid2ver = new System.Windows.Forms.Label();
this.tcdver = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
this.groupBox1.Controls.Add(this.tcdver);
this.groupBox1.Controls.Add(this.fid2ver);
this.groupBox1.Controls.Add(this.fid1ver);
this.groupBox1.Controls.Add(this.PCver);
this.groupBox1.Controls.Add(this.powerver);
this.groupBox1.Controls.Add(this.tempver);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(380, 167);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "固件版本";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 29);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 12);
this.label1.TabIndex = 0;
this.label1.Text = "温控板版本:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(6, 75);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 12);
this.label2.TabIndex = 1;
this.label2.Text = "电源板版本:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(6, 121);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(113, 12);
this.label3.TabIndex = 2;
this.label3.Text = "软件版本(HMI/PC)：";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(203, 29);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.TabIndex = 3;
this.label4.Text = "FID1版本:";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(203, 75);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 12);
this.label5.TabIndex = 4;
this.label5.Text = "FID2版本:";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(203, 121);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(53, 12);
this.label6.TabIndex = 5;
this.label6.Text = "TCD版本:";
//
// tempver
//
this.tempver.AutoSize = true;
this.tempver.Location = new System.Drawing.Point(96, 29);
this.tempver.Name = "tempver";
this.tempver.Size = new System.Drawing.Size(23, 12);
this.tempver.TabIndex = 6;
this.tempver.Text = "0.0";
//
// powerver
//
this.powerver.AutoSize = true;
this.powerver.Location = new System.Drawing.Point(96, 75);
this.powerver.Name = "powerver";
this.powerver.Size = new System.Drawing.Size(23, 12);
this.powerver.TabIndex = 7;
this.powerver.Text = "0.0";
//
// PCver
//
this.PCver.AutoSize = true;
this.PCver.Location = new System.Drawing.Point(116, 121);
this.PCver.Name = "PCver";
this.PCver.Size = new System.Drawing.Size(23, 12);
this.PCver.TabIndex = 8;
this.PCver.Text = "1.4";
//
// fid1ver
//
this.fid1ver.AutoSize = true;
this.fid1ver.Location = new System.Drawing.Point(268, 29);
this.fid1ver.Name = "fid1ver";
this.fid1ver.Size = new System.Drawing.Size(23, 12);
this.fid1ver.TabIndex = 9;
this.fid1ver.Text = "0.0";
//
// fid2ver
//
this.fid2ver.AutoSize = true;
this.fid2ver.Location = new System.Drawing.Point(268, 75);
this.fid2ver.Name = "fid2ver";
this.fid2ver.Size = new System.Drawing.Size(23, 12);
this.fid2ver.TabIndex = 10;
this.fid2ver.Text = "0.0";
//
// tcdver
//
this.tcdver.AutoSize = true;
this.tcdver.Location = new System.Drawing.Point(268, 121);
this.tcdver.Name = "tcdver";
this.tcdver.Size = new System.Drawing.Size(23, 12);
this.tcdver.TabIndex = 11;
this.tcdver.Text = "0.0";
//
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(404, 191);
this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AboutForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "关于";
this.Load += new System.EventHandler(this.AboutForm_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label tcdver;
private System.Windows.Forms.Label fid2ver;
private System.Windows.Forms.Label fid1ver;
private System.Windows.Forms.Label PCver;
private System.Windows.Forms.Label powerver;
private System.Windows.Forms.Label tempver;
}
}
\ No newline at end of file
GcDevicePc/AboutForm.cs 0 → 100644
View file @ 5e1bfd33
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace GcDevicePc
{
public partial class AboutForm : Form
{
private string Hmiversion = "";
private string Tempversion = "";
private string Powerversion = "";
private string FID1version = "";
private string FID2version = "";
private string TCD1version = "";
public AboutForm()
{
InitializeComponent();
}
public AboutForm(ushort[] buf)
{
InitializeComponent();
this.Hmiversion = buf[1].ToString() + "." + buf[0].ToString();
this.Tempversion = buf[3].ToString() + "." + buf[2].ToString();
this.Powerversion = buf[5].ToString() + "." + buf[4].ToString();
this.FID1version = buf[7].ToString() + "." + buf[6].ToString();
this.FID2version = buf[9].ToString() + "." + buf[8].ToString();
this.TCD1version = buf[11].ToString() + "." + buf[10].ToString();
}
private void AboutForm_Load(object sender, EventArgs e)
{
this.tempver.Text = this.Tempversion;
this.powerver.Text = this.Powerversion;
this.fid1ver.Text = this.FID1version;
this.fid2ver.Text = this.FID2version;
this.tcdver.Text = this.TCD1version;
this.PCver.Text = this.Hmiversion + "/1.4.8";
}
}
}
GcDevicePc/AboutForm.resx 0 → 100644
View file @ 5e1bfd33
This diff is collapsed.
GcDevicePc/ConfigDlg/MethodBase.cs
View file @ 5e1bfd33
...@@ -332,9 +332,8 @@ namespace GcDevicePc.ConfigDlg ...@@ -332,9 +332,8 @@ namespace GcDevicePc.ConfigDlg
if (globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName != null) if (globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName != null)
globaldata.m_configDlg.Save_Method(); globaldata.m_configDlg.Save_Method();
if (globaldata.connection_ip != "" && globaldata.connection_ip != null && globaldata.createfile == false) if (!String.IsNullOrEmpty(globaldata.connection_ip) && globaldata.createfile == false)
{ {
//获取配置文件
try try
{ {
FileServerClient mainclient = new FileServerClient(); FileServerClient mainclient = new FileServerClient();
...@@ -352,6 +351,7 @@ namespace GcDevicePc.ConfigDlg ...@@ -352,6 +351,7 @@ namespace GcDevicePc.ConfigDlg
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue) if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue)
{ {
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 0;
sendupdatecmd(true); sendupdatecmd(true);
} }
......
GcDevicePc/DataState.cs
View file @ 5e1bfd33
...@@ -238,24 +238,11 @@ namespace GcDevicePc ...@@ -238,24 +238,11 @@ namespace GcDevicePc
tempshow = new ListViewItem(); tempshow = new ListViewItem();
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD
{ {
tempshow.Text = "TCD1"; tempshow.Text = "TCD1";
//if (CProfileDevice.m_DevParam.tcd[0].fHeaterTempSet == 0.0f)
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.tcd[0].fHeaterTempActual.ToString("#0.00") + " / " + "等待读取");
//else
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.tcd[0].fHeaterTempActual.ToString("#0.00") + " / " + CProfileDevice.m_DevParam.tcd[0].fHeaterTempSet.ToString("0"));
//this.datalist.Items.Add(tempshow);
} }
else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1) else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1)
{ {
// tempshow = new ListViewItem();
tempshow.Text = "FID1"; tempshow.Text = "FID1";
//if (CProfileDevice.m_DevParam.fid[0].fHeaterTempSet == 0.0f)
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.fid[0].fHeaterActualTemp.ToString("#0.00") + " / " + "等待读取");
//else
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.fid[0].fHeaterActualTemp.ToString("#0.00") + " / " + CProfileDevice.m_DevParam.fid[0].fHeaterTempSet.ToString("0"));
//this.datalist.Items.Add(tempshow);
} }
if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp == 0.0f)
...@@ -356,13 +343,6 @@ namespace GcDevicePc ...@@ -356,13 +343,6 @@ namespace GcDevicePc
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
//if (CProfileDevice.m_DevParam.aux.fSetTemp_HeatArea2 == 0.0f)
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.aux.fActualTemp_HeatArea2.ToString("#0.00") + " / " + "等待读取");
//else
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.aux.fActualTemp_HeatArea2.ToString("#0.00") + " / " + CProfileDevice.m_DevParam.aux.fSetTemp_HeatArea2.ToString("0"));
//this.datalist.Items.Add(tempshow);
} }
} }
......
GcDevicePc/GcDevicePc.csproj
View file @ 5e1bfd33
...@@ -146,6 +146,12 @@ ...@@ -146,6 +146,12 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AboutForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AboutForm.Designer.cs">
<DependentUpon>AboutForm.cs</DependentUpon>
</Compile>
<Compile Include="AppInit.cs" /> <Compile Include="AppInit.cs" />
<Compile Include="auxtool.cs"> <Compile Include="auxtool.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
...@@ -505,6 +511,9 @@ ...@@ -505,6 +511,9 @@
<Compile Include="WaitForm.Designer.cs"> <Compile Include="WaitForm.Designer.cs">
<DependentUpon>WaitForm.cs</DependentUpon> <DependentUpon>WaitForm.cs</DependentUpon>
</Compile> </Compile>
<EmbeddedResource Include="AboutForm.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="auxtool.resx"> <EmbeddedResource Include="auxtool.resx">
<DependentUpon>auxtool.cs</DependentUpon> <DependentUpon>auxtool.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
GcDevicePc/MDIBase.Designer.cs
View file @ 5e1bfd33
This diff is collapsed.
GcDevicePc/MDIBase.cs
View file @ 5e1bfd33
This diff is collapsed.
GcDevicePc/ProThread/HMISearch.cs
View file @ 5e1bfd33
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using System.Text.RegularExpressions;
using System.Collections; using System.Collections;
using System.Management;
using System.Net.NetworkInformation; using System.Net.NetworkInformation;
using GcDevicePc.Common; using GcDevicePc.Common;
...@@ -112,7 +108,8 @@ namespace GcDevicePc.ProThread ...@@ -112,7 +108,8 @@ namespace GcDevicePc.ProThread
{ {
client = new UdpClient(new IPEndPoint(IPAddress.Any, 0)); client = new UdpClient(new IPEndPoint(IPAddress.Any, 0));
// client = new UdpClient(new IPEndPoint(IPAddress.Parse(this._localip), 0)); // client = new UdpClient(new IPEndPoint(IPAddress.Parse(this._localip), 0));
endpoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 233); // endpoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 233);
endpoint = new IPEndPoint(IPAddress.Parse("192.168.10.230"), 233);
client.Send(sendBytes, sendBytes.Length, endpoint); client.Send(sendBytes, sendBytes.Length, endpoint);
Thread.Sleep(500); Thread.Sleep(500);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment