From 4f40dfc11ae1ffd5c07674b5570207cd43ddc421 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Wed, 28 Jun 2023 09:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=99=A4=E7=BD=91=E7=BA=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 11 +++-------- hgdriver/hgdev/hg_scanner_239.cpp | 29 ++++++++++++----------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 6193d4e..1beb463 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -1366,40 +1366,35 @@ int hg_scanner::set_color_change(void) } bool hg_scanner::jsn_reorganize() { - bool enble = false; if (!firmware_sup_wait_paper_ && pid_ == 0x239) { erase_option(SANE_STD_OPT_NAME_WAIT_TO_SCAN); - enble = true; } if (!firmware_sup_pick_strength_ && pid_ == 0x239) { erase_option(SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH); erase_option(SANE_STD_OPT_NAME_FEED_STRENGTH); - enble = true; } if (!firmware_sup_color_fill_ && (pid_ == 0x239 || pid_ == 0x439)) { erase_option(SANE_STD_OPT_NAME_IS_FILL_COLOR); - enble = true; } if (!firmware_sup_color_corr_ && (pid_ == 0x239 || pid_ == 0x439)) { erase_option(SANE_STD_OPT_NAME_COLOR_CORRECTION); - enble = true; - } - if (!firmware_sup_morr_ && (pid_ == 0x239 || pid_ == 0x439)) + if (!firmware_sup_morr_) { erase_option(SANE_STD_OPT_NAME_RID_MORR); } + if (pid_ == 0x239 || pid_ == 0x439) //固件不支持防止渗透等级 { erase_option(SANE_STD_OPT_NAME_ANTI_PERMEATE_LEVEL); } erase_option(SANE_STD_OPT_NAME_RID_GRID); //全系移除 除网纹 - return enble; + return true; } int hg_scanner::hgpaper_to_devspaper(Paper_Map papermap[], int len, int& paper, bool* exact, TwSS* type) { diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 0ba4fce..ea17a3c 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -507,23 +507,18 @@ void hg_scanner_239::init_version(void) firmware_sup_color_fill_ = year >= "3C" ? true : false; } - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_wait_paper_:%s\r\n", firmware_sup_wait_paper_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_log_export_:%s\r\n", firmware_sup_log_export_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_pick_strength_:%s\r\n", firmware_sup_pick_strength_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_color_corr_:%s\r\n", firmware_sup_color_corr_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_double_img:%s\r\n", firmware_sup_double_img ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_devs_lock_:%s\r\n", firmware_sup_devs_lock_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_dpi_300:%s\r\n", firmware_sup_dpi_300 ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_dpi_600:%s\r\n", firmware_sup_dpi_600 ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_auto_speed_:%s\r\n", firmware_sup_auto_speed_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_morr_:%s\r\n", firmware_sup_morr_ ? "enable" : "close"); - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "firmware_sup_color_fill_:%s\r\n", firmware_sup_color_fill_ ? "enable" : "close"); - if (!firmware_sup_devs_lock_) - { - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_description(SCANNER_ERR_DEVICE_NOT_SUPPORT)); - } - - VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str()); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_wait_paper_:%s\r\n", firmware_sup_wait_paper_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_log_export_:%s\r\n", firmware_sup_log_export_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_pick_strength_:%s\r\n", firmware_sup_pick_strength_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_color_corr_:%s\r\n", firmware_sup_color_corr_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_double_img:%s\r\n", firmware_sup_double_img ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_devs_lock_:%s\r\n", firmware_sup_devs_lock_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_dpi_300:%s\r\n", firmware_sup_dpi_300 ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_dpi_600:%s\r\n", firmware_sup_dpi_600 ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_auto_speed_:%s\r\n", firmware_sup_auto_speed_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_morr_:%s\r\n", firmware_sup_morr_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware_sup_color_fill_:%s\r\n", firmware_sup_color_fill_ ? "enable" : "close"); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str()); //is_kernelsnap_239_220429_ = date >= "B0429" ? true : false; //is_kernelsnap_239_220430_ = date >= "B0430" ? true : false;