From d98b795b081f0c28f982a6b3c49fe32a94909bfd Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Mon, 6 Mar 2023 15:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E4=B8=8D=E6=94=AF=E6=8C=81=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E5=8E=86=E5=8F=B2=E8=AE=A1=E6=95=B0=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=81=9A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 2 +- hgdriver/hgdev/hg_scanner.h | 1 + hgdriver/hgdev/hg_scanner_300.cpp | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index b44f16d..e8a22d2 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -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) , 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_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) isx86_Advan_ = false; diff --git a/hgdriver/hgdev/hg_scanner.h b/hgdriver/hgdev/hg_scanner.h index 5aa855a..73de0ff 100644 --- a/hgdriver/hgdev/hg_scanner.h +++ b/hgdriver/hgdev/hg_scanner.h @@ -360,6 +360,7 @@ protected: bool is_kernelsnap_221027_; //此版本一下不支持拆分模式 pc实现 bool is_kernelsnap3288_221106_; //G300 3288 在221106版本支持真实300dpi bool is_kernelsnap3288_230210_; //G300 3288 在230210版本支持真实600dpi + bool is_kernelsnap3288_230303_; //G300 3288 支持清除历史扫描张数 bool is_kernelsnap_220430_; //待纸扫描 bool is_kernelsnap_devsislock; //支持设备锁的版本 bool is_kernelsnap_3C_cccc; //支持偏色校正的版本，自适应配置 diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 56e376e..4b7ad3a 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -640,6 +640,7 @@ int hg_scanner_300::set_kernelsnap_ver() is_kernelsnap3288_221106_ = false; is_kernelsnap3288_230210_ = false; } + is_kernelsnap3288_230303_ = atoi(fw.substr(4, 6).c_str()) >= 220303 ? true : false; } else { @@ -771,6 +772,10 @@ int hg_scanner_300::set_clear_roller_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 }; return writeusb(usbcb); }