From 971036b803aa44f379818138ed98382057131e13 Mon Sep 17 00:00:00 2001
From: yangjingzhao123 <yangjingzhao123@163.com>
Date: Wed, 22 Nov 2017 23:24:54 +0800
Subject: [PATCH] =?UTF-8?q?2=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SCADA/Program/.vs/DataExchange/v15/.suo       | Bin 217600 -> 218112 bytes
 .../.vs/DataExchange/v15/sqlite3/storage.ide  | Bin 2555904 -> 2555904 bytes
 SCADA/Program/ModbusDriver/ModbusRTUDriver.cs |   9 +++++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SCADA/Program/.vs/DataExchange/v15/.suo b/SCADA/Program/.vs/DataExchange/v15/.suo
index 1c245de841d751ffc4507b56dec187f743b993b5..28303030dfa53404856534a781027e19f2dd7450 100644
GIT binary patch
delta 2505
zcmd5-dr(wW7{9-}z%FoiS$X*YVL_%ev2;YlQiDLn#{lCiHMJN5ixKg$q(dg_qo(o&
zoQ5-*A_^*FsNgDB^AQC#YNg_9vKmu*%-A&3n9HP<+V@>pXB}&%{_C6h-E+R*`ObIl
zJ?DJC>#DQ5>aFD?@pZ+ho)$n+RubGj{OVAtPJ&Ies}5_*#@~13oyQM~qO>H6QneHt
zM5mgqnTUuY+#?h1Q3+TtN=#W+^d~OBhZi1G67E*y_Vf!PmXaSelAA@G8f$AjT@+GF
z*+Xea8ARE~i&oPRxJ75c6mddL6i)LyX`Jm2t#X&ZZ7})V|B70_?tTchHiAYl6D|{Y
zJ&xb&9&gc6wFwPz4MgoB>?LrDMrxY~`@8+SO}Rr+>8Q8APlPv^1H~ang7pxQhY24L
z&WP)d^zoll?+e0d0*9TYww-W}aGr31P)~bGLl2mRcq_q6-l@o4TN#w0`4i{6dD7X4
zvl?${M0YfAwRAQiN8>%~>B9zAlf#J>aVId=e~hwB87kt;{j>o@@oDj5JUx&<?kd3u
zG*O_8t4FLjZc6swN9-lJaylkz-go1c8RtXH;HpDtwL+yieF+@M`GqHRs)Y~YKH&_@
z(fD)uM7*T#ISfsei{mj_UaCi^%u0Z5fL~xh-|Dye%$RuTxeH0d+7f7jF@tA$tx(BV
z@<d!jtQf2Y$d=tm5*~Yw##f<_&jQkU4C^YjbSrugYky$m0PUZHm^dF+c(fdi@0NER
z<6E58Y^xGTY(L*nXLz)3{}?F{nY~{Xt?CeS7!8*uLHrSMQsc6S@eTJxp0R?{@)hNl
zQ|q1&kqwa^b*$2s&evWzZ8=&jMMU~U36G6lfamZE-nr@#MZV(3WDB3Smkgdy4j%@Y
zxK=enWUaBw%-vX~ZihI#dIR^vN48d<x*2n^@%oc9XI&oqOD3O_k%6=1(;glnKa=j^
zL26^@E?OxgkFl{JsErVg_|dzX8lZ-}m|u`vGT-^UvuI(`@U&s>keC}-72h0>(j?KM
zC(0M*AxZ9?1H1myY(%1Y2IfO_JQmK^QQYVlWv1F-6YY8w2gg*+!c_5VN22bUg)o~G
z3oyt6r7KFFSb!8WA2XRW7h{A>eHpLIPm1vrKzb4`R~BQSOf5u&oVE}Hbyp#-sB-QS
z#Otmij5W#7x8ab5OVJ04#8N!1r!K;pN9BagcvsHZidvbr714V1X8dN3?A^5xKU?0T
z2Va7W({kb>)aWPcFb!gVWxSrc6D_cF?fXL59S&Ky3CsI7(5yX#zf~NaHgUB&!K)IS
zfd%VZioZ&ru3;Cc&tq&~QvVvEgK&lLJ>eU|cZAiDRr|2VkkB=vB&ZClMQ2c!;jfY<
zO(-J~^wV$Y_zYe5(YGM|c?m__4ml-TkHTd&wDqBaYHmgbL`H;5w3!C`Poh;V?%Po}
z5zez;BX<R%jKF?nP;|ErZ8J^zC)pWo3NUn!Z!XO-YU4lZP(^Ny9~XF2?rc;YWliEl
zzO|uyjzUAFmSKpPuNc53OAa9WAvwTu(WzzsOF_^*2ay9qY2$r9LppVmAX~cC5PM&-
z4k)6qV<uU;AEz|lWUfQ+*P~pPxUshRI9mN#T%vxYK@t~wDvD3Zr3^_<HcD=Le6mHQ
zVZJ=N<x~8O;1%SS5nNF8_6P(+G_*&{Taie07tGxBr?#p)oR3Lrs>#t~9Wm<(8weW-
zb#jzydb)oNb+-|=6KV-OVF$H43A+gVo4ddF(^0CI&cz%5ze*1}Mw-JCN|pc77Bn|6
zM%yDYryA+fT#MUA;Y;@xTs1+-;D~cN@f!N^&$7$HTaHubaRMI}OBh@3;)Rk#;GTaT
zd(y84BaNT1;bqn!#WLdzml=({NnTYw`uBP%KYv{Dz-ONsK4$Ww+$RbOmW-P|Z^Y2F
zJUz7@392lsMKq~im&x)SNRabu5pFMS8yq$*cyVAyuZ!b)hZW_?@>(q1Sr7Fuprw_m

delta 1853
zcmchXTWlLe6o&Wg+R3Jw^(9G@)J@5i5~(01sslwK!fi|?uqC@8@JJmJcnT0vM?`r5
zxA1^O3XP}oyg>-1M6KIW4Bmo)MzYII&=d-&+)B7gNW35g;RuoPk6p)`Jn#a-(l<Nv
zpEGC1v-59k&WIf`4&6duPxm$0zgH9`#`hStsfg_`#nm8rc&pm%a1FoNJ3D-lzC&Eu
z#wXQDI?jJrLrlkbGq{2uCwB*rR!+rjohetxrNZ=@!t}^4S1-qO$C~LCck1h=9=6+%
z@fSDh+BdDB;)fU=mkRoBJZnI0>UQ0vxWms}7-^uqwj(66FH<*Pa)g-^5p_+}88Q?P
zlv;~we-;B>ET5$SlPk#e%k>&DgF&gbs!NSw)_zqer6!VO;}e?#2DKux!ICZ`r10hD
zI}ECa-e8IGXiJz?La4Hca)QX`D9D<xs-;Ef3?FX|F*{^=>?PSgih(MYQ}hAPs@;XH
z<m-d10<vMrEAFu&$mCmSTp!50!@8^}fAU2ZvulDpr*`qBnnC`adcBCIXi#riH&x_c
zqd;k8b0SSaVjGdO#gb<aVt`{lM+^Ej7M(9OEr{&9)ED>k^K3<TD(VT56neBtFQxw6
zVpnJDROiTj_YaMaM)yV^7~8r1#+y>kt-n#6&AH?qNut~da1!t{ti$*So!7w|Aj5xQ
z{nyGg$$2OX-~#v<d;%_lPr=Ic(5VBR=}wyTiai<HCn6adS#1L8duWuzK!yf+tj))}
zRGaWcsBT@uU2d=WWQ3|6+;HEZkwQ4iKH(eCY|~v;JhZnO8J(zL6aI&2Kd*B4%5uUt
zMjQFTt=r7l7+qG8(`Lr@(QZxLouLP@7&Cp3&=c3m^&ei{(+FRwIw^J}DLOs2D0V(a
zO=i;!{ZUyjJyH7YKxaGfpHBp|8T0))x{J8(ZkKy7Z#zaAIy#`KVm_>m@Xytz!k?S3
z_m&rtJ%4;dvapc3m?W>dOP-~)<QFLX4Y&j@gD=5n;482QWZt)UK1xLk|A_ui;Acf7
zPSFX25Wga?seBf{9*zsFWa+Z#42#@p>MDA*XeD`v*SHc^61g13SQ{eNYfn>R{2V=%
zm?wY1I`XSgE)6eBM@rYOivMhI>DBcHH(>$XdilALpNmo@5zW$6`W4EOQP5f}G3l>V
zzE)QgZ&OxeU!|DnKTB`LJucJr4yEkU4V!<!1o!~0qF6kzyQjxn@PJN;sle22>aWD)
zfj@@fe(;}N<_Ti*WgkGz$AMrrt;Icq-a+s*cm^C2eKzgZR=I)aF`NZ2fFs~Va1^`*
hR!$EMQ~F-w?Ef$b-iOr}Hy6%PHu`)_w&36S;%_d=a%%tp

diff --git a/SCADA/Program/.vs/DataExchange/v15/sqlite3/storage.ide b/SCADA/Program/.vs/DataExchange/v15/sqlite3/storage.ide
index e33784a642e4c45dd3f34591c46130cf7ea673b3..d89ef11caf0636d6d70fee033aa4ef6e0160ecf6 100644
GIT binary patch
delta 1090
zcmb8udrVVj6aeshKe>H)fl}$?02eAy+JX=4sN$v;=g2e>v7O=Bs#TLE69VW=HnMEA
zG1@4}R>0&;-4-XwCW0Vla?9G@3;$ruHpR!5khm%Tm|&J|Mx)6R=T2k%&wsqhFJI32
zZqE0(_k_b=@nI4x;0ODpclg2aP(?kz;c#z#w6~roj4UD<L?9ZXB|4%fi-|}wNfybL
zd+QDT{k(#)IfHdzs;Lt@S}mq%eBMBEh><KIxg?!86N?<5x1PSJSuaFB{NWJt_YFG+
zeBNAC`@v!=DvchUx%2$6_;~o;%R`>Tu~2P~ywDFJy=H?D>G`>RAQEhO`Fc(sU*$2`
z)c>}9xBA8>E&F5TbMsxdIqh&bbE4ZWEt)t3my9OURlW82qamYM(){}`cbyG4AME>D
zo*9Rk4B>hy$1TQ(dkkjwu^l5O$;t-oI6VRROjm|yS|P94QO0o@+>1ve?C$D3c!<+6
zodziNEzJoyH6ogEqgm22wG96l5iOV#0Ijgz!ErkDe_+VPN{ZQU4)k9IE6$oEfq#rK
z84B1(PP~vFWhdS>OA^a=;aGs;Di<2JLO$B!Ah6>u^ai1Zt*OACAe0N+mT{bj?jkVZ
za|_jaieqsoVs*>$dK}iUJu8sE0~Rct1U<99f$np(BX2tJSK)LWm~mG+_}qi@b+nyO
z2L+c`qwj!d5zXn7wecLcq#8#ip^*94;!l%cV_&|Be@;R*v%H0?K7%UOz78Y1z{6j`
zFMgzSxfgE?i5_;a2163Ku`)sXzPAyLov@bqHepu+s`)8AmjFBKsl{svc)##sEyrcQ
zyx0t1XM4NOuB+8;UPrkr=ud(~)jN{3$Uiukgk?->z}fWpUIRW$LODCufUXoc>F@KU
zU^)K~KTXlBs}awqU<KRVh;u1$vy+XOsen@`X`)kMNTDNdS0Iy}ZNi-jIGC*&k0?;V
zzG=pBg{~f2@R|apEY^aL6sniiic3|h*V~HQRj6dy0Sv3)VkZK4UIiyJ1o4&%#Vi_(
zK2d?>k$h4>B>9P2c<L`c73~`>A~v#=6q6FUZ?trF`t{nNO{@QY<&oFwgrnW|iSDu;
m3mWgM`t4P{BQNZA6a=!KwLKk9x_{l0{zm`GM#b^>+y4Xf4vNJ9

delta 1090
zcmb8ue@L8l90%~{`OfD&J>7ZpethnH^k#Q@(@pJC=T*!m8?{PKZT^^^t+SCWC!UoQ
z25oo5a&%+)BY4wVFshM?Z5iQnm)_lkHE6|VM8se;EEtny%>toC)aQu(w}1A)i!Yzg
z_u=z=zTbyWIDASDv(W;%Z%o}K_ss^&{j&Y7sDC8tmziK2SO!y=j%6}E%VOEgz;akF
z+o(nT#_@6aBu1|qZ4>7^LKx_>nnz;GMwZ7+Y!l08>AZzmwb-)lgU@xOL|*-J2=Wc%
z-ihY=e5A(7Y7SN!PkeZ6I#lua*R{tRceGSIbKo6qWt@UpI=d1%@?HN#q`UL(>v?v$
zy2k8$?O@d5>}k03_qyc26kPMc?6b`cyVVVIr|Aom`NEk$PU$`>JJ#M)d&_q-`>BJs
zS3TOrS-O~^cwCZ{jkO-5MJ%}xF{?K5n+uC`<PbqOPIr;L_^?}&GNk_>o$}mZ=#?Q!
zFZ4R%)L*=(;QWlif}IvMQ`k!I^NhiYyZ~h?@0CcB9xX2!^HIgIs4PXxH)O+-Sykjl
zjA~RMu9V`l^lJ3rx<yq*uLtJ>97jDcJxvZcW2A^*JgD!c$Ha*;9O<Sq<xIIG8Q?7<
zGyb)5ttOm{QIYs$E3U+7yNGXte2uIqj8m2fdEuSpj_T9F)I(ToBn$SZgB#UYZsc}?
z103YmqWNWm)nG}V?2s%;ecLe;r$RARhi~KL6t{g?jZ>W%co+{JrfPBF5k&S=jqJp`
zUvWCJ1K&>>YQ&{_1Xc2)YM%S{?Sv^rJ~7#V!Fj5a36t~W7C-I6<$3BY)bEz0jdw3L
zqdC;yuXpQr>z{a(b567@kjm8u7WgB3@bLm|6+^99O0Uzc_-BF2#BwXPB*-IM(VU=d
z@{@Qo!Mou$Oed&9Xl=NfAg@?!Lr#)B${X#Hv<bl^AGs+>IpR(`o=sAzc)bHhlT<F&
zJ20E%s~_Bl%Sm#HoBQx*lIy+DiOngl_iHDbQdA{+yAV#%7O~oe=@fayivj$QqGEA9
zFtVN^W@ipoz*KELRe182{Qk(;*&^m-n^`e?KpQ*jT3WonF*uZ&^=akN`<jHehuw3-
nC3{zNj(g49y=F&SdA_tDkn0K@aK^nq?n(cnYnmxp`g_BFOKO8i

diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
index 100128a..7c3cab3 100644
--- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
+++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs
@@ -166,7 +166,7 @@ namespace ModbusDriver
             {
                 case '0':
                     {
-                        dv.Area = Modbus.fctReadCoil;
+                        dv.Area = Modbus.fctReadCoil;//读线圈或离散量输出状态    00001 - 09999：数字量输出（ 线圈）
                         int st;
                         int.TryParse(address, out st);
                         dv.Bit = (byte)(st % 16);
@@ -176,7 +176,7 @@ namespace ModbusDriver
                     break;
                 case '1':
                     {
-                        dv.Area = Modbus.fctReadDiscreteInputs;
+                        dv.Area = Modbus.fctReadDiscreteInputs;//读离散量输入   10001 - 19999：数字量输入（触点） 
                         int st;
                         int.TryParse(address.Substring(1), out st);
                         dv.Bit = (byte)(st % 16);
@@ -184,10 +184,11 @@ namespace ModbusDriver
                         dv.Start = st;
                     }
                     break;
+               
                 case '4':
                     {
                         int index = address.IndexOf('.');
-                        dv.Area = Modbus.fctReadHoldingRegister;
+                        dv.Area = Modbus.fctReadHoldingRegister;//读取保持寄存器   40001 - 49999：数据保持寄存器
                         if (index > 0)
                         {
                             dv.Start = int.Parse(address.Substring(1, index - 1));
@@ -201,7 +202,7 @@ namespace ModbusDriver
                 case '3':
                     {
                         int index = address.IndexOf('.');
-                        dv.Area = Modbus.fctReadInputRegister;
+                        dv.Area = Modbus.fctReadInputRegister;//读输入寄存器   30001 - 39999：输入数据寄存器（通常为模拟量输入）
                         if (index > 0)
                         {
                             dv.Start = int.Parse(address.Substring(1, index - 1));