适配SEQ Number.

This commit is contained in:
TAO Cheng
2014-03-18 15:50:10 +08:00
parent a4113d9247
commit d61bee185c
5 changed files with 28 additions and 10 deletions
@@ -2733,14 +2733,20 @@ usb_dev_handle* CSO7_Proto::_open_usb_dev(unsigned short sSeqNumber)
{ {
udev = usb_open(dev); udev = usb_open(dev);
usb_claim_interface(udev, 0); usb_claim_interface(udev, 0);
if (sSeqNumber>255)
if(Get_SeqNumber(udev) != sSeqNumber)
{
usb_close(udev);
}
else
{ {
return udev; 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_init(); // initialize the library
usb_status = usb_find_busses(); // find all busses usb_status = usb_find_busses(); // find all busses
usb_status = usb_find_devices(); // find all connected devices 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) if (!g_dev)
{ {
MessageBox(NULL, _T("Unable to open device"), _T("Message"), MB_OK|MB_ICONERROR); MessageBox(NULL, _T("Unable to open device"), _T("Message"), MB_OK|MB_ICONERROR);
@@ -342,7 +342,7 @@ public:
SSI_STATUS_MOTION Init_SO7Usb(); SSI_STATUS_MOTION Init_SO7Usb();
SSI_STATUS_MOTION Exit_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 _do_single_threaded_usb_comm(int iEP);
SSI_STATUS_MOTION _read_data_8x(int iEP_Base); SSI_STATUS_MOTION _read_data_8x(int iEP_Base);
@@ -4384,3 +4384,15 @@ Unable to open device Init:Open device succeed .
_start_machine _start_machine
Exit: Exit_SO7Usb Exit: Exit_SO7Usb
Destruct Cso7_Proto. 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.
@@ -176,7 +176,7 @@ void CSo7_Option::OnBnClickedOk()
{ {
XBoxPlayer = new CXBOXController(1); XBoxPlayer = new CXBOXController(1);
} }
CSO7_UtilDlg* pSO7_UtilDlg=new CSO7_UtilDlg(); CSO7_UtilDlg* pSO7_UtilDlg=new CSO7_UtilDlg();
pSO7_UtilDlg->DoModal(); pSO7_UtilDlg->DoModal();
delete pSO7_UtilDlg; delete pSO7_UtilDlg;
@@ -312,7 +312,7 @@ void CSo7_Option::OnBnClickedOk()
{ {
m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H(); m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H();
} }
CKeyence_LKG5000_Ethernet* pKeyence_LKG5000_Ethernet=new CKeyence_LKG5000_Ethernet(); CKeyence_LKG5000_Ethernet* pKeyence_LKG5000_Ethernet=new CKeyence_LKG5000_Ethernet();
pKeyence_LKG5000_Ethernet->DoModal(); pKeyence_LKG5000_Ethernet->DoModal();
delete pKeyence_LKG5000_Ethernet; delete pKeyence_LKG5000_Ethernet;