From 124c761c74176428bcae49a23d4801dac279432c Mon Sep 17 00:00:00 2001
From: Gavin <hijkl1999@yeah.net>
Date: Mon, 11 Dec 2017 19:11:55 +0800
Subject: [PATCH] fix modbusRTU

---
 SCADA/Program/ModbusDriver/ModbusRTUDriver.cs |   8 ++++----
 SCADA/dll/ModbusDriver.dll                    | Bin 21504 -> 21504 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
index be6ca2a..4c856ba 100644
--- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
+++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
@@ -328,11 +328,11 @@ namespace ModbusDriver
                 int numBytesRead = 0;
                 lock (_async)
                 {
-                    while (numBytesRead != size)
-                        numBytesRead += _serialPort.Read(frameBytes, numBytesRead, size - numBytesRead);
-                    if (frameBytes[0] == (byte)_id && Utility.CheckSumCRC(frameBytes))
+                    while (numBytesRead != frameBytes.Length)
+                        numBytesRead += _serialPort.Read(frameBytes, numBytesRead, frameBytes.Length - numBytesRead);
+                    if (frameBytes[0] == _slaveId && Utility.CheckSumCRC(frameBytes))
                     {
-                        Array.Copy(frameBytes, 3, data, 0, size);
+                        Array.Copy(frameBytes, 3, data, 0, data.Length);
                         return data;
                     }
                 }
diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll
index 4aa518750822bf47bbaa56104153953d180570fb..0841e632c3bd79aee3212f0ec34befe6849476ae 100644
GIT binary patch
delta 1224
zcmXZbeMl5(90&04^EA)AMX}??w#F8{SZ=<QuJ)!`OGHU6;>$+b9cQ4`>M2=>NrtN>
zwuFS+1`+f}M1ewtG5%3uoc(iuMAunRc}GQmbW4B471t|wAoo1;JOeYsXMVqDelx>&
z2FA$17#U5`{v+vg%ScXod_S4a5R%VQ2_TeNL5ng?B%cH`gCyyEZiBZ~^CJaAhwIP=
zgZMLttiD*TqtQMS&`d`&&$l^R)6uPf-RRdm&ym0!@f(g&{K5>RX`jVA%S<y|#d``#
zz;8NcksoHR6|l~?W%BKKfP}=91P(vO0y)>j>>Kxj{WUjvB`mIFNf-&X3bRW4(9QC&
zXsxV0)CSmU#FU!Z2wQ_ur55`#3u8v<rhS90MX*4w`%}Bk3Q(@(v+lD(j3`aozp`Sy
zPb%ivkJ);}3gyCPJZGi2q7=bvR)+6NopzROK)gtHwzI$4CQK^5)xNSVm{Gb!byOl+
zEINmSCrqK3r>u1oaaxJi;-tLI1FMcz;^2Czr&c4|ie4$}EIw&f7*)!pb*RFa(n?R$
zN~P4tYmbzwNd(*QU8!PzoNj}!#G7F4nooEwR01)7*vui-Y&*)m;;^}l#JHlW^_ulf
zi=t8Kl}%U_U9ywEQ;6%MtdXQ0!EQ{JiV=hOqR+A22t}lH!_fC)O6e{fy%x3Q5c7x8
zWCis)jBpBdTFdn~9x44|6zGk>23h;W^#gwNlqI)yo&AKA(mmbBS}>s`K7K1YHi~s;
z(8J2~R@82iYSB0Ahj39S$)l%R%`AbBUQq_I9krW9YnF&0{)`EwhdhWKFt^B>2x2F?
zltd7Z;-!)ZVi%?>WTyz?F}zd~K|GF<N>NK@iAZ8MdOc=|2x1Q=ltd7F@m5I$@g#!$
zXB3Ynf_MrsB@x7a3@M2q4&bVkb&3YqY0N66xX!@Ge^-8&fc3zR(;?(ZlK;qdeF!_<
z#o_TKzBji%{6799FPeE)xY7M15_D&F+%by!kE}Z&)>6KQ2yi{Y_dP&;!_J28rGxuY
zH8VA-sdHVw^%(!SlY2~(^R7+w%Z;}4^YZkH0Qv0xwRbgj7uNhck1ncko%#<XU1IzX
D07(Wv

delta 1220
zcmXZbZAep57zgnGx!rSi@2zAvWoeD5tXw*4&R%^>DsrVn<|6IQ!h%^!FW3tiZPhRd
zsm7p;`Vdx7Frv79urQ)8Q4$d)Aw|&#83j>6R!||GvvV%o%YJ*FbDr(;Ke3x6c9Wd%
z*3MNW&P*d&iCY`VK$4IG8jk?p<P6Q9Y$63DCwYQI?eDF~Tp|9{KoN0lt-(dIlDo{#
zn#s1VbsB(f*t%}(O?xW<t1+8@)W?WtjAXlPSMfW;lh8T|?|M~g7`{s0Qbau2hHdz5
z7<r~gPx`I!WDu{I5W$XTm?&o&c>T_~VExLA_WHy(Y2rhK=3_`{13Ks|xaZ2+pdO>M
z5mIWVJ#-Fwlv=Dy)Q9IvDeDHEi=0Ba?yY{879ybJHXqU=bSvGnp3q`^iYiXBUeNgn
z70HFoctcCjs}#fsT8dGnb}LO6Vx3=h?xtVqV%$+0(SOmUc&>C&V<<;OvFPl|J!}Yt
zGD@2%gtc;PFOJG>9-H;F99!l~y)qkV1v;e6)A*rRqDLuDt4AfSE6vPkK&eD?^V(CT
z5DB6Rqe^At!&((41TquMRpSY-<pv<;cNvpNh%Q4QQ|vOPkvgsl)!JwN)~gX#dT$Y0
zjW*fI|C5*Ni>#5T6+{j0l!y^0@RN<v8srA0n9Id#(XVtLHd}|f1rYPQ&}8PadUSIN
zwVTsf7*CZRxe8e${we+7+Kk49qBBkIGDf!{uJnMpX$w+H;^pr|WRd7Rg+sKI?L^&T
zsTQ_`?ZSDXDBp&e%`}29nW7BhZqzLit!W~HxCbevK_0|5=u2fy1hE}$N+O7RF{~tl
zxDNwmvQq?cKZcb=5D&m#E^5&<5lQSoM}}!4f_MliB@x6U_^2d;coaGOD2ksZf_Mxe
zB@x8qh$)F6#&AW-Jf?Z*Nen4<bDhEjep>l19`msk*5a5hN&b>$ERJets_)hmw{se|
zU*`9%P7WSC`zPo<;tVbCclpm%&D$i_YW(){!+$lx?=`^shLsK1PNoBSpSP~K7B66z
wtA`Ie{c8-8HPR~j<u%rtd{H}ve0M(A&ejqE-N{<}XPo9PbL{osNFw0+4{=Wf>i_@%