From dd96af84624a0eaf8c6513f787bf22a41b90f9ee Mon Sep 17 00:00:00 2001
From: TAO Cheng <cheng.tao@hexagon.com>
Date: Fri, 14 Mar 2014 18:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp  |   8 ++++----
 .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo   | Bin 2355712 -> 2355712 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
index 414d698..190f685 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
@@ -1257,7 +1257,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ReadInPortStatus()
     if (m_BeginReadIO)
     {
       m_BeginReadIO=FALSE;
-      ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("Í£Ö¹"));
+      ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("¶ÁÈ¡IO״̬"));
     } 
     else
     {
@@ -1268,7 +1268,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ReadInPortStatus()
   else
   {
     m_BeginReadIO=FALSE;
-    ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("Í£Ö¹"));
+    ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("¶ÁÈ¡IO״̬"));
     UpdateIOStatus();
     m_OutMessage.Format(_T("[Addr %d]:Data=%d"),m_ReadIOStatusAddr,(BYTE)m_pSO7_Proto->g_machine.InPortStatus);
     OutputWithScroll(m_OutMessage,m_edMSG);
@@ -1287,8 +1287,8 @@ void CSO7_UtilDlg::UpdateIOAddrCaption(int _type)
       ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR2))->SetWindowTextW(_T("XL"));
       ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR3))->SetWindowTextW(_T("YF"));
       ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR4))->SetWindowTextW(_T("YB"));
