update host.ini

GavinYellow · GavinYellow · commit 36097d606729 · 2017-12-21T21:50:05.000+08:00
diff --git a/SCADA/DataConfig/host.ini b/SCADA/DataConfig/host.ini
@@ -1,7 +1,11 @@
 [HOST]
+
 SERVER=lochost
 
 [DATABASE]
+
 CONNSTRING=Data Source=.\SQLEXPRESS;Initial Catalog=SCADA;Integrated Security=True
+
 ARCHIVE=D:\HDA
+
 TYPE=MSSQL
diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
@@ -332,7 +332,7 @@ public byte[] ReadBytes(DeviceAddress address, ushort size)
                 {
                     while (numBytesRead != frameBytes.Length)
                         numBytesRead += _serialPort.Read(frameBytes, numBytesRead, frameBytes.Length - numBytesRead);
-                    if (frameBytes[0] == func && Utility.CheckSumCRC(frameBytes))
+                    if (frameBytes[0] == address.Area && Utility.CheckSumCRC(frameBytes))
                     {
                         Array.Copy(frameBytes, 3, data, 0, data.Length);
                         return data;
diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public byte[] ReadBytes(DeviceAddress address, ushort size)`
`332`	`332`	`{`
`333`	`333`	`while (numBytesRead != frameBytes.Length)`
`334`	`334`	`numBytesRead += _serialPort.Read(frameBytes, numBytesRead, frameBytes.Length - numBytesRead);`
`335`		`- if (frameBytes[0] == func && Utility.CheckSumCRC(frameBytes))`
	`335`	`+ if (frameBytes[0] == address.Area && Utility.CheckSumCRC(frameBytes))`
`336`	`336`	`{`
`337`	`337`	`Array.Copy(frameBytes, 3, data, 0, data.Length);`
`338`	`338`	`return data;`