From 2f5fb1c2d36360da1c24e6a8ae21f6bfeb3635b7 Mon Sep 17 00:00:00 2001
From: masayume_ht <1936714878@qq.com>
Date: Tue, 17 Aug 2021 16:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=AB=E6=8F=8F=E5=89=8D?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=88=A4=E6=96=AD=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 huagao/Device/GScanO1003399.cpp | 25 ++++++++++++++++++-------
 huagao/Device/IConfig.h         |  7 ++++++-
 huagao/huagaods.cpp             |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/huagao/Device/GScanO1003399.cpp b/huagao/Device/GScanO1003399.cpp
index 65c4b352..74e83e09 100644
--- a/huagao/Device/GScanO1003399.cpp
+++ b/huagao/Device/GScanO1003399.cpp
@@ -346,13 +346,24 @@ void GScanO1003399::Scanner_StartScan(UINT16 count)
 		scanflag = false;
 		return;
 	}
-	if (!Get_Scanner_PaperOn())
-	{
-		devState = DEV_WRONG;
-		Set_ErrorCode(NO_FEED);
-		scanflag = false;
-		return;
-	}
+	//int val = scanner_read_reg(m_usb, SR_GET_MBSTATUS);
+	//if (val)
+	//{
+	//	devState = DEV_WRONG;
+	//	HGEIntInfo info;
+	//	info.From = MtBoard;
+	//	info.Code = val == 0x14 ? 4 : val;
+	//	Set_ErrorCode(codeconvter(info));
+	//	scanflag = false;
+	//	return;
+	//}
+	//if (!Get_Scanner_PaperOn())
+	//{
+	//	devState = DEV_WRONG;
+	//	Set_ErrorCode(NO_FEED);
+	//	scanflag = false;
+	//	return;
+	//}
 
 	start();
 	bool procmode = (m_param.resolution_dst > 200.0f || m_param.papertype == 52 || m_param.papertype == 54 || m_param.papertype == 131);
diff --git a/huagao/Device/IConfig.h b/huagao/Device/IConfig.h
index 1958ff0e..e8ea51e7 100644
--- a/huagao/Device/IConfig.h
+++ b/huagao/Device/IConfig.h
@@ -196,7 +196,12 @@ enum Scanner_Reg_Defs
 	SR_UPDATA_RECOVERY = 0x103,
 	SR_UPDATA_REBOOT = 0x104,
 	SR_POWEROFF = 0x105,
-	SR_REBOOT = 0x106
+	SR_REBOOT = 0x106,
+	SR_FLAT_CLR_MAX_BRIGHT,
+	SR_FLAT_GRAY_MAX_BRIGHT,
+	SR_KERNEL_VERSION_INFO_LENGTH,
+	SR_GET_KERNEL_VERSION,
+	SR_GET_MBSTATUS
 };
 
 enum Scanner_Cmd_Defs
diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp
index c0b0f711..4bb84973 100644
--- a/huagao/huagaods.cpp
+++ b/huagao/huagaods.cpp
@@ -1854,7 +1854,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) {
 		}
 		/*if (Msg::Set == msg) {
 			auto mech = data.currentItem<UInt16>();
-			m_scanparam->hardwarecaps.en_doublefeed = mech ? 0 : 1;
+			m_scanparam->hardwarecaps.en_doublefeed = mech ? 1 : 0;
 			return success();
 		}
 		return CapSupGetAllResetEx<BYTE, UInt16, CapType::DoubleFeedDetection>(msg, data, m_scanparam->hardwarecaps.en_doublefeed, TRUE);*/