-      ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR5))->SetWindowTextW(_T("ZU"));
-      ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR6))->SetWindowTextW(_T("ZD"));
+      ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR5))->SetWindowTextW(_T("ZD"));
+      ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR6))->SetWindowTextW(_T("ZU"));
       break;
     }
   case 1:
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 9daf0144de22d035f4dfedc1910e7ed61194be4b..4ba9222431637accdbfbba7be5e8ffbb2baad829 100644
GIT binary patch
delta 1956
zcma)+drVVT7{Kp$dT(i=NGYW}EVNW`jDeO>5D1SBa8rE102KuUU-$?*aLsf+8@Ej3
z$VPgc$1Khl3z}?G?A<tXZn290h%+EzE^fw9w`|~+?4OEzIN5ir)g}99H~Hn9@4M&w
z&iNkaxPN>X+(>VmD77bCpSxb}5dQ))F36kIg&;nhoSc+D4m+gM41pjdBFtxlblDX#
zC}|-=5QJDHsH3jvDlHgMObe;xK=dHd3Rx&8gmg4utk$5{$)u1*cEyfp#ORPnUCHQ2
zSz&mh3M5z2@{VHawv^L;F<TB;szuQh{OyKJ>Pj8b#G_;h8K{+iE0)l0X>%1j@APuD
z7Gh8r7g|AGnbl%;P*OYuG6xmMu?tXh8>3XdaG_y|AQ0gOJ>Gkabv1xU8*?>m`?z>B
zCnsn2tn568J*%L?QIO?$zC16hEc?ZRtnA#p7aSG&W#tui$4(GHBOL1<Fx44%IRESA
zIZ`Ijj*>HSM!^k2s~hIa^Gn`?6M2OCOD*1Ie$|O0oHkjg?rM}AwR#x5&P)Q6a#q<q
z4Lw|$3WEGW<@AV030YJ}#7I2!<5JYS!6)CVkAQCf8qu@7Us*&0%c~?94AwB1wdN|V
zFdc1*Lw0hYxk{ylB9uo$rKYY`ow9$ug|H@_)WPZ(NJVVsJcyuYTEpZETWylJ?Xnmw
zsO_nn_7Rmh<*De>si=Rah3)=Lw93}E{6MV(8|6*C9-u9aVRBgCci`RC509!o^{L%%
zox0o433Y0nvU8ux6pX@k1bZPBd*H}?EhTM+=<U|-k-BGpG1sj-9<`%Mw)kjDO^mix
za0ymnv9O*(Ta4^EwJEIIe~wVM&&EFN0W&R;@?@8{QziS)TSV3#q3&cCnx!f7`va|b
zD!W8WOCn{%oohfUu44lnr_K^x_Wvq7p8v_m-bs<}MgJg%6guAo&X=;Sd0_So<5Bd)
zESLB$Y1s<B^cibUm%`Z$y_Ckb&Vqexainy>`}O50jTP;4kVls<@V!pW??y_efEQIl
zJ@NeHWA3Zq_KZ2<1_f;?^GL)X*NmM8_G_;g&*Jl8o%gO!Lw!0O9UV6uJPKB3|AJ^h
z!>;GUb|#({cX<LnX4sN2hw1x4WSxiLQ|i0-h6MWHzSuCbYoZ!787O`eY7RMYe@Jas
z9*LW%et`Ue97WC{${nVo51r-#6y8RzBFf@xI1VDg1x1sO-h-fUU@}uwCi3OU2Szsh
zI<c}A2FIv%%*w1spoI-Lkz}51f;$r3JnqIo+{_mXYNk$tLfSj#WbP#JQSZ2u)nu!R
z_?O905ypSdkTk##FM!pAsTWFmuCIYN33E?{RGyj%jYL|5-BQbTJHWzpGeH-%Qm7LO
zg+^hHuvTam>ez)DFq_rpO6hEa2Tbgi8BEa1UM__=W}gXNJ$8H?NQRR+9pGfcx1faY
z8UO;1%MsZ^rm<VKl7TI3Aye3fTInF)xCowslWrpkp2Nm%g>W0V+eDmj(pd~Z4J|9#
zvRtt7ibPTbeNHGBmHub03K$CBHwiNsYzXF>4V~=l&!UyTv{V`eB`|b22OW~?&CI`0
zGV<aE=_`@1ZGtQ~nesOwymT?S2z*fsd?az}S}C9K{5^19O9X+hSOZ7HnHvM;7gv$H
z(6brzJ%@lORp3|!Wd}2avypu0W7`HGHJCG4`6M5O|4tBZzXDz4#2D%61hL0RM0zRS
z&g}<a2w2U2RVA-XBz?fT{)B2)Z6)ak`@zVu{fbJ(@KA(2@GaOg5|qwRzDVppWsJko
zq|A9SA!&W&Re`VmoQ%qvS!g&l)TG?irh1?Sfpxs5`UHowHi+epEvnNoASh48-iiGx
zKCxe{xi4M`*)Z20sZP{{_TL-WBOz)e4ACH3BpiuAbVwvJ1&KoRNHk(VVh|$|i<po&
dBpyjX5|OEh8A(Et5es5PQV<&t?3t!}<sSjUsi^<}

delta 2546
zcma)-4Nz3q702(n@4aQ0&qbCc>cS!cMPY%JFM|jRtfcr+2qJOX7_mVD2?dp>$v9M3
z(osjTTCU+5o2HN&?4)SPz8Rm=G`<v?n%D-ym_)0l5N$P?c3L|tnyF!X-r~kiCU$yf
zetXZk@1Aq-yZ7w>d9ED*4>Hg!N(XDh8f%nI;=h50NlJ^M0L0G-AxeM9VZmrdYZef~
zwIoPY<ggLRMEuxdaXc`_<mgI?*aNNy(iLCy2sJ?x`p&PW_$*b%2=rzKM-(~syiuGH
zbeWt`$%aHH^CeW8AR329gG(~mjzjv24+Uo{K6{nO+%;KDP9D{JgB2g8H?VCf6()#5
zTlc3o>`SRM1TxF%RbqT#7&pm$=_3;42i@3}Xi<tk*h0zN20~2a3VS=V*StYq)tbMu
zRc>l+DQj(MXyOxp6CH4gO=R>$Ev;{o*MF~h!-}RhxlG>7H`RlKzkfr#02jaU`A)x>
z2Jhgb-TdGUF_xFRgftiq`bBI!<HX$ZEN4zxzSHf<T3DXz$Z_UB;#ick$mwvp%d_+I
z%1W1JmuLMz-`Y`LXU3a4k7hrAG*y}(2?UI!=jZQPYb@=qE0}h}t9g|7h8qgM`7LM#
z;k|;ij@2D0W3I*srNa3UeYKFX^>3|Ep3Qj?xGP192`kOYc0ZEq%ynevEB;~!g(<~R
zy4)C_K&r_G(neaz7P6T<g?1t-CrzYTA7z`Cr77AnA<P7Ec%~NQ-hHgDp<L6iKwjg4
zbIPqXVW8L-O$f}~5WzMU&**w`$OK`5dk7Yo?@27Mkw8HN0@q<d%*7c??q^+BDNNt;
zQ=N*vXaczQcd>wF6j+t2?+gg6bZx4VT7Mh7&BLNG5yK+yhi*JCu(Kl8tsE}!(d%NS
z^6dt%#OwYc+P&L{Ku@dqc7z+4_I#pJ{QLy45>v6_+9Oz}%W^?56_Z~H6tUuaWray1
z<kR(p-z<d1j5g0ux_;3T!fs}_DEqf{0rO}{{AeH8Sdo;c$lgvtvA5%<dtMh3Sn*%x
zE069v4Se)4jZ`8B{srEXcCl*=Bh1vM6luRTv69oBfg3wD_%wL`FdSuc;3l$z8&Q0h
z!VQZ3%|8PzeQ+gG_XDc<C7Q|3oUvG!W4`HT(`KWA7eL&4xi0SdtJb|&ka^@FP34!j
zO3CmM15*jV<`A~4uDzgv_jAq2$999p=?T%(<<npQXZ(_n4~mB9&oe@f?3r>}UVCHn
z(Bosrt;PJYD-gpr{@%cA-vKK(-hoJ_-FhK#^zvjC7|-L{9|j6Q7a`y6QG-pz-CRWO
zB3~dsLrx<a!p5guwked1edy@Y@jmu{L`IOS2rKkg8Ly%7Pu)4>PZv#?T^aV@wRBfW
z3t}6|v))_%abMQfbhiCua$(}*r%@dE4jYs(ZG2(mAl5XWMaW7V_4~PIgYtqROt1yV
z+Aw1q9@lp4ci9jVAw5{FVNrN`c_=K{UtLN_2=+Tx6EYstX9WXKvcYzqHAs!za2B?8
z$AgQxBCIiu1QLc0v&q*QqgSr=e*FCt?Uc=_j^XX`Fx)K*X6E`Vi&r~^LiNoAaEGwo
z+!eaE6tUl&u|_|KTMD)xqMgZmlO=ER|06N%gSTR6>DRT&&9ux5dTQ$_A(%KpJBM}!
zy6*d06qpm7K|D`rHRz=2bN+{_27*ezio)Z>J?qMWK@%DKxo0*ctI6r`1m)s6IxD*L
z(+@86e<57ixBunq2gFOeM85M4A(m?y;O6dk;cj0Rh<xla6u~N9oC77QXAig_P^!gj
zqTj;Tnhi_zMeSSfNk8#8wH^2Dko4p2zf<a5gc829j#luh8{%?)-7IDDjj2*7JM-T0
zzJox!LKAt914K2s04@Ws{!si8k1Pc5G1n460cD^a^ArJ`bU~RYK_R|PK>fJvhEe0Y
z_<|@D)6&T0rO?S>@m#e%Li!WvubZSMeG5JTrTOY1s@_>38G-+59;EU8Yosu>XdYzH
zV{^WwRBfIQhbV7JgEIciDydt&m<RK4ale?TCYHlEyy%gl)Tm`}Q&Nj->D!=gSuec+
zs(Ur0ihT_bdMxp2iS}&<Gf!-i7O6+S3%@pn-#dppKXnnJ`u72d_*EU>f*v-ld%ExG
zbUj#M^s~(k56qwb(LV)-pg-`kD`57tO!xnl@@sXc=ZRY#ydz@M>e1HKj*vQja~C|u
zJshm+k7fD{^c@1)&7qr(9k8gccR(%lbpSni1kNrIQ!pU#6;gd4L)L<sp?Lh^NCXmv
z#35E>N?k%}%1L_4pw^$F<BCyNzuEX;I#_NN?wX*6Z`vvxXP=B))P>Ip12LfKf6U#J
zdj)lJuULIsGzM4Wa)(r-e`0p~IwZt^gdj%5goGktNH`LKL?Tg$8Hq+_ATfvqiAAhP
f9P$t{6Pbm~Mr=qtl7QHeL}U(<r20A@4sZPrO*}*@