From b7f9a0b8e498eb7d15138a29599de582c0f6e712 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 19 Jan 2024 10:04:23 +0800 Subject: [PATCH] =?UTF-8?q?G300=EF=BC=9B=E5=9B=BA=E4=BB=B6=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=BA211124=E5=8F=8A=E4=BB=A5=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=8D=E6=94=AF=E6=8C=81=E4=BC=91=E7=9C=A0?= =?UTF-8?q?=EF=BC=8C=E5=B1=8F=E8=94=BD=E8=AF=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 7 ++++++- hgdriver/hgdev/hg_scanner.h | 3 ++- hgdriver/hgdev/hg_scanner_239.cpp | 2 +- hgdriver/hgdev/hg_scanner_300.cpp | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index ce68e5b..dbdc142 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -162,7 +162,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io, i , firmware_sup_wait_paper_(false),firmware_sup_pick_strength_(false),firmware_sup_log_export_(false), firmware_sup_log_export_G300_(false),firmware_sup_color_corr_(false),firmware_sup_wake_device_(false) , firmware_sup_double_img(false),firmware_sup_devs_lock_(false),firmware_sup_dpi_300(false),firmware_sup_dpi_600(false),firmware_sup_auto_speed_(false),firmware_sup_morr_(false) , firmware_sup_color_fill_(false),firmware_sup_history_cnt(false), have_max_size(false), is_discardblank(false),firmware_sup_device_7010(false), firmware_sup_double_check(false) - , firmware_sup_dirty_check(false), firmware_sup_permeation_level(false), firmware_sup_firmware_language_(0) + , firmware_sup_dirty_check(false), firmware_sup_permeation_level(false), firmware_sup_firmware_language_(false), firmware_sup_300device_D8_(false) { #if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64) isx86_Advan_ = false; @@ -1496,6 +1496,11 @@ bool hg_scanner::jsn_reorganize() } + if (!firmware_sup_300device_D8_ && pid_ == 0x300) + { + erase_option(SANE_STD_OPT_NAME_TIME_TO_SLEEP); + } + if (!firmware_sup_dirty_check) { erase_option(SANE_STD_OPT_NAME_LENS_DIRTY); diff --git a/hgdriver/hgdev/hg_scanner.h b/hgdriver/hgdev/hg_scanner.h index 094c114..d28969f 100644 --- a/hgdriver/hgdev/hg_scanner.h +++ b/hgdriver/hgdev/hg_scanner.h @@ -378,7 +378,8 @@ protected: bool firmware_sup_boardTime; //固件支持 板级时间校验 231021 bool firmware_sup_permeation_level; //固件支持 防渗透等级 3399-3C1206 bool firmware_sup_device_7010; //G300 设备但是7010 2023/9/21 - bool firmware_sup_firmware_language_;//固件支持 设置或获取固件语言模式 仅139 239有固件语言功能，3D0115及之后支持 + bool firmware_sup_firmware_language_;//固件支持 设置或获取固件语言模式 仅139 239有固件语言功能，3C1229及之后支持 + bool firmware_sup_300device_D8_; //G300 固件211124及以前是3288设备，之后是D8设备 int mat_width; int mat_height; diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index f54fa18..21b621a 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -575,7 +575,7 @@ void hg_scanner_239::init_version(void) firmware_sup_auto_speed_ = year_date.compare("3B0318") >= 0 ? true : false; firmware_sup_morr_ = year_date.compare("3C0518") >= 0 ? true : false; firmware_sup_color_fill_ = year.compare("3C") >= 0 ? true : false; - firmware_sup_firmware_language_ = year_date.compare("3D0115") >= 0 ? true : false; + firmware_sup_firmware_language_ = year_date.compare("3C1229") >= 0 ? true : false; } else { diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index fc6c3a2..a77ce5c 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -116,6 +116,7 @@ hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) : firmware_sup_boardTime = year_date.compare("231021") >= 0 ? true : false; firmware_sup_double_img = year_date.compare("231027") >= 0 ? true : false; firmware_sup_log_export_G300_ = year_date.compare("230430") >= 0 ? true : false; + firmware_sup_300device_D8_ = year_date.compare("211124") > 0 ? true : false; #ifndef MAPPING_FUNCTION_IN_BASE init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化