diff --git a/SCADA/DataConfig/host.ini b/SCADA/DataConfig/host.ini index 90e032d..429df52 100644 --- 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 index b69532f..76186d3 100644 --- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs @@ -332,7 +332,7 @@ namespace ModbusDriver { 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 index b10193d..81f29f0 100644 Binary files a/SCADA/dll/ModbusDriver.dll and b/SCADA/dll/ModbusDriver.dll differ