From 9bc22b1f1355027c70df0a4e8ef45ac81201915d Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Sat, 20 May 2023 11:13:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20239=20start=20=E6=B8=85?= =?UTF-8?q?=E9=99=A4int=E7=AB=AF=E7=82=B9=E6=97=B6=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=AD=BB=E9=94=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 6 +++--- hgdriver/hgdev/hg_scanner_239.cpp | 16 ++-------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 3ff6c33..8aac3af 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -2631,11 +2631,11 @@ void hg_scanner::init_settings(const char* json_setting_text) p_time = from_default_language(OPTION_VALUE_XMSJ_SFZ); else if (val > 600 && val <= 1800) p_time = from_default_language(OPTION_VALUE_XMSJ_BXS); - else if (val > 600 && val <= 3600) + else if (val > 1800 && val <= 3600) p_time = from_default_language(OPTION_VALUE_XMSJ_YXS); - else if (val > 600 && val <= 7200) + else if (val > 3600 && val <= 7200) p_time = from_default_language(OPTION_VALUE_XMSJ_LXS); - else if (val > 600 && val <= 14400) + else if (val > 7200 && val <= 14400) p_time = from_default_language(OPTION_VALUE_XMSJ_SXS); if (p_time) setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_time; diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index b607265..18c5168 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -678,23 +678,13 @@ int hg_scanner_239::discard_all_images(void) ret = SCANNER_ERR_OK; string str; str.resize(block); - //{ - // std::lock_guard lock(io_lock_); - // while (ret == SCANNER_ERR_OK) - // { - // ret = io_->read_bulk(&str[0], &block); - // } - //} { - std::lock_guard lock(io_lock_); - - char buf[64]; int size = sizeof(buf); ret = SCANNER_ERR_OK; setting3399::HGEIntInfo* info = (setting3399::HGEIntInfo*)buf; { - + std::lock_guard lock(io_lock_); if (!io_) { return 0; @@ -717,12 +707,10 @@ int hg_scanner_239::discard_all_images(void) size = sizeof(buf); { + std::lock_guard lock(io_lock_); ret = io_->read_interrupt(buf, &size); } } - { - io_->set_timeout(oto); - } } std::this_thread::sleep_for(std::chrono::milliseconds(1000)); if (!io_)