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 c989285..4d9a623 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