From ea07433491b9332a19ef01d9ecd05a800c112757 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Tue, 12 Dec 2023 14:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=99=B6pid?= =?UTF-8?q?=EF=BC=9A9222=E5=92=8C9223=EF=BC=8C=E5=88=86=E5=88=AB=E5=AF=B9?= =?UTF-8?q?=E5=BA=94139=E5=92=8C239=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/char_const.h | 6 ++++-- hgdriver/hgdev/scanner_manager.cpp | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index 3183633..3541bed 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -334,7 +334,9 @@ #define SCANNER_NAME_CT_138 "CUMTENN CT-138" #define SCANNER_NAME_CT_238 "CUMTENN CT-238" -#define SCANNER_NAME_ZJ_6500 "Microtek A3HG Scanner" +#define SCANNER_NAME_ZJ_6570 "Microtek A3HG Scanner" +#define SCANNER_NAME_ZJ_8790 "Microtek A3ES Scanner" +#define SCANNER_NAME_ZJ_500DC "Microtek A3FZ Scanner" #define SANNNER_NAME_ZG_Q7110 "Uniscan Q7 Series" #define SANNNER_NAME_ZG_Q1070 "Uniscan Q1 Series" @@ -342,4 +344,4 @@ #define SANNER_NAME_DL_S3000 "DELI SCAN S3000-S3110" #define SANNER_NAME_DL_S3400 "DELI SCAN S3000-S3400" #define SANNER_NAME_DL_S2000 "DELI SCAN S2000-S2090" -#define SANNER_NAME_DL_DL9000 "DELI SCAN DL9000-DL9080" \ No newline at end of file +#define SANNER_NAME_DL_DL9000 "DELI SCAN DL9000-DL9080" \ No newline at end of file diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index af8a320..3369585 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -73,7 +73,9 @@ g_supporting_devices[] = { #elif defined(OEM_ZHONGJING) - {0X05DA, 0x9220, SCANNER_NAME_ZJ_6500, "S6570", "",& hg_scanner_mgr::create_scanner_g439} + {0X05DA, 0x9220, SCANNER_NAME_ZJ_6570, "S6570", "",& hg_scanner_mgr::create_scanner_g439} + , {0X05DA, 0x9222, SCANNER_NAME_ZJ_8790, "S8790", "",& hg_scanner_mgr::create_scanner_g239} + , {0X05DA, 0x9223, SCANNER_NAME_ZJ_500DC, "S500DC", "",& hg_scanner_mgr::create_scanner_g239} #elif defined(OEM_ZIGUANG) {0x32ec, 0x0200, SANNNER_NAME_ZG_Q7110,"Q7110", "", & hg_scanner_mgr::create_scanner_g239} , {0x32ec, 0x0210, SANNNER_NAME_ZG_Q1070, "Q1070", "", &hg_scanner_mgr::create_scanner_g402} @@ -101,6 +103,8 @@ g_supporting_devices[] = { , {0x32ec, 0x0200, SANNNER_NAME_ZG_Q7110,"", "",& hg_scanner_mgr::create_scanner_g239} , {0x32ec, 0x0210, SANNNER_NAME_ZG_Q1070, "", "", &hg_scanner_mgr::create_scanner_g402} , {0X05DA, 0x9220, SCANNER_NAME_ZJ_6500, "S6500", "",&hg_scanner_mgr::create_scanner_g439} + , {0X05DA, 0x9222, SCANNER_NAME_ZJ_8790, "S8790", "",&hg_scanner_mgr::create_scanner_g239} + , {0X05DA, 0x9223, SCANNER_NAME_ZJ_500DC, "S500DC", "",&hg_scanner_mgr::create_scanner_g239} , {0x3308, 0x6006, SCANNER_NAME_CT_9020, SCANNER_NAME_CT_9020, "",& hg_scanner_mgr::create_scanner_g239} , {0x3308, 0x6005, SCANNER_NAME_CT_4520, SCANNER_NAME_CT_4520, "", &hg_scanner_mgr::create_scanner_g300} , {0x3308, 0x0238, SCANNER_NAME_CT_138, SCANNER_NAME_CT_138, "", &hg_scanner_mgr::create_scanner_g239}