From c85a4a6eb3eb1968bebf9157c623def5dc22f755 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Tue, 18 Apr 2023 10:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=B4=AB=E5=85=89=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E8=B0=83=E6=95=B4=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/char_const.h | 4 ++-- hgdriver/hgdev/hg_scanner_300.cpp | 2 +- hgdriver/hgdev/scanner_manager.cpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index ed97e9e..2f033bf 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -230,5 +230,5 @@ #define SCANNER_NAME_ZJ_6500 "Microtek A3HG Scanner" -#define SANNNER_NAME_ZG_Q7110 "Uniscan Q7110" -#define SANNNER_NAME_ZG_Q1070 "Uniscan Q1070" \ No newline at end of file +#define SANNNER_NAME_ZG_Q7110 "Uniscan Q7 Series" +#define SANNNER_NAME_ZG_Q1070 "Uniscan Q1 Series" \ No newline at end of file diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 6f115c7..1048769 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -720,7 +720,7 @@ int hg_scanner_300::initdevice() } set_kernelsnap_ver(); - is_devs_sleep_ = false; + is_devs_sleep_ = true; //客户提前点击设置这边固件版本号 还没有做判断的 return SCANNER_ERR_OK; } diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 4fc61c5..c18a85e 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -62,7 +62,6 @@ g_supporting_devices[] = { #elif defined(OEM_ZIGUANG) {0x32ec, 0x0200, SANNNER_NAME_ZG_Q7110,"", "", & hg_scanner_mgr::create_scanner_g239} , {0x32ec, 0x0210, SANNNER_NAME_ZG_Q1070, "", "", &hg_scanner_mgr::create_scanner_g402} - , {0x3072, 0x0402, SANNNER_NAME_ZG_Q1070, "", "", &hg_scanner_mgr::create_scanner_g402} #else {0x3072, PID_AND_NAME(100, SCANNER_NAME_HG_G100), "G100", "", &hg_scanner_mgr::create_scanner_g100} , {0x3072, PID_AND_NAME(139, SCANNER_NAME_HG_G100), "G100", "", &hg_scanner_mgr::create_scanner_g239}