From fc2a45efab303264439ce006234dafb1cf84b84d Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Sat, 21 May 2022 09:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=80=80=E5=87=BA=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E8=AE=B0=E5=BD=95=E5=9C=A8=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=E4=B8=AD=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=B9=E5=A4=84=E7=90=86=EF=BC=8C=E6=97=A0=E8=AE=BA=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=E9=83=BD=E8=A6=81?= =?UTF-8?q?=E6=81=A2=E5=A4=8DCMakeLists.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 7 ++++--- hgdriver/hgdev/hg_scanner_200.cpp | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 1d0fcb5..fa47188 100755 --- a/build.sh +++ b/build.sh @@ -88,11 +88,12 @@ make if [ $? -ne 0 ];then echo "--------------------------------------make fail---------------------------------------" - exit 1 -fi + #exit 1 # commented, we should restore the CMakeLists.txts... +else echo "--------------------------------------make succeed------------------------------------" +fi -make +#make if [ -f ../code_device/hgsane/CMakeLists.txtbkp ]; then mv ../code_device/hgsane/CMakeLists.txtbkp ../code_device/hgsane/CMakeLists.txt diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index dc8985d..3f3e001 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -384,8 +384,11 @@ void hg_scanner_200::thread_handle_usb_read(void) break; } } - //else + else + { // notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err); + HG_VLOG_MINI_1(LOG_LEVEL_WARNING, "-x-x-x-: USB thread error: %s\n", hg_scanner::strerr((scanner_err)prev_err).c_str()); + } prev_err = ret; } this_thread::sleep_for(chrono::milliseconds(2));