Skip to content

G
GC_Branch
Commit edda63be 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 cefe2d79 9beb7646
Show whitespace changes
Inline Side-by-side
Showing with 300 additions and 285 deletions
.gitignore
View file @ edda63be
......@@ -253,3 +253,4 @@ paket-files/
.idea/
*.sln.iml
VocAnalyzer/
VocsMonitor/
GcDevicePc.sln
View file @ edda63be

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2002
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcDevicePc", "GcDevicePc\GcDevicePc.csproj", "{BBCD58CB-247D-4108-A135-F36F8ABA3289}"
EndProject
......@@ -9,6 +9,8 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "VocAnalyzer", "VocAnalyzer\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedSpace", "SharedSpace\SharedSpace.csproj", "{5498F944-5721-461B-B07F-3105EF0BF643}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocsMonitor", "VocsMonitor\VocsMonitor\VocsMonitor.csproj", "{25AB743D-235C-4F11-96C3-2356AC90BF81}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -47,6 +49,18 @@ Global
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|x86.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|x86.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|x86.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Any CPU.Build.0 = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|x86.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
GcDevicePc/App.config
View file @ edda63be
......@@ -2,7 +2,7 @@
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
......
GcDevicePc/Common/GCModbusSlave.cs
View file @ edda63be
......@@ -89,263 +89,51 @@ namespace GcDevicePc.Common
fnLibModbusSlaveHoldingRegister(hModbusHandle, MySlaveReadHoldingRegister, MySlaveWriteHoldingRegister, startaddr, nreg);
}
static ushort slavereadhreg(ushort address)
{
ushort value = 0;
ushort signalddress = 17;
ushort baseaddress = 23;
address = (ushort)(address - 1);
int listnum = SharedSpace.Data.listValue.Count;
if (address >= 17)
{
ushort[] s = new ushort[2];
float[] f = new float[2];
if (address >= 17 && address <= 22)
{
if (address == 17 || address == 18)
f[0] = float.Parse(globaldata.m_dpbuffer.ShowList.showDet.fDetValue.ToString("0.000"));
if (address == 19 || address == 20)
f[0] = float.Parse(globaldata.m_dpbuffer.ShowList.showDet.iDetValue.ToString("0.000"));
if (address == 21 || address == 22)
f[0] = float.Parse(globaldata.m_dpbuffer.ShowList.showDet.bDetValue.ToString("0.000"));
Buffer.BlockCopy(f, 2, s, 0, 2);
Buffer.BlockCopy(f, 0, s, 2, 2);
value = s[(address - signalddress) % 2];
}
else if ( address >= 23 && listnum > 0)
{
int readnum = (address - baseaddress) / 2;
if (readnum <= listnum - 1)
{
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];
}
else
{
value = 0;
}
}
else
{
value = 0;
}
}
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;
}
}
return value;
}
//static ushort slavereadhreg(ushort address)
//{
// ushort value = 0;
// ushort baseaddress = 20;
// ushort signalddress = 17;
// ushort baseaddress = 23;
// 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
// if (address >= 17)
// {
// ushort[] s = new ushort[2];
// float[] f = new float[2];
// if (address >= 17 && address <= 22)
// {
// if (address == 17 || address == 18)
// f[0] = float.Parse(globaldata.m_dpbuffer.ShowList.showDet.fDetValue.ToString("0.000"));
// if (address == 19 || address == 20)
// f[0] = float.Parse(globaldata.m_dpbuffer.ShowList.showDet.iDetValue.ToString("0.000"));
// if (address == 21 || address == 22)
// f[0] = float.Parse(globaldata.m_dpbuffer.ShowList.showDet.bDetValue.ToString("0.000"));
// Buffer.BlockCopy(f, 2, s, 0, 2);
// Buffer.BlockCopy(f, 0, s, 2, 2);
// value = s[(address - signalddress) % 2];
// }
// else if ( address >= 23 && listnum > 0)
// {
// int readnum = (address - baseaddress) / 2;
// if (readnum <= listnum - 1)
// {
// 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
// else
// {
// value = 0;
// }
// }
// //}
// else
// {
// value = 0;
// }
// }
// if (address >= 2 && address < 20)
// {
// switch (address)
......@@ -522,48 +310,260 @@ namespace GcDevicePc.Common
// }
// }
// 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 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)
{
// Console.WriteLine("MoudbusSlave Wirte adder:" + address.ToString() + " value:" + value.ToString());
......
GcDevicePc/DataState.cs
View file @ edda63be
......@@ -520,7 +520,7 @@ namespace GcDevicePc
tempshow = new ListViewItem();
tempshow.Text = "FID1";
if (globaldata.m_signalbuffer.Draw_Port.Count > 1)
// if (globaldata.m_signalbuffer.Draw_Port.Count > 1)
{
fDetvalue = globaldata.m_dpbuffer.ShowList.showDet.fDetValue;
......@@ -532,10 +532,10 @@ namespace GcDevicePc
if (fDetvalue != 0.0f)
tempshow.SubItems.Add(fDetvalue.ToString("0.000") + " mV");
}
else
{
tempshow.SubItems.Add(fDetvalueold.ToString("0.000") + " mV");
}
//else
//{
// tempshow.SubItems.Add(fDetvalueold.ToString("0.000") + " mV");
//}
this.datalist.Items.Add(tempshow);
......
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