From d61bee185c7a4b38bd62dfc720f14bbce1d66476 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Tue, 18 Mar 2014 15:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DSEQ=20Number.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 20 ++++++++++++------ .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 2 +- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 12 +++++++++++ .../Tools/UsbUtility/UsbUtil/So7_Option.cpp | 4 ++-- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 28249d5..ee3a800 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -2733,14 +2733,20 @@ usb_dev_handle* CSO7_Proto::_open_usb_dev(unsigned short sSeqNumber) { udev = usb_open(dev); usb_claim_interface(udev, 0); - - if(Get_SeqNumber(udev) != sSeqNumber) - { - usb_close(udev); - } - else + if (sSeqNumber>255) { return udev; + } + else + { + if(Get_SeqNumber(udev) != sSeqNumber) + { + usb_close(udev); + } + else + { + return udev; + } } } } @@ -2794,7 +2800,7 @@ SSI_STATUS_MOTION CSO7_Proto::Init_SO7Usb() usb_init(); // initialize the library usb_status = usb_find_busses(); // find all busses usb_status = usb_find_devices(); // find all connected devices - g_dev = _open_usb_dev(USB_SEQ_NUMBER); + g_dev = _open_usb_dev(); if (!g_dev) { MessageBox(NULL, _T("Unable to open device"), _T("Message"), MB_OK|MB_ICONERROR); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 68361bb..daaff8e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -342,7 +342,7 @@ public: SSI_STATUS_MOTION Init_SO7Usb(); SSI_STATUS_MOTION Exit_SO7Usb(); - usb_dev_handle* _open_usb_dev(unsigned short sSeqNumber); + usb_dev_handle* _open_usb_dev(unsigned short sSeqNumber=256); SSI_STATUS_MOTION _do_single_threaded_usb_comm(int iEP); SSI_STATUS_MOTION _read_data_8x(int iEP_Base); 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 c70f4ee..0f7cf5c 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4384,3 +4384,15 @@ Unable to open device Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +Exit: Exit_SO7Usb +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp index 435282a..066bb69 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp @@ -176,7 +176,7 @@ void CSo7_Option::OnBnClickedOk() { XBoxPlayer = new CXBOXController(1); } - + CSO7_UtilDlg* pSO7_UtilDlg=new CSO7_UtilDlg(); pSO7_UtilDlg->DoModal(); delete pSO7_UtilDlg; @@ -312,7 +312,7 @@ void CSo7_Option::OnBnClickedOk() { m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H(); } - + CKeyence_LKG5000_Ethernet* pKeyence_LKG5000_Ethernet=new CKeyence_LKG5000_Ethernet(); pKeyence_LKG5000_Ethernet->DoModal(); delete pKeyence_LKG5000_Ethernet; 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 c98928562e5da3a7e777ba588f9382225dc04ea9..4d9a623cac8ae515d746559737d37f0da964f2cd 100644 GIT binary patch delta 2814 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 bn4U~8CcyM&`Y?T&L?*~2nfj`q=)e9SUE;&h delta 3179 zcma)8e^k^}7Jv86`wla}@S8yp5fBm$a2N&wS8W*3%-kH&s1(B`KuaYobk$@Xj1_a) zBpz|ya*H?yx|NN5lW$vRbpW@mbPLh-^n+USu&uWJaE&_UN!a_H#M<3|dUHPKd+&Sq z-gn=9@7_C};XU9XcuP6_Os?b)LX3KfKM9IkeHFIJ4Pwv?V>E7LjNyQTr?pHFawv@d9lF4o4H+XOnF-t1=^J5v{os%q%Jf=B$3u1 zL{q&&5XZ0}7bd8_=??=I9x#w*`eHFjpZ9qnT^&gmz%Kw^iGwtm5)`k_&FlkdUwJo< z_JLJBx}^zVnhLftL-$M@h>w6V>Bx19QclFK+|AvN5P(j3>V+AyCSsFp&NISZKW8&r zu|C8Yug1?>W)N-Uids8on46HOK!vzf&euV7=~TL_hARh%8daYul0oo$ndANq?32Cj zJ#a)_vgCfw&jMa5;d8r}^@AB=$onAu1o~YB>A@#PAF@8Q00w36(wn5Gq&588(SMyf z7BRMca-Zv#IFBVe5|g5oiLx(rE|jU;@7M@NJ+dj2)GK!y0bAY$m-H^T!aMSr6^$*c zixoN|J0uGZ*Wth$V!HIMH7OHm>dg1+3+3Jweb^kwcXZrsFbqN^E~&GvBCNY61*= z5YUbMS1q;Vd|;M3QX6bAFgB#07~N~dEa~)4kT-1Wloj3~!&z1(pWgb=_(BTwT=QiX z#L78``_VJR<4HXU$D;Tfm>k8+TYh!iG?TV-68zVv9MU(JTf(Mc$^nR%a|358jWqS0 z-16sXa=#L<9^L*5hp+t-`w#jhj3Q50*Wa&ln5eVrw>ts?^m{dwF|Vw@k*j3A94=QuhO4MxenwWFBRe<0peTEOR+0Ru=Y-nu@-qO}^(@)>Ir%w`ERxL0 zFSKPi?Dm3;f;_t;BP+*|Z7VEt71?v<*8u|)I}&o?wb^y$&g;rQX;U@m)vtscIBMze z1xn|MRMr0GTR=w?7Hs}E%vNWg+!bmHq1c&!h~N9cM%8luOM`SDvqzd z5@g4Hi{v7Qqb(YovfQ*4pE?F10gNTnZvH9-_v2VJ)XSE-YUx><_g@KZSi_h$76Sze zW(|Q|UWyGt&m{23eJhUYiSFu|3^pSGW~IUaKJWsMl&(gtr-qwm<*VE(?Y`!3(@j@eHVNH?}W_?dDtp1Vd`}7)3 z9$m{QOX^R`44EV*Xs2$68DTi|0-q;WwK+9s75L0r(jguIxM%~sgr1!+6Kh`Np`8yv z7>1`RE-k23`PiVX-w9H|a~DO3zMM;SLtw!oh(k{gPt_Wlq0WHr1_;6ohatbS6}aZD zQVwwKv%L@rXsK4_^*jOn^grMo>aHIW`~@i3OBB;VqwB;53a+O?q+n+q#8H_vn*L5} zdO!9{V{JPuHZ#5B>*?X2(?;6C9cG$FeEhhaR(lwlf+#hdUCuv&*)adL1ihSTC9lCB z0F$;WleJGCrN=5XF0u0_`4ZEK`KwKufhv*to zAVaL=f0UAzl4v!nU}bDEtD@h%Bwk5MR6G39KcqYLEPmPnCapP%Uq*R3Z<%HMW$NEF zJoT=aBwcmn^()+$oO%me&wjyHlbIs6j()na<<(R7(_be)0ZFGIDc#TNsf=DKs0(+bAiEK21n1w{5T3doBUl?8>uri1v`oT z(TFGdmTM6#V@oL