From e0883dae59fe2291c0c07f596372d90e78dc10aa Mon Sep 17 00:00:00 2001
From: TAO Cheng <cheng.tao@hexagon.com>
Date: Thu, 20 Nov 2014 21:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9FPLC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp     |  24 +++++++++++++++---
 .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo   | Bin 156160 -> 156160 bytes
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
index 4592c5e..c7c118c 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
@@ -230,7 +230,10 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatestate()
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatedata()
 {
   m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
-  m_UpdateControls(FALSE);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
 }
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type)
@@ -243,8 +246,8 @@ void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type)
     g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState=static_cast<int>(g_pSo7_TCPIP_Server->DM5000[0]);
     for (int i=1;i<=8;i++)
     {
-      DM_Data[0]=(g_pSo7_TCPIP_Server->DM5000[i]>>8) && 0x0ff;
-      DM_Data[1]=(g_pSo7_TCPIP_Server->DM5000[i]) && 0x0ff;
+      DM_Data[0]=(g_pSo7_TCPIP_Server->DM5000[i]>>8) & 0x0ff;
+      DM_Data[1]=(g_pSo7_TCPIP_Server->DM5000[i]) & 0x0ff;
       g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2+1]=DM_Data[0];
       g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2]=DM_Data[1];
     }
@@ -301,6 +304,11 @@ void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type)
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrCcdDm()
 {
+  m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
   m_DMAddrList=DM_ADDR_CCD;
   m_UpdateListControl(E_LISTCTRL_TITLE);  
   m_UpdateListControl(E_LISTCTRL_DATA2CONTROL);
@@ -309,6 +317,11 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrCcdDm()
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm5000()
 {
+  m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
   m_DMAddrList=DM_ADDR_DM5000;  
   m_UpdateListControl(E_LISTCTRL_TITLE);  
   m_UpdateListControl(E_LISTCTRL_DATA2CONTROL);
@@ -317,6 +330,11 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm5000()
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm8000()
 {
+  m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
   m_DMAddrList=DM_ADDR_DM8000;  
   m_UpdateListControl(E_LISTCTRL_TITLE);  
   m_UpdateListControl(E_LISTCTRL_DATA2CONTROL);
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 6e45a5df6250c878ade26dd499b1ea522fa26856..5ebc610523466089ff59ca292dc88268a9b358c9 100644
GIT binary patch
delta 1403
zcmY*YZERCz6n@X!+pd?bYxlv*zSsv}(=llQ2_kfLox)(aG2x$lIfNk-HfRDSm~=W5
z!MTqf;0RF|;Ho52%C7Vc5uwt7hy(`vA?hGQ0Uc&Tp(MbM;#*)#ILXO<&vTx0?m72)
zucu4(bg6+_MQ>}ok@%xlulxeaCC(U@8zw5Vb&P474QF)5N7C{cW7M4w1)6(AqY>)x
zLGlG<>kx>Mlvb1Ev+2@Tv8Akz@;Ky~ikO3yvia;qW@9$(MCukkCQUMIY?Jh<(kDxw
z&R%_7_iU~CnObJU<<@Zkn5U$p$C`?R)<r7B1~U!M;2u?h;k~oG=`M0Dgvp9b?8Eoc
z=c<q-kFn{VED%ZWPBW&+Fk=WZydY0MZ^wtWvRDW7*j*|lN-TMZp+)Q!stO4*ZW+eh
zFE{7Mo!ZV=9P7unjU9NXI)gs%fI|4|Y3S1KE^+AaPW6B~!TJV$aoz14PAS`1$xo8k
zgr21d^!-6lwPh>Yr%+`FOh(J6CM*s#cJ6YSF|61%_kkt@<%OYCi#z;)Q>YW{l9PzV
z!Nz^x^7#3yH&nm2y7ui2j?Glr4R-BO5KP|FVF+Tw`6F7eYaVD_r)L88eX<xAUtQUG
z#ubk)y&c^>m5=3Z9bPKZQ=zD=S;lQc7`iW4sNj_$4nbPvaw!=1+&7;(x@7+VI)4jg
z^!F5ecVd4~zg%)+!o+OnR2igc8Nc7;^!{^vf_Cd_nhpas7PLgP&OheFLsTmp5C&YZ
zX1vxPvFg3i@V<u%Hq?#LZbma;hXP^r+{izY56g5|VsubQ2TrmpP)uA8QFLz2rfduN
zd<GbSd)MdU`4bj#*8(QkkqTj7GH^Op$ls)#k#G&q)l8yEGhv%A4aQ?$^%Oc=$X}t{
z3!sp5CzxsOEO`EjbaeZ5SPPe=Iy1=QfPDJ$W5^N?2N>cNbL<=RO@LgqDGB5*gC?}s
zR!I?OlVcvFC9MNVcx)3xaq?#xP3z{uL$R<N?g89<dNEW=sDx@Y<#a>MmVR<RdwuAw
z1+d%OrpGH$RV1#5cJNg}F8Mb=753HGG51}onDYUw0s(G#WFr5EGLdxBAso$62i~5s
zVr(Pys^o8xxUD`>Bz`7)kf#-7rWJbQsD3vrk`u?{p|v*Q*e$DkyFkHfKTN{op<=8!
znS-|DCNhua31VS8Y|$sh%T1nGUZ_%Ts1t)7kjycFnIiKWz@heEL$6Nw4?-13kJ~7W
zz2K9nK<v!{=q<$mYO}=ID=>|V@@d=;zCJLLzhBN7cqdzA4?-IRZ$U_h>#bwy`hfiC
z{@bz_Eq#gWg+2lYWV2smdL-~Hbm$GD^bQ;Y;lC$IqTDGvV(45Gb(eF4@ZN_(J=kzh
zs#P`0*;lg_Yy}>&=7>-fHtCY0@`5JGRbqlB%cqIz<9JG2U4dxie6txZJ{U=TMSO-R
zE8&NM8m>W+C`#o$I;#H)7Guj%i^v?!5rP>!3m_`8Gx?vK{5iY|+c)M=U=T*pg?Zdg
W|NITv^icti;KeoL#J@S*Qu05FQt;{k

delta 1287
zcma)6ZA@EL7{2f6ZP&Ywufq5!;JSi3BZaoGvMQ9ez!cW3fc_m|=7uO>!7ke(BtTe#
zLdwUxaW)bbGH21nn2w9R`z1xl+>f~tG1-Sm%1jn9fdoUM!`OPtR*nBW$(!?>=RD`R
z?|ILg+r1!kF9`k?Uhcm}&Mk=T{5{~qkw^rcio6{lb}DYklnETi=~&Q39UKrnyZe-o
zf=|?U`JotzTgk(i%O|R8xGJuOb8x4)le8xcX~HW^(!@1zZgDo{BZAk`QZbYkj}OyQ
zb|NHK@5}~XK|^lfY5sXo;_bB4IL{l=lkO5=4|DkV-w#D8mSQA1M#-}odK1rPR7cN<
zTN#U~SRpqk@)>=W;<lkmfOv+JVh7M;bUl?CUBV9Vyz15M`haqrl3T;;jf2?TP)IjE
zftSVQ2CEG1r^M&WO^1pO*^7$xW^<uMUsP$g=pClwO1;HyF&=anDjbLH<z4i839O;!
z_`2|yqt){uXTbJ7vzx@O#zNTz&Vl~MOElpN5X6ZSlZDgc<p~0)Syr-GW}@fwK?T}R
zmtp6nKAhB*i{<`pa%G0#NShTu6whH}vr1G2OmPsvo;zQOfrTT0*7<LyZ<fOJt#Z}V
zsx8$h<Cx{}Kek&-E?xjHTaUyz^xSs|+$dXOj1sr*SAcRZEO{T9m;OZC!=PsM)9=>Y
z1<LR-rim6kIu2_&?st`_`SCHq&4FV${_RQhuOy0zD|*@Vqt{gs5v$fE1<f~*474<x
zuz&Rox@XOzd25&a$~KRsPv+6xuR(3QAm)TMFay0ZIDz}KN@-9AHY|<IV_T$*mhlh<
zKkb=-Dydol0Rd|}vT^ZiE4?U(cc^U>w30RvvcabYLQ9ii9t{ogQhW*&fG-tZpvFxo
zpe=jhJZkF;DdX)_dzbatnG&!-^koKUw-t2sYCmL2Rx2n}ye3+V(2Jl&1HXrQs$h`T
zRzrPKC1D#oBQN+y6w_ceZ2$kxkfx4+l1QvSQUD%5>oFazKMKc%*&oUd^zR?C{kQe#
zj0-ON>OiZon@nAfNi;S$NwYOzhp`T*^LZd1=Y}#d-2M`}TX<=_1Db$BFVv2;L9UeB
z2g?GsU$9EUz2FA)zspnJ3rBs!pp@#o@Fk3jb-r=naix`ME;3EvG88D1Zo;#Ba{0k~
z3?GziS3yliA283)U|ELHmPs4Ez)SDtlU13|4|!8g6XAU!P)<3`gam$tplmcNUG8Q^
zJpE}Ma&WahTYCQ&7y)V9Lh6X`Hy~5a62fEf_8?t!5`{GS2W-fx?QMvscP3yr4UMwL
zy%C0P+1_N9MG}kXUr5d7I2PfNw~D1cLOK(soHjye&noC8eF|BUNlpiu0UTb@W6jvU
jfQDoNM5OFY@-xA?8<|pTIzgZt#Y9C_&ym-BTH^Q{{Hwsk