From 8c3165aef0790ba22c194b8a3dcdb4e8aeb7bb47 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Fri, 3 Mar 2023 14:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4402=20403=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E5=8C=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner_302.cpp  | 11 +++++++----
 hgdriver/hgdev/scanner_manager.cpp |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp
index de6117d..e5a620b 100644
--- a/hgdriver/hgdev/hg_scanner_302.cpp
+++ b/hgdriver/hgdev/hg_scanner_302.cpp
@@ -180,10 +180,13 @@ hg_scanner_302::hg_scanner_302(const char* dev_name, int pid, usb_io* io) : hg_s
 #ifndef MAPPING_FUNCTION_IN_BASE
 	init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));
 #endif
-	if(init_settings(pid_))
-		init_settings((jsontext1 + jsontext2).c_str());
-	else
-		init_settings((jsontext3 + jsontext4).c_str());
+	if (init_settings(pid_))
+	{
+		if (pid_ == 0x302)
+			init_settings((jsontext1 + jsontext2).c_str());
+		else
+			init_settings((jsontext3 + jsontext4).c_str());
+	}
 	//writedown_device_configuration();		// initialize the hardware settings
 	init_version();
 }
diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp
index 422d60a..680e15d 100644
--- a/hgdriver/hgdev/scanner_manager.cpp
+++ b/hgdriver/hgdev/scanner_manager.cpp
@@ -262,7 +262,7 @@ hg_scanner* hg_scanner_mgr::create_scanner_g302(const char* name, usb_io* io, sc
 }
 hg_scanner* hg_scanner_mgr::create_scanner_g402(const char* name, usb_io* io, scanner_handle* h)
 {
-    hg_scanner_302* s = new hg_scanner_302(name, 0x402, io);
+    hg_scanner_302* s = new hg_scanner_302(name, 0x302, io);
 
     if (h)
         *h = s;