From a10074e6426b32109007667b2972cea24cce8124 Mon Sep 17 00:00:00 2001 From: yangjingzhao123 Date: Thu, 23 Nov 2017 22:57:34 +0800 Subject: [PATCH] 2 --- SCADA/Program/.vs/DataExchange/v15/.suo | Bin 218112 -> 218112 bytes .../.vs/DataExchange/v15/sqlite3/storage.ide | Bin 2641920 -> 2641920 bytes SCADA/Program/ModbusDriver/ModbusRTUDriver.cs | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/SCADA/Program/.vs/DataExchange/v15/.suo b/SCADA/Program/.vs/DataExchange/v15/.suo index 9846f41eb56c5dba874683a99cfc733bbc91ddd7..8e7b465e0aa1fbed74354bfce96cb3762010bb79 100644 GIT binary patch delta 821 zcma)4KWGzC7{Bl3VxQ%mwrSEPM&qTXM=N%)C}s#6=ph*tqppHFcWL2R#IGeTHS#LIJm{ zMMu$>L*Qyguh>5z{ryYp$r7%d`G||D_o2)~4h!LFI_?{$h)55xTx&Z`h}}9Rrt^u)~*ZBBAg~ZKIZs{VmtI2GHI3$ zyf%c_8rX2x{!>4i`KIRqZiLYyv$8BzE^dbl0NvD+4sKr`1ZZm*b$8#v3YUau`G)r zeh&r%JS;$nSJyMlZoK%Om8Wo|h-_D+Lu@prRl|V6y-@owWcqS2XL>7^d+vSWn zinl`uVoa(v`zJ(uSDG*H$hDEr!YW{eG$>@gG9$g%b4bZa=R$HEOB0B1h_8sl^0t$L zwAwD;f~Tv6Al|VBkkuoI@V!oa64o4M68o~FUmTOBbb>>W?lRde+!v5XF1Zd>yiBvT zz62|+t&iZgu2mtS)+e4sf@~G|G!p5j{*#qA)ntCD=A?|I^h(PD(wL!N2&uZn!C&YI zpmt9g6{&MQPPCknR61X0s(R)f`13V~+8YXa^Gyf}mtoku@-jW(q&;gqkZ96hs5vA+ z@weAG^hi!yOpVPJfzx0PczS;0 zLFIJ?s`ogJb?mgeR z_Z;7;x2X^HCsNOVu!(xc8qaQ|FP+zvck3d(0T&^3Hjw{fUrn&Dh9ZV!NRAXpi6W2+ zMWS^`jWkG$bW&f9esGYwp#LkqY3Repyx`dtX9!L#>QNMmMlmQBt?V07oHVg$n)}QU zm%KDpSA3>=-z(;(o97D3Mq>xBOG9JaB%`0e*$X_G9)znGcrhzdLVt#ssZ{P~ghWBf zMP5dqgCiID2DTgx#SSq=tyeMC>T#J7nu^8P2xS`~WIi7J4lzAKxt|h}l>lQ7F#|qm zS1S~!t%R(DJ572ct4RaDK`^nFG?+ik6WBLtaB3HiH~*PNh#ZTod`iWhc5i1FS-FK{ z{46Yt^CWr#sKhNa29j`L=j>3IE}CH8ASl?!cJQW)M&)Yyb~r3?fxRliw?;u=OCr2q z&l71RT$6YbYfOi-2ELJL9B{OOr_)r}J;BZND)dZX)s!q~%M|ml2W);rHqcTrPHkLm z7n}Oo33>0T<3K&hBbnU=m)zV4j+J0<0W7+?2^u{Z^c6yF2c~)OgkFb3llW>oz$8yn zc!~*$1YNd0=im7*!<|X)VwI)f-;L|=1CX69=E3c+)e81^8C-i$?P68s(3oYv|EBQ@ zi1zX#X4?e19MK8-18N0*9S%-$D}4k`PVs%_z!pMutAoT*%4@x?ttzW(vuaxj?hS(_ z#05GGB_ZyjSD-z_9rPD?GsH8g2p@%b2HgX{hPX(NgLxV^=itF$9N!0Bo3 zq+a-P8dLrNI>YVs5Tvgxzd_v$W_CgE4Bl`PPR`(yo`&!YR{0*5XYltXNDT8_x&-bp zPW~C_4r7%c;H@xEp-)Jc!@Ngfu8z6U`-1a}s+9&7L_*fY!TMQ_;!%QBKbv^@h_s{A zdL=?u5y*!hw+YF%HR=FS5xUXLsrPmR*C5sQY>!r;KD1+7O(C>fLK6R!dl|My;NcbPKjhCVwL{-~vmz;5QWPOk|F~NM%n4J<)vp*p{EnTr1t^w3@Wz zw{73aw3)xZ_WXYnGzM?owMn<`+N0eXEl!kbwi3-&Rt353RxVi=Y-t*0p~8Rk)7Bw> d!{bA>Ww8+Mv_{3#e3xPU|6Md*EhNfl)jyqJl&1gy delta 1362 zcmb`EdrVt(6vyxHmRrhNT9B6hfZGmOAGZ_=MfM2KlIg%%k-7QcAp;jO*`Te!*hZ#n zRaztd!DGuw7Kk&!`2eP5g9}-q8w;AvEgLZ=^N%@UDk|tknDGy@#Z#On=)d0Nlixk( zcYf!b?>XL+?-4K3l|=S+^IOTjk=nr`;y$Brv?-%X{h16yX8g7{I?Do`Wdvan2@-*D zh!lxLWJnaU4v`}YBpOkQon@+?9+C-NU#qme=bv|jt1@047@t!iF-R=(2oi^c{Td`* z9G}yEeog(&_s0}!>$9O7hJqJ+YI_zdeyuwo_Kr}kgj|NfvowXY!qu}hm)$Idt~4QC zD&5aAj0*BbX(4Hc_EEZ-U5tfXtB@*J$ynLyb%6%za)r1^X%oXR*Al>I6)cg`{e)rC z6Jf+Eq`{{iImZnc7-k(T*Qqq@Q%3Nqc`f_05w0JmiR?`yoUEh?x<8Bz6M;#>pOo9} zaW}Uz;VKmEHu!doCX-`8M5-sTkc z8lGow3-C!5O(HUw6=^cN+X98vw1|~k;b=9rkW{D{r#f;4j*Mg0lniJ}7wo73#c#3! z$rs|~npL?dYAGA+AIjrFK0%{cQx05kQVm$c#-5EZ=cHPwb)oV0CMbUe!(4bn7U0kX zc5MQfpvhcQF2h8D(q_*5Yrc!HJVA5V;(YMc;MrFIHk)9FyEo+=`=AhJKa%ILB@U>~ zFhA^Rv>0ODbPH?T3d&3&8&oZFjvR*r=cs|~f)nTHUR}rI45M5fB#tto+}+qHGsqs3 zmE@tX5A;FGlRn4`(i}1ao*=c7W#|jibYg}}L7GNt;9iglq!)CP===<}Ph!Y@Xq%)q zk^}Eg(rn^_8s>OJJBacA#p8A_+*MST&P0 z-H!XyJ9wXZ?@DtA)3{;CyK`{+&>`vhhRTYI;!pFYtVl_*-v&RF@F}HhQeo=+>IZLm zAC~$O?JfQciS>n@^-XoI)`mUL)i<{^xLqI1aPe!qfTv6Oezi$?*)lMsKi<38+NJ9M z@#>RHzx9tj!6!+GJHR`6L?`l2y>=J-QnYCItbZ*+JTsto%OX@V#sQ{by(!*`zmNW_ zo+J%2hxIznrj}S)@y%hqf)IP4`?MZek0c{0NUGRQGs diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs index a4ea124..59658c2 100644 --- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs @@ -13,7 +13,7 @@ namespace ModbusDriver //ModbusRTUReader : IPLCDriver IPLCDriver : IDriver, IReaderWriter IDriver : IDisposable public sealed class ModbusRTUReader : IPLCDriver { - //自定义构造函数 + //自定义构造函数3 public ModbusRTUReader(IDataServer server, short id, string name, string remote = null, int timeOut = 10000, string port = "COM1", string baudRate = "9600") { _id = id;