From 6b05c51c1de8f204b4387b907b08804094c6e46f Mon Sep 17 00:00:00 2001
From: TAO Cheng <cheng.tao@hexagon.com>
Date: Wed, 21 Jan 2015 11:30:31 +0800
Subject: [PATCH]  TCPIP SERVER Add DM200.

---
 .../Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp   |  39 +++++++++---------
 .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo   | Bin 156160 -> 156160 bytes
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp
index 6c342c1..2a6a3cb 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp
@@ -652,25 +652,6 @@ void CSo7_TCPIP_Server::m_ProcessSocketReadEvent(SOCKET s)
       m_TCPIPMsg._CmdType=1;
       m_TCPIPMsg._DataAddr=iAddr;
       m_TCPIPMsg._DataSize=iDataSize;
-      if (iAddr>=200)
-      {      
-        int iBuffsize(0);
-        int iStartAddr(0);
-        iStartAddr=iAddr-200;
-        bData[0]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RSDataIndexBufSize1];
-        bData[1]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RSDataIndexBufSize2];
-        iBuffsize=(bData[0]<<8)+bData[1];
-        iBuffsize-=DRW_RDataCCLen;
-        for (int i=0;i<iBuffsize;i+=2)
-        {
-          bData[0]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RDataIndexData+i];
-          bData[1]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RDataIndexData+i+1];
-          DM200[iStartAddr++]=(bData[0]<<8)+bData[1];
-        }
-        m_TCPIPMsg._UpdateData=2;
-        RESPONSE_PLC_DM_UNKNOWN();
-        m_TCPIPMsg._MsgType=RESPONSE_WRITE_PLC_STATE; 
-      }
       if (iAddr>=8000)
       {       
         int iBuffsize(0);
@@ -695,6 +676,26 @@ void CSo7_TCPIP_Server::m_ProcessSocketReadEvent(SOCKET s)
         RESPONSE_PLC_DM_UNKNOWN();
         m_TCPIPMsg._MsgType=RESPONSE_WRITE_PLC_STATE;
       }
