From 4e1ba85154738bd29a1a038baf84eda729f2c5c6 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 5 Jan 2023 21:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BB=B6=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.h | 2 +- hgdriver/hgdev/hg_scanner_300.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.h b/hgdriver/hgdev/hg_scanner.h index 5906756..ca99ddc 100644 --- a/hgdriver/hgdev/hg_scanner.h +++ b/hgdriver/hgdev/hg_scanner.h @@ -336,7 +336,7 @@ protected: int fold_type_; //对折类型 bool is_cis_image; //设置cis获取原图 bool is_dpi_color_check; //纵向DPI、色差检测 ,畸变自动计算 - float save_dpi_color_check_val; //保存纵向DPI、色差检测 ,畸变自动计算 的值 + float save_dpi_color_check_val; //保存纵向DPI、色差检测 ,畸变自动计算 的值 bool is_auto_falt; //是否进行平场校正 int split3399_; //3399设备正面和反面图像是相对的，所以对折时反面需要进行特殊处理 diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 1381fc9..2385926 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -165,13 +165,13 @@ void hg_scanner_300::thread_handle_usb_read(void) } } - if (sw.elapsed_ms() > 20000)//防止状态信息一直取不上来导致卡死 + if (sw.elapsed_ms() > 30000)//防止状态信息一直取不上来导致卡死 { //3288固件 获取有纸无纸问题的bug，如果是打开盖子在start之前【主动】获取的话，会先报无纸，而不是开盖。 //但是在【端点】又获取不到有纸还是无纸的状态，所以只能通过等待超时，再来【主动】获取有无纸张。 SANE_Bool is_paperon = false; ret = get_scanner_paperon(is_paperon); - if (!is_paperon && !user_cancel_ && ret == SCANNER_ERR_OK) + if (!is_paperon && !user_cancel_ && ret == SCANNER_ERR_OK && !is_auto_falt) { status_ = SCANNER_ERR_DEVICE_NO_PAPER; break;