From c69fd170d927a05d712bfd0d27c1fc046cbcbe7d Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Wed, 6 Aug 2014 20:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=89=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E8=AE=BE=E7=BD=AE=E5=8F=82=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 41 +++++++++++++----- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 5 +++ .../UsbUtil/So7_Util_External_Trig.cpp | 4 +- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 150016 -> 150016 bytes 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index eaf7cae..3c57e0d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -4837,19 +4837,27 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_set_trig_para(char _cAxis,char _TrigMod { long SetStartIndex(0); long SetParaNumber(0); - do + if (_TrigMode==E_DIS_TRIG_PULSE_EQDIS) { - if ((_ParaNumber-SetStartIndex)>15) - { - SetParaNumber=15; - } - else - { - SetParaNumber=(_ParaNumber-SetStartIndex); - } + SetParaNumber=_ParaNumber; _send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(_cAxis,_TrigMode,SetStartIndex,SetParaNumber,_ParaData); - SetStartIndex+=SetParaNumber; - } while ((_ParaNumber-SetStartIndex)>0); + } + else + { + do + { + if ((_ParaNumber-SetStartIndex)>15) + { + SetParaNumber=15; + } + else + { + SetParaNumber=(_ParaNumber-SetStartIndex); + } + _send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(_cAxis,_TrigMode,SetStartIndex,SetParaNumber,_ParaData); + SetStartIndex+=SetParaNumber; + } while ((_ParaNumber-SetStartIndex)>0); + } return SSI_STATUS_MOTION_NORMAL; } @@ -6233,7 +6241,16 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(char Activ *(ep_buff[EP_02_CMD_IDX]._buffer+index) = cBuff; index++; int j=index; - for (long i=StartIndex;i<(StartIndex+ParaNumber);i++) + long lSetParaNumber(0); + if (TrigMode==E_DIS_TRIG_PULSE_EQDIS) + { + lSetParaNumber=1; + } + else + { + lSetParaNumber=ParaNumber; + } + for (long i=StartIndex;i<(StartIndex+lSetParaNumber);i++) { if (Para[i]<0) { 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 8c271c0..9db02f9 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4763,3 +4763,8 @@ 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_Util_External_Trig.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp index bb7d117..4aefe63 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp @@ -273,7 +273,6 @@ void CSo7_Util_External_Trig::m_UpdateCtrls(int _type) if (m_TrigMode==E_DIS_TRIG_PULSE_EQDIS) { ((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_EQDIS))->EnableWindow(TRUE); - ((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_SPECLOCATION))->EnableWindow(FALSE); ((CButton*)GetDlgItem(IDC_LIST_SO7_EXTRIG_SPECLOCATION))->EnableWindow(FALSE); if (_type==0) { @@ -288,7 +287,6 @@ void CSo7_Util_External_Trig::m_UpdateCtrls(int _type) else { ((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_EQDIS))->EnableWindow(FALSE); - ((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_SPECLOCATION))->EnableWindow(TRUE); ((CButton*)GetDlgItem(IDC_LIST_SO7_EXTRIG_SPECLOCATION))->EnableWindow(TRUE); if (_type==0) { @@ -343,7 +341,7 @@ void CSo7_Util_External_Trig::m_UpdatePara(BOOL _bSave) cTmp=T2A(csTmp); dTmp=atof(cTmp); m_TrigPara[0] = static_cast(m_pSO7_Proto->MMtoScale(dTmp,dResolution)); - iParaNumber=1; + iParaNumber=m_ParaNumber; dEndPos+=m_ParaNumber*dTmp; } else 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 36831e28270f1d562e66823baef1a528dc671bde..e5edaca426baea03071e7cc72936af17a3f7338a 100644 GIT binary patch delta 4256 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 FKLOIY>g)gj delta 4216 zcma)<3s_Xu7J$z>a~Nh2ad-(TB8;GDpu>AWlo@6qCFLb{EuYvmpo@YynE4!(d?X^U zh<&eVp(2u*BF8v>`5H4dZ<>nuDpWAkO1;_ruv_MpyAFbR{l5C#!_Qu8zs}lg@4fap z)(W+?LR}ZbyFcpa=xF3P&YcJ)+z4MxH;pe%4goVTs;=g27 z3FU)bK4{x^8WdD)JAn&?F?hr!7|96-!Czex?LhX>lM1xBCaa+j70Hw8 zd^EPZmi7SBWE*F3({Q7Q2W#oit7MbNW3O?!`wO!ra-qDxm zIB(e;N?0~9iVZ&l{+Oe+vI%ElIh#}iYw+4Yw{rbj@u6M-+Tb)w;U8<3XY31>C8dq zICDf$Sa`5G$QT)73Njj_LiADL#>j+-$i=N}P6><_A)rHnxp5bn9S^$#E+r15F|W^YZLj(l)3-lk;45eH(b= zWT#$IuahtnaIHR`e4s9tdrJRJprs zsJs**Vc~jHyxtTSWJ-vmrHBuX3^Io46M{^^p}`@MQM&kuc=KZ5pa=ITWx_+xu4_SXqTBia7z1d7U%{JI3jBdE_}nqb;9gyOSi$Yy(zOTY)%pcV$wb}zEBi` znrsg&${H*xvj*AG{_ACl!R)tsU|78~<{k>Tx6JNB8Lq?(^BQ{c0eo*d8)>nBHr&J=7L z+$Eb^I~T2cssEtoa5;>1^^7K24vOYK+Y5g%PI1?<=eU+b8%TDL$N95u^TOk&{{H{* zOnN;j_~no{$peT^-^D%G7JJhBi7;>7xK)#f4YhRhQ*HK=25_(KzC*~m%|O?^66IK$Q$xK9M8STjp33=mXjSf zmlISRM^mHJ)q-tmgTnf=W?t2k3d@Nu-<&%c`*ddw1t_)fOy_5Yw>&jGJqMRI9kz3& z5u2IO3l_5c7~YJ+g&0K_;-+|5$Ebpk!DJV5G(a{u}g#dAL+j@IVDd}ZI zIZ;F4*gIo=wvkXvd`RpdWV)I=;CEAKU z5lshPvJ0S#m0L;F5mm(7L@7~5$T#;V#6|)G9*hmFCP98T*+iTqHWPb@ABe3)4Y7^b zOJLOl!%`aw`-p?Ye&PUeh}cCeBaRW@5Vgc%;wbS2@lWD1ae`ALP0!}yxBbZfQN(I{81L5&NY^OBa7o~(Vw zEpx*}10A}!E4XP<6|QM5K%dq$x|BO_JD$7M&>KuDH5kdTgl^-Q#T!nesWz4^8vsT; z;u|8}9{`KNX=STR-o*5b*DAl9J8sBa$?6L>C)mLt6V@^(AMkNe9gTdi*wFOTJ%g|M zYV@3Jfoli`6R4qr#(uwhd^_3mjnZ2ouu^ST_(M`#qKNIkLBl98gNjjIRd-9t5(~u+ zn7VQZ8Wz4HYW{PN$9uE-;sM(T)VLv&5*S^9YrNFg;r}kDQ z9C>ZLfp%$J(D?Ld9sL$Y=)?4pdc8gHD3RGAMYnBUr0($U*6&JHw_y9DwY_JEG}btf-+5WR?x zh<=0%;Yzp>r&($Pc&O#`;YDf`o6`WUkjUO{fbptGDv@hgO9S|gy+E3YFcYan0x^ad zO~|drQl3P(Qe+xO`FJ9kNFn5UcPdXOc?!W&B=8ev%F=uZygXkgDU-+|vWYi{b%eA- zf^;6|@o2alImV(rC2d$8_?g-4`nU6QW70(v zL_FQ!W_s-JxA?sOzh>!{f81hYuOVY5AJnXojbxthLV$F&17;|NtVs|2<*(NODM!gy z03W?b;#K?x1@pTNGah@%k@o?W9OzfcedVuS$OEHV=LSAMQ!(+=r0YydULWM1R7Y7(n