From 3b8805419368e82b4337885c7c4a9b1e4a245dc0 Mon Sep 17 00:00:00 2001
From: Gavin <hijkl1999@yeah.net>
Date: Mon, 11 Dec 2017 22:20:46 +0800
Subject: [PATCH] fix omron bugs

---
 .../Program/OmronPlcDriver/OmronUdpReader.cs  |   9 ++++-----
 SCADA/dll/OmronPlcDriver.dll                  | Bin 16896 -> 16384 bytes
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/SCADA/Program/OmronPlcDriver/OmronUdpReader.cs b/SCADA/Program/OmronPlcDriver/OmronUdpReader.cs
index 8562a82..e77745b 100644
--- a/SCADA/Program/OmronPlcDriver/OmronUdpReader.cs
+++ b/SCADA/Program/OmronPlcDriver/OmronUdpReader.cs
@@ -5,7 +5,6 @@ using System.ComponentModel;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using System.Timers;
 
 namespace OmronPlcDriver
 {
@@ -232,7 +231,7 @@ namespace OmronPlcDriver
             _timeout = timeOut;
             byte.TryParse(spare1, out _plcNodeId);
             byte.TryParse(spare2, out _pcNodeId);
-            Console.WriteLine("id->" + _id.ToString() + " name->" + _name + " _server->" + _server + " _ip->" + _ip + " _port->" + _port + " _pdu->" + _pdu + " _timeout->" + _timeout + " plcNodeId->" + _plcNodeId + " pcNodeId->" + PcNodeId);
+            //Console.WriteLine("id->" + _id.ToString() + " name->" + _name + " _server->" + _server + " _ip->" + _ip + " _port->" + _port + " _pdu->" + _pdu + " _timeout->" + _timeout + " plcNodeId->" + _plcNodeId + " pcNodeId->" + PcNodeId);
         }
 
         /// <summary>
