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

华凌cis dpi设置 1

This commit is contained in:
13038267101 2023-03-15 11:03:36 +08:00
parent c9f623f316
commit 49b6c4ab06
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hgdriver/hgdev/hg_scanner.cpp
View File

@ -158,6 +158,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io,in
, is_dpi_color_check(false),save_dpi_color_check_val(0.0f), is_auto_falt(false),HGVersion_mgr_(NULL), HGVersion_Init_(NULL)
, HGVersion_Islock_(NULL), HGVersion_Postlog_(NULL), HGVersion_Free_(NULL), Dynamicopen_HGVersion_pHandle_(NULL),pid_(pid), fetching_id_(-1)
, is_kernelsnap3288_230210_(false), color_correction_(false), is_kernelsnap_3C_cccc(false), is_kernelsnap_220500_(false), is_kernelsnap3288_230303_(false)
, is_kernelsnap_211227_(false)
{
#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
isx86_Advan_ = false;

3
hgdriver/hgdev/hg_scanner.h
View File

@ -372,6 +372,9 @@ protected:
bool is_kernelsnap_3C_cccc; //支持偏色校正的版本，自适应配置
bool is_kernelsnap_220500_; //支持双张保留的版本
bool is_kernelsnap_211227_; //此版本以下，不支持真实dpi ，只设置1下去
SCANCONF img_conf_; //此参数外部不做任何改变，请在writedown_image_configuration做修改
std::string img_type_;

14
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -451,11 +451,13 @@ void hg_scanner_239::init_version(void)
if (dev == "G1" || dev == "G2" || dev == "G4")
{
is_kernelsnap_211209_ = date >= "A1209" ? (is_kernelsnap_211209_ = atoi(get_fpga().c_str()) >= 35211210) : false;//基本用不到了
is_kernelsnap_220830_ = date >= "A0830" ? true: false;
is_kernelsnap_221027_ = date >= "A1027" ? true : false;
is_kernelsnap_220430_ = date >= "A0430" ? true : false;
is_kernelsnap_220830_ = date >= "B0830" ? true: false;
is_kernelsnap_221027_ = date >= "B1027" ? true : false;
is_kernelsnap_220430_ = date >= "B0430" ? true : false;
is_kernelsnap_3C_cccc = year >= "3C" ? true : false;
is_kernelsnap_220500_ = date >= "B0500" ? true : false;
is_kernelsnap_211227_ = date <= "A1227" ? true : false;
}
VLOG_MINI_6(LOG_LEVEL_DEBUG_INFO,
"Firmware version : %s,is_kernelsnap_211209_:%d ,is_kernelsnap_220830_:%d,is_kernelsnap_221027_:%d,is_kernelsnap_220430_:%d,is_kernelsnap_3C_cccc:%d\n",
@ -777,7 +779,11 @@ int hg_scanner_239::on_paper_check_changed(bool& check)
}
int hg_scanner_239::on_resolution_changed(int& dpi)
{
dev_conf_.params_3399.dpi = dpi == 600 ? 3 : (dpi < 599 && dpi>299) ? 2 : 1;
if (is_kernelsnap_211227_)
dev_conf_.params_3399.dpi = 1;
else
dev_conf_.params_3399.dpi = dpi == 600 ? 3 : (dpi < 599 && dpi>299) ? 2 : 1;
//dev_conf_.params_3399.dpi = 1; //dpi 华凌cis和敦南cis 默认发1无需改变
int ret = writedown_device_configuration();
return ret;