lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整中晶设备型号

This commit is contained in:
yangjiaxuan 2023-09-05 10:32:26 +08:00
parent 3067ff1a2f
commit c70a4e82e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgdriver/hgdev/scanner_manager.cpp
View File

@ -66,7 +66,7 @@ g_supporting_devices[] = {
#elif defined(OEM_ZHONGJING) #elif defined(OEM_ZHONGJING)
{0X05DA, 0x9220, SCANNER_NAME_ZJ_6500, "S6500", "",& hg_scanner_mgr::create_scanner_g439} {0X05DA, 0x9220, SCANNER_NAME_ZJ_6500, "S6570", "",& hg_scanner_mgr::create_scanner_g439}
#elif defined(OEM_ZIGUANG) #elif defined(OEM_ZIGUANG)
{0x32ec, 0x0200, SANNNER_NAME_ZG_Q7110,"", "", & hg_scanner_mgr::create_scanner_g239} {0x32ec, 0x0200, SANNNER_NAME_ZG_Q7110,"", "", & hg_scanner_mgr::create_scanner_g239}
, {0x32ec, 0x0210, SANNNER_NAME_ZG_Q1070, "", "", &hg_scanner_mgr::create_scanner_g402} , {0x32ec, 0x0210, SANNNER_NAME_ZG_Q1070, "", "", &hg_scanner_mgr::create_scanner_g402}
@ -373,7 +373,7 @@ void hg_scanner_mgr::on_hgscanner_pnp(usb_event ev, libusb_device* device, int v
int index = -1; int index = -1;
for (int i = 0; i < _countof(g_supporting_devices); ++i) for (int i = 0; i < _countof(g_supporting_devices); ++i)
{ {
// 064B 婢舵艾褰寸拋鎯ь槵娴ｈ法鏁ゆ潻娆庨嚋vid閿涘本澧嶆禒銉ュ<EFBFBD>鏉炶姤妞傛稉宥勭窗濞撳懏顨熺憰浣瑰ⅵ瀵<EFBFBD>偓閸濐亙绔撮崣鎷岊啎婢跺浄绱濋崣顏呮箒闁<EFBFBD>俺绻冩径鏍<EFBFBD>劥鏉╂稖顢戦崝鐘烘祰閺€鐟板綁鐎圭偘绶? // 064B 婢舵艾褰寸拋鎯ь槵娴ｈ法鏁ゆ潻娆庨嚋vid閿涘本澧嶆禒銉ュ鏉炶姤妞傛稉宥勭窗濞撳懏顨熺憰浣瑰ⅵ瀵偓閸濐亙绔撮崣鎷岊啎婢跺浄绱濋崣顏呮箒闁俺绻冩径鏍劥鏉╂稖顢戦崝鐘烘祰閺€鐟板綁鐎圭偘绶?
if (g_supporting_devices[i].vid == vid && g_supporting_devices[i].pid == pid) if (g_supporting_devices[i].vid == vid && g_supporting_devices[i].pid == pid)
{ {
index = i; index = i;
@ -401,14 +401,14 @@ void hg_scanner_mgr::on_hgscanner_pnp(usb_event ev, libusb_device* device, int v
size_t i = 0; size_t i = 0;
for (; i < online_devices_.size(); ++i) for (; i < online_devices_.size(); ++i)
{ {
if (online_devices_[i].dev == device) // 濮濄倕顦╅崑鍥х暰閸氬奔绔撮崣鎷岊啎婢跺洭鍣搁弬鎷岀箾閹恒儱鎮楅敍宀冾啎婢跺洤顕<EFBFBD>挒鈾€鈧<EFBFBD>竸evice閳ユ繀绻氶幐浣风瑝閸欐﹫绱辨俊鍌涚亯閸嬪洩顔曟稉宥嗗灇缁斿<EFBFBD>绱濇导姘<EFBFBD>嚤閼风<EFBFBD>顔曟径鍥<EFBFBD>櫢鏉╃偞绉烽幁顖欑瑝閼宠姤顒滅敮鍛婂复閺€璁圭礉缂佹垵鐣鹃崚鎷岊嚉鐠佹儳顦<EFBFBD>惃鍓哻anner鐎电<EFBFBD>钖勫<EFBFBD>妞剧瑝閸掍即鍣撮弨? if (online_devices_[i].dev == device) // 濮濄倕顦╅崑鍥х暰閸氬奔绔撮崣鎷岊啎婢跺洭鍣搁弬鎷岀箾閹恒儱鎮楅敍宀冾啎婢跺洤顕挒鈾€鈧竸evice閳ユ繀绻氶幐浣风瑝閸欐﹫绱辨俊鍌涚亯閸嬪洩顔曟稉宥嗗灇缁斿绱濇导姘嚤閼风顔曟径鍥櫢鏉╃偞绉烽幁顖欑瑝閼宠姤顒滅敮鍛婂复閺€璁圭礉缂佹垵鐣鹃崚鎷岊嚉鐠佹儳顦惃鍓哻anner鐎电钖勫妞剧瑝閸掍即鍣撮弨?
{ {
online_devices_[i].ind = index; online_devices_[i].ind = index;
add = false; add = false;
break; break;
} }
} }
if (add) // 婢跺嫮鎮婄€电<EFBFBD>钖勯垾娓別vice閳ユ繃鏁奸崣妯兼畱閹<EFBFBD>懏娅? if (add) // 婢跺嫮鎮婄€电钖勯垾娓別vice閳ユ繃鏁奸崣妯兼畱閹懏娅?
{ {
i = 0; i = 0;
for (auto& v : online_devices_) for (auto& v : online_devices_)