Skip to content

G
GC_Branch
Commit 881b020e authored by wangwanxh@sina.com's avatar wangwanxh@sina.com
Browse files
Options

Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

parents 6d8fe00a baa200ec
Show whitespace changes
Inline Side-by-side
Showing with 480 additions and 225 deletions
GcDevicePc/Common/GCModbusSlave.cs
View file @ 881b020e
...@@ -94,7 +94,7 @@ namespace GcDevicePc.Common ...@@ -94,7 +94,7 @@ namespace GcDevicePc.Common
ushort value = 0; ushort value = 0;
ushort signalddress = 17; ushort signalddress = 17;
ushort baseaddress = 23; ushort baseaddress = 23;
address = (ushort) (address - 1); address = (ushort)(address - 1);
int listnum = SharedSpace.Data.listValue.Count; int listnum = SharedSpace.Data.listValue.Count;
if (address >= 17) if (address >= 17)
{ {
...@@ -112,9 +112,11 @@ namespace GcDevicePc.Common ...@@ -112,9 +112,11 @@ namespace GcDevicePc.Common
Buffer.BlockCopy(f, 0, s, 2, 2); Buffer.BlockCopy(f, 0, s, 2, 2);
value = s[(address - signalddress) % 2]; value = s[(address - signalddress) % 2];
} }
else if (address >= 23 && listnum > 0) else if ( address >= 23 && listnum > 0)
{ {
int readnum = (address - baseaddress) / 2; int readnum = (address - baseaddress) / 2;
if (readnum <= listnum - 1)
{
f[0] = float.Parse(SharedSpace.Data.listValue[readnum].vale.ToString()); f[0] = float.Parse(SharedSpace.Data.listValue[readnum].vale.ToString());
Buffer.BlockCopy(f, 2, s, 0, 2); Buffer.BlockCopy(f, 2, s, 0, 2);
Buffer.BlockCopy(f, 0, s, 2, 2); Buffer.BlockCopy(f, 0, s, 2, 2);
...@@ -124,6 +126,12 @@ namespace GcDevicePc.Common ...@@ -124,6 +126,12 @@ namespace GcDevicePc.Common
{ {
value = 0; value = 0;
} }
}
else
{
value = 0;
}
} }
if (address >= 2 && address < 20) if (address >= 2 && address < 20)
...@@ -132,12 +140,12 @@ namespace GcDevicePc.Common ...@@ -132,12 +140,12 @@ namespace GcDevicePc.Common
{ {
case 2: case 2:
{ {
value = (ushort) SharedSpace.Data.typesint; value = (ushort)SharedSpace.Data.typesint;
} }
break; break;
case 3: case 3:
{ {
value = SharedSpace.Data.change == true ? (ushort) 1 : (ushort) 0; value = SharedSpace.Data.change == true ? (ushort)1 : (ushort)0;
} }
break; break;
case 4: case 4:
...@@ -157,7 +165,7 @@ namespace GcDevicePc.Common ...@@ -157,7 +165,7 @@ namespace GcDevicePc.Common
break; break;
case 7: //设备联机状态 case 7: //设备联机状态
{ {
value = (ushort) (globaldata.m_hmibuffer.gcinfo.hmioffline ? 1 : 0); value = (ushort)(globaldata.m_hmibuffer.gcinfo.hmioffline ? 1 : 0);
} }
break; break;
case 8: //HMI状态 case 8: //HMI状态
...@@ -169,7 +177,7 @@ namespace GcDevicePc.Common ...@@ -169,7 +177,7 @@ namespace GcDevicePc.Common
{ {
if (CProfileDevice.m_DevParam.syspara.u16InjPortFront == 1) if (CProfileDevice.m_DevParam.syspara.u16InjPortFront == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp * 10);
} }
else else
{ {
...@@ -181,7 +189,7 @@ namespace GcDevicePc.Common ...@@ -181,7 +189,7 @@ namespace GcDevicePc.Common
{ {
if (CProfileDevice.m_DevParam.syspara.u16InjPortBehind == 1) if (CProfileDevice.m_DevParam.syspara.u16InjPortBehind == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp * 10);
} }
else else
{ {
...@@ -193,7 +201,7 @@ namespace GcDevicePc.Common ...@@ -193,7 +201,7 @@ namespace GcDevicePc.Common
{ {
if (CProfileDevice.m_DevParam.syspara.u16Col == 1) if (CProfileDevice.m_DevParam.syspara.u16Col == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp * 10);
} }
else else
{ {
...@@ -207,11 +215,11 @@ namespace GcDevicePc.Common ...@@ -207,11 +215,11 @@ namespace GcDevicePc.Common
{ {
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp * 10);
} }
else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1) else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp * 10);
} }
else else
{ {
...@@ -230,11 +238,11 @@ namespace GcDevicePc.Common ...@@ -230,11 +238,11 @@ namespace GcDevicePc.Common
{ {
if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0) if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp * 10);
} }
else if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 1) else if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp * 10);
} }
else else
{ {
...@@ -243,7 +251,7 @@ namespace GcDevicePc.Common ...@@ -243,7 +251,7 @@ namespace GcDevicePc.Common
} }
else if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 == 1) else if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1 * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1 * 10);
} }
else else
{ {
...@@ -257,15 +265,15 @@ namespace GcDevicePc.Common ...@@ -257,15 +265,15 @@ namespace GcDevicePc.Common
{ {
if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0) if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp * 10);
} }
else if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 1) else if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp * 10);
} }
else if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 == 1) else if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 == 1)
{ {
value = (ushort) (globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2 * 10); value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2 * 10);
} }
else else
{ {
...@@ -304,10 +312,258 @@ namespace GcDevicePc.Common ...@@ -304,10 +312,258 @@ namespace GcDevicePc.Common
break; break;
} }
} }
return value; return value;
} }
//static ushort slavereadhreg(ushort address)
//{
// ushort value = 0;
// ushort baseaddress = 20;
// address = (ushort)(address - 1);
// int listnum = SharedSpace.Data.listValue.Count;
// int readnum = (address - baseaddress) / 2;
// if (readnum <= listnum - 1 && listnum > 0 && address >= 20)
// {
// // lock(CKVocAnalyzer.GlobalCKV.valueparamlist){
// try
// {
// ushort[] s = new ushort[2];
// float[] f = new float[2];
// {
// f[0] = float.Parse(SharedSpace.Data.listValue[readnum].vale.ToString());
// Buffer.BlockCopy(f, 2, s, 0, 2);
// Buffer.BlockCopy(f, 0, s, 2, 2);
// }
// value = s[(address - baseaddress) % 2];
// }
// catch
// {
// }
// //}
// }
// if (address >= 2 && address < 20)
// {
// switch (address)
// {
// case 2:
// {
// value = (ushort)SharedSpace.Data.typesint;
// }
// break;
// case 3:
// {
// value = SharedSpace.Data.change == true ? (ushort)1 : (ushort)0;
// }
// break;
// case 4:
// {
// value = globaldata.m_hmibuffer.gcinfo.HMIMac[0];
// }
// break;
// case 5:
// {
// value = globaldata.m_hmibuffer.gcinfo.HMIMac[1];
// }
// break;
// case 6:
// {
// value = globaldata.m_hmibuffer.gcinfo.HMIMac[2];
// }
// break;
// case 7: //设备联机状态
// {
// value = (ushort)(globaldata.m_hmibuffer.gcinfo.hmioffline ? 1 : 0);
// }
// break;
// case 8: //HMI状态
// {
// value = globaldata.m_hmibuffer.gcinfo.methodstatus;
// }
// break;
// case 9: //前进样口
// {
// if (CProfileDevice.m_DevParam.syspara.u16InjPortFront == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp * 10);
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 10: //后进样口
// {
// if (CProfileDevice.m_DevParam.syspara.u16InjPortBehind == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp * 10);
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 11: // 柱箱
// {
// if (CProfileDevice.m_DevParam.syspara.u16Col == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp * 10);
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 12: //前检测器
// {
// if (CProfileDevice.m_DevParam.syspara.u16InjPortFront == 1)
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp * 10);
// }
// else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp * 10);
// }
// else
// {
// value = 0;
// }
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 13: //中检测器
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp * 10);
// }
// else if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp * 10);
// }
// else
// {
// value = 0;
// }
// }
// else if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1 * 10);
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 14: //后检测器
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp * 10);
// }
// else if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp * 10);
// }
// else if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2 * 10);
// }
// else
// {
// value = 0;
// }
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 15: //前点火信号
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1)
// {
// value = globaldata.m_dpbuffer.ShowList.showDet.fDetStatue;
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 16: //后点火信号
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 1)
// {
// value = globaldata.m_dpbuffer.ShowList.showDet.fDetStatue;
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 17: //前检测器值
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showDet.fDetValue * 1000);
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 18: //中检测器值
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showDet.iDetValue * 1000);
// }
// else
// {
// value = 0;
// }
// }
// break;
// case 19: //后检测器值
// {
// if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
// {
// value = (ushort)(globaldata.m_dpbuffer.ShowList.showDet.bDetValue * 1000);
// }
// else
// {
// value = 0;
// }
// }
// break;
// }
// }
// return value;
//}
static void slavewirtehreg(ushort address, ushort value) static void slavewirtehreg(ushort address, ushort value)
{ {
// Console.WriteLine("MoudbusSlave Wirte adder:" + address.ToString() + " value:" + value.ToString()); // Console.WriteLine("MoudbusSlave Wirte adder:" + address.ToString() + " value:" + value.ToString());
......
GcDevicePc/DataState.cs
View file @ 881b020e
...@@ -110,7 +110,7 @@ namespace GcDevicePc ...@@ -110,7 +110,7 @@ namespace GcDevicePc
tempshow.Text = "运行时间/总时间"; tempshow.Text = "运行时间/总时间";
if (globaldata.MethodRun_Statue == 4 || globaldata.MethodRun_Statue == 5) if (globaldata.MethodRun_Statue == 4 || globaldata.MethodRun_Statue == 5)
// tempshow.SubItems.Add((globaldata.RunTime_Now/60.0f).ToString("0.0") + "/" + (globaldata.RunTotal_Now/60.0f).ToString("0.0")); // tempshow.SubItems.Add((globaldata.RunTime_Now/60.0f).ToString("0.0") + "/" + (globaldata.RunTotal_Now/60.0f).ToString("0.0"));
tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0")); tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.00") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.00"));
else else
tempshow.SubItems.Add("未运行"); tempshow.SubItems.Add("未运行");
......
GcDevicePc/ProThread/GcDataTh.cs
View file @ 881b020e
...@@ -849,6 +849,5 @@ namespace GcDevicePc.ProThread ...@@ -849,6 +849,5 @@ namespace GcDevicePc.ProThread
} }
} }
} }
} }
GcDevicePc/ProThread/HMISearch.cs
View file @ 881b020e
...@@ -106,8 +106,8 @@ namespace GcDevicePc.ProThread ...@@ -106,8 +106,8 @@ namespace GcDevicePc.ProThread
try try
{ {
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); // endpoint = new IPEndPoint(IPAddress.Parse("192.168.10.230"), 233);
client.Send(sendBytes, sendBytes.Length, endpoint); client.Send(sendBytes, sendBytes.Length, endpoint);
......
GcDevicePc/Program.cs
View file @ 881b020e
...@@ -13,7 +13,7 @@ namespace GcDevicePc ...@@ -13,7 +13,7 @@ namespace GcDevicePc
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
bool createNew; bool createNew;
// Application.Run(new DebugForm());
{ {
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew)) using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{ {
......
GcDevicePc/RestartHmi.cs
View file @ 881b020e
...@@ -21,9 +21,9 @@ namespace GcDevicePc ...@@ -21,9 +21,9 @@ namespace GcDevicePc
{ {
int ret = 1; int ret = 1;
FileServerClient singlesend = new FileServerClient(); FileServerClient singlesend = new FileServerClient();
singlesend.WtClientInit("192.168.10.230", 911); singlesend.WtClientInit("192.168.1.88", 911);
ret = singlesend.WtHMICloseRro("WtMainProc"); ret = singlesend.WtHMICloseRro("WtMainProc");
if (ret == 1) // if (ret == 1)
{ {
MessageBox.Show("停止HMI成功！"); MessageBox.Show("停止HMI成功！");
ret = singlesend.WtHMIRunPro("GcDevice.exe", globaldata.exeremoteFolder); ret = singlesend.WtHMIRunPro("GcDevice.exe", globaldata.exeremoteFolder);
......
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