From cc8de4f4a6f3f73cb2cd7a910289e79b35d11c8e Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Tue, 17 May 2022 09:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0=E9=A2=84?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=9Abuild.sh=20hw|lsc=EF=BC=9B=E4=B8=8D?= =?UTF-8?q?=E5=B8=A6=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=8D=8E?= =?UTF-8?q?=E9=AB=98APP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 25 +++++++++++++++++++++++++ hgdriver/hgdev/CMakeLists.txt | 1 + hgdriver/hgdev/hg_scanner.cpp | 17 ++++++++++++++--- hgdriver/hgdev/hg_scanner.h | 7 +++++++ hgdriver/wrapper/CMakeLists.txt | 1 + hgsane/CMakeLists.txt | 1 + 6 files changed, 49 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index e288e69..1166f8e 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,30 @@ sysarch=$(arch) sys=$(cat /etc/issue) sys=${sys%% *} +echo "${1}" +if [ "${1}" == "hw" ]; then + sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgsane/CMakeLists.txt + sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/-DOEM_LISICHENG/-DOEM_HANWANG/g" hgsane/CMakeLists.txt + sed -i "s/-DOEM_LISICHENG/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/-DOEM_LISICHENG/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt +elif [ "${1}" == "lsc" ]; then + sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgsane/CMakeLists.txt + sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/-DOEM_HANWANG/-DOEM_LISICHENG/g" hgsane/CMakeLists.txt + sed -i "s/-DOEM_HANWANG/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/-DOEM_HANWANG/-DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt +else + sed -i "s/-DOEM_LISICHENG/-DOEM_HUAGAO/g" hgsane/CMakeLists.txt + sed -i "s/-DOEM_LISICHENG/-DOEM_HUAGAO/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/-DOEM_LISICHENG/-DOEM_HUAGAO/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/-DOEM_HANWANG/-DOEM_HUAGAO/g" hgsane/CMakeLists.txt + sed -i "s/-DOEM_HANWANG/-DOEM_HUAGAO/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/-DOEM_HANWANG/-DOEM_HUAGAO/g" hgdriver/hgdev/CMakeLists.txt +fi + echo "------------------------------change cmake path:$1--------------------" if [ "$sys" == "UnionTech" ];then sed -i "s/kylin/uos/g" hgdriver/wrapper/CMakeLists.txt @@ -22,3 +46,4 @@ fi echo "--------------------------------------make succeed------------------------------------" make + diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt index 8ece724..55ad07f 100644 --- a/hgdriver/hgdev/CMakeLists.txt +++ b/hgdriver/hgdev/CMakeLists.txt @@ -1,5 +1,6 @@ project(gdev) add_compile_options(-std=c++11) +add_definitions(-DOEM_HUAGAO) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") aux_source_directory(${PROJECT_SOURCE_DIR} DIR_SRCS) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index e76f683..961cc05 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -356,8 +356,6 @@ void hg_scanner::set_setting_map(int sn, const char* title) setting_map_[HG_BASE_SETTING_INDEX_SKEW_CHECK] = sn; else if (val == OPTION_TITLE_WXRRD) setting_map_[HG_BASE_SETTING_INDEX_SKEW_CHECK_LEVEL] = sn; - else if (val ==OPTION_TITLE_DLSC) - setting_map_[HG_BASE_SETTING_INDEX_MULTI_OUT] = sn; } void hg_scanner::thread_handle_usb(void) { @@ -1000,7 +998,7 @@ int hg_scanner::setting_multi_out(void *data) int color; image_prc_param_.bits.multi_out = match_best_multi_out(str,NULL); HG_VLOG_MINI_3(HG_LOG_LEVEL_DEBUG_INFO, "set multi_out type from %s to %s = %s\n", multi_out_string(image_prc_param_.bits.multi_out).c_str(), (char*)data, hg_scanner::strerr((hg_err)ret).c_str()); - + if (image_prc_param_.bits.multi_out == MULTI_GRAY_AND_BW) color = COLOR_MODE_256_GRAY; @@ -1812,6 +1810,19 @@ int hg_scanner::save_final_image(hg_imgproc::LPIMGHEAD head, void* buf) return HG_ERR_OK; } +int hg_scanner::is_running(void) +{ + if (!scan_life_) + return THREAD_RUNNING_IDLE; + + int run = THREAD_RUNNING_IDLE; + if (!wait_usb_.is_waiting()) + run |= THREAD_RUNNING_USB; + if (!wait_img_.is_waiting()) + run |= THREAD_RUNNING_IMAGE; + + return run; +} int hg_scanner::reset_io(usb_io* io) { diff --git a/hgdriver/hgdev/hg_scanner.h b/hgdriver/hgdev/hg_scanner.h index 8a867d1..d6235f1 100644 --- a/hgdriver/hgdev/hg_scanner.h +++ b/hgdriver/hgdev/hg_scanner.h @@ -256,6 +256,13 @@ protected: int save_usb_data(std::shared_ptr> data); int save_final_image(hg_imgproc::LPIMGHEAD head, void* buf); + enum thread_running + { + THREAD_RUNNING_IDLE = 0, + THREAD_RUNNING_USB = 1 << 0, + THREAD_RUNNING_IMAGE = 1 << 1, + }; + int is_running(void); // return thread_running //////////////////////////////////////////////////////////////// // 新增自定义伽玛曲线及扫描区域属性 - 2022-05-05 diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index fa8c2c4..cf184ca 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -3,6 +3,7 @@ string(TIMESTAMP CURRENT_YEAR "%y") string(TIMESTAMP MONTHDAY "1%m%d") add_definitions(-DVERSION_YEAR=${CURRENT_YEAR}) add_definitions(-DVERSION_BUILD=${MONTHDAY}) +add_definitions(-DOEM_HUAGAO) add_definitions("-Wl,--exclude-libs,ALL") #add_definitions("-B direct") add_compile_options(-std=c++11) diff --git a/hgsane/CMakeLists.txt b/hgsane/CMakeLists.txt index 2d31764..7139560 100644 --- a/hgsane/CMakeLists.txt +++ b/hgsane/CMakeLists.txt @@ -3,6 +3,7 @@ project(sane-hgsane) string(TIMESTAMP YEARDAY "%y%j") add_definitions(-DVERSION_BUILD=${YEARDAY}) #add_definitions(-DRUN_TEST) +add_definitions(-DOEM_HUAGAO) add_definitions(-DPRINT_DEBUG_INFO) add_definitions(-DBACKEND_NAME=hgsane) add_definitions(-DEXPORT_SANE_API)