From f6792e2b54e0f9e1a23dcba081e01d8f51d0c568 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Thu, 12 Jun 2014 21:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A4=96=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 11 +++++++++++ .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 12 ++++++++---- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 150016 -> 150016 bytes 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index 3902d58..417c1c2 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4642,3 +4642,14 @@ Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. 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 3a7624a..7d8a251 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 @@ -1598,7 +1598,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara() { UpdateData(TRUE); USES_CONVERSION; - short TrigDis[2]={0}; + short TrigDis[20]={0}; char ActiveAxis(E_AXIS_X); char TrigMode(E_DIS_TRIG_PULSE_EQDIS); short StartIndex(0); @@ -1627,7 +1627,11 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara() if (((CButton *)GetDlgItem(IDC_RADIO_SO7_TRIGPULSE_SPECLOCATION))->GetCheck()) { TrigMode=E_DIS_TRIG_PULSE_SPEC_LOCA; - ParaNumber=2; + ParaNumber=20; + for (int i=2;i(TrigDis[1]+(i-1)*10); + } } else { @@ -1644,8 +1648,8 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara() { UpdateData(TRUE); USES_CONVERSION; - short GetIndex(256); - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_TRIG_PULSE_PARA(GetIndex); + short sGetIndex(0); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_TRIG_PULSE_PARA(sGetIndex); m_OutMessage.Format(_T("[Read Trig Para]:R Axis=%d,Method=%d,TotalNo=%d,CurIndex=%d,Para[%d]=%d."),m_pSO7_Proto->g_machine.TrigPara.TrigPulseActiveAxis, m_pSO7_Proto->g_machine.TrigPara.TrigPulseMethod,m_pSO7_Proto->g_machine.TrigPara.TrigTotalNo, 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 a7ae33818b0789cc26c20ec334d97594decbe75f..6694fb80b4e841f1074e47b913053b6bd085f0fa 100644 GIT binary patch delta 2975 zcma(T3s6+o^`6JuWfxRj!F53@u-(K}fxxmVAmaW&r3h%WP8{N=f?SV;$^y3rm`2I?a7^-aY5s zbIO6*gbS5o9A<~Y{(-y3b%)`rKvNRIu)vE@`&`GRG z`j#e~CPW1$sZ$6$SA&m|mebtD=uLKNVG8jSpZtMOiY4slA@rk$$?*wNf<>>e3mN&i3#lZgE87pz6AahWP!8d=m0*sHf-onF(d*KlDKWJsBr0zjB#Uvkl`?xsds5&%v|n7zjVr)_M|FDqSx1=0Q{pb#T;VQ8U1L1fzHk+;`==F@?1Ep9V+Hu) z!)LIg^g4!ao2=NM^R?_h!yL5;FQ*w?>4ht5Tos$E%ZkfAg}D`53$rWSWt%)?G69cQ z4B}(=V*Z>PLZzg#R|To5veKYfN&8w>D3AZuT>mf1U+mWF_fAZ@-*t#^Wq-M@j0c>B z<@=`Mp1pQ`83g3+ch!vJt}o|B(RL&tMg4mO%HDBZ^J}xcaY+B!#PCzTKNGHO9M?pi zQPChM`_tb*wJfYPcDy7^LLW(SgHso@$=(3W2YlbnX8;%^t`)T3<^-v2vMSDg7lmc zL0}=c{d5C=DHp8GL-VA@mYN`}tTnfu5hQbaAK_I|_@ufJWB635p|e#BecYZ7A4(tn zDjx7a)f%bR_Y>&2YJ=wM+0cOXu5V(J-o}gcpl|&RgqP5{-oz?dBHK)Mm9sL4H-A(H zr|@ETmt^a{pu)PxCOq~y8ZV?TKu>RhW)BJJ15V;dZ@zM#)ec(I6AZV1n4?h&z=423 z=yt-yvBl)|4G@9hA0?penyp0-Cvf$j^eEgY!U9_~cV`GLNxbC}#OA6IMTOMxWMpHteKlOLNsO?7U0Nj1K+C#Q~dgyzI1D1@$k}S z*_!>gN9&XT759|(J;LkNU(izFCnn$j)m840b}r34L#3)x>(qUJsF8qQI+Mo z#Ijhr)YWeX$$Y5~F!s%v(#$LOpn1UDe8&p|QvIFxL5vCbs2-*;M3A-*-_or7E#bEa zJ|?(LFiNg`Lj7k1{p0i<>VHQtI8G}vcgOL2)c>B~4+MWyc+xw6X$|7e3b07k5BAWu z7@%#@^vWTBA(Gx6*#jMqHbP`Sd2@%Ln&4xC0fM^(qf*Vk8U=jGn2!k-oz(RAqk!IC z<5?pN1c?>pTT1akW1_U~pKXBom(9@5FV=#cJJgWFbGLw1_Nl?93n(wgmZ5u z82Pa#h?X-m;Zi8--j9}D5pW*3X)$E*o(z~G=VU-9;3;>A9FhaG#LiV{n} zI1b{Ff)1BKwD@Cl9tdq7n8JsKAspWx36paQXmX1i%q`_$l1)3IUyHh(yX6iy~LE-BkwJ-U3}g ze90j?);GhV*6v#@MB0t=~dX0c?Jz#M)&g|KA$ zTr7z&yMN41SQ3490w+tOf42W~vK0Jf)NBJOoM<&s9R-b7>+;{w)unTrT8O~js0i7s z7QA3kvU9U;(R!1#W%;hzy>C^WOr3sXE?xdBOU)SD|1zD<5bo0m-k8n)l2*v5<-Z(c&t#!H2z|3`+~n3$PJC*}pJ%1TrEQvRG(n74Knk@>Vd4gx1FN-6pNB3UUS zPBnSwAz#bM&kD**AeOHzAIS%-oBcOPf?|ILuGAT1!z`gh%LkhwmJehIQ}|#dOj0W~ UGmFW-*@7>I_Y8u!ZJ8ka8$}6r4gdfE delta 2053 zcmZWq4Nz276n^LKd+YuHv9RKTJBTaklFINChCjhVTbgYynp88HqNY)TC9XMI${y^}od>S{otg9QIp00^+;i_a z=RSF_S>9`I_KD!cvEmqG-I?iak3Xr@h;zX#{7E!c5Cne81#TrG`9(>%M%U%XVUiNC z_{l~hJ@s!JYnjnBhSc3L2m?u*!Hxq-Cru*=i@%CTlI!^Le3m$IIYEiUWx`^ihWH-g z0pVWK(}?dAmIzhCe4&!CrNRoO&A!=y?~1t?aQMv-M;6d>%yf?a9XzRVT6P!4uFiWV+y~M66kpl>h=* zg{DDc^|*QUp8t6fCkdrHP!7z%o^@7Cd&7q1odrte!+8t`SB91SH4i)B{eNtokF~o~ zQf{M&V{|tO`iZ^&^<84?(zAYrJ|{UF57hmZaui~iLsLl3Ce_<{CFZ#)vtqL}&LP%Q z<^9)@^bl~IXjfj?bC(If@4X(w_h;aoixy>J^Lj(ee(wnMN;yj4P>un!#6<2hvN%OM zQYgY+9C&{A@V&nT9zajG2T!@>!yl0N{w;6} zKY4B{oI>bmQ#@VACCXgw<#BlAvJ;P6jHYcALP{(Q44f{*4lxHKr~P=7lq;1oL2&bd z1u&71UkhniBpFRsvaXA*u&yVmo0y1i+(JE-+&vk67fgKHXlmZfZYS5Kf`|WH3g6uD-0HjRK$ zm&-BK=WdCF4E6moyrOLEe-A`cY)9izBMQp;^Pig_x@Yld=^R}F3DcFPAGyH{B3bIL zhqD;?WhcW`kM0}l2xZOhI{@n*o1<$VEra9d(v)hFEX&uk}$` zcWEobLy=KeQ>i8-0wqsA?Rwn>y#~}eY0d_=pq-pSGjCr6CA>Qdc7CT3reIu8W@4!& z^z=*5u4tIxO}%vgSMd+3nh`u^9vTVm;0#*Tm;{W6ZUlGzMW^bV4aXpu0v;>GVabK$ z1fXU*MX~hJ*e#$hJzbT@f}F-L`(Ord^g)8^@<9-|Tm&wDWE(iuq9S<5s)lX{x7b(% z44YkvYT_n10l|52eVVABRxPZ8=V4epUky%?hn@g8%8zbWx9@^Ez;m)eQ?&qi;<0a^ zo&T_#PV`m-tX5Yyz%pof2r|{o&2Y|)xhq}jActOPtOFwt?ISM-H>6^?*Nhh`i`B&k zV67pzA3)@155WXpdG7RdpqaaJta(c;^s%PBqX3>FOOV@G=D7qzkJLWuoh>Q}r~120Xn9ysGm!JOdb>kP&Q!3MQrMb-|Yf zp%%*dH$fQV&{KL7pjCcV6Mv4)4)oxB1f#d36}>h+i!%qn}SU{b&Ti$ZKb^jkuvHj>kn|Jk>KGoK$`N z&^j73&P?UsN8t}j;L4>ni>nt+T~+UNu$!mxTnC$piwZ{Kl*zMOS(n61Ev!(|D_G#g z7IwqP%6kT{)wO?8F20pEQI(BMrZSu?^YA&Cq!+cFYbGWuo;-~Od-7X`U-7Gr+_^`Fct