+      else if (iAddr>=200)
+      {      
+        int iBuffsize(0);
+        int iStartAddr(0);
+        iStartAddr=iAddr-200;
+        bData[0]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RSDataIndexBufSize1];
+        bData[1]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RSDataIndexBufSize2];
+        iBuffsize=(bData[0]<<8)+bData[1];
+        iBuffsize-=DRW_RDataCCLen;
+        for (int i=0;i<iBuffsize;i+=2)
+        {
+          bData[0]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RDataIndexData+i];
+          bData[1]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RDataIndexData+i+1];
+          DM200[iStartAddr++]=(bData[0]<<8)+bData[1];
+          TRACE2("DM%d=%d\r\n",iAddr+199,DM200[iStartAddr-1]);
+        }
+        m_TCPIPMsg._UpdateData=2;
+        RESPONSE_PLC_DM_UNKNOWN();
+        m_TCPIPMsg._MsgType=RESPONSE_WRITE_PLC_STATE; 
+      }
       else
       {
         RESPONSE_PLC_DM_UNKNOWN();
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
index 826e49d8bb54ee536ea7b545010f4c4e5706bbbd..976f904d888704c783edd712dbad67580b4868dd 100644
GIT binary patch
delta 1511
zcmYjRYfMx}6rMACcVS_LWm%Cyu(;hK;gy9}ZGGTfq-{V1w3s$(L=+zw>I%JSYbEJw
zHGNTpJ!S`OV-)K~E78?!nYL*nrc`Tx6h+%&ODr1W)+RN!*&nq@wR3@0&&}kX`ObG9
zGiPS}16KclHC&~D8>cHzSVptHU6(ggZ&j9nl{}DQCxq~eF382GxlXw+5v;NlzzTh<
z<$IHvBpc?@8IX-0#inZsb)Y21JoIQ{oki)0O;K~~1h;<A@gZb^1Z{GxA?2ijXmUIz
z`ax%pVg)06s)Wb0Ypli$4rBT-Ta+pB@fIVL0Z;FS96iUiKPldD%rGFMY;%#+_TW8F
zr4^E-ni4ahR$PPMD8+iTIH@46<6}Y;GK44F+Iit_NYoFkx<PUInwxOpA!dE4W_EpT
zt55Uc*_M3Xy%^@A{Z$u+TN2Upx}tx!cF395EaQ*M-7{}W#n_<oM{)7Ms(D!ZR$AHz
zbb>}m|7odDGkCXUuEV&XAp<|D&o^i(K2wZ#_e_V>bM%k4WrI>m%6>JtJbMt7xMf;X
zb9wUyywp^vhudniuzoK)wQpha*z&ZaSCmJ4rX6nw^mqC2zjw3r!{HSs48Os8PE$;&
zPvxr@!E*EjZF-<@^Q6Ez27Tx)J;bYrz^<Pjr~*9LRV^Kz`nGes04vYi&~|N7YBSkD
zipW~BMSkO5{RJ-_D%92QOo>*AlUP8Gv1aJn<usEg{m3nT;XS>x;dbxkDNmkQw?>+c
zo*Cly65=%zGPy$j<$8D55Tbwe)BAu6&Bdq<*NmSFj77xgaGkQ};Y_<a(bKCp0o(34
zCleAcjZyMEnL}2RI^rXn$#L|?FF?l?mG}Gzs@^}Mg3hi*On9-Mow`v@<1?j;;Wkn8
z%|V+L6gf9~F@gQnF1PIb99~gI=j)x(EoStuW<CEZw5%6fwE6lg_m2Q>S<lcv<oetN
z*Gvc}^Y~o_W{6D+1R-b#7P3GBo^6{gYV8mP-18+1Ie_A&mZ`Y)o)4!r*~AGaECK%F
zd`V7&9Q>i1@#nmB7Eeq8kLaEU8v$24)1j!Z6jX%|-2zqk%V5BwxQtR`H-&2z&@Nad
zMB;+2!1|WLLTZIBNeRYQB(yqc&l0Q^A`m#wLK-At%k_M&mQkx%yaROLqaCt}oshs=
z2B2DO=zzU|2V5+0)h*neFcQbl?uC40Po;=u-Ea)>=Oz}~2Z~_(A!6l$UYJ5(@Q$&M
zz=%n(UWk~uy%Lgn@(3gZhGm$rJj_ay+-6ZA;EG$Y5y?UOJ7zA^Iq1f=;3)XHBLa=q
zjk0p%ZTdo<wbamch{Gj~xx)K9oB{0I!9st4f-QW#c>4})HwB}>xPKU2{8Jmv#8R_G
zl>ZH1gJ4maAn2eh^bceR=AaSa3sNcL+pj~RD0I@xCjMIqEfp`P)1$JXovbf|HiCVn
ztkHN2jZrUku1%!{<}swJVMQpD+62p`5i_?vO_@-OXg~1mh<sz!!A!ns5e@Pa9(o@e
z8mI7M#dH~0OK2LF4CbX9ci_Q;xvSjz`ifmMhPq$teRlH2Jei=Xkmd@1300}_qC75q
i@EKan`)5*>FRi9--Z+!4<m#WG@~%bHCw#MLSN{J6qW;DJ

delta 1635
zcma)7eN0nV6o2RTmbTE90*b5Rri>{FkF}*=PQ`xE8b5{>A^XE>sfZhkQc|mqDOvGz
zi^d37xl9))XsSk0^qD?gW`;tH*<$?Ml#HktH=LQyEsdL7;&vZU$^P3(PVV`gbMCq4
zp5J|Wksei~N7XqGLl&8cUr&m3{PcOuB!sXRRDd~-(=w%3vmuwn<>h#hjN{0>qyq2>
z^-15zR4|r>vlA&oIJq3~j+Zc=Ql5kr2}r`}o1j*Bp1uvnOO=zER&nLrO0I4g)o^88
zkXtLXjcUiF8yiSiH(y$XxDG3o&sdfu6fVOgVN&)!4bG6@y~!|v=&@Q}$WRA)uAf7?
z+h&l6!KDHXbEQj3(hY>TK~tbOw3p-L+;w_B4;7MoTb9tLt)M2Am0D6*pD*++i6U}x
zi;&}X8XOj*v524Q_IP-c!(7BWtR6FOaeE8~m($`bakxoi;77q&RXlohh@CMc#;%Rb
z7{|0ks$=>;bsC2ECKl58;ghrqlz@h=0JBF6k$O2~Rx<_?vUk`n8A#k_EwQg#gJ*Eg
zyCWWdYO*k^VSm=CJ+4$0q_NGZOot{CK5`S|oDq0@JCL^49CBjQwC2xJi2kBc*x0#D
z)_xk1rrpg#eXRBsh!IEe0a|(;w8H70d4P=#&JNP_hg;BJ6d_{;_a0Zsc&!^`Rn1Dr
z$+ZK#V80|wQE@2@H;){5BU7e-_~MI`c=Ox44n4IlULMUqyp)Ci8J3?t9Cukcf<IC`
zvkG5+|0&S!vtT5vZ<h`}llbj&OcGT|xOct^ni$-ba0&6=2SC4i0J(6SIFvJ0Wvs>b
zSyW3>FBwQAKZ&+~2X>*W&kj0YS#@176!y72R{xN>AP@?ytPY>LGax&4zXU0z=2%mS
z5k9!0rmi3uh1I`pL&SSNPteA1$=m<JG=QN(nEv7@90W|fJF|yIno0hSrHRup9D`^Q
zB&%%I0aMk|2Iu(%WjfKSg-(d310v^Enn>mIAYFeD)MCph@Io{bCXqmGo~WG;x1ePv
zWYdG6K$cis3<#65EV~$SLQfKw-p0#sgNA3rc9OQ?HBmkX?ki$t;6kdwF}EZxB8JOh
z`*@vG&pV7R6K`^R^t{t%HuEmM*<x_pVj&oSXc#o~nieLK%KkT~-HBAB^n!yvaiMh5
zd8btJB#U=9fD&k=7IMU#P0*(zox7LQ30DBqU++SySh)kXLUS(*?u0%C-MN(o-t2~%
zQcAiwy%ml^bPpR?+Q!MEW*_vbqK5(NBsykQ%(e{jA{m9Ds`cyFc^t80Fd%E$EFIPf
zSb<+KcEkb^ZszEG@2v4xglkp|rP^!;y~|u;<!#njpS0&5M9783#bn<BHM#mjHk@G(
zH6z*&icGf0w{X7Izp%P?nSYr6>JafZ=8L%x;cJLKVm(is3m=QipFpFGMtUU{)QGY0
zJ6r&ro}a4sSa{o1x7lHEn`|XT&W6ip_ItWxadvR@PZ+E7l?Q_>R{1JcEtNW~3D^4;
zgo5Fqzao~727os9126KU&<z=F<I%ff@vG<v#Kxj!p!G9mrAsE1hR2}-d5z?43M`6d
zAvN(<Wr;O5bPmL>JTw_o`(rpv>b})d&10A#wicpXpx(LY1Pxk{oOTr<JN?Ci&e9G8
zT1dOzLU!W2qM;fiQc?qtric+EvLo`rm?`v;31v#Zg#QTb=g}D2kb!j6Zbp$7GppA$
L7X?LDzA67-Vs9Ye