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

调整 最大尺寸裁切三米超时设置

This commit is contained in:
13038267101 2023-02-21 18:02:46 +08:00
parent ca31cc7ea1
commit 62d8334646
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgdriver/hgdev/hg_scanner.cpp
View File

@ -3871,7 +3871,10 @@ void hg_scanner::image_process(std::shared_ptr<tiny_buffer>& 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); 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"); printf("cis 原图测试无需任何算法\r\n");
} }

4
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -208,7 +208,7 @@ void hg_scanner_300::thread_handle_usb_read(void)
} }
if (sw.elapsed_ms() > 30000 && img_conf_.resolution_dst != 600)//防止状态信息一直取不上来导致卡死 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"); 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) 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) if (is_quality_ == IMG_SPEED && resolution_ >= 300)