Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
846efca8b9
|
@ -318,6 +318,7 @@
|
||||||
#define SCANNER_NAME_LSC_G42S "LANXUMSCAN G42S"
|
#define SCANNER_NAME_LSC_G42S "LANXUMSCAN G42S"
|
||||||
#define SCANNER_NAME_LSC_G52S "LANXUMSCAN G52S"
|
#define SCANNER_NAME_LSC_G52S "LANXUMSCAN G52S"
|
||||||
#define SCANNER_NAME_LSC_G62S "LANXUMSCAN G62S"
|
#define SCANNER_NAME_LSC_G62S "LANXUMSCAN G62S"
|
||||||
|
#define SCANNER_NAME_LSC_G63S "LANXUMSCAN G63S"
|
||||||
#define SCANNER_NAME_LSC_G73S "LANXUMSCAN G73S"
|
#define SCANNER_NAME_LSC_G73S "LANXUMSCAN G73S"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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_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_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_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)
|
#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
|
||||||
isx86_Advan_ = false;
|
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)
|
if (!firmware_sup_dirty_check)
|
||||||
{
|
{
|
||||||
erase_option(SANE_STD_OPT_NAME_LENS_DIRTY);
|
erase_option(SANE_STD_OPT_NAME_LENS_DIRTY);
|
||||||
|
|
|
@ -378,7 +378,8 @@ protected:
|
||||||
bool firmware_sup_boardTime; //固件支持 板级时间校验 231021
|
bool firmware_sup_boardTime; //固件支持 板级时间校验 231021
|
||||||
bool firmware_sup_permeation_level; //固件支持 防渗透等级 3399-3C1206
|
bool firmware_sup_permeation_level; //固件支持 防渗透等级 3399-3C1206
|
||||||
bool firmware_sup_device_7010; //G300 设备但是7010 2023/9/21
|
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_width;
|
||||||
int mat_height;
|
int mat_height;
|
||||||
|
|
||||||
|
|
|
@ -575,7 +575,7 @@ void hg_scanner_239::init_version(void)
|
||||||
firmware_sup_auto_speed_ = year_date.compare("3B0318") >= 0 ? true : false;
|
firmware_sup_auto_speed_ = year_date.compare("3B0318") >= 0 ? true : false;
|
||||||
firmware_sup_morr_ = year_date.compare("3C0518") >= 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_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
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -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_boardTime = year_date.compare("231021") >= 0 ? true : false;
|
||||||
firmware_sup_double_img = year_date.compare("231027") >= 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_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
|
#ifndef MAPPING_FUNCTION_IN_BASE
|
||||||
init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
|
init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
|
||||||
|
|
|
@ -47,6 +47,7 @@ g_supporting_devices[] = {
|
||||||
, {0x31c9, PID_AND_NAME(8529, SCANNER_NAME_LSC_G52S), "G52S", "", &hg_scanner_mgr::create_scanner_g439}
|
, {0x31c9, PID_AND_NAME(8529, SCANNER_NAME_LSC_G52S), "G52S", "", &hg_scanner_mgr::create_scanner_g439}
|
||||||
, {0x31c9, PID_AND_NAME(8620, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g100}
|
, {0x31c9, PID_AND_NAME(8620, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g100}
|
||||||
, {0x31c9, PID_AND_NAME(8629, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g239}
|
, {0x31c9, PID_AND_NAME(8629, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
|
, {0x31c9, PID_AND_NAME(8630, SCANNER_NAME_LSC_G63S), "G63S", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
, {0x31c9, PID_AND_NAME(8730, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g100}
|
, {0x31c9, PID_AND_NAME(8730, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g100}
|
||||||
, {0x31c9, PID_AND_NAME(8739, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g239}
|
, {0x31c9, PID_AND_NAME(8739, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
#endif
|
#endif
|
||||||
|
@ -109,6 +110,7 @@ g_supporting_devices[] = {
|
||||||
, {0x31c9, PID_AND_NAME(8529, SCANNER_NAME_LSC_G52S), "G52S", "", &hg_scanner_mgr::create_scanner_g439}
|
, {0x31c9, PID_AND_NAME(8529, SCANNER_NAME_LSC_G52S), "G52S", "", &hg_scanner_mgr::create_scanner_g439}
|
||||||
, {0x31c9, PID_AND_NAME(8620, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g100}
|
, {0x31c9, PID_AND_NAME(8620, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g100}
|
||||||
, {0x31c9, PID_AND_NAME(8629, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g239}
|
, {0x31c9, PID_AND_NAME(8629, SCANNER_NAME_LSC_G62S), "G62S", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
|
, {0x31c9, PID_AND_NAME(8630, SCANNER_NAME_LSC_G63S), "G63S", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
, {0x31c9, PID_AND_NAME(8730, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g100}
|
, {0x31c9, PID_AND_NAME(8730, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g100}
|
||||||
, {0x31c9, PID_AND_NAME(8739, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g239}
|
, {0x31c9, PID_AND_NAME(8739, SCANNER_NAME_LSC_G73S), "G73S", "", &hg_scanner_mgr::create_scanner_g239}
|
||||||
|
|
||||||
|
@ -808,6 +810,7 @@ scanner_err hg_scanner_mgr::hg_scanner_open(scanner_handle* h, const char* name,
|
||||||
g_supporting_devices[it->ind].pid == 0x9000 ||
|
g_supporting_devices[it->ind].pid == 0x9000 ||
|
||||||
g_supporting_devices[it->ind].pid == 0x8739 ||
|
g_supporting_devices[it->ind].pid == 0x8739 ||
|
||||||
g_supporting_devices[it->ind].pid == 0x8629 ||
|
g_supporting_devices[it->ind].pid == 0x8629 ||
|
||||||
|
g_supporting_devices[it->ind].pid == 0x8630 ||
|
||||||
g_supporting_devices[it->ind].pid == 0x0439 ||
|
g_supporting_devices[it->ind].pid == 0x0439 ||
|
||||||
g_supporting_devices[it->ind].pid == 0x7039 ||
|
g_supporting_devices[it->ind].pid == 0x7039 ||
|
||||||
g_supporting_devices[it->ind].pid == 0x8529)
|
g_supporting_devices[it->ind].pid == 0x8529)
|
||||||
|
|
Loading…
Reference in New Issue