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-03-06 15:34:56 +08:00
parent e19a382946
commit d98b795b08
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/hg_scanner.cpp
View File

@ -157,7 +157,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io,in
, size_check(false), save_sleeptime_type_(false), is_kernelsnap_devsislock(false), is_checksum_strat_scan(false), is_cis_image(false) , size_check(false), save_sleeptime_type_(false), is_kernelsnap_devsislock(false), is_checksum_strat_scan(false), is_cis_image(false)
, is_dpi_color_check(false),save_dpi_color_check_val(0.0f), is_auto_falt(false),HGVersion_mgr_(NULL), HGVersion_Init_(NULL) , 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) , 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_230210_(false), color_correction_(false), is_kernelsnap_3C_cccc(false), is_kernelsnap_220500_(false), is_kernelsnap3288_230303_(false)
{ {
#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64) #if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
isx86_Advan_ = false; isx86_Advan_ = false;

1
hgdriver/hgdev/hg_scanner.h
View File

@ -360,6 +360,7 @@ protected:
bool is_kernelsnap_221027_; //此版本一下不支持拆分模式 pc实现 bool is_kernelsnap_221027_; //此版本一下不支持拆分模式 pc实现
bool is_kernelsnap3288_221106_; //G300 3288 在221106版本支持真实300dpi bool is_kernelsnap3288_221106_; //G300 3288 在221106版本支持真实300dpi
bool is_kernelsnap3288_230210_; //G300 3288 在230210版本支持真实600dpi bool is_kernelsnap3288_230210_; //G300 3288 在230210版本支持真实600dpi
bool is_kernelsnap3288_230303_; //G300 3288 支持清除历史扫描张数
bool is_kernelsnap_220430_; //待纸扫描 bool is_kernelsnap_220430_; //待纸扫描
bool is_kernelsnap_devsislock; //支持设备锁的版本 bool is_kernelsnap_devsislock; //支持设备锁的版本
bool is_kernelsnap_3C_cccc; //支持偏色校正的版本，自适应配置 bool is_kernelsnap_3C_cccc; //支持偏色校正的版本，自适应配置

5
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -640,6 +640,7 @@ int hg_scanner_300::set_kernelsnap_ver()
is_kernelsnap3288_221106_ = false; is_kernelsnap3288_221106_ = false;
is_kernelsnap3288_230210_ = false; is_kernelsnap3288_230210_ = false;
} }
is_kernelsnap3288_230303_ = atoi(fw.substr(4, 6).c_str()) >= 220303 ? true : false;
} }
else else
{ {
@ -771,6 +772,10 @@ int hg_scanner_300::set_clear_roller_num(void)
} }
int hg_scanner_300::set_clear_history_num(void) int hg_scanner_300::set_clear_history_num(void)
{ {
if (!is_kernelsnap3288_230303_)
{
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
}
USBCB usbcb = { setting3288dsp::CLR_SCAN_NUM,0,4 }; USBCB usbcb = { setting3288dsp::CLR_SCAN_NUM,0,4 };
return writeusb(usbcb); return writeusb(usbcb);
} }