@@ -498,7 +497,7 @@ namespace OmronPlcDriver
         internal void CallException(int id, byte function, byte exception)
         {
             if (udpSynCl == null) return;
-            Console.WriteLine("OmronReader错误->" + GetErrorString(exception));
+            //Console.WriteLine("OmronReader错误->" + GetErrorString(exception));
             if (exception == OmronCSCJ.excExceptionConnectionLost && IsClosed == false)
             {
                 if (OnClose != null)
@@ -650,13 +649,13 @@ namespace OmronPlcDriver
 
         public int WriteInt16(DeviceAddress address, short value)
         {
-            var data = WriteSingleRegister(PcNodeId, address.Start, (byte)address.DBNumber, BitConverter.GetBytes(value), (byte)address.Area);
+            var data = WriteSingleRegister(PcNodeId, address.Start, (byte)address.DBNumber, BitConverter.GetBytes(IPAddress.HostToNetworkOrder(value)), (byte)address.Area);
             return data == null ? -1 : 0;
         }
 
         public int WriteInt32(DeviceAddress address, int value)
         {
-            var data = WriteMultipleRegister(PcNodeId, address.Start, (byte)address.DBNumber, BitConverter.GetBytes(value), (byte)address.Area);
+            var data = WriteMultipleRegister(PcNodeId, address.Start, (byte)address.DBNumber, BitConverter.GetBytes(IPAddress.HostToNetworkOrder(value)), (byte)address.Area);
             return data == null ? -1 : 0;
         }
 
diff --git a/SCADA/dll/OmronPlcDriver.dll b/SCADA/dll/OmronPlcDriver.dll
index 7d62b05708c4c3bfc5e3b8a4d692b6621078e517..6f6b1c52229677a51dfc94909a0c7b137a6952ab 100644
GIT binary patch
delta 4126
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
Y`tp^m%QNnKjqfY#@=p4abrie)4PUYUEC2ui

delta 4647
zcmai23v^V+dH!bZWB1;bR?_N$UT9Y@SP&8dNfvJl5Lg0?g+WHxCW!E`RNInRl$;QO
zcV$yII5tHd{D6?w;O5x0PVGd596NCeJ++%UiDS~{G$h!D(*%dcj-Avo;5cr-nO!(I
zO;4}1-~8V<|3CB3<IcUisgy|V7W=+Xb!vLUt;k$wQ56e`MqmyFH!VKgGxoQ)gxh+6
zo3zjieBT<Y%+E>zS>(aBK)I@v)6_aK*?)W%r5HbR)B~bU%u~n3WYMPH5LG3^Y(ZZg
z{75)hGZQ#g0|<4hwROBp*4Xl|g!-&|DjAJDR6xD9DB%D@M`|a?oiyzDWWYaCTb#%-
zYKa_ShW3%#(nQn<WpacGQ7BKe7-6Cu2^gUwvDgSvPmTnsJUErjAE}M{iSD!>k|W}(
zerIhoE3qYAku68$)r#6^II%0O=g1LH>viddaubiG^*kBR=FFw_c$^8xrx3sn%NlJQ
z;n;m34@f-AfcO-(K2V&+N*}VgIGVS;PK^c%>!ulD#9|NW{s-%?RrH|J0~u^kCj+t2
zbk=U?s`-O6)Z2kXlr!tcn+PE{njI(_JLE>gfeE_EDLUlzsX{NR4h4JMw4eGgSnf9K
zkQP<$#l>}MiPu!xN@0@B<Y2SMq8L~d4bD;zd-sajs?eW9?DF@DIqFTnj&>+i8=lKB
zUyg(r;114H3qqyg`IL~Btic6pYp7w<^;*Ik&Lje>^gsvGvrw>06Ydbx#9$j8Lv?u(
z5no6v3&FufCX@n~)UQAPMovV0T*NghOV^yq1h%V-p##b1Imw~A-b7UBvM2G7DZ3IE
zP1%vyBDLO@IBCjRiB?PV#>7*mj3)xN=CQ<`rYugJGG%UJx}){rJ(VUs1eiPWxxRfY
zBYJ()V^TTU!Q!=vJ@l4Nyo?(ozJw9!Euo6DTe8xNW`;CX-JZR-d@1d$x-z#YeuMVZ
z%Tn}bu@h`}`%>kGSCsSi$v9l69rO}jap+J3;T8Fv#v$Ssja|_@)epj}qRWh45ns;I
zEpqqv53aZ-cA1)=v#RPw<5P)iyU&hTXIEZn>PGck&N8u5{XVCHSen~Bori)Sjc)k#
zhN6$HD_$#2GYC%Qq)70FK&hD&E8eAc<!%$J)VsM8MU%?TyF=NLD6Io|<!UI;HmpUR
zyN2CtSX-njpcA(TSCdz&2O>FQjXD^q65Z;>NUK;&tW-t$wGBLFd@H_==-0vJ!sItP
zC}9e`!MQHmO}#DSyl33_t*Sr2b^d-H8`byFg_-to=T@&CPV^7lv7HL~ih*Z%`c!wX
zMnMITORf5b?#_0WHRSu$>-m#Q+Q_(XQO6Hg1Wc7D9B`|eSTH+zo6Ej=x%j62ouG>v
zN8>STG?;@ocpka9Xzg}g9JDo#7z{bu{&!=)XE1E=KdirI?1Kgu8D)z7oa5p%ZmZ{F
zgRSwP)e-V>#9qP{-tq>LZWvX;%OZ?=qKox%fXeFut!%V3o}}$V_(vH$3G=C3cD3Ga
z{I^*;-DOPI#dnEejCi`8VtV>G;U4wEC}a!UaT^B{<}B*i0;zpIat7R_%lQ~!E=x(m
z*h^Oz`;5}hRD4Vd9rb)%kQ&brUA*jS&kA<qW5D}>%C7?2GvevmSV*_F+1JWXP4^$M
zOBYW$ANXPHH%TwFw9ixGQ70_%dG*7>vMqN6T7s*%4frQ=@g_72bGZa$sDt=(U*lBw
zj3w}QfwRQ7#LtP(%N^8z<7&Li`0N#T(>`Euwf7c%x`OW#CtCldZYt_embrK1meivL
zrv$X!WbF5)whN3sJEZNUMtPMj-I7Z98ecOQG&qOY71LYiyyuFG?4d8s#OJ)<lYO_!
z)QLTwv?b1_nfGc1Jln#h41HK0=ibb%PB-%<d0cf*n4Embzi8RGlu-}(f`_hMqkZlV
zCPcRFpghA;B9APdVLhyKuhwm0or^Y8civm)71;swWY`UUjBF?!SG+Y?OIFSUpMw#<
zPI_aU`!j})qCGIf4r7SVcVHCVWcdij(=1=iwTscmrzlgyrNAP)1W#mGR&bGBf%gnM
zFA%uVu12{&i`j)2SZl}8o?*3?iz#^9u>0_zPIA3H1+VGb75Cxm?x*dkXy;Q`2fh>R
zx9hPl!<vz>r{hwF?Z7>DBYNx8o{O9Z>=`(bVXruk+B4DEkgofY_oUs7Co-(ef7Win
z8lE}2hvm+<lJ<2N%Fv6!f3{okOomnaui3Lvzz2hN{kHcLdoFr1>^_{e=i~7VTYz8M
z*W)J{cE)?pUWnou>9`*|m+Zyp&9H6<&JyfQGtakz&e|JrEJKS(JMeafHF95cf&($#
z56iIAiJA=CEi0U5=rrtpuBeL@^b$DiT}8FAEME<jxh1Q36iED%2cLzP_;|MQ4>C8`
z!B><hositm2n*S+){nYccjzOKO_WI2Rx<XJwNt2k(&wmYA>{q(7XEjw&V*U1$C$(K
z7%T9aL7k^$COWIMqQ@k`C-*1Ecg<M;zuK3t&Wgk||4KU&8NJbT(0jE5iT}&q#i`^Z
ztMz3QvWJa*mzmrb)M(j+<kq0zb4@Qs3DM^+-x|!t41==`E;QI_aFxMz1~(E5(QoW+
z26q_TLoCG@(ZvCyTsF2RwgzL!6TP7Y=oCGn#k9jo(Lu7=TTa~TbWxfc=%#JCJy<0g
ztxr+;6c0_UY{EJ!eN^H+*z&~Qz!3G`&<^7FycAC3gc#$O3O%I5rptAr-g*}O;+%8b
z_`HB^;uU#<o>AV=r|FY?mBm+ie4WON27m4S3}d34hu#6^n~PJpUY^5Y@p#~U92L^L
zZ0!Fwwk?i|y(kr@@xG`eZgncf^P)L4O`H@uwJB`j7LkP~MX$Jk0jH43-Ro?n=UI0L
z^`2lVDGG42|FC!-`iLpOJH8%4b-*?G9ueit@gLbuC%!Lgj6Ka@v%%Bi$H<bW#bqZV
z=NYBl;5l)@?Ud(4AhcH2;8tgc)T!^Hr}XZlo*&vHFNlAWhh*|MA}*gMxz{<wC$3(z
zb7Gr(nNFkfXEKO-G+GhvhZbTB(ZMXdFCEOo2gEj9BDUj0Vh27Vc47{FR^VgWUA!Oo
zMGcbJ1Dkj|T;h7;(~F?xB(a(ATMplRvxs*gOdLWkaTpQeXN>FTP(XVpiijx`6L+JO
z_yv>`_ZXiCQ9*kjV#NKZB0i29D~nrDCw&N$EQv20&nFP4@;8`DOg@ciES^DwHJL~G
zCbt10EO#1^k2S<HY$sM@C$SFuh)o9P;!)a*jlLXTp}pGZw;9}om#N%|_lVo^2WK(9
zh;8m+q1gUm@g?-RPdM5>;ix2wAm8BTvHLoXb|?M<58)AJ{Ulz(1^8mNXcH^NUE(ou
zNIWf`75^&Ei_4-^HprE7i@Z}R`GS<Z!NJ#uex5nn@<p5n!;dhHcuevI7JqN>o1&Ta
zmwjEkTg)OB_M2k8H;-hwzm(YQ$CZlqZ+bv{OS~z5D;zmlE|PXipCZ>@Ej&f+YlL6P
zX5;WlZGea3A4gs`eqY5m#y7;yJ95q7_<~9IJ4uVb8hHKO5cOC9krTrJHsWq<N%O)O
zHgGn#Ac4;sG+x<S?dO&;EKjo`4AN)#YAagV%&9dV6ST)LBXqliR5N}hF-#xg{@a9=
zlsB`o^GYHN8TwQD_`lTs)NYF2#HJFA8Nkhq+Gt`ED0$@FFPaWH_|YG}^7S2!3p@Y(
z;OCz?@>J0Rb*%AtlNCeQfe245xA{I94hC!~BdIZ&6|+QM>cza&$-LA{PE6`5VtFL>
z1NGR9MOmk_;D|`-^&mg$7c)A<FI2<KD%XJwhr_CCX0^DWhG#Aj@2D4M{$=2Ik(B;d
zT}|~lqhexSYEKTFV5B=TD#jmddd`}5<<}cN*ig=8so~EtHM4=6SGTYJ!*7ole{cCe
zbv)8j8vEMqq4M#*)}RRY@f*;U>)sx9&#Y28+%tY~*04}#TN}s2b3U}>{#oOB3*HrD
Hje-9GBq~Pq