Skip to content

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

修改modbus 组分输出

parent db9764e2
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
GcDevicePc/Common/GCModbusSlave.cs
View file @ cef76502
...@@ -86,7 +86,7 @@ namespace GcDevicePc.Common ...@@ -86,7 +86,7 @@ namespace GcDevicePc.Common
ushort value = 0; ushort value = 0;
ushort baseaddress = 20; ushort baseaddress = 20;
address = (ushort)(address - 1); address = (ushort)(address - 1);
int listnum = CKVocAnalyzer.GlobalCKV.valueparamlist.Count; int listnum = SharedSpace.Data.listValue.Count;
int readnum = (address - baseaddress)/2; int readnum = (address - baseaddress)/2;
if (readnum <= listnum - 1 && listnum > 0 && address >= 20) if (readnum <= listnum - 1 && listnum > 0 && address >= 20)
...@@ -98,7 +98,7 @@ namespace GcDevicePc.Common ...@@ -98,7 +98,7 @@ namespace GcDevicePc.Common
ushort[] s = new ushort[2]; ushort[] s = new ushort[2];
float[] f = new float[2]; float[] f = new float[2];
{ {
f[0] = float.Parse(CKVocAnalyzer.GlobalCKV.valueparamlist[(ushort)readnum].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);
} }
......
GcDevicePc/Common/GCModbusSlave485.cs
View file @ cef76502
...@@ -82,7 +82,7 @@ namespace GcDevicePc.Common ...@@ -82,7 +82,7 @@ namespace GcDevicePc.Common
ushort value = 0; ushort value = 0;
ushort baseaddress = 20; ushort baseaddress = 20;
address = (ushort)(address - 1); address = (ushort)(address - 1);
int listnum = CKVocAnalyzer.GlobalCKV.valueparamlist.Count; int listnum = SharedSpace.Data.listValue.Count;
int readnum = (address - baseaddress) / 2; int readnum = (address - baseaddress) / 2;
if (readnum <= listnum - 1 && listnum > 0 && address >= 20) if (readnum <= listnum - 1 && listnum > 0 && address >= 20)
...@@ -92,7 +92,7 @@ namespace GcDevicePc.Common ...@@ -92,7 +92,7 @@ namespace GcDevicePc.Common
ushort[] s = new ushort[2]; ushort[] s = new ushort[2];
float[] f = new float[2]; float[] f = new float[2];
{ {
f[0] = float.Parse(CKVocAnalyzer.GlobalCKV.valueparamlist[(ushort)readnum].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);
} }
......
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