适配SEQ Number.
This commit is contained in:
@@ -2733,7 +2733,12 @@ 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)
|
||||||
|
{
|
||||||
|
return udev;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
if(Get_SeqNumber(udev) != sSeqNumber)
|
if(Get_SeqNumber(udev) != sSeqNumber)
|
||||||
{
|
{
|
||||||
usb_close(udev);
|
usb_close(udev);
|
||||||
@@ -2745,6 +2750,7 @@ usb_dev_handle* CSO7_Proto::_open_usb_dev(unsigned short sSeqNumber)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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.
|
||||||
|
|
||||||
|
Construct Cso7_Proto.
|
||||||
|
|
||||||
|
Init:Open device succeed .
|
||||||
|
|
||||||
|
_start_machine
|
||||||
|
Exit: Exit_SO7Usb
|
||||||
|
|
||||||
|
Destruct Cso7_Proto.
|
||||||
|
|
||||||
|
Construct Cso7_Proto.
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user