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-06-15 18:27:31 +08:00
parent 45b0c92bb0
commit b928ad56dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hgdriver/hgdev/scanner_manager.cpp
View File

@ -360,7 +360,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 多å<EFBFBD>°è®¾å¤‡ä½¿ç”¨è¿™ä¸ªvid，所以加载时ä¸<EFBFBD>会清楚è¦<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;
@ -388,14 +388,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>Œä¸€å<EFBFBD>°è®¾å¤‡é‡<EFBFBD>新连接å<EFBFBD>Žï¼Œè®¾å¤‡å¯¹è±¡â€œdeviceâ€<EFBFBD>ä¿<EFBFBD>æŒ<EFBFBD>ä¸<EFBFBD>å<EFBFBD>˜ï¼›å¦‚æžœå<EFBFBD>‡è®¾ä¸<EFBFBD>æˆ<EFBFBD>立，会导致设备é‡<EFBFBD>连消æ<EFBFBD>¯ä¸<EFBFBD>能正常接收，绑定到该设备的scanner对象得ä¸<EFBFBD>到释æ”? if (online_devices_[i].dev == device) // 姝ゅ鍋囧畾鍚屼竴鍙拌澶囬噸鏂拌繛鎺ュ悗锛岃澶囧璞♀€渄evice鈥濅繚鎸佷笉鍙橈紱濡傛灉鍋囪涓嶆垚绔嬶紝浼氬鑷磋澶囬噸杩炴秷鎭笉鑳芥甯告帴鏀讹紝缁戝畾鍒拌璁惧鐨剆canner瀵硅薄寰椾笉鍒伴噴鏀?
{ {
online_devices_[i].ind = index; online_devices_[i].ind = index;
add = false; add = false;
break; break;
} }
} }
if (add) // 处ç<EFBFBD>†å¯¹è±¡â€œdeviceâ€<EFBFBD>改å<EFBFBD>˜çš„情景 if (add) // 澶勭悊瀵硅薄鈥渄evice鈥濇敼鍙樼殑鎯呮櫙
{ {
i = 0; i = 0;
for (auto& v : online_devices_) for (auto& v : online_devices_)
@ -851,8 +851,8 @@ scanner_err hg_scanner_mgr::hg_scanner_get_parameter(scanner_handle h, const cha
strcmp(SANE_STD_OPT_NAME_FIRMWARE_VERSION, name) == 0 || strcmp(SANE_STD_OPT_NAME_FIRMWARE_VERSION, name) == 0 ||
strcmp(SANE_STD_OPT_NAME_DEVICE_IP_ADDR, name) == 0 || strcmp(SANE_STD_OPT_NAME_DEVICE_IP_ADDR, name) == 0 ||
strcmp(SANE_STD_OPT_NAME_ROLLER_COUNT, name) == 0 || strcmp(SANE_STD_OPT_NAME_ROLLER_COUNT, name) == 0 ||
strcmp(SANE_STD_OPT_NAME_TOTAL_COUNT, name) == 0 || strcmp(SANE_STD_OPT_NAME_TOTAL_COUNT, name) == 0 /*||
strcmp(SANE_STD_OPT_NAME_GET_DEVS_L0G, name) == 0) strcmp(SANE_STD_OPT_NAME_GET_DEVS_L0G, name) == 0*/)
return (scanner_err)SCAN_PTR(h)->set_setting(name, data, len); return (scanner_err)SCAN_PTR(h)->set_setting(name, data, len);
} }