From dc91bcd8215c7bb93dc6395ea3cce93640e94840 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 26 Dec 2017 14:28:40 +0800 Subject: [PATCH] set default of timeout --- SCADA/Program/ModbusDriver/ModbusRTUDriver.cs | 3 ++- SCADA/Program/ModbusDriver/ModbusTCPDriver.cs | 3 ++- .../SiemensPLCDriver/SiemensPLCDriver.cs | 2 +- SCADA/dll/ModbusDriver.dll | Bin 22016 -> 22528 bytes SCADA/dll/SiemensPLCDriver.dll | Bin 22528 -> 22528 bytes 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs index d03f705..b08d16d 100644 --- a/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusRTUDriver.cs @@ -47,7 +47,7 @@ namespace ModbusDriver } } - private int _timeOut; + private int _timeOut = 1000; public int TimeOut { get { return _timeOut; } @@ -79,6 +79,7 @@ namespace ModbusDriver { if (_serialPort == null) _serialPort = new SerialPort(_port); + if (_timeOut <= 0) _timeOut = 1000; _serialPort.ReadTimeout = _timeOut; _serialPort.WriteTimeout = _timeOut; _serialPort.BaudRate = _baudRate; diff --git a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs index 7723f3b..5930e6d 100644 --- a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs +++ b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs @@ -107,7 +107,7 @@ namespace ModbusDriver } #endregion - private int _timeout; + private int _timeout = 1000; private Socket tcpSynCl; private byte[] tcpSynClBuffer = new byte[0xFF]; @@ -180,6 +180,7 @@ namespace ModbusDriver //IPAddress ip = IPAddress.Parse(_ip); // ---------------------------------------------------------------- // Connect synchronous client + if (_timeout <= 0) _timeout = 1000; tcpSynCl = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); tcpSynCl.SendTimeout = _timeout; tcpSynCl.ReceiveTimeout = _timeout; diff --git a/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs index 91accf3..c382367 100644 --- a/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs +++ b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs @@ -45,7 +45,7 @@ namespace SiemensPLCDriver } } - int _timeOut; + int _timeOut = 1000; public int TimeOut { get diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll index c78034124ea23a47891b6adfb112e0b0bdbc81d7..f7db08de2bbb7c3b72c944c3f4db808f0ef1ff16 100644 GIT binary patch delta 3220 zcmaKve^3?I7018l?%sWG-+M+VKO%~ihd&TOAVL-J7b;SyibNeM!-#x`Z3?NDtU!!))!+HrdB-J3MiKe99L z`_AW_bNAle{qF92jVGwFgLXBizW$GC3t+Y$q^1NZ2dLnL<0TWmUeUq*@2WNRIe z91V-iXbq(WlFPXxg+CS1?UX_DqNgd1s-xYMnsj%yH@K9)1SHND0hcoXivG5ILbO8s zhpt8ESm}v2U?)Bhi4Q2~%M6N?>lW~g9bIp&o)PNK9sse)&mHj(tT;Q?&Kzu5xNC<3 zfel||Sv!mcNDOtuKZa+c7&SBDXgji_$@aw|UscSTc!Gd+&+r8Hr}Nyki#sRE^nr1Y zdOa|e6mE*v#g{r5l4IkoXjgpt;7uy&tu^HTbgjCxH@X)3MGYeS)Xs;3M8X)%l%)GahMk7UOcnpfYDMt{Y-=GGUw^=oW|=rjVfu8i$$4 z|Ac}qVkRmKDFe^MLPN@=C8#%~Oj?3gO={WYOgG0xytOIMmf>QqBF}7P$jkF6**Djj zgDZyqj2dSiYR9WulQv={4jWQNtj1prDI+expb1{5GUC@!ugSYBmf+w7sQLRy-4-iw z-W1gdejMBK)xfQ2l}nt*QCr~AMrVby5+^kEkuvGG;4f4)&!lyzHKa_s8s`luldi$& ziC(8N=~^^1@%)}k*P+K0l}p#7bduMqT)F`rhLlO`v1hVZQzmUdhaqLsCt*+VYRaTf zVYVS<(x6J^L#a&ZWE^S24RBt!RrO%<(kTU5u{J@YhX%ns(QYLLi zzenoPBDZ67k=~1|o-8}C#L(41i)cl?rno+`M4i)$JzkOG#OBVm83}fz5=4c81*{p4 zgLFDhOR2h2wx@Z zZ}>G4rU1Vty6Cv5p*GeTZ$P)EE|YgFrgtuOH&3f&{3mp%^uNQ4mapA%Jh5O_~?LHWNbN{^&P{vyg~3*Xaa z^s-ij5;)!)=ocjFeE;TZ8zos~6qHF;thiz4u{NO0s?pb`jE*|XE!FuQORe|3)k_^t zzZDkhdi3(U?jgIEV#IJegrQhq3xu)QmdL~;)*MWU@K+v+So1NRbrOnMi%`N^j8fK8 ze1&y3X0ul4VO5yI@q9gMp&qqFk6Nxr)uNoMb*Nxnhk2~^sA7Ez)vTK_pO>kOTrg_!)^pa=KiPy(%@m+4p3O?UVNr-~v`BUXv$#3}KCxG!95gq3L(SVdO3Rc)=Z z)>#eKCacwY!8&YpSZA%v)`!-=towZFq9b#|E1UTD^9-?_b+Xnf`Yy*yg1cGI38iP< z@3Gzq9Av!)mGSf>K5y)2NBuFdJNjzwD{&E=q^s0Vt{5T;#5}QF{5rZUZ+JqkZIODG z*hxevjjmKMI0(l+3$r=RX7O<-okk;>u%VpIo%Q#y_|7i8C$xRu_HLxxCy@U$|-h p1*n;wH7qG@;Y7L{-8*+CbjDVFL~S{~{{o_Ymx2HQ delta 3106 zcmaKueQ;FO8OERY+33`Eun%{ zcafMz2%7X#EaF%w6k3K+>{0{^m0GlXwRS8Pu}YJUO>w3I9h_PihW0)8o{s+2oyn8; z_nz~fuYJzl8$U?#1Ju)%nYQh|hoC=w$jk^*AyCf=%S--hW$*qbYITTmWN9mq=7dGW znMXN+le4%-2LIJNn<$T>&SA=-M&}Y`-nDb3S6svY1SDE2fpd8PIpO;!I#F?pjybc8 zT&LG)nG(E|AAM< znxU9K;@bqQe#&sNWL2U?jvef;_8Q>qPN|V23r*~G{+W{Nj8APC7P^!_h-b?6=1n$- zn33U(&JZ&-WoYOU{Ns2IcP1ZJKaTvwsno_n^l>6R>tPZ5k4dNz%ZYGzP-#nWI_nvs z^yjvagvb2>))&PctXaW3S#xNZY>HozbEqjkKcIA!U+Dx_Z@T&SeJT^Tm0E88GdJ^q zr83uCeOJzjF{~0Qb=WN%6H@VcQu>&y|E=TZ!V!lzV9rV>^ zj#z3lU*CXQw6~3DhC0gu`yjI9NZzr=uxRG5BCctiXm)zDbE(VuW%kHemoN|ttFli2 zaX~OJ+@%5gh@B%%6l%I2C}OJdh<*?#hKYuo1JMn?9O^(2a znrwfYOh@Y&)iz*%fG&}N4v*-9y-sG}P>$P1m+hDg`Ia1u3QcR}S(%HtruBgjWgbpwdOPr`jKI&A zOx0a8ugUxvMr+KrZ^;65XgU*+Rv|8H8XFj76(bt)3cHYMmExzG9!0t}0m%2-A{b+p zVTq=h$hXRIO4G)`c&h@D0NKfau@vo^)cGz$VHwo? z8__Kvv6dm_9#yyz>#fDsa?EvUfRsyD;E*O|(pIFDtDXa-Ou7>7nv_Xb;k+hg(l(S% z@_H(hu12>eWzuiq3nrd_fRszuV19+yRk^esm6JVEE?tZHnv_YugM*rsN!Q`unv_YO zK;aaxPMP#cv}jT$eHwc-DU-(Wv7#7HuUz^JQttH%l}kHNqe;266LC$-q+NK~Blpp= z3FkGbN6Th}D&0}+3xO`tjSP>-5G$;1RBB2VPgq;H8$rs%xxA1WYXDJsU><9pWg(aL zQ#01n7Jm{><9D-1o#fVD)Hu>M4r#po#Q6H_QmpJ2M1s$u<&J&QBK*TDK7 z|1g9pz&{K}X}_3Dy{rp3v&grIdoB#|PXgISj84;AzVC57iJqrjvWO^(a(9;NAcEiO}Rv<3$xB5qvj>P3135pj`r$YN2U`+P|=M3o!Yx!O;E53Ui! zkHIdXcHHgi_g(#=tFQ0~<@O%YPuGL{MF=tf3DJn#f%nBxsEg3(%qhyDe&?y8VX-TM zM62%$QOjE#X4Fzp4l{;`&&*=hwfLqn&;2H9X`i*oP(7bD)au?f`stu`#Rv;^`uzkE zGW#h>gv}7rG1n9bV}U6VK{;z7Dp*S~g|!TotQDBbT8XL{|EoeZYYl2x>o9{g>XtRS zWpmxK`EFUWTebvM+@}R~tgWbLU5zMfI~rKmp^^1TH1SflkXlMFEiiNVn(y)zAc);o z0g`cmbtKMOu>xe_JVPD^SW8@;m+?b|DwSnEbbL^#R{=O91<7A4dF8~jd8|AV~SB{G#ZZ@tBf_qdSjEZ&G@nL zs_~}rd*dVHx^cq*p9Aq5gy3uVqFAa`!09OoEbrjg+G(PTb+W6C)Xi~ou!r^6Lg_Jk zE9;kmS6DAXWjsBE|5y9Z ze)TDGu9l`#A~9(E3qz7_AL)C2(YdR&8_GXAKKppfGUq^bt>O2Xi5u0Mg=zbwKk;0x zl#&0vyQ`h1@sLq|KabV}4YR9eiz^%6KJvHQGoR0%vwa|`d{W|Ay`S#fy7H?jUsZ8N dZ+Ix}bUwd-ed3OWn}#?sIWeT^D)kon{tI#ee`Npw diff --git a/SCADA/dll/SiemensPLCDriver.dll b/SCADA/dll/SiemensPLCDriver.dll index 0965929a08856e6d22ba45c8e907a5277094c0fd..10dc600cc62fa1392da28e9186eff55196c7e28f 100644 GIT binary patch delta 716 zcmXZaO-vI(6bJDC?9Q~iTCt5^6-uDC*rEjrZEe9%5=^S6wj_!k6b~AS6+M8liMVZS zLXC-177i6+NZ|l_Y22Fh=z)Vr5-vS>RIKq}G?+BTgWJwdGL!uBfA7uZrAs7TB6B%$ z^~Z4jMLQ|xH?ESHN{ENqCjp1*6nyG6;vws5hA6h|12j)me+4l3G@B40B(7c*yUd+6 z5t!Ml-Vu8>Rdl(P6=$P(N4_UbQwbGAPh~~d78iMJ%If-OC}Vm__rZOv*+&Y}0&T&V ziz_EB(fvps=d#F?#EQCyYfUi0igj;88Jsq6>#8e09-5>gwc$$-*9rEH9zeC1D~bv| zgv~xKFE;66l>A&NY|$fF?&m7tGqoc(z%@r}^eCnRTv2(Kwjvqi`X+(3;ciIbT%i`` zKsLk`lkKb>mQ!3Gq)yg>w4qganGg3X&Bz%y>%5U~k0-L&daLgjV?pw_~+UsFhywYOJ&iMX<;>W3fZX zgJr%21)op~@A+2bI)$dO#vK^z63X#!d>aP+LJ{Q;uR(H`&{r8$i!*_=;4D|kiP3;i zOmR>huv_Sr+(7lXV(KY8_=s1wi1%HS>yQ5TZ?L}rsxE?Eb^Au4@!+|SdN{gj^%^U7 zy7ZT1TqgrO#)5fbK%zg~|EcfI;pmq~y_5RerF&;T|Ii~bnN?o8T