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

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev

This commit is contained in:
13038267101 2023-06-16 18:01:40 +08:00
parent c44a7bad03 e7b06c0c2a
commit ce5368af5a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1074,9 +1074,9 @@ void hg_scanner_239::thread_correction(void)
}
if (ret == SCANNER_ERR_TIMEOUT)
{
if (sw.elapsed_s() > 30)
if (sw.elapsed_s() > 10)
{
status_ = ret;
status_ = SCANNER_ERR_DEVICE_AUTO_FAIL_OVER;
//notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_FAIL_OUTTIME), SANE_EVENT_ERROR, ret); // 通信超时
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "设备校正超时 '%s'\n", hg_scanner_err_name(status_));
break;
@ -1088,6 +1088,7 @@ void hg_scanner_239::thread_correction(void)
{
if (setting3399::AutoCorrect ==info->From)
{
std::lock_guard<std::mutex> lock(io_lock_);
status_ == SCANNER_ERR_DEVICE_AUTO_FAIL_INFO;
sw.reset();
std::string sinfo;