diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 007b4bb..01f04ec 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -3408,6 +3408,14 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len) is_auto_falt = true; return set_auto_flat(); } + else if (code == IO_CTRL_CODE_SET_COLOR) + { + return setting_color_mode(data); + } + else if (code == IO_CTRL_CODE_SET_DPI) + { + return setting_resolution(data); + } return SCANNER_ERR_DEVICE_NOT_SUPPORT; } std::string hg_scanner::get_firmware_version(void) diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 397c36f..fbc527c 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -165,7 +165,7 @@ void hg_scanner_300::thread_handle_usb_read(void) } } - if (sw.elapsed_ms() > 30000 && !is_auto_falt)//防止状态信息一直取不上来导致卡死 + if (sw.elapsed_ms() > 20000 && !is_auto_falt)//防止状态信息一直取不上来导致卡死 { //3288固件 获取有纸无纸问题的bug,如果是打开盖子在start之前【主动】获取的话,会先报无纸,而不是开盖。 //但是在【端点】又获取不到有纸还是无纸的状态,所以只能通过等待超时,再来【主动】获取有无纸张。