From 19ce266a4d3fef2ed0944265d6bea52ed4a3a1a4 Mon Sep 17 00:00:00 2001
From: lovelyyoung <1002639516@qq.com>
Date: Fri, 3 Apr 2020 09:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0USB=E6=94=B6=E5=9B=BE?=
 =?UTF-8?q?=E5=BB=B6=E6=97=B6=EF=BC=8C=E9=81=BF=E5=85=8D2=E5=80=8DA3?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E6=94=B6=E5=AE=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 huagao/Device/GScanO200.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/huagao/Device/GScanO200.cpp b/huagao/Device/GScanO200.cpp
index 3fbed4ea..83c52a80 100644
--- a/huagao/Device/GScanO200.cpp
+++ b/huagao/Device/GScanO200.cpp
@@ -312,6 +312,7 @@ void GScanO200::usbmain()
 		case HAVE_IMAGE:
 		{
 			int totalNum = usbcb.u32_Count;
+			m_usb->set_timeout(1500);
 			imgData = Get_Img_Data(totalNum);
 			if (!imgData->size()) {
 				Stop_scan();
@@ -323,6 +324,7 @@ void GScanO200::usbmain()
 			static int rawdataindex = 0;
 			FileTools::write_log("out.txt", "Enquque rawbuffer index " + std::to_string(++rawdataindex));
 #endif // LOG
+			m_usb->set_timeout(200);
 			Pop_Image();
 			break;
 		}
@@ -370,7 +372,7 @@ std::shared_ptr<std::vector<char>>  GScanO200::Get_Img_Data(int bufferSize)
 	std::shared_ptr<std::vector<char>> imData(new std::vector<char>(bufferSize));
 	StopWatch sw;
 	int readed = 0;
-	while (readed < bufferSize && sw.elapsed_ms() < 3000){
+	while (readed < bufferSize && sw.elapsed_ms() < 5000){
 		USBCB usbcb = { GET_IMAGE,0,(UINT32)bufferSize };
 		m_usb->write_bulk(&usbcb, sizeof(usbcb));
 		readed = m_usb->read_bulk(imData->data(), bufferSize);