fix bugs in shortgroup

leewheel · Feb 9, 2018 · 5c4481b · 5c4481b
1 parent 5c8c046
commit 5c4481b
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 7 deletions.
diff --git a/SCADA/Example/BatchCoreTest.exe b/SCADA/Example/BatchCoreTest.exe
diff --git a/SCADA/Example/ClientDriver.dll b/SCADA/Example/ClientDriver.dll
diff --git a/SCADA/Example/DataService.dll b/SCADA/Example/DataService.dll
diff --git a/SCADA/Program/.vs/DataExchange/v15/.suo b/SCADA/Program/.vs/DataExchange/v15/.suo
diff --git a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide
diff --git a/SCADA/Program/.vs/DataExchange/v15/sqlite3/storage.ide b/SCADA/Program/.vs/DataExchange/v15/sqlite3/storage.ide
diff --git a/SCADA/Program/DataService/PLCGroup.cs b/SCADA/Program/DataService/PLCGroup.cs
@@ -983,7 +983,7 @@ protected override unsafe void Poll()
                                 {
                                     for (int i = 0; i < addr.DataSize / 2; i++)
                                     {
-                                        prcv[iShort1] = IPAddress.HostToNetworkOrder(prcv[iShort1]);
+                                        prcv[iShort1 + i] = IPAddress.HostToNetworkOrder(prcv[iShort1 + i]);
                                     }
                                 }
                                 if (addr.DataSize <= 2)

diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
@@ -478,20 +478,23 @@ public byte[] ReadBytes(DeviceAddress address, ushort size)
                  CreateReadHeader(address.Area, address.Start, size, func);
                 lock (_async)
                 {
-                    byte[] frameBytes = new byte[size * 2 + 3];//size * 2 +
+                    byte[] frameBytes = new byte[size * 2 + 5];//size * 2 +
                     byte[] data = new byte[size * 2];
                     _serialPort.Write(header, 0, header.Length);
                     int numBytesRead = 0;
                     while (numBytesRead < 2)
                         numBytesRead += _serialPort.Read(frameBytes, numBytesRead, 2 - numBytesRead);
                     if (frameBytes[1] == address.DBNumber)
                     {
-                        numBytesRead = 0;
-                        while (numBytesRead != frameBytes.Length)
+                        while (numBytesRead < frameBytes.Length)
                             numBytesRead += _serialPort.Read(frameBytes, numBytesRead, frameBytes.Length - numBytesRead);
-                        Array.Copy(frameBytes, 1, data, 0, data.Length);
-                        Thread.Sleep(20);
-                        return data;
+                        if (Utility.CheckSumCRC(frameBytes))
+                        {
+                            Array.Copy(frameBytes, 3, data, 0, data.Length);
+                            Thread.Sleep(20);
+                            return data;
+                        }
+                        else Thread.Sleep(10);
                     }
                     else
                     {

diff --git a/SCADA/dll/DataService.dll b/SCADA/dll/DataService.dll
diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll
diff --git a/SCADA/dll/OPCDriver.dll b/SCADA/dll/OPCDriver.dll
diff --git a/SCADA/dll/SiemensPLCDriver.dll b/SCADA/dll/SiemensPLCDriver.dll