From 36097d60672974e5d9bc43b8632d0f1ee31246fe Mon Sep 17 00:00:00 2001
From: Gavin <hijkl1999@yeah.net>
Date: Thu, 21 Dec 2017 21:50:05 +0800
Subject: [PATCH] update host.ini

---
 SCADA/DataConfig/host.ini                     |   4 ++++
 SCADA/Program/ModbusDriver/ModbusRTUDriver.cs |   2 +-
 SCADA/dll/ModbusDriver.dll                    | Bin 22016 -> 22016 bytes
 3 files changed, 5 insertions(+), 1 deletion(-)

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 b10193d680b3ce240a8d931353961eb0ee4b4d45..81f29f0de68bb77759e11ebb9667dfc132bbb5b5 100644
GIT binary patch
delta 1234
zcmXZcTWAwm7zgnGndY2yrs}o`y9HBqL2TM)d-W1+t8uk$Tt#D5)Kawz^@1i|@X~6P
zBt%<9i*09jU)EiV=z|bn%!^nlMZ}e&Py{UtKEx`asAxeDQ9<X+`35HN%l|v)gvp<Y
zB}FVL`p)HSAFA!YP$WkCZ)_2rwh+ZK5C%N<&xX(5CW^(F9T(ApWCYnO=zJQG@TUrl
zF1MI%_nIk{(^U;v_6qC3kHSOw5$ygS)Ab4y6K_%vtlggIn3ulEh#+psVoWR1@?uze
z5oCoiDob#NbrH{GDMnan*Muy?C)P3fPWn(+s&_eIeUarj#kyy?RR!*|rd%^sCDKvm
zd~=SfLZD199JRcv2G>|#t5Pk*G@s7?f?q90JF5c$wFGxrH3+I&%>6}AHY23!afX$!
zwyNcrWW{8gT7gh`RF8gk?NuugF4wwgC^X=CR^5fYxui**nJ>{}GyoNPa@_n|HlVUf
zYtp<b8xhnphw-ayLK~~X*nlQ<viw=~Re{dWm`z5$6JF+Uhp0vn4_TqS9wUe}t2IwJ
z*<03avr(>w%lV^emk(CRktZwq+4~*EbSD0^su9Af8k&qF&)p$INIG)PkHh0Wq&8vg
z0v%4_q}qn`LQ*#lnlae|&mygac}{LeE9<FyK>m(CmYF*s+wnH5jQCG&mU~dRnAT;)
znA$1B2(ak+M(~vsMFJOPTt$%f(`W)GRJS^Sc}qwc;W2N>!-%n{q(_iuQAv*?uvAY{
zNsnQWMI}8B)ar~%+JUVsDrqN1vWjK|we%!>b$XOq+J*djEo$j0_*hiZ(}=OCq)|L%
zQAy*#GQEyUnt-20B|VFyEGlUal3M!&we&n*aY!w_fWqZ^8)|7ULM$rjC4{xi0b`f!
z$2Hc!jt20YHE#77Hl}!8fzhjM<fncpE1H$xF!59PwD;3*ce+P{v%i%-PSrKKa(&MG
zriG3)oZBOSR_ATgx(;aGxN75z*ZV&XJ{n##^v9Fy!$nt$QsH&EV)|f&=Jj>Qj<263
ZlJ-CABdHmo&pF1U`c%QD_oBbj{T(R#5ibA$

delta 1258
zcmXZcU1$_n6bJDC9rxbdnW&g3ZNx2_7qcd7zO9LFVruiTV$jt@Ohm1L)&`ojDMq6)
zWp`OjEJ>)lqa{>ZR1j8(FD{4=5=4RtArC&N5nMs4EKy1;)Q4j8&^de0zzp-7bI!fP
z@MofvB04E9URd^esxC45nRt}Abx`!%LKMqDFW|L{48Pqaip9Jg6OsH>7`Y?pTn$Ln
zr1On)Zn4%LH`7AdE!K%oA-q&OiS8#@p}S4I%%<n8<KD=;kDg>j5O-uTJe#z9n36s;
zv3fBlHzCRz!!uce`>a>4KV&IBuujRpq#v~<dX=-*f3gf`SPw0?D#ruXd)I1JflP$C
z(Oj=85h&GzbCyq4;~L9nRj4iS_;u|U)T*sG#u`AQs>3~2HG*n8yqk6BeuPv#qO7>p
zsdnHED=LqvFVI#N(XAg{J?cyJlxf{I6q@lor{ThJ59y7rnXfToG-HW77tAZN8U9K=
zw`kswEojm*r?6AD;xMb+*oRj1vubl1s|4+zHCv5UPH}>ZM@1Eam}Z6YMvNdbtiyT2
zsV%bZnJsb`P?g)>{KpD8D$I#q`#VQNx+X4LRS2Q6nmS|1a}UT6QjVPcWAM8BR0o1J
zy7(T0stcJdq+xt-M&%(Cey$ZaFUTY4WIc5!WjDrHrY9-C#$rxcF{2L1Z?R@8&1J=7
z^_A>JfJNUojDJZH#4#pgDvV4mwZ?H)4XYE_P)EuNuX#)UfFTxz^dvGY3TZzA+jJ*|
z^c1eLD5R&c#G;T6pkur4q>!G${hT6MK`9-CFQAK*(sNi|uSF>xf{#TZ{SiYf3TXt>
zEDC81ODqa$95oGk6$<Hj^sy+UBS>jQ1f}#Ryy7CIbQEiL=s`;9INDeg(x1_zWhRYp
zWCGV%zdK6eIcvchF>L(FbNR-&va!5TuUTaLrY<?R0#X8LU#Vx^s=<ci9~vfhxBdF|
z#pt_KVL`gF#pUrkKcGW2V>qW*0G-b7r*jXmzrCsbW<mFCviMGGtmM*U+sw+N>ApQ4
pQE)X({rb2|_Zt#LpNN!weQ!8X;YzOzeOzYD)~EA3{uYS}_x~h-6R7|I