From 1102ed3eb8ca1947fd15f272c92fe203c3144cdf Mon Sep 17 00:00:00 2001 From: "mo1027728827@qq.com" Date: Wed, 8 Jun 2022 15:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4G100=20=E5=8F=96=E5=9B=BE?= =?UTF-8?q?=E8=BF=87=E6=85=A2=EF=BC=8C=E5=80=92=E6=98=AF=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 3 ++- hgdriver/hgdev/hg_scanner_239.cpp | 2 +- hgdriver/hgdev/scanner_manager.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index b86659e..8c83ff5 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,8 @@ fi cd ../ if [ -f ./build/CMakeCache.txt ]; then - rm -rf ./build/* + echo "" + #rm -rf ./build/* else mkdir build fi diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 9f32f53..08a06b4 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1458,7 +1458,7 @@ void hg_scanner_239::thread_handle_usb_read(void) } if (ret == SCANNER_ERR_TIMEOUT) { - if (++to_cnt > 10) + if (++to_cnt > 20) { status_ = ret; notify_ui_working_status("通信超时", SANE_EVENT_ERROR, ret); diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 1ca729f..ffcd97f 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -24,20 +24,20 @@ static struct std::string rsc; // USB resource, version-addr. e.g. "USB2.0-1" } g_supporting_devices[] = { -#ifdef OEM_LISICHENG +//#ifdef OEM_LISICHENG {0x31c9, 0x8420, SCANNER_NAME_LSC_G42S, "G426xF", ""} , {0x31c9, 0x8520, SCANNER_NAME_LSC_G52S, "G52x0F", ""} , {0x31c9, 0x8620, SCANNER_NAME_LSC_G62S, "G6290U", ""} , {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""} , {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""} , {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""}, -#endif -#ifdef OEM_HANWANG +//#endif +//#ifdef OEM_HANWANG {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""} , {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""} , {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""} , {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""}, -#endif +//#endif {0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""} , {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""} , {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""}