From 62d83346469042be6cda0aa394bba88a99281da7 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Tue, 21 Feb 2023 18:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E8=A3=81=E5=88=87=E4=B8=89=E7=B1=B3=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 5 ++++- hgdriver/hgdev/hg_scanner_300.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 99e1771..a6dc1d6 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -3871,7 +3871,10 @@ void hg_scanner::image_process(std::shared_ptr& buffer, uint32_t id VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "Set distortion val is:h:%f w:%f distortion val is:%f\n", distortion_val.h, distortion_val.w, distortion_val.scaleXY); } - else if (param.cis_image || (img_conf_.papertype == TwSS::MaxSize && pid_ == 0x0300 && is_kernelsnap3288_230210_)) + else if (param.cis_image + || ((img_conf_.papertype == TwSS::MaxSize || img_conf_.papertype == TwSS::USStatement) + && pid_ == 0x0300 + && is_kernelsnap3288_230210_)) { printf("cis 原图测试无需任何算法\r\n"); } diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index f5b3004..bb14ec0 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -208,7 +208,7 @@ void hg_scanner_300::thread_handle_usb_read(void) } if (sw.elapsed_ms() > 30000 && img_conf_.resolution_dst != 600)//防止状态信息一直取不上来导致卡死 { - if (img_conf_.papertype == TwSS::MaxSize && pid_ == 0x0300 && is_kernelsnap3288_230210_) + if ((img_conf_.papertype == TwSS::MaxSize || img_conf_.papertype == TwSS::USStatement) && pid_ == 0x0300 && is_kernelsnap3288_230210_) { hg_log::log(LOG_LEVEL_WARNING, "while 30S\n"); } @@ -485,7 +485,7 @@ int hg_scanner_300::writedown_device_configuration(bool type,setting_hardware::H } if (paper_size_ == TwSS::USStatement || paper_size_ == TwSS::MaxSize) { - d->params_3288.pageSize = setting3288dsp::G400_MAXSIZE; + //d->params_3288.pageSize = setting3288dsp::G400_MAXSIZE; } if (is_quality_ == IMG_SPEED && resolution_ >= 300)